summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-12-17 17:00:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-02 16:39:13 +0000
commit4cd9a3045c87b37a2d48142bd78ab1e2616026f8 (patch)
treeca2f82e49d5a32ce6c339ed34e5b6154dbcf32be /meta/recipes-core
parent0ae95bcc5113a9913aeabaccd5629f2165d986ed (diff)
downloadpoky-4cd9a3045c87b37a2d48142bd78ab1e2616026f8.tar.gz
gettext: update to 0.20.1
License-Update: URLs changed from http to https (From OE-Core rev: c9f8b48ddae0c951fe4df99fda062526160c0a9f) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/gettext/gettext-0.19.8.1/fix-CVE-2018-18751.patch141
-rw-r--r--meta/recipes-core/gettext/gettext-0.19.8.1/parallel.patch23
-rw-r--r--meta/recipes-core/gettext/gettext-0.19.8.1/use-pkgconfig.patch321
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.1/add-with-bisonlocaledir.patch (renamed from meta/recipes-core/gettext/gettext-0.19.8.1/add-with-bisonlocaledir.patch)0
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.1/cr-statement.c-timsort.h-fix-formatting-issues.patch (renamed from meta/recipes-core/gettext/gettext-0.19.8.1/cr-statement.c-timsort.h-fix-formatting-issues.patch)30
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.1/parallel.patch32
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.1/run-ptest (renamed from meta/recipes-core/gettext/gettext-0.19.8.1/run-ptest)0
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.1/serial-tests-config.patch (renamed from meta/recipes-core/gettext/gettext-0.19.8.1/serial-tests-config.patch)26
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.1/use-pkgconfig.patch713
-rw-r--r--meta/recipes-core/gettext/gettext_0.20.1.bb (renamed from meta/recipes-core/gettext/gettext_0.19.8.1.bb)23
10 files changed, 775 insertions, 534 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.19.8.1/fix-CVE-2018-18751.patch b/meta/recipes-core/gettext/gettext-0.19.8.1/fix-CVE-2018-18751.patch
deleted file mode 100644
index 6dfe200d65..0000000000
--- a/meta/recipes-core/gettext/gettext-0.19.8.1/fix-CVE-2018-18751.patch
+++ /dev/null
@@ -1,141 +0,0 @@
1Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commit;h=dce3a16]
2CVE: CVE-2018-18751
3
4Signed-off-by: Kai Kang <kai.kang@windriver.com>
5
6From dce3a16e5e9368245735e29bf498dcd5e3e474a4 Mon Sep 17 00:00:00 2001
7From: Daiki Ueno <ueno@gnu.org>
8Date: Thu, 15 Sep 2016 13:57:24 +0200
9Subject: [PATCH] xgettext: Fix crash with *.po file input
10
11When xgettext was given two *.po files with the same msgid_plural, it
12crashed with double-free. Problem reported by Davlet Panech in:
13http://lists.gnu.org/archive/html/bug-gettext/2016-09/msg00001.html
14* gettext-tools/src/po-gram-gen.y: Don't free msgid_pluralform after
15calling do_callback_message, assuming that it takes ownership.
16* gettext-tools/src/read-catalog.c (default_add_message): Free
17msgid_plural after calling message_alloc.
18* gettext-tools/tests/xgettext-po-2: New file.
19* gettext-tools/tests/Makefile.am (TESTS): Add new test.
20---
21 gettext-tools/src/po-gram-gen.y | 13 ++++-----
22 gettext-tools/src/read-catalog.c | 2 ++
23 gettext-tools/tests/Makefile.am | 2 +-
24 gettext-tools/tests/xgettext-po-2 | 55 +++++++++++++++++++++++++++++++++++++++
25 4 files changed, 63 insertions(+), 9 deletions(-)
26 create mode 100755 gettext-tools/tests/xgettext-po-2
27
28diff --git a/gettext-tools/src/po-gram-gen.y b/gettext-tools/src/po-gram-gen.y
29index becf5e6..4428e77 100644
30--- a/gettext-tools/src/po-gram-gen.y
31+++ b/gettext-tools/src/po-gram-gen.y
32@@ -221,14 +221,11 @@ message
33 check_obsolete ($1, $3);
34 check_obsolete ($1, $4);
35 if (!$1.obsolete || pass_obsolete_entries)
36- {
37- do_callback_message ($1.ctxt, string2, &$1.pos, $3.string,
38- $4.rhs.msgstr, $4.rhs.msgstr_len, &$4.pos,
39- $1.prev_ctxt,
40- $1.prev_id, $1.prev_id_plural,
41- $1.obsolete);
42- free ($3.string);
43- }
44+ do_callback_message ($1.ctxt, string2, &$1.pos, $3.string,
45+ $4.rhs.msgstr, $4.rhs.msgstr_len, &$4.pos,
46+ $1.prev_ctxt,
47+ $1.prev_id, $1.prev_id_plural,
48+ $1.obsolete);
49 else
50 {
51 free_message_intro ($1);
52diff --git a/gettext-tools/src/read-catalog.c b/gettext-tools/src/read-catalog.c
53index 571d18e..6af6d20 100644
54--- a/gettext-tools/src/read-catalog.c
55+++ b/gettext-tools/src/read-catalog.c
56@@ -397,6 +397,8 @@ default_add_message (default_catalog_reader_ty *this,
57 appropriate. */
58 mp = message_alloc (msgctxt, msgid, msgid_plural, msgstr, msgstr_len,
59 msgstr_pos);
60+ if (msgid_plural != NULL)
61+ free (msgid_plural);
62 mp->prev_msgctxt = prev_msgctxt;
63 mp->prev_msgid = prev_msgid;
64 mp->prev_msgid_plural = prev_msgid_plural;
65diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
66index 23b09b1..0dfb4d8 100644
67--- a/gettext-tools/tests/Makefile.am
68+++ b/gettext-tools/tests/Makefile.am
69@@ -95,7 +95,7 @@ TESTS = gettext-1 gettext-2 gettext-3 gettext-4 gettext-5 gettext-6 gettext-7 \
70 xgettext-perl-1 xgettext-perl-2 xgettext-perl-3 xgettext-perl-4 \
71 xgettext-perl-5 xgettext-perl-6 xgettext-perl-7 xgettext-perl-8 \
72 xgettext-php-1 xgettext-php-2 xgettext-php-3 xgettext-php-4 \
73- xgettext-po-1 \
74+ xgettext-po-1 xgettext-po-2 \
75 xgettext-properties-1 \
76 xgettext-python-1 xgettext-python-2 xgettext-python-3 \
77 xgettext-python-4 \
78diff --git a/gettext-tools/tests/xgettext-po-2 b/gettext-tools/tests/xgettext-po-2
79new file mode 100755
80index 0000000..c4bd9d0
81--- /dev/null
82+++ b/gettext-tools/tests/xgettext-po-2
83@@ -0,0 +1,55 @@
84+#! /bin/sh
85+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
86+
87+# Test PO extractors with multiple input files.
88+
89+cat <<EOF > xg-po-2-1.po
90+msgid "first msgid"
91+msgid_plural "first msgid (plural)"
92+msgstr[0] ""
93+msgstr[1] ""
94+
95+msgid "second msgid"
96+msgid_plural "second msgid (plural)"
97+msgstr[0] ""
98+msgstr[1] ""
99+EOF
100+
101+cat <<EOF > xg-po-2-2.po
102+msgid "third msgid"
103+msgid_plural "third msgid (plural)"
104+msgstr[0] ""
105+msgstr[1] ""
106+
107+msgid "second msgid"
108+msgid_plural "second msgid (plural)"
109+msgstr[0] ""
110+msgstr[1] ""
111+EOF
112+
113+: ${XGETTEXT=xgettext}
114+${XGETTEXT} --omit-header xg-po-2-1.po xg-po-2-2.po -o xg-po-2.tmp.po || Exit 1
115+LC_ALL=C tr -d '\r' < xg-po-2.tmp.po > xg-po-2.po || Exit 1
116+
117+cat <<EOF > xg-po-2.ok
118+msgid "first msgid"
119+msgid_plural "first msgid (plural)"
120+msgstr[0] ""
121+msgstr[1] ""
122+
123+msgid "second msgid"
124+msgid_plural "second msgid (plural)"
125+msgstr[0] ""
126+msgstr[1] ""
127+
128+msgid "third msgid"
129+msgid_plural "third msgid (plural)"
130+msgstr[0] ""
131+msgstr[1] ""
132+EOF
133+
134+: ${DIFF=diff}
135+${DIFF} xg-po-2.ok xg-po-2.po
136+result=$?
137+
138+exit $result
139--
1401.9.1
141
diff --git a/meta/recipes-core/gettext/gettext-0.19.8.1/parallel.patch b/meta/recipes-core/gettext/gettext-0.19.8.1/parallel.patch
deleted file mode 100644
index c8e2c94af0..0000000000
--- a/meta/recipes-core/gettext/gettext-0.19.8.1/parallel.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1instal libgettextlib.a before removing it
2
3In a multiple job build, Makefile can simultaneously
4be installing and removing libgettextlib.a. We serialize
5the operations.
6
7Upstream-Status: Pending
8
9Signed-off-by: Joe Slater <jslater@windriver.com>
10
11--- a/gettext-tools/gnulib-lib/Makefile.am
12+++ b/gettext-tools/gnulib-lib/Makefile.am
13@@ -57,6 +57,10 @@ endif
14 # Rules generated and collected by gnulib-tool.
15 include Makefile.gnulib
16
17+# defined in Makefile.gnulib but missing this dependency
18+#
19+install-exec-clean: install-libLTLIBRARIES
20+
21 # Which classes to export from the shared library.
22 MOOPPFLAGS += --dllexport=styled_ostream
23
diff --git a/meta/recipes-core/gettext/gettext-0.19.8.1/use-pkgconfig.patch b/meta/recipes-core/gettext/gettext-0.19.8.1/use-pkgconfig.patch
deleted file mode 100644
index 6156a153f7..0000000000
--- a/meta/recipes-core/gettext/gettext-0.19.8.1/use-pkgconfig.patch
+++ /dev/null
@@ -1,321 +0,0 @@
1For reasons which I just can't fathom gnulib doesn't use the expected tools to
2find libraries but badly reinvents the wheel. This will trivially lead to host
3contamination (explicit searches of /usr/lib) or incorrect RPATHs (bad
4canonicalisation resulting in relative paths).
5
6Simply delete all the crazy, and replace with a single call to pkg-config.
7
8Upstream-Status: Inappropriate (upstream still refuse to consider pkg-config)
9Signed-off-by: Ross Burton <ross.burton@intel.com>
10
11diff --git a/gnulib-local/m4/libcroco.m4 b/gnulib-local/m4/libcroco.m4
12index f79ea82f1..1f67274db 100644
13--- a/gettext-tools/gnulib-m4/libcroco.m4
14+++ b/gettext-tools/gnulib-m4/libcroco.m4
15@@ -8,6 +8,7 @@ dnl From Bruno Haible.
16
17 AC_DEFUN([gl_LIBCROCO],
18 [
19+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
20 dnl libcroco depends on libglib.
21 AC_REQUIRE([gl_LIBGLIB])
22
23@@ -23,65 +24,10 @@ AC_DEFUN([gl_LIBCROCO],
24 LTLIBCROCO=
25 INCCROCO=
26 if test "$gl_cv_libcroco_use_included" != yes; then
27- dnl Figure out whether we can use a preinstalled libcroco-0.6, or have to
28- dnl use the included one.
29- AC_CACHE_VAL([gl_cv_libcroco], [
30- gl_cv_libcroco=no
31- gl_cv_LIBCROCO=
32- gl_cv_LTLIBCROCO=
33- gl_cv_INCCROCO=
34- gl_save_LIBS="$LIBS"
35- dnl Search for libcroco and define LIBCROCO_0_6, LTLIBCROCO_0_6 and
36- dnl INCCROCO_0_6 accordingly.
37- dnl Don't use croco-0.6-config nor pkg-config, since it doesn't work when
38- dnl cross-compiling or when the C compiler in use is different from the
39- dnl one that built the library.
40- AC_LIB_LINKFLAGS_BODY([croco-0.6], [glib-2.0])
41- LIBS="$gl_save_LIBS $LIBCROCO_0_6"
42- AC_TRY_LINK([#include <libcroco-config.h>],
43- [const char *version = LIBCROCO_VERSION; return !version;],
44- [gl_cv_libcroco=yes
45- gl_cv_LIBCROCO="$LIBCROCO_0_6"
46- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
47- ])
48- if test "$gl_cv_libcroco" != yes; then
49- gl_save_CPPFLAGS="$CPPFLAGS"
50- CPPFLAGS="$CPPFLAGS $INCCROCO_0_6"
51- AC_TRY_LINK([#include <libcroco-config.h>],
52- [const char *version = LIBCROCO_VERSION; return !version;],
53- [gl_cv_libcroco=yes
54- gl_cv_LIBCROCO="$LIBCROCO_0_6"
55- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
56- gl_cv_INCCROCO="$INCCROCO_0_6"
57- ])
58- if test "$gl_cv_libcroco" != yes; then
59- dnl Often the include files are installed in
60- dnl /usr/include/libcroco-0.6/libcroco.
61- AC_TRY_LINK([#include <libcroco-0.6/libcroco/libcroco-config.h>],
62- [const char *version = LIBCROCO_VERSION; return !version;],
63- [gl_ABSOLUTE_HEADER([libcroco-0.6/libcroco/libcroco-config.h])
64- libcroco_include_dir=`echo "$gl_cv_absolute_libcroco_0_6_libcroco_libcroco_config_h" | sed -e 's,.libcroco-config\.h$,,'`
65- if test -d "$libcroco_include_dir"; then
66- gl_cv_libcroco=yes
67- gl_cv_LIBCROCO="$LIBCROCO_0_6"
68- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
69- gl_cv_INCCROCO="-I$libcroco_include_dir"
70- fi
71- ])
72- fi
73- CPPFLAGS="$gl_save_CPPFLAGS"
74- fi
75- LIBS="$gl_save_LIBS"
76- ])
77- AC_MSG_CHECKING([for libcroco])
78- AC_MSG_RESULT([$gl_cv_libcroco])
79- if test $gl_cv_libcroco = yes; then
80- LIBCROCO="$gl_cv_LIBCROCO"
81- LTLIBCROCO="$gl_cv_LTLIBCROCO"
82- INCCROCO="$gl_cv_INCCROCO"
83- else
84- gl_cv_libcroco_use_included=yes
85- fi
86+ PKG_CHECK_MODULES([CROCO], [libcroco-0.6])
87+ LIBCROCO=$CROCO_LIBS
88+ LTLIBCROCO=$CROCO_LIBS
89+ INCCROCO=$CROCO_CFLAGS
90 fi
91 AC_SUBST([LIBCROCO])
92 AC_SUBST([LTLIBCROCO])
93diff --git a/gnulib-local/m4/libglib.m4 b/gnulib-local/m4/libglib.m4
94index 42e55e6fd..ab25a5b22 100644
95--- a/gettext-tools/gnulib-m4/libglib.m4
96+++ b/gettext-tools/gnulib-m4/libglib.m4
97@@ -8,6 +8,7 @@ dnl From Bruno Haible.
98
99 AC_DEFUN([gl_LIBGLIB],
100 [
101+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
102 AC_MSG_CHECKING([whether included glib is requested])
103 AC_ARG_WITH([included-glib],
104 [ --with-included-glib use the glib2 included here],
105@@ -20,76 +21,10 @@ AC_DEFUN([gl_LIBGLIB],
106 LTLIBGLIB=
107 INCGLIB=
108 if test "$gl_cv_libglib_use_included" != yes; then
109- dnl Figure out whether we can use a preinstalled libglib-2.0, or have to use
110- dnl the included one.
111- AC_CACHE_VAL([gl_cv_libglib], [
112- gl_cv_libglib=no
113- gl_cv_LIBGLIB=
114- gl_cv_LTLIBGLIB=
115- gl_cv_INCGLIB=
116- gl_save_LIBS="$LIBS"
117- dnl Search for libglib2 and define LIBGLIB_2_0, LTLIBGLIB_2_0 and
118- dnl INCGLIB_2_0 accordingly.
119- dnl Don't use glib-config nor pkg-config, since it doesn't work when
120- dnl cross-compiling or when the C compiler in use is different from the
121- dnl one that built the library.
122- AC_LIB_LINKFLAGS_BODY([glib-2.0])
123- LIBS="$gl_save_LIBS $LIBGLIB_2_0"
124- AC_TRY_LINK([#include <glib.h>
125-#ifndef G_BEGIN_DECLS
126-error this glib.h includes a glibconfig.h from a glib version 1.x
127-#endif
128-],
129- [g_string_new ("foo");],
130- [gl_cv_libglib=yes
131- gl_cv_LIBGLIB="$LIBGLIB_2_0"
132- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
133- ])
134- if test "$gl_cv_libglib" != yes; then
135- gl_save_CPPFLAGS="$CPPFLAGS"
136- CPPFLAGS="$CPPFLAGS $INCGLIB_2_0"
137- AC_TRY_LINK([#include <glib.h>
138-#ifndef G_BEGIN_DECLS
139-error this glib.h includes a glibconfig.h from a glib version 1.x
140-#endif
141-],
142- [g_string_new ("foo");],
143- [gl_cv_libglib=yes
144- gl_cv_LIBGLIB="$LIBGLIB_2_0"
145- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
146- gl_cv_INCGLIB="$INCGLIB_2_0"
147- ])
148- if test "$gl_cv_libglib" != yes; then
149- dnl Often the include files are installed in /usr/include/glib-2.0
150- dnl and /usr/lib/glib-2.0/include.
151- if test -n "$LIBGLIB_2_0_PREFIX"; then
152- CPPFLAGS="$gl_save_CPPFLAGS -I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include"
153- AC_TRY_LINK([#include <glib.h>
154-#ifndef G_BEGIN_DECLS
155-error this glib.h includes a glibconfig.h from a glib version 1.x
156-#endif
157-],
158- [g_string_new ("foo");],
159- [gl_cv_libglib=yes
160- gl_cv_LIBGLIB="$LIBGLIB_2_0"
161- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
162- gl_cv_INCGLIB="-I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include"
163- ])
164- fi
165- fi
166- CPPFLAGS="$gl_save_CPPFLAGS"
167- fi
168- LIBS="$gl_save_LIBS"
169- ])
170- AC_MSG_CHECKING([for glib])
171- AC_MSG_RESULT([$gl_cv_libglib])
172- if test $gl_cv_libglib = yes; then
173- LIBGLIB="$gl_cv_LIBGLIB"
174- LTLIBGLIB="$gl_cv_LTLIBGLIB"
175- INCGLIB="$gl_cv_INCGLIB"
176- else
177- gl_cv_libglib_use_included=yes
178- fi
179+ PKG_CHECK_MODULES([GLIB], [glib-2.0])
180+ LIBGLIB="$GLIB_LIBS"
181+ LTLIBGLIB="$GLIB_LIBS"
182+ INCGLIB="$GLIB_CFLAGS"
183 fi
184 AC_SUBST([LIBGLIB])
185 AC_SUBST([LTLIBGLIB])
186diff --git a/gnulib-local/m4/libxml.m4 b/gnulib-local/m4/libxml.m4
187index 480c700d2..cb39309d5 100644
188--- a/gettext-tools/gnulib-m4/libxml.m4
189+++ b/gettext-tools/gnulib-m4/libxml.m4
190@@ -8,6 +8,7 @@ dnl From Bruno Haible.
191
192 AC_DEFUN([gl_LIBXML],
193 [
194+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
195 AC_REQUIRE([AM_ICONV_LINK])
196
197 AC_MSG_CHECKING([whether included libxml is requested])
198@@ -22,100 +22,10 @@ AC_DEFUN([gl_LIBXML],
199 LTLIBXML=
200 INCXML=
201 if test "$gl_cv_libxml_use_included" != yes; then
202- dnl Figure out whether we can use a preinstalled libxml2, or have to use
203- dnl the included one.
204- AC_CACHE_VAL([gl_cv_libxml], [
205- gl_cv_libxml=no
206- gl_cv_LIBXML=
207- gl_cv_LTLIBXML=
208- gl_cv_INCXML=
209- gl_save_LIBS="$LIBS"
210- LIBS="$LIBS $LIBICONV"
211- dnl Search for libxml2 and define LIBXML2, LTLIBXML2 and INCXML2
212- dnl accordingly.
213- dnl Don't use xml2-config nor pkg-config, since it doesn't work when
214- dnl cross-compiling or when the C compiler in use is different from the
215- dnl one that built the library.
216- dnl Use a test program that tries to invoke xmlFree. On Cygwin 1.7.x,
217- dnl libxml2 is built in such a way that uses of xmlFree work fine with
218- dnl -Wl,--enable-auto-import but lead to a link error with
219- dnl -Wl,--disable-auto-import.
220- AC_LIB_LINKFLAGS_BODY([xml2])
221- LIBS="$gl_save_LIBS $LIBXML2 $LIBICONV"
222- AC_TRY_LINK([#include <libxml/xmlversion.h>
223- #include <libxml/xmlmemory.h>
224- #include <libxml/xpath.h>
225- ],
226- [xmlCheckVersion (0);
227- xmlFree ((void *) 0);
228- xmlXPathSetContextNode ((void *)0, (void *)0);
229- ],
230- [gl_cv_libxml=yes
231- gl_cv_LIBXML="$LIBXML2 $LIBICONV"
232- gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
233- ])
234- if test "$gl_cv_libxml" != yes; then
235- gl_save_CPPFLAGS="$CPPFLAGS"
236- CPPFLAGS="$CPPFLAGS $INCXML2"
237- AC_TRY_LINK([#include <libxml/xmlversion.h>
238- #include <libxml/xmlmemory.h>
239- #include <libxml/xpath.h>
240- ],
241- [xmlCheckVersion (0);
242- xmlFree ((void *) 0);
243- xmlXPathSetContextNode ((void *)0, (void *)0);
244- ],
245- [gl_cv_libxml=yes
246- gl_cv_LIBXML="$LIBXML2 $LIBICONV"
247- gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
248- gl_cv_INCXML="$INCXML2"
249- ])
250- if test "$gl_cv_libxml" != yes; then
251- dnl Often the include files are installed in /usr/include/libxml2.
252- dnl In libxml2-2.5, <libxml/xmlversion.h> is self-contained.
253- dnl In libxml2-2.6, it includes <libxml/xmlexports.h> which is
254- dnl self-contained.
255- libxml2_include_dir=
256- AC_TRY_CPP([#include <libxml2/libxml/xmlexports.h>],
257- [gl_ABSOLUTE_HEADER([libxml2/libxml/xmlexports.h])
258- libxml2_include_dir=`echo "$gl_cv_absolute_libxml2_libxml_xmlexports_h" | sed -e 's,.libxml.xmlexports\.h$,,'`
259- ])
260- if test -z "$libxml2_include_dir"; then
261- AC_TRY_CPP([#include <libxml2/libxml/xmlversion.h>],
262- [gl_ABSOLUTE_HEADER([libxml2/libxml/xmlversion.h])
263- libxml2_include_dir=`echo "$gl_cv_absolute_libxml2_libxml_xmlversion_h" | sed -e 's,.libxml.xmlversion\.h$,,'`
264- ])
265- fi
266- if test -n "$libxml2_include_dir" && test -d "$libxml2_include_dir"; then
267- CPPFLAGS="$gl_save_CPPFLAGS -I$libxml2_include_dir"
268- AC_TRY_LINK([#include <libxml/xmlversion.h>
269- #include <libxml/xmlmemory.h>
270- #include <libxml/xpath.h>
271- ],
272- [xmlCheckVersion (0);
273- xmlFree ((void *) 0);
274- xmlXPathSetContextNode ((void *)0, (void *)0);
275- ],
276- [gl_cv_libxml=yes
277- gl_cv_LIBXML="$LIBXML2 $LIBICONV"
278- gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
279- gl_cv_INCXML="-I$libxml2_include_dir"
280- ])
281- fi
282- fi
283- CPPFLAGS="$gl_save_CPPFLAGS"
284- fi
285- LIBS="$gl_save_LIBS"
286- ])
287- AC_MSG_CHECKING([for libxml])
288- AC_MSG_RESULT([$gl_cv_libxml])
289- if test $gl_cv_libxml = yes; then
290- LIBXML="$gl_cv_LIBXML"
291- LTLIBXML="$gl_cv_LTLIBXML"
292- INCXML="$gl_cv_INCXML"
293- else
294- gl_cv_libxml_use_included=yes
295- fi
296+ PKG_CHECK_MODULES([XML], [libxml-2.0])
297+ LIBXML=$XML_LIBS
298+ LTLIBXML=$XML_LIBS
299+ INCXML=$XML_CFLAGS
300 fi
301 AC_SUBST([LIBXML])
302 AC_SUBST([LTLIBXML])
303diff --git a/gnulib-local/lib/term-styled-ostream.oo.c b/gnulib-local/lib/term-styled-ostream.oo.c
304index 81a407467..218565329 100644
305--- a/gettext-tools/gnulib-lib/term-styled-ostream.oo.c
306+++ b/gettext-tools/gnulib-lib/term-styled-ostream.oo.c
307@@ -25,4 +25,4 @@
308-#include <cr-om-parser.h>
309-#include <cr-sel-eng.h>
310-#include <cr-style.h>
311-#include <cr-rgb.h>
312+#include <libcroco/cr-om-parser.h>
313+#include <libcroco/cr-sel-eng.h>
314+#include <libcroco/cr-style.h>
315+#include <libcroco/cr-rgb.h>
316@@ -31 +31 @@
317-# include <cr-fonts.h>
318+# include <libcroco/cr-fonts.h>
319@@ -33 +33 @@
320-#include <cr-string.h>
321+#include <libcroco/cr-string.h>
diff --git a/meta/recipes-core/gettext/gettext-0.19.8.1/add-with-bisonlocaledir.patch b/meta/recipes-core/gettext/gettext-0.20.1/add-with-bisonlocaledir.patch
index 35a131067a..35a131067a 100644
--- a/meta/recipes-core/gettext/gettext-0.19.8.1/add-with-bisonlocaledir.patch
+++ b/meta/recipes-core/gettext/gettext-0.20.1/add-with-bisonlocaledir.patch
diff --git a/meta/recipes-core/gettext/gettext-0.19.8.1/cr-statement.c-timsort.h-fix-formatting-issues.patch b/meta/recipes-core/gettext/gettext-0.20.1/cr-statement.c-timsort.h-fix-formatting-issues.patch
index 6af1604198..0561ed7d32 100644
--- a/meta/recipes-core/gettext/gettext-0.19.8.1/cr-statement.c-timsort.h-fix-formatting-issues.patch
+++ b/meta/recipes-core/gettext/gettext-0.20.1/cr-statement.c-timsort.h-fix-formatting-issues.patch
@@ -1,4 +1,4 @@
1From e546de65a333789e83f5485757967cee29ee3681 Mon Sep 17 00:00:00 2001 1From f6245ef5530fc37a6243e798df34162fbbeab6f0 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Sun, 19 Feb 2017 23:32:46 -0800 3Date: Sun, 19 Feb 2017 23:32:46 -0800
4Subject: [PATCH] cr-statement.c/timsort.h: fix formatting issues 4Subject: [PATCH] cr-statement.c/timsort.h: fix formatting issues
@@ -15,15 +15,15 @@ gettext-tools/gnulib-lib/libxml/timsort.h:326:80: warning: format '%lu' expects
15Upstream-Status: Pending 15Upstream-Status: Pending
16 16
17Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 17Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
18
18--- 19---
19 gettext-tools/gnulib-lib/libcroco/cr-statement.c | 10 +++++----- 20 libtextstyle/lib/libcroco/cr-statement.c | 10 +++++-----
20 gettext-tools/gnulib-lib/libxml/timsort.h | 2 +- 21 1 file changed, 5 insertions(+), 5 deletions(-)
21 2 files changed, 6 insertions(+), 6 deletions(-)
22 22
23diff --git a/gettext-tools/gnulib-lib/libcroco/cr-statement.c b/gettext-tools/gnulib-lib/libcroco/cr-statement.c 23diff --git a/libtextstyle/lib/libcroco/cr-statement.c b/libtextstyle/lib/libcroco/cr-statement.c
24index 617520f..100104b 100644 24index 617520f..100104b 100644
25--- a/gettext-tools/gnulib-lib/libcroco/cr-statement.c 25--- a/libtextstyle/lib/libcroco/cr-statement.c
26+++ b/gettext-tools/gnulib-lib/libcroco/cr-statement.c 26+++ b/libtextstyle/lib/libcroco/cr-statement.c
27@@ -2607,7 +2607,7 @@ cr_statement_dump_ruleset (CRStatement * a_this, FILE * a_fp, glong a_indent) 27@@ -2607,7 +2607,7 @@ cr_statement_dump_ruleset (CRStatement * a_this, FILE * a_fp, glong a_indent)
28 g_return_if_fail (a_fp && a_this); 28 g_return_if_fail (a_fp && a_this);
29 str = cr_statement_ruleset_to_string (a_this, a_indent); 29 str = cr_statement_ruleset_to_string (a_this, a_indent);
@@ -69,19 +69,3 @@ index 617520f..100104b 100644
69 g_free (str) ; 69 g_free (str) ;
70 str = NULL ; 70 str = NULL ;
71 } 71 }
72diff --git a/gettext-tools/gnulib-lib/libxml/timsort.h b/gettext-tools/gnulib-lib/libxml/timsort.h
73index 795f272..443918a 100644
74--- a/gettext-tools/gnulib-lib/libxml/timsort.h
75+++ b/gettext-tools/gnulib-lib/libxml/timsort.h
76@@ -323,7 +323,7 @@ static void TIM_SORT_RESIZE(TEMP_STORAGE_T *store, const size_t new_size)
77 SORT_TYPE *tempstore = (SORT_TYPE *)realloc(store->storage, new_size * sizeof(SORT_TYPE));
78 if (tempstore == NULL)
79 {
80- fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size);
81+ fprintf(stderr, "Error allocating temporary storage for tim sort: need %zu bytes", sizeof(SORT_TYPE) * new_size);
82 exit(1);
83 }
84 store->storage = tempstore;
85--
862.10.2
87
diff --git a/meta/recipes-core/gettext/gettext-0.20.1/parallel.patch b/meta/recipes-core/gettext/gettext-0.20.1/parallel.patch
new file mode 100644
index 0000000000..d96a376b7d
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.20.1/parallel.patch
@@ -0,0 +1,32 @@
1From 4a2a0a93b469093b60ffd0bec55d33d1e03d4713 Mon Sep 17 00:00:00 2001
2From: Joe Slater <jslater@windriver.com>
3Date: Thu, 7 Jun 2012 16:37:01 -0700
4Subject: [PATCH] instal libgettextlib.a before removing it
5
6In a multiple job build, Makefile can simultaneously
7be installing and removing libgettextlib.a. We serialize
8the operations.
9
10Upstream-Status: Pending
11
12Signed-off-by: Joe Slater <jslater@windriver.com>
13
14---
15 gettext-tools/gnulib-lib/Makefile.am | 4 ++++
16 1 file changed, 4 insertions(+)
17
18diff --git a/gettext-tools/gnulib-lib/Makefile.am b/gettext-tools/gnulib-lib/Makefile.am
19index 2126699..d2dd7e4 100644
20--- a/gettext-tools/gnulib-lib/Makefile.am
21+++ b/gettext-tools/gnulib-lib/Makefile.am
22@@ -58,6 +58,10 @@ endif
23 # Rules generated and collected by gnulib-tool.
24 include Makefile.gnulib
25
26+# defined in Makefile.gnulib but missing this dependency
27+#
28+install-exec-clean: install-libLTLIBRARIES
29+
30 # OS/2 does not support a DLL name longer than 8 characters.
31 if OS2
32 libgettextlib_la_LDFLAGS += -os2dllname gtlib
diff --git a/meta/recipes-core/gettext/gettext-0.19.8.1/run-ptest b/meta/recipes-core/gettext/gettext-0.20.1/run-ptest
index f17f3c87a7..f17f3c87a7 100644
--- a/meta/recipes-core/gettext/gettext-0.19.8.1/run-ptest
+++ b/meta/recipes-core/gettext/gettext-0.20.1/run-ptest
diff --git a/meta/recipes-core/gettext/gettext-0.19.8.1/serial-tests-config.patch b/meta/recipes-core/gettext/gettext-0.20.1/serial-tests-config.patch
index 31ff9138a9..93f7c03334 100644
--- a/meta/recipes-core/gettext/gettext-0.19.8.1/serial-tests-config.patch
+++ b/meta/recipes-core/gettext/gettext-0.20.1/serial-tests-config.patch
@@ -1,4 +1,4 @@
1From c4b1f3a0c7b7c40b343be9b95deb84e0485643be Mon Sep 17 00:00:00 2001 1From ed64a5724ef7d6eb4e9a876f817ea266a536e195 Mon Sep 17 00:00:00 2001
2From: "Hongjun.Yang" <hongjun.yang@windriver.com> 2From: "Hongjun.Yang" <hongjun.yang@windriver.com>
3Date: Thu, 28 Jul 2016 12:36:15 +0800 3Date: Thu, 28 Jul 2016 12:36:15 +0800
4Subject: [PATCH] fix for ptest 4Subject: [PATCH] fix for ptest
@@ -8,6 +8,7 @@ Add serial-tests support, ptest need it
8Upstream-Status: Inappropriate [oe specific] 8Upstream-Status: Inappropriate [oe specific]
9 9
10Signed-off-by: Changqing Li <changqing.li@windriver.com> 10Signed-off-by: Changqing Li <changqing.li@windriver.com>
11
11--- 12---
12 configure.ac | 2 +- 13 configure.ac | 2 +-
13 gettext-runtime/configure.ac | 2 +- 14 gettext-runtime/configure.ac | 2 +-
@@ -15,24 +16,24 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
15 3 files changed, 3 insertions(+), 3 deletions(-) 16 3 files changed, 3 insertions(+), 3 deletions(-)
16 17
17diff --git a/configure.ac b/configure.ac 18diff --git a/configure.ac b/configure.ac
18index 5e996fa..880581f 100644 19index 38db6fd..f019ae0 100644
19--- a/configure.ac 20--- a/configure.ac
20+++ b/configure.ac 21+++ b/configure.ac
21@@ -23,7 +23,7 @@ AC_INIT([gettext], 22@@ -22,7 +22,7 @@ AC_INIT([gettext],
22 [bug-gnu-gettext@gnu.org]) 23 [bug-gettext@gnu.org])
23 AC_CONFIG_SRCDIR([gettext-tools/src/msgfmt.c]) 24 AC_CONFIG_SRCDIR([gettext-tools/src/msgfmt.c])
24 AC_CONFIG_AUX_DIR([build-aux]) 25 AC_CONFIG_AUX_DIR([build-aux])
25-AM_INIT_AUTOMAKE([1.13 silent-rules parallel-tests dist-xz dist-lzip]) 26-AM_INIT_AUTOMAKE([1.13 silent-rules parallel-tests tar-ustar])
26+AM_INIT_AUTOMAKE([1.13 silent-rules serial-tests dist-xz dist-lzip]) 27+AM_INIT_AUTOMAKE([1.13 silent-rules serial-tests tar-ustar])
27 28
28 dnl Override automake's tar command used for creating distributions. 29 dnl Override automake's tar command used for creating distributions.
29 am__tar='${AMTAR} chof - --owner=root --group=root "$$tardir"' 30 am__tar='${AMTAR} chf - --format=ustar --owner=root --group=root "$$tardir"'
30diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac 31diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
31index e9299b6..d4f5528 100644 32index de203e7..138a07f 100644
32--- a/gettext-runtime/configure.ac 33--- a/gettext-runtime/configure.ac
33+++ b/gettext-runtime/configure.ac 34+++ b/gettext-runtime/configure.ac
34@@ -22,7 +22,7 @@ AC_INIT([gettext-runtime], 35@@ -22,7 +22,7 @@ AC_INIT([gettext-runtime],
35 [bug-gnu-gettext@gnu.org]) 36 [bug-gettext@gnu.org])
36 AC_CONFIG_SRCDIR([intl/dcigettext.c]) 37 AC_CONFIG_SRCDIR([intl/dcigettext.c])
37 AC_CONFIG_AUX_DIR([../build-aux]) 38 AC_CONFIG_AUX_DIR([../build-aux])
38-AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests]) 39-AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
@@ -41,11 +42,11 @@ index e9299b6..d4f5528 100644
41 42
42 dnl Installation directories. 43 dnl Installation directories.
43diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac 44diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
44index 920eeb6..c507434 100644 45index cf1dd73..b544d6d 100644
45--- a/gettext-tools/configure.ac 46--- a/gettext-tools/configure.ac
46+++ b/gettext-tools/configure.ac 47+++ b/gettext-tools/configure.ac
47@@ -22,7 +22,7 @@ AC_INIT([gettext-tools], 48@@ -22,7 +22,7 @@ AC_INIT([gettext-tools],
48 [bug-gnu-gettext@gnu.org]) 49 [bug-gettext@gnu.org])
49 AC_CONFIG_SRCDIR([src/msgfmt.c]) 50 AC_CONFIG_SRCDIR([src/msgfmt.c])
50 AC_CONFIG_AUX_DIR([../build-aux]) 51 AC_CONFIG_AUX_DIR([../build-aux])
51-AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests]) 52-AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
@@ -53,6 +54,3 @@ index 920eeb6..c507434 100644
53 AC_CONFIG_HEADERS([config.h]) 54 AC_CONFIG_HEADERS([config.h])
54 55
55 dnl Installation directories. 56 dnl Installation directories.
56--
572.1.4
58
diff --git a/meta/recipes-core/gettext/gettext-0.20.1/use-pkgconfig.patch b/meta/recipes-core/gettext/gettext-0.20.1/use-pkgconfig.patch
new file mode 100644
index 0000000000..d3f3fe8e2f
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.20.1/use-pkgconfig.patch
@@ -0,0 +1,713 @@
1From ef414b06be80c6f605731abc9e674e396b80ec9e Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 23 Jan 2018 00:54:13 +0000
4Subject: [PATCH] gettext: beat library detection into shape
5
6For reasons which I just can't fathom gnulib doesn't use the expected tools to
7find libraries but badly reinvents the wheel. This will trivially lead to host
8contamination (explicit searches of /usr/lib) or incorrect RPATHs (bad
9canonicalisation resulting in relative paths).
10
11Simply delete all the crazy, and replace with a single call to pkg-config.
12
13Upstream-Status: Inappropriate [upstream still refuse to consider pkg-config]
14Signed-off-by: Ross Burton <ross.burton@intel.com>
15
16---
17 gettext-tools/gnulib-m4/libxml.m4 | 99 +----------------
18 .../gnulib-local/lib/term-styled-ostream.oo.c | 12 +-
19 libtextstyle/gnulib-local/m4/libcroco.m4 | 99 +++--------------
20 libtextstyle/gnulib-local/m4/libglib.m4 | 104 +++---------------
21 libtextstyle/gnulib-m4/libcroco.m4 | 99 +++--------------
22 libtextstyle/gnulib-m4/libglib.m4 | 104 +++---------------
23 libtextstyle/lib/term-styled-ostream.c | 12 +-
24 libtextstyle/lib/term-styled-ostream.oo.c | 12 +-
25 8 files changed, 87 insertions(+), 454 deletions(-)
26
27diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4
28index 05b9550..031ee65 100644
29--- a/gettext-tools/gnulib-m4/libxml.m4
30+++ b/gettext-tools/gnulib-m4/libxml.m4
31@@ -13,6 +13,7 @@ dnl gl_LIBXML(FORCE-INCLUDED)
32 dnl forces the use of the included or an external libxml.
33 AC_DEFUN([gl_LIBXML],
34 [
35+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
36 AC_REQUIRE([AM_ICONV_LINK])
37
38 ifelse([$1], , [
39@@ -30,100 +31,10 @@ AC_DEFUN([gl_LIBXML],
40 INCXML=
41 ifelse([$1], [yes], , [
42 if test "$gl_cv_libxml_use_included" != yes; then
43- dnl Figure out whether we can use a preinstalled libxml2, or have to use
44- dnl the included one.
45- AC_CACHE_VAL([gl_cv_libxml], [
46- gl_cv_libxml=no
47- gl_cv_LIBXML=
48- gl_cv_LTLIBXML=
49- gl_cv_INCXML=
50- gl_save_LIBS="$LIBS"
51- LIBS="$LIBS $LIBICONV"
52- dnl Search for libxml2 and define LIBXML2, LTLIBXML2 and INCXML2
53- dnl accordingly.
54- dnl Don't use xml2-config nor pkg-config, since it doesn't work when
55- dnl cross-compiling or when the C compiler in use is different from the
56- dnl one that built the library.
57- dnl Use a test program that tries to invoke xmlFree. On Cygwin 1.7.x,
58- dnl libxml2 is built in such a way that uses of xmlFree work fine with
59- dnl -Wl,--enable-auto-import but lead to a link error with
60- dnl -Wl,--disable-auto-import.
61- AC_LIB_LINKFLAGS_BODY([xml2])
62- LIBS="$gl_save_LIBS $LIBXML2 $LIBICONV"
63- AC_TRY_LINK([#include <libxml/xmlversion.h>
64- #include <libxml/xmlmemory.h>
65- #include <libxml/xpath.h>
66- ],
67- [xmlCheckVersion (0);
68- xmlFree ((void *) 0);
69- xmlXPathSetContextNode ((void *)0, (void *)0);
70- ],
71- [gl_cv_libxml=yes
72- gl_cv_LIBXML="$LIBXML2 $LIBICONV"
73- gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
74- ])
75- if test "$gl_cv_libxml" != yes; then
76- gl_save_CPPFLAGS="$CPPFLAGS"
77- CPPFLAGS="$CPPFLAGS $INCXML2"
78- AC_TRY_LINK([#include <libxml/xmlversion.h>
79- #include <libxml/xmlmemory.h>
80- #include <libxml/xpath.h>
81- ],
82- [xmlCheckVersion (0);
83- xmlFree ((void *) 0);
84- xmlXPathSetContextNode ((void *)0, (void *)0);
85- ],
86- [gl_cv_libxml=yes
87- gl_cv_LIBXML="$LIBXML2 $LIBICONV"
88- gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
89- gl_cv_INCXML="$INCXML2"
90- ])
91- if test "$gl_cv_libxml" != yes; then
92- dnl Often the include files are installed in /usr/include/libxml2.
93- dnl In libxml2-2.5, <libxml/xmlversion.h> is self-contained.
94- dnl In libxml2-2.6, it includes <libxml/xmlexports.h> which is
95- dnl self-contained.
96- libxml2_include_dir=
97- AC_TRY_CPP([#include <libxml2/libxml/xmlexports.h>],
98- [gl_ABSOLUTE_HEADER([libxml2/libxml/xmlexports.h])
99- libxml2_include_dir=`echo "$gl_cv_absolute_libxml2_libxml_xmlexports_h" | sed -e 's,.libxml.xmlexports\.h$,,'`
100- ])
101- if test -z "$libxml2_include_dir"; then
102- AC_TRY_CPP([#include <libxml2/libxml/xmlversion.h>],
103- [gl_ABSOLUTE_HEADER([libxml2/libxml/xmlversion.h])
104- libxml2_include_dir=`echo "$gl_cv_absolute_libxml2_libxml_xmlversion_h" | sed -e 's,.libxml.xmlversion\.h$,,'`
105- ])
106- fi
107- if test -n "$libxml2_include_dir" && test -d "$libxml2_include_dir"; then
108- CPPFLAGS="$gl_save_CPPFLAGS -I$libxml2_include_dir"
109- AC_TRY_LINK([#include <libxml/xmlversion.h>
110- #include <libxml/xmlmemory.h>
111- #include <libxml/xpath.h>
112- ],
113- [xmlCheckVersion (0);
114- xmlFree ((void *) 0);
115- xmlXPathSetContextNode ((void *)0, (void *)0);
116- ],
117- [gl_cv_libxml=yes
118- gl_cv_LIBXML="$LIBXML2 $LIBICONV"
119- gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
120- gl_cv_INCXML="-I$libxml2_include_dir"
121- ])
122- fi
123- fi
124- CPPFLAGS="$gl_save_CPPFLAGS"
125- fi
126- LIBS="$gl_save_LIBS"
127- ])
128- AC_MSG_CHECKING([for libxml])
129- AC_MSG_RESULT([$gl_cv_libxml])
130- if test $gl_cv_libxml = yes; then
131- LIBXML="$gl_cv_LIBXML"
132- LTLIBXML="$gl_cv_LTLIBXML"
133- INCXML="$gl_cv_INCXML"
134- else
135- gl_cv_libxml_use_included=yes
136- fi
137+ PKG_CHECK_MODULES([XML], [libxml-2.0])
138+ LIBXML=$XML_LIBS
139+ LTLIBXML=$XML_LIBS
140+ INCXML=$XML_CFLAGS
141 fi
142 ])
143 AC_SUBST([LIBXML])
144diff --git a/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c b/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c
145index 2cfd4a8..d42c8b4 100644
146--- a/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c
147+++ b/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c
148@@ -22,15 +22,15 @@
149
150 #include <stdlib.h>
151
152-#include <cr-om-parser.h>
153-#include <cr-sel-eng.h>
154-#include <cr-style.h>
155-#include <cr-rgb.h>
156+#include <libcroco/cr-om-parser.h>
157+#include <libcroco/cr-sel-eng.h>
158+#include <libcroco/cr-style.h>
159+#include <libcroco/cr-rgb.h>
160 /* <cr-fonts.h> has a broken double-inclusion guard in libcroco-0.6.1. */
161 #ifndef __CR_FONTS_H__
162-# include <cr-fonts.h>
163+# include <libcroco/cr-fonts.h>
164 #endif
165-#include <cr-string.h>
166+#include <libcroco/cr-string.h>
167
168 #include "term-ostream.h"
169 #include "hash.h"
170diff --git a/libtextstyle/gnulib-local/m4/libcroco.m4 b/libtextstyle/gnulib-local/m4/libcroco.m4
171index bc53cc6..10b2455 100644
172--- a/libtextstyle/gnulib-local/m4/libcroco.m4
173+++ b/libtextstyle/gnulib-local/m4/libcroco.m4
174@@ -1,99 +1,34 @@
175-# libcroco.m4 serial 3
176-dnl Copyright (C) 2006-2007, 2019 Free Software Foundation, Inc.
177+# libcroco.m4 serial 2 (gettext-0.17)
178+dnl Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
179 dnl This file is free software; the Free Software Foundation
180 dnl gives unlimited permission to copy and/or distribute it,
181 dnl with or without modifications, as long as this notice is preserved.
182
183 dnl From Bruno Haible.
184
185-dnl gl_LIBCROCO
186-dnl gives the user the option to decide whether to use the included or
187-dnl an external libcroco.
188-dnl gl_LIBCROCO(FORCE-INCLUDED)
189-dnl forces the use of the included or an external libcroco.
190 AC_DEFUN([gl_LIBCROCO],
191 [
192- ifelse([$1], [yes], , [
193- dnl libcroco depends on libglib.
194- AC_REQUIRE([gl_LIBGLIB])
195- ])
196+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
197+ dnl libcroco depends on libglib.
198+ AC_REQUIRE([gl_LIBGLIB])
199
200- ifelse([$1], , [
201- AC_MSG_CHECKING([whether included libcroco is requested])
202- AC_ARG_WITH([included-libcroco],
203- [ --with-included-libcroco use the libcroco included here],
204- [gl_cv_libcroco_force_included=$withval],
205- [gl_cv_libcroco_force_included=no])
206- AC_MSG_RESULT([$gl_cv_libcroco_force_included])
207- ], [gl_cv_libcroco_force_included=$1])
208+ AC_MSG_CHECKING([whether included libcroco is requested])
209+ AC_ARG_WITH([included-libcroco],
210+ [ --with-included-libcroco use the libcroco included here],
211+ [gl_cv_libcroco_force_included=$withval],
212+ [gl_cv_libcroco_force_included=no])
213+ AC_MSG_RESULT([$gl_cv_libcroco_force_included])
214
215 gl_cv_libcroco_use_included="$gl_cv_libcroco_force_included"
216 LIBCROCO=
217 LTLIBCROCO=
218 INCCROCO=
219- ifelse([$1], [yes], , [
220- if test "$gl_cv_libcroco_use_included" != yes; then
221- dnl Figure out whether we can use a preinstalled libcroco-0.6, or have to
222- dnl use the included one.
223- AC_CACHE_VAL([gl_cv_libcroco], [
224- gl_cv_libcroco=no
225- gl_cv_LIBCROCO=
226- gl_cv_LTLIBCROCO=
227- gl_cv_INCCROCO=
228- gl_save_LIBS="$LIBS"
229- dnl Search for libcroco and define LIBCROCO_0_6, LTLIBCROCO_0_6 and
230- dnl INCCROCO_0_6 accordingly.
231- dnl Don't use croco-0.6-config nor pkg-config, since it doesn't work when
232- dnl cross-compiling or when the C compiler in use is different from the
233- dnl one that built the library.
234- AC_LIB_LINKFLAGS_BODY([croco-0.6], [glib-2.0])
235- LIBS="$gl_save_LIBS $LIBCROCO_0_6"
236- AC_TRY_LINK([#include <libcroco-config.h>],
237- [const char *version = LIBCROCO_VERSION; return !version;],
238- [gl_cv_libcroco=yes
239- gl_cv_LIBCROCO="$LIBCROCO_0_6"
240- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
241- ])
242- if test "$gl_cv_libcroco" != yes; then
243- gl_save_CPPFLAGS="$CPPFLAGS"
244- CPPFLAGS="$CPPFLAGS $INCCROCO_0_6"
245- AC_TRY_LINK([#include <libcroco-config.h>],
246- [const char *version = LIBCROCO_VERSION; return !version;],
247- [gl_cv_libcroco=yes
248- gl_cv_LIBCROCO="$LIBCROCO_0_6"
249- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
250- gl_cv_INCCROCO="$INCCROCO_0_6"
251- ])
252- if test "$gl_cv_libcroco" != yes; then
253- dnl Often the include files are installed in
254- dnl /usr/include/libcroco-0.6/libcroco.
255- AC_TRY_LINK([#include <libcroco-0.6/libcroco/libcroco-config.h>],
256- [const char *version = LIBCROCO_VERSION; return !version;],
257- [gl_ABSOLUTE_HEADER([libcroco-0.6/libcroco/libcroco-config.h])
258- libcroco_include_dir=`echo "$gl_cv_absolute_libcroco_0_6_libcroco_libcroco_config_h" | sed -e 's,.libcroco-config\.h$,,'`
259- if test -d "$libcroco_include_dir"; then
260- gl_cv_libcroco=yes
261- gl_cv_LIBCROCO="$LIBCROCO_0_6"
262- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
263- gl_cv_INCCROCO="-I$libcroco_include_dir"
264- fi
265- ])
266- fi
267- CPPFLAGS="$gl_save_CPPFLAGS"
268- fi
269- LIBS="$gl_save_LIBS"
270- ])
271- AC_MSG_CHECKING([for libcroco])
272- AC_MSG_RESULT([$gl_cv_libcroco])
273- if test $gl_cv_libcroco = yes; then
274- LIBCROCO="$gl_cv_LIBCROCO"
275- LTLIBCROCO="$gl_cv_LTLIBCROCO"
276- INCCROCO="$gl_cv_INCCROCO"
277- else
278- gl_cv_libcroco_use_included=yes
279- fi
280- fi
281- ])
282+ if test "$gl_cv_libcroco_use_included" != yes; then
283+ PKG_CHECK_MODULES([CROCO], [libcroco-0.6])
284+ LIBCROCO=$CROCO_LIBS
285+ LTLIBCROCO=$CROCO_LIBS
286+ INCCROCO=$CROCO_CFLAGS
287+ fi
288 AC_SUBST([LIBCROCO])
289 AC_SUBST([LTLIBCROCO])
290 AC_SUBST([INCCROCO])
291diff --git a/libtextstyle/gnulib-local/m4/libglib.m4 b/libtextstyle/gnulib-local/m4/libglib.m4
292index bef6fa3..8841755 100644
293--- a/libtextstyle/gnulib-local/m4/libglib.m4
294+++ b/libtextstyle/gnulib-local/m4/libglib.m4
295@@ -1,105 +1,31 @@
296-# libglib.m4 serial 4
297-dnl Copyright (C) 2006-2007, 2019 Free Software Foundation, Inc.
298+# libglib.m4 serial 3 (gettext-0.17)
299+dnl Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
300 dnl This file is free software; the Free Software Foundation
301 dnl gives unlimited permission to copy and/or distribute it,
302 dnl with or without modifications, as long as this notice is preserved.
303
304 dnl From Bruno Haible.
305
306-dnl gl_LIBGLIB
307-dnl gives the user the option to decide whether to use the included or
308-dnl an external libglib.
309-dnl gl_LIBGLIB(FORCE-INCLUDED)
310-dnl forces the use of the included or an external libglib.
311 AC_DEFUN([gl_LIBGLIB],
312 [
313- ifelse([$1], , [
314- AC_MSG_CHECKING([whether included glib is requested])
315- AC_ARG_WITH([included-glib],
316- [ --with-included-glib use the glib2 included here],
317- [gl_cv_libglib_force_included=$withval],
318- [gl_cv_libglib_force_included=no])
319- AC_MSG_RESULT([$gl_cv_libglib_force_included])
320- ], [gl_cv_libglib_force_included=$1])
321+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
322+ AC_MSG_CHECKING([whether included glib is requested])
323+ AC_ARG_WITH([included-glib],
324+ [ --with-included-glib use the glib2 included here],
325+ [gl_cv_libglib_force_included=$withval],
326+ [gl_cv_libglib_force_included=no])
327+ AC_MSG_RESULT([$gl_cv_libglib_force_included])
328
329 gl_cv_libglib_use_included="$gl_cv_libglib_force_included"
330 LIBGLIB=
331 LTLIBGLIB=
332 INCGLIB=
333- ifelse([$1], [yes], , [
334- if test "$gl_cv_libglib_use_included" != yes; then
335- dnl Figure out whether we can use a preinstalled libglib-2.0, or have to use
336- dnl the included one.
337- AC_CACHE_VAL([gl_cv_libglib], [
338- gl_cv_libglib=no
339- gl_cv_LIBGLIB=
340- gl_cv_LTLIBGLIB=
341- gl_cv_INCGLIB=
342- gl_save_LIBS="$LIBS"
343- dnl Search for libglib2 and define LIBGLIB_2_0, LTLIBGLIB_2_0 and
344- dnl INCGLIB_2_0 accordingly.
345- dnl Don't use glib-config nor pkg-config, since it doesn't work when
346- dnl cross-compiling or when the C compiler in use is different from the
347- dnl one that built the library.
348- AC_LIB_LINKFLAGS_BODY([glib-2.0])
349- LIBS="$gl_save_LIBS $LIBGLIB_2_0"
350- AC_TRY_LINK([#include <glib.h>
351-#ifndef G_BEGIN_DECLS
352-error this glib.h includes a glibconfig.h from a glib version 1.x
353-#endif
354-],
355- [g_string_new ("foo");],
356- [gl_cv_libglib=yes
357- gl_cv_LIBGLIB="$LIBGLIB_2_0"
358- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
359- ])
360- if test "$gl_cv_libglib" != yes; then
361- gl_save_CPPFLAGS="$CPPFLAGS"
362- CPPFLAGS="$CPPFLAGS $INCGLIB_2_0"
363- AC_TRY_LINK([#include <glib.h>
364-#ifndef G_BEGIN_DECLS
365-error this glib.h includes a glibconfig.h from a glib version 1.x
366-#endif
367-],
368- [g_string_new ("foo");],
369- [gl_cv_libglib=yes
370- gl_cv_LIBGLIB="$LIBGLIB_2_0"
371- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
372- gl_cv_INCGLIB="$INCGLIB_2_0"
373- ])
374- if test "$gl_cv_libglib" != yes; then
375- dnl Often the include files are installed in /usr/include/glib-2.0
376- dnl and /usr/lib/glib-2.0/include.
377- if test -n "$LIBGLIB_2_0_PREFIX"; then
378- CPPFLAGS="$gl_save_CPPFLAGS -I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include"
379- AC_TRY_LINK([#include <glib.h>
380-#ifndef G_BEGIN_DECLS
381-error this glib.h includes a glibconfig.h from a glib version 1.x
382-#endif
383-],
384- [g_string_new ("foo");],
385- [gl_cv_libglib=yes
386- gl_cv_LIBGLIB="$LIBGLIB_2_0"
387- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
388- gl_cv_INCGLIB="-I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include"
389- ])
390- fi
391- fi
392- CPPFLAGS="$gl_save_CPPFLAGS"
393- fi
394- LIBS="$gl_save_LIBS"
395- ])
396- AC_MSG_CHECKING([for glib])
397- AC_MSG_RESULT([$gl_cv_libglib])
398- if test $gl_cv_libglib = yes; then
399- LIBGLIB="$gl_cv_LIBGLIB"
400- LTLIBGLIB="$gl_cv_LTLIBGLIB"
401- INCGLIB="$gl_cv_INCGLIB"
402- else
403- gl_cv_libglib_use_included=yes
404- fi
405- fi
406- ])
407+ if test "$gl_cv_libglib_use_included" != yes; then
408+ PKG_CHECK_MODULES([GLIB], [glib-2.0])
409+ LIBGLIB="$GLIB_LIBS"
410+ LTLIBGLIB="$GLIB_LIBS"
411+ INCGLIB="$GLIB_CFLAGS"
412+ fi
413 AC_SUBST([LIBGLIB])
414 AC_SUBST([LTLIBGLIB])
415 AC_SUBST([INCGLIB])
416diff --git a/libtextstyle/gnulib-m4/libcroco.m4 b/libtextstyle/gnulib-m4/libcroco.m4
417index bc53cc6..10b2455 100644
418--- a/libtextstyle/gnulib-m4/libcroco.m4
419+++ b/libtextstyle/gnulib-m4/libcroco.m4
420@@ -1,99 +1,34 @@
421-# libcroco.m4 serial 3
422-dnl Copyright (C) 2006-2007, 2019 Free Software Foundation, Inc.
423+# libcroco.m4 serial 2 (gettext-0.17)
424+dnl Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
425 dnl This file is free software; the Free Software Foundation
426 dnl gives unlimited permission to copy and/or distribute it,
427 dnl with or without modifications, as long as this notice is preserved.
428
429 dnl From Bruno Haible.
430
431-dnl gl_LIBCROCO
432-dnl gives the user the option to decide whether to use the included or
433-dnl an external libcroco.
434-dnl gl_LIBCROCO(FORCE-INCLUDED)
435-dnl forces the use of the included or an external libcroco.
436 AC_DEFUN([gl_LIBCROCO],
437 [
438- ifelse([$1], [yes], , [
439- dnl libcroco depends on libglib.
440- AC_REQUIRE([gl_LIBGLIB])
441- ])
442+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
443+ dnl libcroco depends on libglib.
444+ AC_REQUIRE([gl_LIBGLIB])
445
446- ifelse([$1], , [
447- AC_MSG_CHECKING([whether included libcroco is requested])
448- AC_ARG_WITH([included-libcroco],
449- [ --with-included-libcroco use the libcroco included here],
450- [gl_cv_libcroco_force_included=$withval],
451- [gl_cv_libcroco_force_included=no])
452- AC_MSG_RESULT([$gl_cv_libcroco_force_included])
453- ], [gl_cv_libcroco_force_included=$1])
454+ AC_MSG_CHECKING([whether included libcroco is requested])
455+ AC_ARG_WITH([included-libcroco],
456+ [ --with-included-libcroco use the libcroco included here],
457+ [gl_cv_libcroco_force_included=$withval],
458+ [gl_cv_libcroco_force_included=no])
459+ AC_MSG_RESULT([$gl_cv_libcroco_force_included])
460
461 gl_cv_libcroco_use_included="$gl_cv_libcroco_force_included"
462 LIBCROCO=
463 LTLIBCROCO=
464 INCCROCO=
465- ifelse([$1], [yes], , [
466- if test "$gl_cv_libcroco_use_included" != yes; then
467- dnl Figure out whether we can use a preinstalled libcroco-0.6, or have to
468- dnl use the included one.
469- AC_CACHE_VAL([gl_cv_libcroco], [
470- gl_cv_libcroco=no
471- gl_cv_LIBCROCO=
472- gl_cv_LTLIBCROCO=
473- gl_cv_INCCROCO=
474- gl_save_LIBS="$LIBS"
475- dnl Search for libcroco and define LIBCROCO_0_6, LTLIBCROCO_0_6 and
476- dnl INCCROCO_0_6 accordingly.
477- dnl Don't use croco-0.6-config nor pkg-config, since it doesn't work when
478- dnl cross-compiling or when the C compiler in use is different from the
479- dnl one that built the library.
480- AC_LIB_LINKFLAGS_BODY([croco-0.6], [glib-2.0])
481- LIBS="$gl_save_LIBS $LIBCROCO_0_6"
482- AC_TRY_LINK([#include <libcroco-config.h>],
483- [const char *version = LIBCROCO_VERSION; return !version;],
484- [gl_cv_libcroco=yes
485- gl_cv_LIBCROCO="$LIBCROCO_0_6"
486- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
487- ])
488- if test "$gl_cv_libcroco" != yes; then
489- gl_save_CPPFLAGS="$CPPFLAGS"
490- CPPFLAGS="$CPPFLAGS $INCCROCO_0_6"
491- AC_TRY_LINK([#include <libcroco-config.h>],
492- [const char *version = LIBCROCO_VERSION; return !version;],
493- [gl_cv_libcroco=yes
494- gl_cv_LIBCROCO="$LIBCROCO_0_6"
495- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
496- gl_cv_INCCROCO="$INCCROCO_0_6"
497- ])
498- if test "$gl_cv_libcroco" != yes; then
499- dnl Often the include files are installed in
500- dnl /usr/include/libcroco-0.6/libcroco.
501- AC_TRY_LINK([#include <libcroco-0.6/libcroco/libcroco-config.h>],
502- [const char *version = LIBCROCO_VERSION; return !version;],
503- [gl_ABSOLUTE_HEADER([libcroco-0.6/libcroco/libcroco-config.h])
504- libcroco_include_dir=`echo "$gl_cv_absolute_libcroco_0_6_libcroco_libcroco_config_h" | sed -e 's,.libcroco-config\.h$,,'`
505- if test -d "$libcroco_include_dir"; then
506- gl_cv_libcroco=yes
507- gl_cv_LIBCROCO="$LIBCROCO_0_6"
508- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
509- gl_cv_INCCROCO="-I$libcroco_include_dir"
510- fi
511- ])
512- fi
513- CPPFLAGS="$gl_save_CPPFLAGS"
514- fi
515- LIBS="$gl_save_LIBS"
516- ])
517- AC_MSG_CHECKING([for libcroco])
518- AC_MSG_RESULT([$gl_cv_libcroco])
519- if test $gl_cv_libcroco = yes; then
520- LIBCROCO="$gl_cv_LIBCROCO"
521- LTLIBCROCO="$gl_cv_LTLIBCROCO"
522- INCCROCO="$gl_cv_INCCROCO"
523- else
524- gl_cv_libcroco_use_included=yes
525- fi
526- fi
527- ])
528+ if test "$gl_cv_libcroco_use_included" != yes; then
529+ PKG_CHECK_MODULES([CROCO], [libcroco-0.6])
530+ LIBCROCO=$CROCO_LIBS
531+ LTLIBCROCO=$CROCO_LIBS
532+ INCCROCO=$CROCO_CFLAGS
533+ fi
534 AC_SUBST([LIBCROCO])
535 AC_SUBST([LTLIBCROCO])
536 AC_SUBST([INCCROCO])
537diff --git a/libtextstyle/gnulib-m4/libglib.m4 b/libtextstyle/gnulib-m4/libglib.m4
538index bef6fa3..8841755 100644
539--- a/libtextstyle/gnulib-m4/libglib.m4
540+++ b/libtextstyle/gnulib-m4/libglib.m4
541@@ -1,105 +1,31 @@
542-# libglib.m4 serial 4
543-dnl Copyright (C) 2006-2007, 2019 Free Software Foundation, Inc.
544+# libglib.m4 serial 3 (gettext-0.17)
545+dnl Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
546 dnl This file is free software; the Free Software Foundation
547 dnl gives unlimited permission to copy and/or distribute it,
548 dnl with or without modifications, as long as this notice is preserved.
549
550 dnl From Bruno Haible.
551
552-dnl gl_LIBGLIB
553-dnl gives the user the option to decide whether to use the included or
554-dnl an external libglib.
555-dnl gl_LIBGLIB(FORCE-INCLUDED)
556-dnl forces the use of the included or an external libglib.
557 AC_DEFUN([gl_LIBGLIB],
558 [
559- ifelse([$1], , [
560- AC_MSG_CHECKING([whether included glib is requested])
561- AC_ARG_WITH([included-glib],
562- [ --with-included-glib use the glib2 included here],
563- [gl_cv_libglib_force_included=$withval],
564- [gl_cv_libglib_force_included=no])
565- AC_MSG_RESULT([$gl_cv_libglib_force_included])
566- ], [gl_cv_libglib_force_included=$1])
567+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
568+ AC_MSG_CHECKING([whether included glib is requested])
569+ AC_ARG_WITH([included-glib],
570+ [ --with-included-glib use the glib2 included here],
571+ [gl_cv_libglib_force_included=$withval],
572+ [gl_cv_libglib_force_included=no])
573+ AC_MSG_RESULT([$gl_cv_libglib_force_included])
574
575 gl_cv_libglib_use_included="$gl_cv_libglib_force_included"
576 LIBGLIB=
577 LTLIBGLIB=
578 INCGLIB=
579- ifelse([$1], [yes], , [
580- if test "$gl_cv_libglib_use_included" != yes; then
581- dnl Figure out whether we can use a preinstalled libglib-2.0, or have to use
582- dnl the included one.
583- AC_CACHE_VAL([gl_cv_libglib], [
584- gl_cv_libglib=no
585- gl_cv_LIBGLIB=
586- gl_cv_LTLIBGLIB=
587- gl_cv_INCGLIB=
588- gl_save_LIBS="$LIBS"
589- dnl Search for libglib2 and define LIBGLIB_2_0, LTLIBGLIB_2_0 and
590- dnl INCGLIB_2_0 accordingly.
591- dnl Don't use glib-config nor pkg-config, since it doesn't work when
592- dnl cross-compiling or when the C compiler in use is different from the
593- dnl one that built the library.
594- AC_LIB_LINKFLAGS_BODY([glib-2.0])
595- LIBS="$gl_save_LIBS $LIBGLIB_2_0"
596- AC_TRY_LINK([#include <glib.h>
597-#ifndef G_BEGIN_DECLS
598-error this glib.h includes a glibconfig.h from a glib version 1.x
599-#endif
600-],
601- [g_string_new ("foo");],
602- [gl_cv_libglib=yes
603- gl_cv_LIBGLIB="$LIBGLIB_2_0"
604- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
605- ])
606- if test "$gl_cv_libglib" != yes; then
607- gl_save_CPPFLAGS="$CPPFLAGS"
608- CPPFLAGS="$CPPFLAGS $INCGLIB_2_0"
609- AC_TRY_LINK([#include <glib.h>
610-#ifndef G_BEGIN_DECLS
611-error this glib.h includes a glibconfig.h from a glib version 1.x
612-#endif
613-],
614- [g_string_new ("foo");],
615- [gl_cv_libglib=yes
616- gl_cv_LIBGLIB="$LIBGLIB_2_0"
617- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
618- gl_cv_INCGLIB="$INCGLIB_2_0"
619- ])
620- if test "$gl_cv_libglib" != yes; then
621- dnl Often the include files are installed in /usr/include/glib-2.0
622- dnl and /usr/lib/glib-2.0/include.
623- if test -n "$LIBGLIB_2_0_PREFIX"; then
624- CPPFLAGS="$gl_save_CPPFLAGS -I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include"
625- AC_TRY_LINK([#include <glib.h>
626-#ifndef G_BEGIN_DECLS
627-error this glib.h includes a glibconfig.h from a glib version 1.x
628-#endif
629-],
630- [g_string_new ("foo");],
631- [gl_cv_libglib=yes
632- gl_cv_LIBGLIB="$LIBGLIB_2_0"
633- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
634- gl_cv_INCGLIB="-I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include"
635- ])
636- fi
637- fi
638- CPPFLAGS="$gl_save_CPPFLAGS"
639- fi
640- LIBS="$gl_save_LIBS"
641- ])
642- AC_MSG_CHECKING([for glib])
643- AC_MSG_RESULT([$gl_cv_libglib])
644- if test $gl_cv_libglib = yes; then
645- LIBGLIB="$gl_cv_LIBGLIB"
646- LTLIBGLIB="$gl_cv_LTLIBGLIB"
647- INCGLIB="$gl_cv_INCGLIB"
648- else
649- gl_cv_libglib_use_included=yes
650- fi
651- fi
652- ])
653+ if test "$gl_cv_libglib_use_included" != yes; then
654+ PKG_CHECK_MODULES([GLIB], [glib-2.0])
655+ LIBGLIB="$GLIB_LIBS"
656+ LTLIBGLIB="$GLIB_LIBS"
657+ INCGLIB="$GLIB_CFLAGS"
658+ fi
659 AC_SUBST([LIBGLIB])
660 AC_SUBST([LTLIBGLIB])
661 AC_SUBST([INCGLIB])
662diff --git a/libtextstyle/lib/term-styled-ostream.c b/libtextstyle/lib/term-styled-ostream.c
663index 3675b5f..811e546 100644
664--- a/libtextstyle/lib/term-styled-ostream.c
665+++ b/libtextstyle/lib/term-styled-ostream.c
666@@ -28,15 +28,15 @@
667
668 #include <stdlib.h>
669
670-#include <cr-om-parser.h>
671-#include <cr-sel-eng.h>
672-#include <cr-style.h>
673-#include <cr-rgb.h>
674+#include <libcroco/cr-om-parser.h>
675+#include <libcroco/cr-sel-eng.h>
676+#include <libcroco/cr-style.h>
677+#include <libcroco/cr-rgb.h>
678 /* <cr-fonts.h> has a broken double-inclusion guard in libcroco-0.6.1. */
679 #ifndef __CR_FONTS_H__
680-# include <cr-fonts.h>
681+# include <libcroco/cr-fonts.h>
682 #endif
683-#include <cr-string.h>
684+#include <libcroco/cr-string.h>
685
686 #include "term-ostream.h"
687 #include "hash.h"
688diff --git a/libtextstyle/lib/term-styled-ostream.oo.c b/libtextstyle/lib/term-styled-ostream.oo.c
689index 2cfd4a8..d42c8b4 100644
690--- a/libtextstyle/lib/term-styled-ostream.oo.c
691+++ b/libtextstyle/lib/term-styled-ostream.oo.c
692@@ -22,15 +22,15 @@
693
694 #include <stdlib.h>
695
696-#include <cr-om-parser.h>
697-#include <cr-sel-eng.h>
698-#include <cr-style.h>
699-#include <cr-rgb.h>
700+#include <libcroco/cr-om-parser.h>
701+#include <libcroco/cr-sel-eng.h>
702+#include <libcroco/cr-style.h>
703+#include <libcroco/cr-rgb.h>
704 /* <cr-fonts.h> has a broken double-inclusion guard in libcroco-0.6.1. */
705 #ifndef __CR_FONTS_H__
706-# include <cr-fonts.h>
707+# include <libcroco/cr-fonts.h>
708 #endif
709-#include <cr-string.h>
710+#include <libcroco/cr-string.h>
711
712 #include "term-ostream.h"
713 #include "hash.h"
diff --git a/meta/recipes-core/gettext/gettext_0.19.8.1.bb b/meta/recipes-core/gettext/gettext_0.20.1.bb
index 30121ad23e..fc05ef2e0a 100644
--- a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.20.1.bb
@@ -6,7 +6,7 @@ a few stand-alone programs to massage in various ways the sets of translatable a
6HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" 6HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
7SECTION = "libs" 7SECTION = "libs"
8LICENSE = "GPLv3+ & LGPL-2.1+" 8LICENSE = "GPLv3+ & LGPL-2.1+"
9LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 9LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e"
10 10
11# Because po-gram-gen.y has been modified by fix-CVE-2018-18751.patch, 11# Because po-gram-gen.y has been modified by fix-CVE-2018-18751.patch,
12# it requires yacc which provided by bison-native 12# it requires yacc which provided by bison-native
@@ -17,17 +17,16 @@ PROVIDES = "virtual/libintl virtual/gettext"
17PROVIDES_class-native = "virtual/gettext-native" 17PROVIDES_class-native = "virtual/gettext-native"
18RCONFLICTS_${PN} = "proxy-libintl" 18RCONFLICTS_${PN} = "proxy-libintl"
19SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ 19SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
20 file://parallel.patch \ 20 file://parallel.patch \
21 file://add-with-bisonlocaledir.patch \ 21 file://add-with-bisonlocaledir.patch \
22 file://cr-statement.c-timsort.h-fix-formatting-issues.patch \ 22 file://cr-statement.c-timsort.h-fix-formatting-issues.patch \
23 file://use-pkgconfig.patch \ 23 file://use-pkgconfig.patch \
24 file://fix-CVE-2018-18751.patch \ 24 file://run-ptest \
25 file://run-ptest \ 25 file://serial-tests-config.patch \
26 file://serial-tests-config.patch \ 26 "
27"
28 27
29SRC_URI[md5sum] = "97e034cf8ce5ba73a28ff6c3c0638092" 28SRC_URI[md5sum] = "bb5b0c0caa028105f3ca1905ddc306e2"
30SRC_URI[sha256sum] = "ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43" 29SRC_URI[sha256sum] = "66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c"
31 30
32inherit autotools texinfo pkgconfig ptest 31inherit autotools texinfo pkgconfig ptest
33 32
@@ -127,7 +126,7 @@ do_install_append_class-native () {
127 rm ${D}${datadir}/gettext/po/remove-potcdate.sin 126 rm ${D}${datadir}/gettext/po/remove-potcdate.sin
128 127
129 create_wrapper ${D}${bindir}/msgfmt \ 128 create_wrapper ${D}${bindir}/msgfmt \
130 GETTEXTDATADIR="${STAGING_DATADIR_NATIVE}/gettext-0.19.8/" 129 GETTEXTDATADIR="${STAGING_DATADIR_NATIVE}/gettext-0.20/"
131 130
132} 131}
133 132
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 22:35:12 +0000