1
0

Accepting request 1011105 from home:coolo:branches:Base:System

Version update to fix build failures on ppc64le

OBS-URL: https://build.opensuse.org/request/show/1011105
OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=180
This commit is contained in:
Dirk Mueller 2022-10-20 11:30:03 +00:00 committed by Git OBS Bridge
parent 077990608d
commit 20e558c25b
12 changed files with 105 additions and 62 deletions

View File

@ -1,28 +1,34 @@
--- 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 @@
Index: gettext-0.21.1/gettext-runtime/configure.ac
===================================================================
--- gettext-0.21.1.orig/gettext-runtime/configure.ac
+++ gettext-0.21.1/gettext-runtime/configure.ac
@@ -34,7 +34,7 @@ AC_PROG_INSTALL
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 @@
AS_IF([test "$JAVA_CHOICE" != no], [
- 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"; then
BUILDJAVA=yes
Index: gettext-0.21.1/gettext-tools/configure.ac
===================================================================
--- gettext-0.21.1.orig/gettext-tools/configure.ac
+++ gettext-0.21.1/gettext-tools/configure.ac
@@ -35,7 +35,7 @@ AC_PROG_INSTALL
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 @@
AS_IF([test "$JAVA_CHOICE" != no], [
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
Index: gettext-0.21.1/gettext-tools/gnulib-lib/javacomp.c
===================================================================
--- gettext-0.21.1.orig/gettext-tools/gnulib-lib/javacomp.c
+++ gettext-0.21.1/gettext-tools/gnulib-lib/javacomp.c
@@ -116,9 +116,8 @@ default_target_version (void)
&& (java_version_cache[1] >= '2'
&& java_version_cache[1] <= '7')
&& java_version_cache[2] == '\0')
@ -34,7 +40,7 @@
else
java_version_cache = "1.1";
}
@@ -128,7 +127,7 @@
@@ -128,7 +127,7 @@ default_target_version (void)
/* ======================= Source version dependent ======================= */
/* Convert a source version to an index. */
@ -43,7 +49,7 @@
static unsigned int
source_version_index (const char *source_version)
{
@@ -144,7 +143,7 @@
@@ -144,7 +143,7 @@ source_version_index (const char *source
else if (source_version[0] == '9' && source_version[1] == '\0')
return 5;
else if (source_version[0] == '1'
@ -52,7 +58,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 @@
@@ -171,6 +170,10 @@ get_goodcode_snippet (const char *source
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";
@ -63,7 +69,7 @@
error (EXIT_FAILURE, 0, _("invalid source_version argument to compile_java_class"));
return NULL;
}
@@ -197,6 +200,10 @@
@@ -197,6 +200,10 @@ get_failcode_snippet (const char *source
return "class conftestfail { Readable r = (var b) -> 0; }\n";
if (strcmp (source_version, "11") == 0)
return NULL;
@ -74,7 +80,7 @@
error (EXIT_FAILURE, 0, _("invalid source_version argument to compile_java_class"));
return NULL;
}
@@ -204,7 +211,7 @@
@@ -204,7 +211,7 @@ get_failcode_snippet (const char *source
/* ======================= Target version dependent ======================= */
/* Convert a target version to an index. */
@ -83,7 +89,7 @@
static unsigned int
target_version_index (const char *target_version)
{
@@ -215,7 +222,7 @@
@@ -215,7 +222,7 @@ target_version_index (const char *target
else if (target_version[0] == '9' && target_version[1] == '\0')
return 8;
else if (target_version[0] == '1'
@ -92,7 +98,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 @@
@@ -245,10 +252,10 @@ corresponding_classfile_version (const c
return 52;
if (strcmp (target_version, "9") == 0)
return 53;
@ -107,7 +113,7 @@
error (EXIT_FAILURE, 0, _("invalid target_version argument to compile_java_class"));
return 0;
}
@@ -2433,7 +2440,7 @@
@@ -2439,7 +2446,7 @@ compile_java_class (const char * const *
}
}
@ -116,9 +122,11 @@
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 @@
Index: gettext-0.21.1/gettext-tools/src/write-java.c
===================================================================
--- gettext-0.21.1.orig/gettext-tools/src/write-java.c
+++ gettext-0.21.1/gettext-tools/src/write-java.c
@@ -1209,8 +1209,14 @@ msgdomain_write_java (message_list_ty *m
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;

BIN
gettext-0.21.1.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

16
gettext-0.21.1.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEkAG4WvnhuD3xvalC9b6LJnxqQG0FAmNDU6UACgkQ9b6LJnxq
QG0TBg//SO/rw2U2fSAFX43+TMLUm5ZkvClz1lqE+nbRyb86ShLgyDJrDzZ+BeYo
FEWTelhLs82ruiZ0ed8xy1gvErW614CxOgMwHPb3ZTkI3Q6mJqFzujYcKnCRsRv+
hX+iAu/A4P+UMvreWvfDKoF0qe9ORARg8tE9dgCCN63+QLu+3HrTuxvOaIChghbx
BaNn27MmgkutvXYspnx6u5koZXQpnt17YNJe1wbNAVym1O6ByfWPoP7+OYds8wAF
jOoAALHj/zrJYL/Sg3SjKdfvVHNesyMFNg/HSA0w4mZbnuLjBcl0lO6qU9RBubgx
aqqS/+zwvI3om/EdqKZxGvRTfhz/MUQ5rij3gjopz27MLW6Z5lsbGDq6PQYIFxBA
0KXE0LHWCQRZu/8Z+zAiiiitEYhhYDX4A3ycbhCF+ZJ6TfJ5t8qYYNvzGGp4k2Gv
h8VVFGnZJqDLwa0pbkFi2aGAI3HzVaSAJOhUJjdQ9HAujgSppLmZxODbHcq3KXnq
iR88aqzmOg5dH5m+kENV+9KfysWptmdaIpcdmJTPXtRcdeL7QtfH+Bpq+ePgPThM
JT2Yz+uWiTQqDBTIpJHhSKYTdim34ynKJbDnYphTncdvXm/juuK762dpy5jhcoiJ
Ah8LfiikxiKDjJVivSs7zx1lQPnvJvC9UtlZZrMqx+GYD0y8w20=
=U/vR
-----END PGP SIGNATURE-----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192
size 9714352

View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJfHh9mAAoJEPW+iyZ8akBtIXIQAKGUlp67181VBHA050f8pcxX
QHnQbna51vvUI/5zwO5gOJb/ocVBsrXM0wfBUmnSOVH+vKw2CGOil9QfmhTVEWNN
R4DBiFs3hMefabzdp177vWn6gBWYVZ10hQy/ptx4kaNEFHHaXo+ei0p0nfkpab5D
0cNniOCm35tkK0WeFgPESQeGpmItWXRsSkg+xeZblm1DJ4gbQYqCPgFJSYVZzq6G
PEfyISC1OAll8o0dz8D2nddkiVboBMaurXpuMt7CVCCjiEUWGyWiEdfhxBI/aE+z
bZ7hVCV2dThoFvz3ay90IjisjBhsNGQ9cEEB+hyvCfCX0c93OnAuD35nBvb4RfFK
Be1rFqp0SN7ZkeHp4djdDoze34ui0SHWRpzNjD7Hf/mz3SyxzuY6t7sPL1YObz8i
dlCXJ8uYoG9ZU74eDK9epVb880hOPL6G1NVqX859wS14vPH/IGIC7W+BYPBcYsSJ
InxaD2CU38iBrhNS6s8Y9hXjnTqyWWQ4e1yRl1m76MpSXDDwEUzTv2isyPlSJst6
341V2TPAesXJzB/ndMcusUM2gK+63cH1VSByLn1FYB+InFxKzyUTP6JNqv3eECV8
WTLD5RIccp391fuGtbIfccVVucOZhahzCxvouXGjQTmT6t28p72oCvroUySkvgoe
6en2/1+QyIzFLJqLCKBq
=02/q
-----END PGP SIGNATURE-----

View File

@ -20,7 +20,7 @@
%global debug_package %{nil}
%endif
Name: gettext-csharp
Version: 0.21
Version: 0.21.1
Release: 0
Summary: Native Language Support (NLS) for C#
License: LGPL-2.1-or-later

View File

@ -17,7 +17,7 @@
Name: gettext-java
Version: 0.21
Version: 0.21.1
Release: 0
Summary: Java Support for Native Language Support (NLS)
License: LGPL-2.1-or-later

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Sat Oct 15 10:38:53 UTC 2022 - Stephan Kulow <coolo@suse.com>
- Update to Version 0.21.1
* Runtime behaviour:
- On AIX, locale names with a script or with an uppercase language are now
supported.
For example, sr_Cyrl_RS.UTF-8 is treated like sr_RS.UTF-8@cyrillic, and
EN_US.UTF-8 is treated like en_US.UTF-8.
* The base Unicode standard is now updated to 14.0.0.
* Portability:
- Building on macOS 11/arm64 is now supported.
- Building on Linux/powerpc64le with glibc ≥ 2.35 is now supported.
-------------------------------------------------------------------
Fri Apr 8 15:05:10 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -20,7 +20,7 @@
%bcond_without mini
Name: gettext-runtime-mini
Version: 0.21
Version: 0.21.1
Release: 0
BuildRequires: gcc-c++
BuildRequires: libtool

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Sat Oct 15 10:38:53 UTC 2022 - Stephan Kulow <coolo@suse.com>
- Update to Version 0.21.1
* Runtime behaviour:
- On AIX, locale names with a script or with an uppercase language are now
supported.
For example, sr_Cyrl_RS.UTF-8 is treated like sr_RS.UTF-8@cyrillic, and
EN_US.UTF-8 is treated like en_US.UTF-8.
* The base Unicode standard is now updated to 14.0.0.
* Portability:
- Building on macOS 11/arm64 is now supported.
- Building on Linux/powerpc64le with glibc ≥ 2.35 is now supported.
-------------------------------------------------------------------
Fri Apr 8 15:05:10 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -20,7 +20,7 @@
%bcond_with mini
Name: gettext-runtime
Version: 0.21
Version: 0.21.1
Release: 0
BuildRequires: gcc-c++
BuildRequires: libtool

View File

@ -1,9 +1,11 @@
--- gettext-0.21/libtextstyle/configure.ac
+++ gettext-0.21/libtextstyle/configure.ac
@@ -17,11 +17,10 @@
Index: gettext-0.21.1/libtextstyle/configure.ac
===================================================================
--- gettext-0.21.1.orig/libtextstyle/configure.ac
+++ gettext-0.21.1/libtextstyle/configure.ac
@@ -17,11 +17,10 @@ dnl along with this program. If not, se
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.63])
AC_PREREQ([2.64])
-AC_INIT
+AC_INIT([libtextstyle],
+ m4_esyscmd([source ./version.sh; echo $VERSION_NUMBER | tr -d '\n']))
@ -12,5 +14,5 @@
-. $srcdir/version.sh
-gl_INIT_PACKAGE([libtextstyle], [$VERSION_NUMBER])
AM_INIT_AUTOMAKE([1.13 silent-rules])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_HEADERS([config.h])