Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gettext-runtime for openSUSE:Factory checked in at 2022-04-23 19:44:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gettext-runtime (Old) and /work/SRC/openSUSE:Factory/.gettext-runtime.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gettext-runtime" Sat Apr 23 19:44:52 2022 rev:88 rq:970778 version:0.21 Changes: -------- --- /work/SRC/openSUSE:Factory/gettext-runtime/gettext-csharp.changes 2021-12-13 20:46:49.552502935 +0100 +++ /work/SRC/openSUSE:Factory/.gettext-runtime.new.1538/gettext-csharp.changes 2022-04-23 19:44:55.754909347 +0200 @@ -1,0 +2,9 @@ +Fri Apr 8 15:05:10 UTC 2022 - Fridrich Strba <[email protected]> + +- Added patch: + * gettext-0.21-jdk17.patch + + Build with java source and target levels 1.8 + + Allows building with JDK17 + + Fixes build in Factory + +------------------------------------------------------------------- gettext-java.changes: same change gettext-runtime-mini.changes: same change gettext-runtime.changes: same change New: ---- gettext-0.21-jdk17.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gettext-csharp.spec ++++++ --- /var/tmp/diff_new_pack.KC6YCM/_old 2022-04-23 19:44:56.722910497 +0200 +++ /var/tmp/diff_new_pack.KC6YCM/_new 2022-04-23 19:44:56.726910502 +0200 @@ -1,7 +1,7 @@ # # spec file for package gettext-csharp # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,7 +32,7 @@ Source3: gettext-linkdupes.sh Source4: gettext-rpmlintrc Source5: %{name}.keyring -Patch: gettext-0.12.1-sigfpe.patch +Patch0: gettext-0.12.1-sigfpe.patch Patch1: gettext-0.19.3-fix-bashisms.patch Patch2: gettext-0.12.1-gettextize.patch Patch3: use-acinit-for-libtextstyle.patch @@ -40,6 +40,7 @@ Patch5: gettext-initialize_vars.patch # PATCH-FIX-OPENSUSE gettext-dont-test-gnulib.patch -- [email protected] Patch6: gettext-dont-test-gnulib.patch +Patch7: gettext-0.21-jdk17.patch # PATCH-FIX-UPSTREAM boo#941629 -- [email protected] Patch11: boo941629-unnessary-rpath-on-standard-path.patch # PATCH-FIX-SUSE Bug boo#1106843 @@ -87,6 +88,7 @@ %patch4 %patch5 %patch6 -p1 +%patch7 -p1 %patch11 -p1 %patch13 -p1 %patch14 -p1 ++++++ gettext-java.spec ++++++ --- /var/tmp/diff_new_pack.KC6YCM/_old 2022-04-23 19:44:56.750910531 +0200 +++ /var/tmp/diff_new_pack.KC6YCM/_new 2022-04-23 19:44:56.754910535 +0200 @@ -1,7 +1,7 @@ # # spec file for package gettext-java # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,6 +37,7 @@ Patch5: gettext-initialize_vars.patch # PATCH-FIX-OPENSUSE gettext-dont-test-gnulib.patch -- [email protected] Patch6: gettext-dont-test-gnulib.patch +Patch7: gettext-0.21-jdk17.patch # PATCH-FIX-UPSTREAM boo#941629 -- [email protected] Patch11: boo941629-unnessary-rpath-on-standard-path.patch # PATCH-FIX-SUSE Bug boo#1106843 @@ -47,7 +48,7 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: glib2-devel -BuildRequires: java-devel +BuildRequires: java-devel >= 1.8 BuildRequires: libtextstyle-devel BuildRequires: libtool BuildRequires: libxml2-devel @@ -72,6 +73,7 @@ %patch4 %patch5 %patch6 -p1 +%patch7 -p1 %patch11 -p1 %patch13 -p1 %patch14 -p1 ++++++ gettext-runtime-mini.spec ++++++ --- /var/tmp/diff_new_pack.KC6YCM/_old 2022-04-23 19:44:56.786910573 +0200 +++ /var/tmp/diff_new_pack.KC6YCM/_new 2022-04-23 19:44:56.790910578 +0200 @@ -1,7 +1,7 @@ # # spec file for package gettext-runtime-mini # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -67,6 +67,7 @@ Patch5: gettext-initialize_vars.patch # PATCH-FIX-OPENSUSE gettext-dont-test-gnulib.patch -- [email protected] Patch6: gettext-dont-test-gnulib.patch +Patch7: gettext-0.21-jdk17.patch # PATCH-FIX-UPSTREAM boo#941629 -- [email protected] Patch11: boo941629-unnessary-rpath-on-standard-path.patch # PATCH-FIX-SUSE Bug boo#1106843 @@ -159,6 +160,7 @@ %patch4 %patch5 %patch6 -p1 +%patch7 -p1 %patch11 -p1 %patch13 -p1 %patch14 -p1 gettext-runtime.spec: same change ++++++ gettext-0.21-jdk17.patch ++++++ --- gettext-0.21/gettext-runtime/configure.ac 2022-04-08 16:40:35.014012388 +0200 +++ gettext-0.21/gettext-runtime/configure.ac 2022-04-08 16:42:34.054638232 +0200 @@ -34,7 +34,7 @@ gt_JAVA_CHOICE -gt_JAVACOMP([1.5], [1.6]) +gt_JAVACOMP([1.8], [1.8]) AC_CHECK_PROG([JAR], [jar], [jar]) if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then BUILDJAVA=yes --- gettext-0.21/gettext-tools/configure.ac 2022-04-08 16:40:35.138012934 +0200 +++ gettext-0.21/gettext-tools/configure.ac 2022-04-08 16:59:13.080602790 +0200 @@ -35,7 +35,7 @@ gt_JAVA_CHOICE gt_JAVAEXEC -gt_JAVACOMP([1.5]) +gt_JAVACOMP([1.8], [1.8]) AC_CHECK_PROG([JAR], [jar], [jar]) if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then BUILDJAVA=yes --- gettext-0.21/gettext-tools/gnulib-lib/javacomp.c 2022-04-08 16:40:35.238013375 +0200 +++ gettext-0.21/gettext-tools/gnulib-lib/javacomp.c 2022-04-08 16:41:56.686411176 +0200 @@ -116,9 +116,8 @@ && (java_version_cache[1] >= '2' && java_version_cache[1] <= '7') && java_version_cache[2] == '\0') - /* Assume that these (not yet released) Java versions will behave - like the preceding ones. */ - java_version_cache = "11"; + /* It's one of the valid target version values. */ + ; else java_version_cache = "1.1"; } @@ -128,7 +127,7 @@ /* ======================= Source version dependent ======================= */ /* Convert a source version to an index. */ -#define SOURCE_VERSION_BOUND 8 /* exclusive upper bound */ +#define SOURCE_VERSION_BOUND 14 /* exclusive upper bound */ static unsigned int source_version_index (const char *source_version) { @@ -144,7 +143,7 @@ else if (source_version[0] == '9' && source_version[1] == '\0') return 5; else if (source_version[0] == '1' - && (source_version[1] >= '0' && source_version[1] <= '1') + && (source_version[1] >= '0' && source_version[1] <= '7') && source_version[2] == '\0') return source_version[1] - '0' + 6; error (EXIT_FAILURE, 0, _("invalid source_version argument to compile_java_class")); @@ -171,6 +170,10 @@ return "class conftest { public void m() { var i = new Integer(0); } }\n"; if (strcmp (source_version, "11") == 0) return "class conftest { Readable r = (var b) -> 0; }\n"; + if (source_version[0] == '1' + && (source_version[1] >= '2' && source_version[1] <= '7') + && source_version[2] == '\0') + return "class conftest { Readable r = (var b) -> 0; }\n"; error (EXIT_FAILURE, 0, _("invalid source_version argument to compile_java_class")); return NULL; } @@ -197,6 +200,10 @@ return "class conftestfail { Readable r = (var b) -> 0; }\n"; if (strcmp (source_version, "11") == 0) return NULL; + if (source_version[0] == '1' + && (source_version[1] >= '2' && source_version[1] <= '7') + && source_version[2] == '\0') + return NULL; error (EXIT_FAILURE, 0, _("invalid source_version argument to compile_java_class")); return NULL; } @@ -204,7 +211,7 @@ /* ======================= Target version dependent ======================= */ /* Convert a target version to an index. */ -#define TARGET_VERSION_BOUND 11 /* exclusive upper bound */ +#define TARGET_VERSION_BOUND 17 /* exclusive upper bound */ static unsigned int target_version_index (const char *target_version) { @@ -215,7 +222,7 @@ else if (target_version[0] == '9' && target_version[1] == '\0') return 8; else if (target_version[0] == '1' - && (target_version[1] >= '0' && target_version[1] <= '1') + && (target_version[1] >= '0' && target_version[1] <= '7') && target_version[2] == '\0') return target_version[1] - '0' + 9; error (EXIT_FAILURE, 0, _("invalid target_version argument to compile_java_class")); @@ -245,10 +252,10 @@ return 52; if (strcmp (target_version, "9") == 0) return 53; - if (strcmp (target_version, "10") == 0) - return 54; - if (strcmp (target_version, "11") == 0) - return 55; + if (target_version[0] == '1' + && (target_version[1] >= '0' && target_version[1] <= '7') + && target_version[2] == '\0') + return target_version[1] + 54; error (EXIT_FAILURE, 0, _("invalid target_version argument to compile_java_class")); return 0; } @@ -2433,7 +2440,7 @@ } } - error (0, 0, _("Java compiler not found, try installing gcj or set $JAVAC")); + /* error (0, 0, _("Java compiler not found, try installing gcj or set $JAVAC")); */ err = true; done2: --- gettext-0.21/gettext-tools/src/write-java.c 2022-04-08 16:40:35.218013286 +0200 +++ gettext-0.21/gettext-tools/src/write-java.c 2022-04-08 16:41:56.690411201 +0200 @@ -1208,8 +1208,14 @@ Java compilers create the class files in the source file's directory - which is in a temporary directory in our case. */ java_sources[0] = java_file_name; - if (compile_java_class (java_sources, 1, NULL, 0, "1.5", "1.6", directory, + if (1 + && (compile_java_class (java_sources, 1, NULL, 0, "17", "17", directory, + true, false, true, verbose > 0)) /* assume JDK 17 */ + && (compile_java_class (java_sources, 1, NULL, 0, "11", "11", directory, + true, false, true, verbose > 0)) /* assume JDK 11 */ + && (compile_java_class (java_sources, 1, NULL, 0, "1.5", "1.6", directory, true, false, true, verbose > 0)) + ) { if (!verbose) error (0, 0,
