Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package java-11-openj9 for openSUSE:Factory checked in at 2021-03-19 16:42:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-11-openj9 (Old) and /work/SRC/openSUSE:Factory/.java-11-openj9.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-11-openj9" Fri Mar 19 16:42:11 2021 rev:5 rq:866734 version:11.0.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/java-11-openj9/java-11-openj9.changes 2020-11-04 18:31:10.832308899 +0100 +++ /work/SRC/openSUSE:Factory/.java-11-openj9.new.2401/java-11-openj9.changes 2021-03-19 16:42:42.642077926 +0100 @@ -1,0 +2,15 @@ +Tue Jan 26 07:20:29 UTC 2021 - Fridrich Strba <[email protected]> + +- Update to OpenJDK 11.0.10 with OpenJ9 0.24.0 virtual machine + * including Oracle January 2021 CPU changes (bsc#1181239) + * OpenJ9 changes, see + https://www.eclipse.org/openj9/docs/version0.24 +- Modified patch: + * system-pcsclite.patch + + rediff to changed context +- Modified template patch: + * openj9-nogit.patch.in + + replace git runs by pre-fetched git hashes in new places + + remove hunks that are irrelevant in new sources + +------------------------------------------------------------------- Old: ---- 0394ef7545243942a4b27227a22174c1be67ed60.zip 3b09cfd7e972ed3f67e7c89d079d06bef1c81d04.zip 582366ae54510a48f7815921091db00357c4338a.zip New: ---- 0a86953833177e8104be499247f52d0d0d138647.zip 345e1b09e2a1f2cf6323b25edc901cce197f4365.zip 741e94ea8673b021fc7edc59a2ec8bd203fa2b03.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-11-openj9.spec ++++++ --- /var/tmp/diff_new_pack.BEApQ3/_old 2021-03-19 16:42:45.242081434 +0100 +++ /var/tmp/diff_new_pack.BEApQ3/_new 2021-03-19 16:42:45.246081440 +0100 @@ -1,7 +1,7 @@ # # spec file for package java-11-openj9 # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,20 +28,20 @@ # Standard JPackage naming and versioning defines. %global featurever 11 %global interimver 0 -%global updatever 9 +%global updatever 10 %global patchver 0 -%global datever 2020-10-20 -%global buildver 11 +%global datever 2021-01-19 +%global buildver 9 %global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk11/archive -%global root_revision 3b09cfd7e972ed3f67e7c89d079d06bef1c81d04 -%global root_branch openj9-0.23.0 +%global root_revision 0a86953833177e8104be499247f52d0d0d138647 +%global root_branch openj9-0.24.0 %global omr_repository https://github.com/eclipse/openj9-omr/archive -%global omr_revision 582366ae54510a48f7815921091db00357c4338a -%global omr_branch v0.23.0-release +%global omr_revision 741e94ea8673b021fc7edc59a2ec8bd203fa2b03 +%global omr_branch v0.24.0-release %global openj9_repository https://github.com/eclipse/openj9/archive -%global openj9_revision 0394ef7545243942a4b27227a22174c1be67ed60 -%global openj9_branch v0.23.0-release -%global openj9_tag openj9-0.23.0 +%global openj9_revision 345e1b09e2a1f2cf6323b25edc901cce197f4365 +%global openj9_branch v0.24.0-release +%global openj9_tag openj9-0.24.0 %global icedtea_sound_version 1.0.1 %global freemarker_version 2.3.29 # JavaEE modules @@ -96,6 +96,7 @@ %global bits 64 # Turn on/off some features %global with_system_pcsc 1 +%global with_system_harfbuzz 1 %global with_pulseaudio 1 Name: java-%{featurever}-openj9 Version: %{featurever}.%{interimver}.%{updatever}.%{patchver} @@ -113,7 +114,7 @@ # Package also the sources Source4: https://repo1.maven.org/maven2/org/freemarker/freemarker/%{freemarker_version}/freemarker-%{freemarker_version}-sources.jar # Accessibility support -Source8: ftp://ftp.gnome.org/pub/GNOME/sources/java-atk-wrapper/0.33/java-atk-wrapper-%{java_atk_wrapper_version}.tar.xz +Source8: https://download.gnome.org/sources/java-atk-wrapper/0.33/java-atk-wrapper-%{java_atk_wrapper_version}.tar.xz # Pulseaudio support Source9: http://icedtea.classpath.org/download/source/icedtea-sound-%{icedtea_sound_version}.tar.xz # Desktop files. Adapted from IcedTea. @@ -271,6 +272,9 @@ BuildRequires: libpulse-devel >= 0.9.11 BuildRequires: pulseaudio >= 0.9.11 %endif +%if %{with_system_harfbuzz} +BuildRequires: harfbuzz-devel +%endif %if %{with_system_pcsc} BuildRequires: pcsc-lite-devel %endif @@ -509,6 +513,9 @@ %if %{with_system_pcsc} --with-pcsclite=system \ %endif +%if %{with_system_harfbuzz} + --with-harfbuzz=system \ +%endif --with-stdc++lib=dynamic \ --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \ --with-extra-cflags="$EXTRA_CFLAGS" \ @@ -1105,6 +1112,9 @@ %{_jvmdir}/%{sdkdir}/lib/libdt_socket.so %{_jvmdir}/%{sdkdir}/lib/libextnet.so %{_jvmdir}/%{sdkdir}/lib/libfontmanager.so +%if ! %{with_system_harfbuzz} +%{_jvmdir}/%{sdkdir}/lib/libharfbuzz.so +%endif %{_jvmdir}/%{sdkdir}/lib/libinstrument.so %{_jvmdir}/%{sdkdir}/lib/libj2gss.so %{_jvmdir}/%{sdkdir}/lib/libj2pcsc.so ++++++ openj9-nogit.patch.in ++++++ --- /var/tmp/diff_new_pack.BEApQ3/_old 2021-03-19 16:42:45.398081645 +0100 +++ /var/tmp/diff_new_pack.BEApQ3/_new 2021-03-19 16:42:45.398081645 +0100 @@ -1,9 +1,17 @@ +diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk +index 65e002c738..3837214054 100644 --- a/closed/OpenJ9.gmk +++ b/closed/OpenJ9.gmk -@@ -32,15 +32,15 @@ ifeq (,$(BUILD_ID)) +@@ -32,20 +32,20 @@ ifeq (,$(BUILD_ID)) BUILD_ID := 000000 endif +-OPENJDK_SHA := $(shell git -C $(TOPDIR) rev-parse --short HEAD) ++OPENJDK_SHA := @OPENJDK_SHA@ + ifeq (,$(OPENJDK_SHA)) + $(error Could not determine OpenJDK SHA) + endif + -OPENJ9_SHA := $(shell git -C $(OPENJ9_TOPDIR) rev-parse --short HEAD) +OPENJ9_SHA := @OPENJ9_SHA@ ifeq (,$(OPENJ9_SHA)) @@ -19,7 +27,7 @@ ifeq (,$(OPENJ9_BRANCH)) $(error Could not determine OpenJ9 branch) endif -@@ -49,7 +49,7 @@ else +@@ -54,7 +54,7 @@ else OPENJ9_VERSION_STRING := $(OPENJ9_TAG) endif @@ -28,14 +36,17 @@ ifeq (,$(OPENJ9OMR_SHA)) $(error Could not determine OMR SHA) endif ---- a/closed/autoconf/custom-hook.m4 -+++ b/closed/autoconf/custom-hook.m4 -@@ -436,7 +436,7 @@ AC_DEFUN_ONCE([OPENJ9_CHECK_NASM_VERSION], - - AC_DEFUN_ONCE([OPENJDK_VERSION_DETAILS], - [ -- OPENJDK_SHA=`git -C $TOPDIR rev-parse --short HEAD` -+ OPENJDK_SHA=@OPENJDK_SHA@ - - AC_SUBST(OPENJDK_SHA) - +diff --git a/closed/custom/ReleaseFile.gmk b/closed/custom/ReleaseFile.gmk +index 4a7267056d..4b4f1ca51c 100644 +--- a/closed/custom/ReleaseFile.gmk ++++ b/closed/custom/ReleaseFile.gmk +@@ -18,6 +18,6 @@ + # 2 along with this work; if not, see <http://www.gnu.org/licenses/>. + # =========================================================================== + +-SOURCE_REVISION := OpenJDK:$(shell git -C $(TOPDIR) rev-parse --short HEAD) +-SOURCE_REVISION += OpenJ9:$(shell git -C $(OPENJ9_TOPDIR) rev-parse --short HEAD) +-SOURCE_REVISION += OMR:$(shell git -C $(OPENJ9OMR_TOPDIR) rev-parse --short HEAD) ++SOURCE_REVISION := OpenJDK:@OPENJ9_SHA@ ++SOURCE_REVISION += OpenJ9:@OPENJ9_SHA@ ++SOURCE_REVISION += OMR:@OPENJ9OMR_SHA@ ++++++ system-pcsclite.patch ++++++ --- /var/tmp/diff_new_pack.BEApQ3/_old 2021-03-19 16:42:45.406081656 +0100 +++ /var/tmp/diff_new_pack.BEApQ3/_new 2021-03-19 16:42:45.406081656 +0100 @@ -1,16 +1,16 @@ ---- jdk11/make/autoconf/lib-bundled.m4 2018-06-13 06:35:04.000000000 +0200 -+++ jdk11/make/autoconf/lib-bundled.m4 2018-06-14 15:06:38.825090243 +0200 -@@ -37,6 +37,7 @@ - LIB_SETUP_LIBPNG +--- jdk11/make/autoconf/lib-bundled.m4 2021-01-19 09:46:26.193562524 +0100 ++++ jdk11/make/autoconf/lib-bundled.m4 2021-01-19 09:47:38.465983974 +0100 +@@ -38,6 +38,7 @@ LIB_SETUP_ZLIB LIB_SETUP_LCMS + LIB_SETUP_HARFBUZZ + LIB_SETUP_PCSCLITE ]) ################################################################################ -@@ -260,3 +261,41 @@ - AC_SUBST(LCMS_CFLAGS) - AC_SUBST(LCMS_LIBS) +@@ -301,3 +302,41 @@ + AC_SUBST(HARFBUZZ_CFLAGS) + AC_SUBST(HARFBUZZ_LIBS) ]) + +################################################################################ @@ -50,9 +50,9 @@ + + AC_SUBST(USE_EXTERNAL_PCSCLITE) +]) ---- jdk11/make/autoconf/spec.gmk.in 2018-06-13 06:35:04.000000000 +0200 -+++ jdk11/make/autoconf/spec.gmk.in 2018-06-14 15:06:38.873090499 +0200 -@@ -730,6 +730,7 @@ +--- jdk11/make/autoconf/spec.gmk.in 2021-01-19 09:46:26.193562524 +0100 ++++ jdk11/make/autoconf/spec.gmk.in 2021-01-19 09:47:10.805822676 +0100 +@@ -763,6 +763,7 @@ ENABLE_INTREE_EC:=@ENABLE_INTREE_EC@ USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@ USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@ @@ -60,8 +60,8 @@ USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@ LIBZ_CFLAGS:=@LIBZ_CFLAGS@ LIBZ_LIBS:=@LIBZ_LIBS@ ---- jdk11/make/lib/Lib-java.smartcardio.gmk 2018-06-13 06:35:04.000000000 +0200 -+++ jdk11/make/lib/Lib-java.smartcardio.gmk 2018-06-14 15:09:10.281896734 +0200 +--- jdk11/make/lib/Lib-java.smartcardio.gmk 2021-01-19 09:46:26.245562827 +0100 ++++ jdk11/make/lib/Lib-java.smartcardio.gmk 2021-01-19 09:47:10.805822676 +0100 @@ -30,12 +30,12 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJ2PCSC, \ NAME := j2pcsc, \ @@ -78,8 +78,8 @@ LIBS_windows := winscard.lib, \ )) ---- jdk11/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c 2018-06-13 06:35:04.000000000 +0200 -+++ jdk11/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c 2018-06-14 15:06:38.877090521 +0200 +--- jdk11/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c 2021-01-19 09:46:26.681565369 +0100 ++++ jdk11/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c 2021-01-19 09:47:10.809822699 +0100 @@ -36,6 +36,7 @@ #include "pcsc_md.h" @@ -122,8 +122,8 @@ #endif // __APPLE__ +#endif } ---- jdk11/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.h 2018-06-13 06:35:04.000000000 +0200 -+++ jdk11/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.h 2018-06-14 15:06:38.877090521 +0200 +--- jdk11/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.h 2021-01-19 09:46:26.681565369 +0100 ++++ jdk11/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.h 2021-01-19 09:47:10.809822699 +0100 @@ -23,6 +23,8 @@ * questions. */ @@ -133,7 +133,7 @@ typedef LONG (*FPTR_SCardEstablishContext)(DWORD dwScope, LPCVOID pvReserved1, LPCVOID pvReserved2, -@@ -110,3 +112,41 @@ +@@ -111,3 +113,41 @@ extern FPTR_SCardBeginTransaction scardBeginTransaction; extern FPTR_SCardEndTransaction scardEndTransaction; extern FPTR_SCardControl scardControl;
