From 7412691f671911962c3625a1e2ce7f3ef99b62d6 Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 22 Aug 2023 23:24:21 +0300 Subject: [PATCH] gettext rebuild --- ...> gettext-0.22-disable-libtextstyle.patch} | 57 +++++++++---------- system/base/gettext/pspec.xml | 10 +++- 2 files changed, 35 insertions(+), 32 deletions(-) rename system/base/gettext/files/fedora/{gettext-0.21.1-disable-libtextstyle.patch => gettext-0.22-disable-libtextstyle.patch} (71%) diff --git a/system/base/gettext/files/fedora/gettext-0.21.1-disable-libtextstyle.patch b/system/base/gettext/files/fedora/gettext-0.22-disable-libtextstyle.patch similarity index 71% rename from system/base/gettext/files/fedora/gettext-0.21.1-disable-libtextstyle.patch rename to system/base/gettext/files/fedora/gettext-0.22-disable-libtextstyle.patch index cb70687b..993163ed 100644 --- a/system/base/gettext/files/fedora/gettext-0.21.1-disable-libtextstyle.patch +++ b/system/base/gettext/files/fedora/gettext-0.22-disable-libtextstyle.patch @@ -1,7 +1,6 @@ -diff --git a/Makefile.am b/Makefile.am -index 5a7184c..28267a5 100644 ---- a/Makefile.am -+++ b/Makefile.am +diff -ur gettext-0.22.orig/Makefile.am gettext-0.22/Makefile.am +--- gettext-0.22.orig/Makefile.am 2023-06-23 17:44:45.388281215 +0800 ++++ gettext-0.22/Makefile.am 2023-06-23 17:43:14.098701787 +0800 @@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies ACLOCAL_AMFLAGS = -I m4 @@ -11,19 +10,19 @@ index 5a7184c..28267a5 100644 changelog_etc = \ gettext-runtime/ChangeLog.0 \ -@@ -124,7 +124,6 @@ distcheck-hook: - test "`sed 1,16d $(srcdir)/gettext-runtime/intl/xsize.h | md5sum`" = "`sed 1,16d $(srcdir)/gettext-tools/gnulib-lib/xsize.h | md5sum`" +@@ -87,7 +87,7 @@ + cmp -s $(srcdir)/gettext-runtime/m4/xsize.m4 $(srcdir)/gettext-tools/gnulib-m4/xsize.m4 cmp -s $(srcdir)/gettext-runtime/man/help2man $(srcdir)/gettext-tools/man/help2man cmp -s $(srcdir)/gettext-runtime/man/x-to-1.in $(srcdir)/gettext-tools/man/x-to-1.in - cmp -s $(srcdir)/libtextstyle/m4/libtextstyle.m4 $(srcdir)/gettext-tools/gnulib-m4/libtextstyle.m4 ++# cmp -s $(srcdir)/libtextstyle/m4/libtextstyle.m4 $(srcdir)/gettext-tools/gnulib-m4/libtextstyle.m4 cmp -s $(srcdir)/gettext-tools/examples/hello-java-awt/m4/TestAWT.java $(srcdir)/gettext-tools/examples/hello-java-swing/m4/TestAWT.java cmp -s $(srcdir)/gettext-tools/examples/hello-java-awt/m4/TestAWT.class $(srcdir)/gettext-tools/examples/hello-java-swing/m4/TestAWT.class - test "`sed 1,15d $(srcdir)/gnulib-local/lib/alloca.in.h | md5sum`" = "`sed 1,15d $(srcdir)/gettext-runtime/libasprintf/alloca.in.h | md5sum`" -diff --git a/configure.ac b/configure.ac -index f4e54ea..ff850ae 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -37,7 +37,7 @@ dnl Checks for typedefs, structures, and compiler characteristics. + # Verify that all files have appropriate copyright headers. +diff -ur gettext-0.22.orig/configure.ac gettext-0.22/configure.ac +--- gettext-0.22.orig/configure.ac 2020-09-06 18:01:37.000000000 +0800 ++++ gettext-0.22/configure.ac 2023-06-23 17:43:14.099701793 +0800 +@@ -37,7 +37,7 @@ dnl Checks for library functions. @@ -32,7 +31,7 @@ index f4e54ea..ff850ae 100644 AM_EXTRA_RECURSIVE_TARGETS([maintainer-update-po]) -@@ -49,7 +49,7 @@ AC_CANONICAL_HOST +@@ -49,7 +49,7 @@ dnl Optional Features: AC_ARG_ENABLE calls dnl Optional Packages: AC_ARG_WITH calls dnl Some influential environment variables: AC_ARG_VAR calls @@ -41,24 +40,22 @@ index f4e54ea..ff850ae 100644 AC_CONFIG_FILES([Makefile]) -diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am -index 449a797..bce4ad8 100644 ---- a/gettext-tools/Makefile.am -+++ b/gettext-tools/Makefile.am +diff -ur gettext-0.22.orig/gettext-tools/Makefile.am gettext-0.22/gettext-tools/Makefile.am +--- gettext-0.22.orig/gettext-tools/Makefile.am 2021-06-15 04:22:46.000000000 +0800 ++++ gettext-0.22/gettext-tools/Makefile.am 2023-06-23 18:24:08.822906444 +0800 @@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 --SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc -+SUBDIRS = intl gnulib-lib libgrep libgettextpo src po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc +-SUBDIRS = gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc ++SUBDIRS = gnulib-lib libgrep libgettextpo src po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc EXTRA_DIST = misc/DISCLAIM MOSTLYCLEANFILES = core *.stackdump -diff --git a/gettext-tools/libgettextpo/textstyle.in.h b/gettext-tools/libgettextpo/textstyle.in.h -index 05ce0cf..936331c 100644 ---- a/gettext-tools/libgettextpo/textstyle.in.h -+++ b/gettext-tools/libgettextpo/textstyle.in.h -@@ -239,7 +239,8 @@ typedef ostream_t file_ostream_t; +diff -ur gettext-0.22.orig/gettext-tools/libgettextpo/textstyle.in.h gettext-0.22/gettext-tools/libgettextpo/textstyle.in.h +--- gettext-0.22.orig/gettext-tools/libgettextpo/textstyle.in.h 2023-05-19 12:20:56.000000000 +0800 ++++ gettext-0.22/gettext-tools/libgettextpo/textstyle.in.h 2023-06-23 17:43:14.099701793 +0800 +@@ -243,7 +243,8 @@ static inline file_ostream_t file_ostream_create (FILE *fp) { @@ -68,7 +65,7 @@ index 05ce0cf..936331c 100644 } /* --------------------------- From fd-ostream.h --------------------------- */ -@@ -439,6 +440,30 @@ html_styled_ostream_create (_GL_ATTRIBUTE_MAYBE_UNUSED ostream_t destination, +@@ -443,6 +444,30 @@ return NULL; } @@ -99,11 +96,10 @@ index 05ce0cf..936331c 100644 /* ------------------------------ From color.h ------------------------------ */ #define color_test_mode false -diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am -index 510ab2a..72791ba 100644 ---- a/gettext-tools/src/Makefile.am -+++ b/gettext-tools/src/Makefile.am -@@ -291,19 +291,9 @@ cldr_plurals_SOURCES = cldr-plural.y cldr-plural-exp.c cldr-plurals.c +diff -ur gettext-0.22.orig/gettext-tools/src/Makefile.am gettext-0.22/gettext-tools/src/Makefile.am +--- gettext-0.22.orig/gettext-tools/src/Makefile.am 2023-06-09 05:03:36.000000000 +0800 ++++ gettext-0.22/gettext-tools/src/Makefile.am 2023-06-23 17:43:14.099701793 +0800 +@@ -305,19 +305,9 @@ cldr_plurals_CFLAGS = $(AM_CFLAGS) $(INCXML) cldr_plurals_LDADD = libgettextsrc.la $(LDADD) @@ -126,4 +122,3 @@ index 510ab2a..72791ba 100644 # How to build libgettextsrc.la. # Need ../gnulib-lib/libgettextlib.la. - diff --git a/system/base/gettext/pspec.xml b/system/base/gettext/pspec.xml index b02bbc20..e0542795 100644 --- a/system/base/gettext/pspec.xml +++ b/system/base/gettext/pspec.xml @@ -24,7 +24,7 @@ - + fedora/gettext-0.22-disable-libtextstyle.patch @@ -55,6 +55,7 @@ /usr/lib /usr/share/gettext-0.21 /usr/share/gettext + /usr/share/gettext-* /usr/share/locale /usr/share/info /usr/share/man @@ -78,6 +79,13 @@ + + 2023-08-22 + 0.22 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2023-06-19 0.22