Switch to Java8

freebsd-ports/graphics/lightzone/Makefile

@@ -31,7 +31,7 @@ USE_GCC=	yes
 USE_LDCONFIG=	yes
 USE_XORG=	x11
 JAVA_VENDOR=	openjdk
-JAVA_VERSION=	1.6+
+JAVA_VERSION=	1.8+
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 INSTALLS_ICONS=	yes

lightcrafts/build.xml

@@ -57,7 +57,7 @@
 
     <mkdir dir="build"/>
     <javac destdir="build" includeantruntime="false" debug="true"
-           source="1.6" target="1.6">
+           source="1.8" target="1.8">
       <src path="src"/>
       <classpath>
         <pathelement path="extbuild"/>

linux/PKGBUILD

@@ -7,8 +7,13 @@ url="http://lightzoneproject.org/"
 license=('custom:BSD-3-Clause')
 arch=('i686' 'x86_64')
 
+<<<<<<< HEAD
 depends=('java-runtime=8' 'javahelp2' 'lcms2' 'libjpeg-turbo' 'libtiff' 'libxml2')
 makedepends=('java-environment=8' 'apache-ant' 'autoconf' 'gcc' 'make' 'git' 'libx11' 'pkgconf' 'rsync' 'javahelp2' 'lcms2' 'libjpeg-turbo' 'libtiff')
+=======
+depends=('jre8-openjdk' 'javahelp2' 'lensfun' 'lcms2' 'libjpeg-turbo' 'libtiff' 'libxml2')
+makedepends=('jdk8-openjdk' 'apache-ant' 'autoconf' 'gcc' 'make' 'git' 'libx11' 'pkg-config' 'rsync' 'javahelp2' 'lensfun' 'lcms2' 'libjpeg-turbo' 'libtiff')
+>>>>>>> 99988022... Switch to Java8
 
 #vcsname=${pkgname}-${pkgver}
 #source=("${vcsname}.tar.bz2")
@@ -18,11 +23,15 @@ md5sums=('SKIP')
 
 build() {
   # Set $JAVA_HOME and $ANT_HOME
+<<<<<<< HEAD
   if [ -d /usr/lib/jvm/java-7-jdk ]; then
     export JAVA_HOME=/usr/lib/jvm/java-8-jdk
   else
     export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
   fi
+=======
+  export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
+>>>>>>> 99988022... Switch to Java8
   [ -f /etc/profile.d/apache-ant.sh ] && source /etc/profile.d/apache-ant.sh
 
   # Parallel compilation fails, so disable it

linux/build.xml

@@ -48,7 +48,7 @@
   <target name="javac" depends="common">
     <mkdir dir="build"/>
     <javac destdir="build" includeantruntime="false"
-           source="1.6" target="1.6" debug="true">
+           source="1.8" target="1.8" debug="true">
       <src path="src"/>
       <classpath>
         <fileset dir="${common-dir}/products">

macosx/build.xml

@@ -35,7 +35,7 @@
 
   <target name="javac" depends="common">
     <mkdir dir="build"/>
-    <javac destdir="build" source="1.6" target="1.6" debug="true">
+    <javac destdir="build" source="1.8" target="1.8" debug="true">
       <src path="src"/>
       <compilerarg value="-XDignore.symbol.file"/>
       <classpath>

windows/lightzone-amd64.install4j

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="5.1.15" transformSequenceNumber="4">
   <directoryPresets config="./resources/icons" />
-  <application name="LightZone" distributionSourceDir="" applicationId="3263-1164-2624-0047" mediaDir="" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="9" lzmaCompression="true" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="LightZone" publisher="LightZone Project" publisherWeb="http://lightzoneproject.org/" version="${compiler:LC_VERSION}" allPathsRelative="true" backupOnSave="false" autoSave="false" convertDotsToUnderscores="true" macSignature="????" installerName="" javaMinVersion="1.6" javaMaxVersion="" allowBetaVM="false" jdkMode="runtimeJre" jdkName="">
+  <application name="LightZone" distributionSourceDir="" applicationId="3263-1164-2624-0047" mediaDir="" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="9" lzmaCompression="true" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="LightZone" publisher="LightZone Project" publisherWeb="http://lightzoneproject.org/" version="${compiler:LC_VERSION}" allPathsRelative="true" backupOnSave="false" autoSave="false" convertDotsToUnderscores="true" macSignature="????" installerName="" javaMinVersion="1.8" javaMaxVersion="" allowBetaVM="false" jdkMode="runtimeJre" jdkName="">
     <languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="true">
       <principalLanguage id="en" customLocalizationFile="" />
       <additionalLanguages>

windows/lightzone-x86.install4j

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="5.1.15" transformSequenceNumber="4">
   <directoryPresets config="./resources/icons" />
-  <application name="LightZone" distributionSourceDir="" applicationId="3263-1164-2624-0047" mediaDir="" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="9" lzmaCompression="true" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="LightZone" publisher="LightZone Project" publisherWeb="http://lightzoneproject.org/" version="${compiler:LC_VERSION}" allPathsRelative="true" backupOnSave="false" autoSave="false" convertDotsToUnderscores="true" macSignature="????" installerName="" javaMinVersion="1.6" javaMaxVersion="" allowBetaVM="false" jdkMode="runtimeJre" jdkName="">
+  <application name="LightZone" distributionSourceDir="" applicationId="3263-1164-2624-0047" mediaDir="" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="9" lzmaCompression="true" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="LightZone" publisher="LightZone Project" publisherWeb="http://lightzoneproject.org/" version="${compiler:LC_VERSION}" allPathsRelative="true" backupOnSave="false" autoSave="false" convertDotsToUnderscores="true" macSignature="????" installerName="" javaMinVersion="1.8" javaMaxVersion="" allowBetaVM="false" jdkMode="runtimeJre" jdkName="">
     <languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="true">
       <principalLanguage id="en" customLocalizationFile="" />
       <additionalLanguages>