[crux-commits] ports/contrib (3.6): [notify] openjdk8: 8u252-b09 -> 8u292-b10 picked up port and dependency change gtk to gtk3

20 Jun 2021

commit 41ccaed00414d46449162653cdf535d3d81cf794
Author: Danny Rawlins <contact@romster.me>
Date:   Sun Jun 20 22:31:55 2021 +1000

    [notify] openjdk8: 8u252-b09 -> 8u292-b10 picked up port and dependency change gtk to gtk3

diff --git a/openjdk8/.footprint b/openjdk8/.footprint
index fca36059d..02cec78bf 100644
--- a/openjdk8/.footprint
+++ b/openjdk8/.footprint
@@ -23,6 +23,7 @@ drwxr-xr-x	root/root	usr/lib/java/openjdk8/bin/
 -rwxr-xr-x	root/root	usr/lib/java/openjdk8/bin/jconsole
 -rwxr-xr-x	root/root	usr/lib/java/openjdk8/bin/jdb
 -rwxr-xr-x	root/root	usr/lib/java/openjdk8/bin/jdeps
+-rwxr-xr-x	root/root	usr/lib/java/openjdk8/bin/jfr
 -rwxr-xr-x	root/root	usr/lib/java/openjdk8/bin/jhat
 -rwxr-xr-x	root/root	usr/lib/java/openjdk8/bin/jinfo
 -rwxr-xr-x	root/root	usr/lib/java/openjdk8/bin/jjs
@@ -154,6 +155,10 @@ drwxr-xr-x	root/root	usr/lib/java/openjdk8/jre/lib/images/cursors/
 -rw-r--r--	root/root	usr/lib/java/openjdk8/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif
 -rw-r--r--	root/root	usr/lib/java/openjdk8/jre/lib/jce.jar
 -rwxr-xr-x	root/root	usr/lib/java/openjdk8/jre/lib/jexec
+-rw-r--r--	root/root	usr/lib/java/openjdk8/jre/lib/jfr.jar
+drwxr-xr-x	root/root	usr/lib/java/openjdk8/jre/lib/jfr/
+-rw-r--r--	root/root	usr/lib/java/openjdk8/jre/lib/jfr/default.jfc
+-rw-r--r--	root/root	usr/lib/java/openjdk8/jre/lib/jfr/profile.jfc
 -rw-r--r--	root/root	usr/lib/java/openjdk8/jre/lib/jsse.jar
 -rw-r--r--	root/root	usr/lib/java/openjdk8/jre/lib/jvm.hprof.txt
 -rw-r--r--	root/root	usr/lib/java/openjdk8/jre/lib/logging.properties
diff --git a/openjdk8/.signature b/openjdk8/.signature
index 636485e81..550971742 100644
--- a/openjdk8/.signature
+++ b/openjdk8/.signature
@@ -1,14 +1,14 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF32SJFje9r2BukqHLUpWLAYoNPg8IEJjWWaAcY1EEVFdy9AmTAVps1LNMb+LIzv33evs/yVwI4ccvmOzMQfKPMww=
-SHA256 (Pkgfile) = 457d4d6c47658f107e6f3a8874dde6a0d541a376f8a89bbc5cb11cae3f6a7b4d
-SHA256 (.footprint) = cbff9c3cbe559abe9d2a5d1ef95a6f21a9fc6f2b8bbbb994b1d9a3838679e328
-SHA256 (icedtea-3.16.0.tar.xz) = b84bb7678baf09008670ce230a787b7bce7186cb5500d5a0664b8a369ad52500
-SHA256 (corba-8u252-b09.tar.xz) = 45fbaefea10211f1efc17df5d1f2197583a119d2e8d1773ecd0f4fbc786813d3
-SHA256 (hotspot-8u252-b09.tar.xz) = a6b3e5379b95d6263d8d397cf181d6c07946400f1d5a424a8bc06c1cce9ef1e3
-SHA256 (jaxp-8u252-b09.tar.xz) = 030ee059bcb815934b4ea4fb1e6b8d4ee4d15fdad6f4ea8ce20f99ded80631b6
-SHA256 (jaxws-8u252-b09.tar.xz) = b529f8d44af3ed7588e51f8326da2ba47fb3ea79c23933b5a7e8ec1e5e4e0f1b
-SHA256 (jdk-8u252-b09.tar.xz) = da14787acc99062ffb8b087eb27619eded0c84649b4a4e0f8d50d5c067533e8b
-SHA256 (langtools-8u252-b09.tar.xz) = dd6978cce62c30bdeb2afeec865449d99e2a65a8555fdbecf9f7173c10022fcd
-SHA256 (nashorn-8u252-b09.tar.xz) = 30086e392a365242c7c61eee18534bfc1583ced855fbb301f187fcd16403845c
-SHA256 (openjdk-8u252-b09.tar.xz) = f08a768697cefd1bc2b358b075803d366d7023c7e84a78fc47fef66134bbc7e9
-SHA256 (openjdk8-boot-20200504-bin.tar.xz) = d5633e613b33728fb7bb4305144d3654f238c9759edda112422533b7e2495195
+RWSagIOpLGJF3zPdAjd2Ri7vYi+iC3P3kWKaMu4Lilq81iYlznc/wU5F6yrbxZTG4DsNHvHj2NykVr2Wbh7Lw8cB3lkkgqU/5Qc=
+SHA256 (Pkgfile) = 9df746968bdbfd304cba95ca668b7218553eee0a1ad4ef71340b6f2cc00f8208
+SHA256 (.footprint) = b5b8d3b68f8c867337b3028d52fbcf2584dba33a02f9a6b97a6672a0a0cb343c
+SHA256 (icedtea-3.19.0.tar.xz) = eed61e51ba35635b2292a6e67404d5e3f4bf7cc5d69bc1b81f5b69b1d8d1b5b2
+SHA256 (corba-8u292-b10.tar.xz) = 19b87e02b27a7312fa0835660159bee55a9e8867fd0013dc36acc057dc331076
+SHA256 (hotspot-8u292-b10.tar.xz) = a2417711339f3c1bb3b32612022e331fe090037b11ef98d989c1fab1acebcab9
+SHA256 (jaxp-8u292-b10.tar.xz) = b9d78eec0ae71332b61e44f71bcf991d3af60663028fdb10bdb1c497cb186f10
+SHA256 (jaxws-8u292-b10.tar.xz) = 197053d93fc478adf0645577e85feca004b1496a29dc0d98acc256b1c9be80dd
+SHA256 (jdk-8u292-b10.tar.xz) = 3bc3dcaa1f9d109ed99139e1108a691964c68ad90375214a841fd1522aa3829c
+SHA256 (langtools-8u292-b10.tar.xz) = 0b94950c68153862c315e1aae62de58a95bc9487ea197723bcb435d6c53d3f22
+SHA256 (nashorn-8u292-b10.tar.xz) = 2451e97fe9b4c3d14859170c9621ce1323075e97f6148890ba3644512f3bd695
+SHA256 (openjdk-8u292-b10.tar.xz) = c9d0f566a2cf9d4150a16b7c68b07ccdeeb317b7d055c56f671a0d3d5afd6bd0
+SHA256 (openjdk8_boot-20210620.tar.xz) = 141003c3036fd27b13f478b5ee4be65be7b43258a680a7f8bc5c47f1b210d4d0
diff --git a/openjdk8/Pkgfile b/openjdk8/Pkgfile
index 24e923f8c..4c490f04d 100644
--- a/openjdk8/Pkgfile
+++ b/openjdk8/Pkgfile
@@ -1,142 +1,143 @@
 # Description: OpenJDK 8 built using IcedTea build harness
-# URL:         http://icedtea.classpath.org
-# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
-# Depends on:  alsa-lib cups fontconfig freetype giflib gtk krb5 lcms2 libjpeg-turbo libpng libxslt nss p11-kit unzip xorg-libxt xorg-libxtst xorg-libxinerama zip
+# URL: https://icedtea.classpath.org
+# Maintainer: Tim Biermann, tbier at posteo dot de
+# Co-Maintainer: Danny Rawlins, crux at romster dot me
+# Depends on: alsa-lib cups fontconfig freetype giflib gtk3 krb5 lcms2 libjpeg-turbo libpng libxslt nss p11-kit unzip xorg-libxt xorg-libxtst xorg-libxinerama zip
 
 name=openjdk8
-version=8u252-b09
-icedtea_version=3.16.0
-boot_version=20200504
+version=8u292-b10
+_icedtea_version=3.19.0
+_boot_version=20210620
 release=1
-source=(http://icedtea.wildebeest.org/download/source/icedtea-$icedtea_version.tar.x...
-	https://stygian.me/crux/distfiles/$name/corba-$version.tar.xz
-	https://stygian.me/crux/distfiles/$name/hotspot-$version.tar.xz
-	https://stygian.me/crux/distfiles/$name/jaxp-$version.tar.xz
-	https://stygian.me/crux/distfiles/$name/jaxws-$version.tar.xz
-	https://stygian.me/crux/distfiles/$name/jdk-$version.tar.xz
-	https://stygian.me/crux/distfiles/$name/langtools-$version.tar.xz
-	https://stygian.me/crux/distfiles/$name/nashorn-$version.tar.xz
-	https://stygian.me/crux/distfiles/$name/openjdk-$version.tar.xz
-	https://stygian.me/crux/distfiles/$name-boot-$boot_version-bin.tar.xz)
-	# See README for links to originally named files and rationale of renaming/versioning/mirroring.
+source=(http://icedtea.wildebeest.org/download/source/icedtea-$_icedtea_version.tar....
+  https://crux.ster.zone/downloads/java/corba-$version.tar.xz
+  https://crux.ster.zone/downloads/java/hotspot-$version.tar.xz
+  https://crux.ster.zone/downloads/java/jaxp-$version.tar.xz
+  https://crux.ster.zone/downloads/java/jaxws-$version.tar.xz
+  https://crux.ster.zone/downloads/java/jdk-$version.tar.xz
+  https://crux.ster.zone/downloads/java/langtools-$version.tar.xz
+  https://crux.ster.zone/downloads/java/nashorn-$version.tar.xz
+  https://crux.ster.zone/downloads/java/openjdk-$version.tar.xz
+  https://crux.ster.zone/downloads/java/openjdk8_boot-$_boot_version.tar.xz)
+ # See README for links to originally named files and rationale of renaming/versioning/mirroring.
 
 unpack_source() {
-	for file in ${source[@]}; do
-		case ${file##*/} in
-			icedtea-$icedtea_version.tar.xz|\
-			$name-boot-$boot_version-bin.tar.xz)
-				bsdtar -p -o -C $SRC -xf $(get_filename $file) ;;
-			*)
-				cp $(get_filename $file) $SRC ;;
-		esac
-	done
+  for file in ${source[@]}; do
+   case ${file##*/} in
+    icedtea-$_icedtea_version.tar.xz|\
+    openjdk8_boot-$_boot_version.tar.xz)
+     bsdtar -p -o -C $SRC -xf $(get_filename $file) ;;
+    *)
+     cp $(get_filename $file) $SRC ;;
+   esac
+  done
 }
 
 build() {
-	# Most of these flags were snarfed directly from Alpine Linux APKBUILD for openjdk7, added -fabi-version.
-	# Fixes build failures due to suspected gcc8 changes for default std and abi.
-	export EXTRA_CPP_FLAGS="$CXXFLAGS -fabi-version=10 -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-strict-overflow"
-	export EXTRA_CFLAGS="$CFLAGS -fabi-version=10 -std=gnu++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-strict-overflow"
+  # Most of these flags were snarfed directly from Alpine Linux APKBUILD for openjdk7, added -fabi-version.
+  # Fixes build failures due to suspected gcc8 changes for default std and abi.
+  export EXTRA_CPP_FLAGS="$CXXFLAGS -fabi-version=10 -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-strict-overflow"
+  export EXTRA_CFLAGS="$CFLAGS -fabi-version=10 -std=gnu++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-strict-overflow"
 
-	# Make sure we do not have ccache masquerade directory in PATH.
-	# Use --enable-ccache instead of providing a wrapped compiler.
-	# NOTE: the check for usr/bin/ccache may be too specific, since it rules out
-	#       local or opt installs.
-	if [ -e '/usr/bin/ccache' ]; then
-		EXTRA_OPTIONS='--enable-ccache'
-		PATH=$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')
-	fi
+  # Make sure we do not have ccache masquerade directory in PATH.
+  # Use --enable-ccache instead of providing a wrapped compiler.
+  # NOTE: the check for usr/bin/ccache may be too specific, since it rules out
+  #       local or opt installs.
+  if [ -e '/usr/bin/ccache' ]; then
+   EXTRA_OPTIONS='--enable-ccache'
+   PATH=$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')
+  fi
 
-	OLD_PATH=$PATH
-	export JAVA_HOME=$SRC/$name-boot
-	export PATH=$JAVA_HOME/bin:$OLD_PATH
+  unset JAVA_HOME
+  OLD_PATH=$PATH
+  export JAVA_HOME=$SRC/$name-boot
+  export PATH=$JAVA_HOME/bin:$OLD_PATH
 
-	if [ -f /etc/pki/tls/java/cacerts ]; then
-		JAVA_CACERTS=/etc/pki/tls/java/cacerts
-	else
-		/usr/sbin/make-ca -g -D $SRC/certs || exit 1
-		JAVA_CACERTS=$SRC/certs/etc/pki/tls/java/cacerts
-	fi
+  if [ -f /etc/pki/tls/java/cacerts ]; then
+   JAVA_CACERTS=/etc/pki/tls/java/cacerts
+  else
+   /usr/sbin/make-ca -g -D $SRC/certs || exit 1
+   JAVA_CACERTS=$SRC/certs/etc/pki/tls/java/cacerts
+  fi
+  mkdir $SRC/build
+  cd $SRC/build
 
-	mkdir $SRC/build
-	cd $SRC/build
+  # Will fail if make-ca has not been run after p11-kit install
+  LC_ALL=C \
+  CONFIG_SHELL=/bin/bash \
+  ../icedtea-$_icedtea_version/configure ${EXTRA_OPTIONS} \
+   --prefix=/usr/lib/java/$name \
+   --disable-docs \
+   --disable-downloading \
+   --disable-hotspot-tests \
+   --disable-jdk-tests \
+   --disable-langtools-tests \
+   --disable-precompiled-headers \
+   --disable-system-pcsc \
+   --disable-system-sctp \
+   --disable-systemtap-tests \
+   --disable-tests \
+   --enable-improved-font-rendering \
+   --enable-non-nss-curves \
+   --enable-nss \
+   --enable-system-cups \
+   --enable-system-fontconfig \
+   --enable-system-gio \
+   --enable-system-gtk \
+   --enable-system-jpeg \
+   --enable-system-kerberos \
+   --enable-system-lcms \
+   --enable-system-png \
+   --enable-system-zlib \
+   --with-corba-src-zip=$SRC/corba-$version.tar.xz \
+   --with-hotspot-src-zip=$SRC/hotspot-$version.tar.xz \
+   --with-jaxp-src-zip=$SRC/jaxp-$version.tar.xz \
+   --with-jaxws-src-zip=$SRC/jaxws-$version.tar.xz \
+   --with-jdk-src-zip=$SRC/jdk-$version.tar.xz \
+   --with-langtools-src-zip=$SRC/langtools-$version.tar.xz \
+   --with-nashorn-src-zip=$SRC/nashorn-$version.tar.xz \
+   --with-openjdk-src-zip=$SRC/openjdk-$version.tar.xz \
+   --with-pkgversion=CRUX \
+   --with-jdk-home=$JAVA_HOME \
+   --with-cacerts-file=$JAVA_CACERTS \
+   --with-tzdata-dir=/usr/share/zoneinfo
 
-	# Will fail if make-ca has not been run after p11-kit install
-	LC_ALL=C \
-	CONFIG_SHELL=/bin/bash \
-	../icedtea-$icedtea_version/configure ${EXTRA_OPTIONS} \
-		--prefix=/usr/lib/java/$name \
-		--disable-docs \
-		--disable-downloading \
-		--disable-hotspot-tests \
-		--disable-jdk-tests \
-		--disable-langtools-tests \
-		--disable-precompiled-headers \
-		--disable-system-pcsc \
-		--disable-system-sctp \
-		--disable-systemtap-tests \
-		--disable-tests \
-		--enable-improved-font-rendering \
-		--enable-non-nss-curves \
-		--enable-nss \
-		--enable-system-cups \
-		--enable-system-fontconfig \
-		--enable-system-gio \
-		--enable-system-gtk \
-		--enable-system-jpeg \
-		--enable-system-kerberos \
-		--enable-system-lcms \
-		--enable-system-png \
-		--enable-system-zlib \
-		--with-corba-src-zip=$SRC/corba-$version.tar.xz \
-		--with-hotspot-src-zip=$SRC/hotspot-$version.tar.xz \
-		--with-jaxp-src-zip=$SRC/jaxp-$version.tar.xz \
-		--with-jaxws-src-zip=$SRC/jaxws-$version.tar.xz \
-		--with-jdk-src-zip=$SRC/jdk-$version.tar.xz \
-		--with-langtools-src-zip=$SRC/langtools-$version.tar.xz \
-		--with-nashorn-src-zip=$SRC/nashorn-$version.tar.xz \
-		--with-openjdk-src-zip=$SRC/openjdk-$version.tar.xz \
-		--with-pkgversion=CRUX \
-		--with-jdk-home=$JAVA_HOME \
-		--with-cacerts-file=$JAVA_CACERTS \
-		--with-tzdata-dir=/usr/share/zoneinfo
+  LC_ALL=C \
+  make
 
-	LC_ALL=C \
-	make
+  # Copy the sdk image first before pruning it, saving original for later inspection/comparison.
+  install -d -m 0755 $PKG/usr/lib/java/$name
+  cp -a openjdk.build/images/j2sdk-image/* $PKG/usr/lib/java/$name
 
-	# Copy the sdk image first before pruning it, saving original for later inspection/comparison.
-	install -d -m 0755 $PKG/usr/lib/java/$name
-	cp -a openjdk.build/images/j2sdk-image/* $PKG/usr/lib/java/$name
+  install -d -m 0755 $PKG/etc/revdep.d
+  echo "/usr/lib/java/$name/jre/lib/amd64" > $PKG/etc/revdep.d/$name
+  echo "/usr/lib/java/$name/jre/lib/amd64/jli" >> $PKG/etc/revdep.d/$name
+  echo "/usr/lib/java/$name/jre/lib/amd64/server" >> $PKG/etc/revdep.d/$name
 
-	install -d -m 0755 $PKG/etc/revdep.d
-	echo "/usr/lib/java/$name/jre/lib/amd64" > $PKG/etc/revdep.d/$name
-	echo "/usr/lib/java/$name/jre/lib/amd64/jli" >> $PKG/etc/revdep.d/$name
-	echo "/usr/lib/java/$name/jre/lib/amd64/server" >> $PKG/etc/revdep.d/$name
+  # Remove unneeded files
+  rm -f $PKG/usr/lib/java/$name/src.zip
+  rm -rf $PKG/usr/lib/java/$name/{demo,man/ja*,sample}
+  rm -f $PKG/usr/lib/java/$name/{,jre/}THIRD_PARTY_README
+  find $PKG/usr/lib/java/$name \( \
+   -name '*.ja' -o \
+   -name 'ASSEMBLY_EXCEPTION' -o \
+   -name 'LICENSE' -o \
+   -name 'THIRD_PARTY_README' \) \
+   -delete
 
-	# Remove unneeded files
-	rm -f $PKG/usr/lib/java/$name/src.zip
-	rm -rf $PKG/usr/lib/java/$name/{demo,man/ja*,sample}
-	rm -f $PKG/usr/lib/java/$name/{,jre/}THIRD_PARTY_README
-	find $PKG/usr/lib/java/$name \( \
-		-name '*.ja' -o \
-		-name 'ASSEMBLY_EXCEPTION' -o \
-		-name 'LICENSE' -o \
-		-name 'THIRD_PARTY_README' \) \
-		-delete
+  # Deduplicate
+  rm $PKG/usr/lib/java/$name/jre/lib/amd64/libjawt.so
+  ln -sr $PKG/usr/lib/java/$name/lib/amd64/libjawt.so \
+   $PKG/usr/lib/java/$name/jre/lib/amd64/libjawt.so
+  rm $PKG/usr/lib/java/$name/jre/lib/amd64/jli/libjli.so
+  ln -sr $PKG/usr/lib/java/$name/lib/amd64/jli/libjli.so \
+   $PKG/usr/lib/java/$name/jre/lib/amd64/jli/libjli.so
+  for f in $PKG/usr/lib/java/$name/jre/bin/* ; do
+   if [ -f $PKG/usr/lib/java/$name/bin/${f##*/} ]; then
+    rm $f
+    ln -sr $PKG/usr/lib/java/$name/bin/${f##*/} $f
+   fi
+  done
 
-	# Deduplicate
-	rm $PKG/usr/lib/java/$name/jre/lib/amd64/libjawt.so
-	ln -sr $PKG/usr/lib/java/$name/lib/amd64/libjawt.so \
-		$PKG/usr/lib/java/$name/jre/lib/amd64/libjawt.so
-	rm $PKG/usr/lib/java/$name/jre/lib/amd64/jli/libjli.so
-	ln -sr $PKG/usr/lib/java/$name/lib/amd64/jli/libjli.so \
-		$PKG/usr/lib/java/$name/jre/lib/amd64/jli/libjli.so
-	for f in $PKG/usr/lib/java/$name/jre/bin/* ; do
-		if [ -f $PKG/usr/lib/java/$name/bin/${f##*/} ]; then
-			rm $f
-			ln -sr $PKG/usr/lib/java/$name/bin/${f##*/} $f
-		fi
-	done
-
-	chmod u+w $PKG/usr/lib/java/$name/jre/lib/security/cacerts
+  chmod u+w $PKG/usr/lib/java/$name/jre/lib/security/cacerts
 }

    

[crux-commits] ports/contrib (3.6): [notify] openjdk8: 8u252-b09 -> 8u292-b10 picked up port and dependency change gtk to gtk3

crux＠crux.nu