wok-current annotate gettext/stuff/gettext-0.21-disable-libtextstyle.patch @ rev 25792

Fix openbox menu, label keymap on lxpanel and add miss it translation for tazpkg
author Stanislas Leduc <shann@slitaz.org>
date Tue Oct 07 05:55:24 2025 +0000 (2 weeks ago)
parents
children
rev   line source
shann@25582 1 diff --git a/Makefile.am b/Makefile.am
shann@25582 2 index 815e3c7..e897de7 100644
shann@25582 3 --- a/Makefile.am
shann@25582 4 +++ b/Makefile.am
shann@25582 5 @@ -19,7 +19,7 @@
shann@25582 6 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
shann@25582 7 ACLOCAL_AMFLAGS = -I m4
shann@25582 8
shann@25582 9 -SUBDIRS = gnulib-local gettext-runtime libtextstyle gettext-tools
shann@25582 10 +SUBDIRS = gnulib-local gettext-runtime gettext-tools
shann@25582 11
shann@25582 12 changelog_etc = \
shann@25582 13 gettext-runtime/ChangeLog.0 \
shann@25582 14 @@ -123,7 +123,6 @@ distcheck-hook:
shann@25582 15 test "`sed 1,16d $(srcdir)/gettext-runtime/intl/xsize.h | md5sum`" = "`sed 1,16d $(srcdir)/gettext-tools/gnulib-lib/xsize.h | md5sum`"
shann@25582 16 cmp -s $(srcdir)/gettext-runtime/man/help2man $(srcdir)/gettext-tools/man/help2man
shann@25582 17 cmp -s $(srcdir)/gettext-runtime/man/x-to-1.in $(srcdir)/gettext-tools/man/x-to-1.in
shann@25582 18 - cmp -s $(srcdir)/libtextstyle/m4/libtextstyle.m4 $(srcdir)/gettext-tools/gnulib-m4/libtextstyle.m4
shann@25582 19 cmp -s $(srcdir)/gettext-tools/examples/hello-java-awt/m4/TestAWT.java $(srcdir)/gettext-tools/examples/hello-java-swing/m4/TestAWT.java
shann@25582 20 cmp -s $(srcdir)/gettext-tools/examples/hello-java-awt/m4/TestAWT.class $(srcdir)/gettext-tools/examples/hello-java-swing/m4/TestAWT.class
shann@25582 21 test "`sed 1,15d $(srcdir)/gnulib-local/lib/alloca.in.h | md5sum`" = "`sed 1,15d $(srcdir)/gettext-runtime/libasprintf/alloca.in.h | md5sum`"
shann@25582 22 diff --git a/configure.ac b/configure.ac
shann@25582 23 index 49689fb..2d23b44 100644
shann@25582 24 --- a/configure.ac
shann@25582 25 +++ b/configure.ac
shann@25582 26 @@ -37,7 +37,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
shann@25582 27
shann@25582 28 dnl Checks for library functions.
shann@25582 29
shann@25582 30 -AC_CONFIG_SUBDIRS([gettext-runtime libtextstyle gettext-tools])
shann@25582 31 +AC_CONFIG_SUBDIRS([gettext-runtime gettext-tools])
shann@25582 32
shann@25582 33 AM_EXTRA_RECURSIVE_TARGETS([maintainer-update-po])
shann@25582 34
shann@25582 35 @@ -49,7 +49,7 @@ AC_CANONICAL_HOST
shann@25582 36 dnl Optional Features: AC_ARG_ENABLE calls
shann@25582 37 dnl Optional Packages: AC_ARG_WITH calls
shann@25582 38 dnl Some influential environment variables: AC_ARG_VAR calls
shann@25582 39 -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 ])
shann@25582 40 +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 ])
shann@25582 41
shann@25582 42 AC_CONFIG_FILES([Makefile])
shann@25582 43
shann@25582 44 diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am
shann@25582 45 index 449a797..c5719c2 100644
shann@25582 46 --- a/gettext-tools/Makefile.am
shann@25582 47 +++ b/gettext-tools/Makefile.am
shann@25582 48 @@ -19,7 +19,7 @@
shann@25582 49 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
shann@25582 50 ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
shann@25582 51
shann@25582 52 -SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
shann@25582 53 +SUBDIRS = intl gnulib-lib libgrep libgettextpo src po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
shann@25582 54
shann@25582 55 EXTRA_DIST = misc/DISCLAIM
shann@25582 56 MOSTLYCLEANFILES = core *.stackdump
shann@25582 57 diff --git a/gettext-tools/libgettextpo/textstyle.in.h b/gettext-tools/libgettextpo/textstyle.in.h
shann@25582 58 index 536b51b..585ce66 100644
shann@25582 59 --- a/gettext-tools/libgettextpo/textstyle.in.h
shann@25582 60 +++ b/gettext-tools/libgettextpo/textstyle.in.h
shann@25582 61 @@ -213,7 +213,8 @@ typedef ostream_t file_ostream_t;
shann@25582 62 static inline file_ostream_t
shann@25582 63 file_ostream_create (FILE *fp)
shann@25582 64 {
shann@25582 65 - return fp;
shann@25582 66 + /* Closing the stream we return should not close 'fp'. */
shann@25582 67 + return fdopen (dup (fileno (fp)), "w");
shann@25582 68 }
shann@25582 69
shann@25582 70 /* --------------------------- From fd-ostream.h --------------------------- */
shann@25582 71 @@ -413,6 +414,30 @@ html_styled_ostream_create (ostream_t destination _GL_UNUSED,
shann@25582 72 return NULL;
shann@25582 73 }
shann@25582 74
shann@25582 75 +/* ----------------------- From noop-styled-ostream.h ----------------------- */
shann@25582 76 +
shann@25582 77 +/* noop_styled_ostream_t is a subtype of ostream_t. */
shann@25582 78 +typedef ostream_t noop_styled_ostream_t;
shann@25582 79 +
shann@25582 80 +#define noop_styled_ostream_write_mem ostream_write_mem
shann@25582 81 +#define noop_styled_ostream_flush ostream_flush
shann@25582 82 +#define noop_styled_ostream_free ostream_free
shann@25582 83 +#define noop_styled_ostream_begin_use_class styled_ostream_begin_use_class
shann@25582 84 +#define noop_styled_ostream_end_use_class styled_ostream_end_use_class
shann@25582 85 +#define noop_styled_ostream_get_hyperlink_ref styled_ostream_get_hyperlink_ref
shann@25582 86 +#define noop_styled_ostream_get_hyperlink_id styled_ostream_get_hyperlink_id
shann@25582 87 +#define noop_styled_ostream_set_hyperlink styled_ostream_set_hyperlink
shann@25582 88 +#define noop_styled_ostream_flush_to_current_style styled_ostream_flush_to_current_style
shann@25582 89 +
shann@25582 90 +static inline ostream_t
shann@25582 91 +noop_styled_ostream_create (ostream_t destination, bool pass_ownership)
shann@25582 92 +{
shann@25582 93 + if (pass_ownership)
shann@25582 94 + return destination;
shann@25582 95 + else
shann@25582 96 + return fdopen (dup (fileno (destination)), "w");
shann@25582 97 +}
shann@25582 98 +
shann@25582 99 /* ------------------------------ From color.h ------------------------------ */
shann@25582 100
shann@25582 101 #define color_test_mode false
shann@25582 102 diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
shann@25582 103 index 764ffad..eccfbbd 100644
shann@25582 104 --- a/gettext-tools/src/Makefile.am
shann@25582 105 +++ b/gettext-tools/src/Makefile.am
shann@25582 106 @@ -292,19 +292,9 @@ cldr_plurals_SOURCES = cldr-plural.y cldr-plural-exp.c cldr-plurals.c
shann@25582 107 cldr_plurals_CFLAGS = $(AM_CFLAGS) $(INCXML)
shann@25582 108 cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
shann@25582 109
shann@25582 110 -if USE_INSTALLED_LIBTEXTSTYLE
shann@25582 111 -LT_LIBTEXTSTYLE = @LTLIBTEXTSTYLE@
shann@25582 112 -else
shann@25582 113 -# How to get the include files of libtextstyle.
shann@25582 114 -textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
shann@25582 115 - here=`pwd`; \
shann@25582 116 - cd ../../libtextstyle/lib && \
shann@25582 117 - $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
shann@25582 118 -BUILT_SOURCES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
shann@25582 119 -MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
shann@25582 120 -# Where to find the built libtextstyle library.
shann@25582 121 -LT_LIBTEXTSTYLE = ../../libtextstyle/lib/libtextstyle.la
shann@25582 122 -endif
shann@25582 123 +# Use the dummy libtextstyle from gnulib, as libgettextpo does.
shann@25582 124 +LT_LIBTEXTSTYLE =
shann@25582 125 +AM_CPPFLAGS += -I../libgettextpo -I$(top_srcdir)/libgettextpo
shann@25582 126
shann@25582 127 # How to build libgettextsrc.la.
shann@25582 128 # Need ../gnulib-lib/libgettextlib.la.