summaryrefslogtreecommitdiff
path: root/gettext-0.22-disable-libtextstyle.patch
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2025-02-03 10:16:10 +0000
committerCoprDistGit <infra@openeuler.org>2025-02-03 10:16:10 +0000
commitb070b48919535348041b9b9523ad83c5384619ef (patch)
tree5e54bb2e549a2c50caf3a79cb585739d32edbdd8 /gettext-0.22-disable-libtextstyle.patch
parent8902916c3eacd3fed9f97a3353e900cc7294c7cc (diff)
automatic import of gettextopeneuler24.03_LTS
Diffstat (limited to 'gettext-0.22-disable-libtextstyle.patch')
-rw-r--r--gettext-0.22-disable-libtextstyle.patch110
1 files changed, 0 insertions, 110 deletions
diff --git a/gettext-0.22-disable-libtextstyle.patch b/gettext-0.22-disable-libtextstyle.patch
deleted file mode 100644
index 771c49c..0000000
--- a/gettext-0.22-disable-libtextstyle.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -ur gettext-0.22.4.orig/configure.ac gettext-0.22.4/configure.ac
---- gettext-0.22.4.orig/configure.ac 2022-10-09 08:05:42.000000000 +0530
-+++ gettext-0.22.4/configure.ac 2024-02-13 12:47:32.099238869 +0530
-@@ -37,7 +37,7 @@
-
- dnl Checks for library functions.
-
--AC_CONFIG_SUBDIRS([gettext-runtime libtextstyle gettext-tools])
-+AC_CONFIG_SUBDIRS([gettext-runtime gettext-tools])
-
- AM_EXTRA_RECURSIVE_TARGETS([maintainer-update-po])
-
-@@ -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
--esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd libtextstyle && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; { cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | grep -v installed.libtextstyle | grep -v installed.csharp | grep -v 'installed C#'; } | sed -f build-aux/ac-help.sed ])
-+esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; { cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | grep -v installed.csharp | grep -v 'installed C#'; } | sed -f build-aux/ac-help.sed ])
-
- AC_CONFIG_FILES([Makefile])
-
-diff -ur gettext-0.22.4.orig/gettext-tools/libgettextpo/textstyle.in.h gettext-0.22.4/gettext-tools/libgettextpo/textstyle.in.h
---- gettext-0.22.4.orig/gettext-tools/libgettextpo/textstyle.in.h 2023-09-19 02:06:31.000000000 +0530
-+++ gettext-0.22.4/gettext-tools/libgettextpo/textstyle.in.h 2024-02-13 13:04:15.238643775 +0530
-@@ -254,8 +254,9 @@
-
- static inline file_ostream_t
- file_ostream_create (FILE *fp)
--{
-- return fp;
-+{
-+ /* Closing the stream we return should not close 'fp'. */
-+ return fdopen (dup (fileno (fp)), "w");
- }
-
- static inline bool
-@@ -676,10 +677,10 @@
- static inline noop_styled_ostream_t
- noop_styled_ostream_create (ostream_t destination, bool pass_ownership)
- {
-- if (!pass_ownership)
-- /* Not supported without the real libtextstyle. */
-- abort ();
-- return destination;
-+ if (pass_ownership)
-+ return destination;
-+ else
-+ return fdopen (dup (fileno (destination)), "w");
- }
-
- static inline bool
-diff -ur gettext-0.22.4.orig/gettext-tools/Makefile.am gettext-0.22.4/gettext-tools/Makefile.am
---- gettext-0.22.4.orig/gettext-tools/Makefile.am 2023-09-19 01:38:31.000000000 +0530
-+++ gettext-0.22.4/gettext-tools/Makefile.am 2024-02-13 12:49:27.145661060 +0530
-@@ -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 = 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 -ur gettext-0.22.4.orig/gettext-tools/src/Makefile.am gettext-0.22.4/gettext-tools/src/Makefile.am
---- gettext-0.22.4.orig/gettext-tools/src/Makefile.am 2023-11-17 17:14:38.000000000 +0530
-+++ gettext-0.22.4/gettext-tools/src/Makefile.am 2024-02-13 13:06:34.194367930 +0530
-@@ -311,19 +311,9 @@
- cldr_plurals_CFLAGS = $(AM_CFLAGS) $(INCXML)
- cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
-
--if USE_INSTALLED_LIBTEXTSTYLE
--LT_LIBTEXTSTYLE = @LTLIBTEXTSTYLE@
--else
--# How to get the include files of libtextstyle.
--textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
-- here=`pwd`; \
-- cd ../../libtextstyle/lib && \
-- $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
--BUILT_SOURCES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
--MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
--# Where to find the built libtextstyle library.
--LT_LIBTEXTSTYLE = ../../libtextstyle/lib/libtextstyle.la
--endif
-+# Use the dummy libtextstyle from gnulib, as libgettextpo does.
-+LT_LIBTEXTSTYLE =
-+AM_CPPFLAGS += -I../libgettextpo -I$(top_srcdir)/libgettextpo
-
- # How to build libgettextsrc.la.
- # Need ../gnulib-lib/libgettextlib.la.
-diff -ur gettext-0.22.4.orig/Makefile.am gettext-0.22.4/Makefile.am
---- gettext-0.22.4.orig/Makefile.am 2023-11-17 17:39:11.000000000 +0530
-+++ gettext-0.22.4/Makefile.am 2024-02-13 12:44:18.309841774 +0530
-@@ -19,7 +19,7 @@
- AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
- ACLOCAL_AMFLAGS = -I m4
-
--SUBDIRS = gnulib-local gettext-runtime libtextstyle gettext-tools
-+SUBDIRS = gnulib-local gettext-runtime gettext-tools
-
- changelog_etc = \
- gettext-runtime/ChangeLog.0 \
-@@ -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
- # Verify that all files have appropriate copyright headers.