diff options
Diffstat (limited to 'meta/recipes-core/gettext/gettext-0.21')
8 files changed, 0 insertions, 899 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.21/0001-init-env.in-do-not-add-C-CXX-parameters.patch b/meta/recipes-core/gettext/gettext-0.21/0001-init-env.in-do-not-add-C-CXX-parameters.patch deleted file mode 100644 index d45b75869a..0000000000 --- a/meta/recipes-core/gettext/gettext-0.21/0001-init-env.in-do-not-add-C-CXX-parameters.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9b912a47f790a7b282ec0c2295a188c5d8fb6a7c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 6 Mar 2020 21:04:05 +0000 -Subject: [PATCH] init-env.in: do not add C/CXX parameters - -These are taken from the cross environment and include -sysroot paths, so are not reproducible. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - gettext-tools/tests/init-env.in | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/gettext-tools/tests/init-env.in b/gettext-tools/tests/init-env.in -index cc84ffd..b69c990 100644 ---- a/gettext-tools/tests/init-env.in -+++ b/gettext-tools/tests/init-env.in -@@ -3,10 +3,6 @@ top_builddir=../.. - - OBJEXT="@OBJEXT@" - EXEEXT="@EXEEXT@" --CC="@CC@" --CFLAGS="@CFLAGS@" --CXX="@CXX@" --CXXFLAGS="@CXXFLAGS@" - CPPFLAGS="@CPPFLAGS@" - LDFLAGS="@LDFLAGS@" - LTLIBINTL="@LTLIBINTL@" diff --git a/meta/recipes-core/gettext/gettext-0.21/0001-msgmerge-29-Add-executable-file-mode-bits.patch b/meta/recipes-core/gettext/gettext-0.21/0001-msgmerge-29-Add-executable-file-mode-bits.patch deleted file mode 100644 index e42a6c0a4d..0000000000 --- a/meta/recipes-core/gettext/gettext-0.21/0001-msgmerge-29-Add-executable-file-mode-bits.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 71988f83b69c4ed98d1b9418da80edf11a931894 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 23 Sep 2020 22:08:34 -0700 -Subject: [PATCH] msgmerge-29: Add executable file mode bits - -This script is installed with default mode bits and executed directly -e.g ./msgmerge-29 when doing make check which results in - -/bin/bash: line 9: ./msgmerge-29: Permission denied - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gettext-tools/tests/msgmerge-29 | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) - mode change 100644 => 100755 gettext-tools/tests/msgmerge-29 - -diff --git a/gettext-tools/tests/msgmerge-29 b/gettext-tools/tests/msgmerge-29 -old mode 100644 -new mode 100755 --- -2.28.0 - diff --git a/meta/recipes-core/gettext/gettext-0.21/0001-tests-autopoint-3-unset-MAKEFLAGS.patch b/meta/recipes-core/gettext/gettext-0.21/0001-tests-autopoint-3-unset-MAKEFLAGS.patch deleted file mode 100644 index b0bc6b97a6..0000000000 --- a/meta/recipes-core/gettext/gettext-0.21/0001-tests-autopoint-3-unset-MAKEFLAGS.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 38b256e5aa7dfeb42acffd89565e53a2c0bab3e3 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 7 Jan 2020 16:44:38 +0100 -Subject: [PATCH] tests/autopoint-3: unset MAKEFLAGS - -This is needed when running ptests, as the MAKEFLAGS value (set up by run-ptest) -is messing up the test. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - gettext-tools/tests/autopoint-3 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gettext-tools/tests/autopoint-3 b/gettext-tools/tests/autopoint-3 -index e13552b..55188df 100755 ---- a/gettext-tools/tests/autopoint-3 -+++ b/gettext-tools/tests/autopoint-3 -@@ -126,6 +126,7 @@ test $? = 0 || { cat autopoint.err; Exit 1; } - ${CONFIG_SHELL} ./configure >/dev/null 2>autpoint.err - test $? = 0 || { cat autopoint.err; Exit 1; } - -+unset MAKEFLAGS - ${MAKE} >/dev/null 2>autopoint.err - test $? = 0 || { cat autopoint.err; Exit 1; } - diff --git a/meta/recipes-core/gettext/gettext-0.21/mingw.patch b/meta/recipes-core/gettext/gettext-0.21/mingw.patch deleted file mode 100644 index b062c784f6..0000000000 --- a/meta/recipes-core/gettext/gettext-0.21/mingw.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7cf68dffb2adb76375bfb0781e277510523a1f3e Mon Sep 17 00:00:00 2001 -From: Michele Locati <michele@locati.it> -Date: Thu, 30 Jul 2020 18:58:02 +0200 -Subject: [PATCH] build: Fix build failure on Cygwin and mingw. - -* gettext-tools/woe32dll/gettextsrc-exports.c: Export formatstring_ruby. - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - gettext-tools/woe32dll/gettextsrc-exports.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gettext-tools/woe32dll/gettextsrc-exports.c b/gettext-tools/woe32dll/gettextsrc-exports.c -index 4477ae8..6d76089 100644 ---- a/gettext-tools/woe32dll/gettextsrc-exports.c -+++ b/gettext-tools/woe32dll/gettextsrc-exports.c -@@ -50,6 +50,7 @@ VARIABLE(formatstring_python) - VARIABLE(formatstring_python_brace) - VARIABLE(formatstring_qt) - VARIABLE(formatstring_qt_plural) -+VARIABLE(formatstring_ruby) - VARIABLE(formatstring_scheme) - VARIABLE(formatstring_sh) - VARIABLE(formatstring_smalltalk) --- -1.9.1 - diff --git a/meta/recipes-core/gettext/gettext-0.21/parallel.patch b/meta/recipes-core/gettext/gettext-0.21/parallel.patch deleted file mode 100644 index d96a376b7d..0000000000 --- a/meta/recipes-core/gettext/gettext-0.21/parallel.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4a2a0a93b469093b60ffd0bec55d33d1e03d4713 Mon Sep 17 00:00:00 2001 -From: Joe Slater <jslater@windriver.com> -Date: Thu, 7 Jun 2012 16:37:01 -0700 -Subject: [PATCH] instal libgettextlib.a before removing it - -In a multiple job build, Makefile can simultaneously -be installing and removing libgettextlib.a. We serialize -the operations. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater <jslater@windriver.com> - ---- - gettext-tools/gnulib-lib/Makefile.am | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/gettext-tools/gnulib-lib/Makefile.am b/gettext-tools/gnulib-lib/Makefile.am -index 2126699..d2dd7e4 100644 ---- a/gettext-tools/gnulib-lib/Makefile.am -+++ b/gettext-tools/gnulib-lib/Makefile.am -@@ -58,6 +58,10 @@ endif - # Rules generated and collected by gnulib-tool. - include Makefile.gnulib - -+# defined in Makefile.gnulib but missing this dependency -+# -+install-exec-clean: install-libLTLIBRARIES -+ - # OS/2 does not support a DLL name longer than 8 characters. - if OS2 - libgettextlib_la_LDFLAGS += -os2dllname gtlib diff --git a/meta/recipes-core/gettext/gettext-0.21/run-ptest b/meta/recipes-core/gettext/gettext-0.21/run-ptest deleted file mode 100644 index f17f3c87a7..0000000000 --- a/meta/recipes-core/gettext/gettext-0.21/run-ptest +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# -#This script is used to run gettext test suites -cd tests - -make -k runtest-TESTS top_srcdir=.. srcdir=. abs_srcdir=$PWD top_builddir=$PWD/../ abs_top_srcdir=$PWD/../ | cat diff --git a/meta/recipes-core/gettext/gettext-0.21/serial-tests-config.patch b/meta/recipes-core/gettext/gettext-0.21/serial-tests-config.patch deleted file mode 100644 index 93f7c03334..0000000000 --- a/meta/recipes-core/gettext/gettext-0.21/serial-tests-config.patch +++ /dev/null @@ -1,56 +0,0 @@ -From ed64a5724ef7d6eb4e9a876f817ea266a536e195 Mon Sep 17 00:00:00 2001 -From: "Hongjun.Yang" <hongjun.yang@windriver.com> -Date: Thu, 28 Jul 2016 12:36:15 +0800 -Subject: [PATCH] fix for ptest - -Add serial-tests support, ptest need it - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> - ---- - configure.ac | 2 +- - gettext-runtime/configure.ac | 2 +- - gettext-tools/configure.ac | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 38db6fd..f019ae0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,7 +22,7 @@ AC_INIT([gettext], - [bug-gettext@gnu.org]) - AC_CONFIG_SRCDIR([gettext-tools/src/msgfmt.c]) - AC_CONFIG_AUX_DIR([build-aux]) --AM_INIT_AUTOMAKE([1.13 silent-rules parallel-tests tar-ustar]) -+AM_INIT_AUTOMAKE([1.13 silent-rules serial-tests tar-ustar]) - - dnl Override automake's tar command used for creating distributions. - am__tar='${AMTAR} chf - --format=ustar --owner=root --group=root "$$tardir"' -diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac -index de203e7..138a07f 100644 ---- a/gettext-runtime/configure.ac -+++ b/gettext-runtime/configure.ac -@@ -22,7 +22,7 @@ AC_INIT([gettext-runtime], - [bug-gettext@gnu.org]) - AC_CONFIG_SRCDIR([intl/dcigettext.c]) - AC_CONFIG_AUX_DIR([../build-aux]) --AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests]) -+AM_INIT_AUTOMAKE([1.11.1 silent-rules serial-tests]) - AC_CONFIG_HEADERS([config.h]) - - dnl Installation directories. -diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac -index cf1dd73..b544d6d 100644 ---- a/gettext-tools/configure.ac -+++ b/gettext-tools/configure.ac -@@ -22,7 +22,7 @@ AC_INIT([gettext-tools], - [bug-gettext@gnu.org]) - AC_CONFIG_SRCDIR([src/msgfmt.c]) - AC_CONFIG_AUX_DIR([../build-aux]) --AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests]) -+AM_INIT_AUTOMAKE([1.11.1 silent-rules serial-tests]) - AC_CONFIG_HEADERS([config.h]) - - dnl Installation directories. diff --git a/meta/recipes-core/gettext/gettext-0.21/use-pkgconfig.patch b/meta/recipes-core/gettext/gettext-0.21/use-pkgconfig.patch deleted file mode 100644 index fc77feb270..0000000000 --- a/meta/recipes-core/gettext/gettext-0.21/use-pkgconfig.patch +++ /dev/null @@ -1,699 +0,0 @@ -From 15647f679834be633fb4a9aeff4671b9cb95ccb8 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Tue, 23 Jan 2018 00:54:13 +0000 -Subject: [PATCH] gettext: beat library detection into shape - -For reasons which I just can't fathom gnulib doesn't use the expected tools to -find libraries but badly reinvents the wheel. This will trivially lead to host -contamination (explicit searches of /usr/lib) or incorrect RPATHs (bad -canonicalisation resulting in relative paths). - -Simply delete all the crazy, and replace with a single call to pkg-config. - -Upstream-Status: Inappropriate [upstream still refuse to consider pkg-config] -Signed-off-by: Ross Burton <ross.burton@intel.com> - ---- - gettext-tools/gnulib-m4/libxml.m4 | 99 +---------------- - .../gnulib-local/lib/term-styled-ostream.oo.c | 12 +-- - libtextstyle/gnulib-local/m4/libcroco.m4 | 99 +++-------------- - libtextstyle/gnulib-local/m4/libglib.m4 | 100 +++--------------- - libtextstyle/gnulib-m4/libcroco.m4 | 99 +++-------------- - libtextstyle/gnulib-m4/libglib.m4 | 100 +++--------------- - libtextstyle/lib/term-styled-ostream.c | 12 +-- - libtextstyle/lib/term-styled-ostream.oo.c | 12 +-- - 8 files changed, 83 insertions(+), 450 deletions(-) - -diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4 -index 2f80c37..30ce58e 100644 ---- a/gettext-tools/gnulib-m4/libxml.m4 -+++ b/gettext-tools/gnulib-m4/libxml.m4 -@@ -13,6 +13,7 @@ dnl gl_LIBXML(FORCE-INCLUDED) - dnl forces the use of the included or an external libxml. - AC_DEFUN([gl_LIBXML], - [ -+ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) - AC_REQUIRE([AM_ICONV_LINK]) - - ifelse([$1], , [ -@@ -30,100 +31,10 @@ AC_DEFUN([gl_LIBXML], - INCXML= - ifelse([$1], [yes], , [ - if test "$gl_cv_libxml_use_included" != yes; then -- dnl Figure out whether we can use a preinstalled libxml2, or have to use -- dnl the included one. -- AC_CACHE_VAL([gl_cv_libxml], [ -- gl_cv_libxml=no -- gl_cv_LIBXML= -- gl_cv_LTLIBXML= -- gl_cv_INCXML= -- gl_save_LIBS="$LIBS" -- LIBS="$LIBS $LIBICONV" -- dnl Search for libxml2 and define LIBXML2, LTLIBXML2 and INCXML2 -- dnl accordingly. -- dnl Don't use xml2-config nor pkg-config, since it doesn't work when -- dnl cross-compiling or when the C compiler in use is different from the -- dnl one that built the library. -- dnl Use a test program that tries to invoke xmlFree. On Cygwin 1.7.x, -- dnl libxml2 is built in such a way that uses of xmlFree work fine with -- dnl -Wl,--enable-auto-import but lead to a link error with -- dnl -Wl,--disable-auto-import. -- AC_LIB_LINKFLAGS_BODY([xml2]) -- LIBS="$gl_save_LIBS $LIBXML2 $LIBICONV" -- AC_TRY_LINK([#include <libxml/xmlversion.h> -- #include <libxml/xmlmemory.h> -- #include <libxml/xpath.h> -- ], -- [xmlCheckVersion (0); -- xmlFree ((void *) 0); -- xmlXPathSetContextNode ((void *)0, (void *)0); -- ], -- [gl_cv_libxml=yes -- gl_cv_LIBXML="$LIBXML2 $LIBICONV" -- gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV" -- ]) -- if test "$gl_cv_libxml" != yes; then -- gl_save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $INCXML2" -- AC_TRY_LINK([#include <libxml/xmlversion.h> -- #include <libxml/xmlmemory.h> -- #include <libxml/xpath.h> -- ], -- [xmlCheckVersion (0); -- xmlFree ((void *) 0); -- xmlXPathSetContextNode ((void *)0, (void *)0); -- ], -- [gl_cv_libxml=yes -- gl_cv_LIBXML="$LIBXML2 $LIBICONV" -- gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV" -- gl_cv_INCXML="$INCXML2" -- ]) -- if test "$gl_cv_libxml" != yes; then -- dnl Often the include files are installed in /usr/include/libxml2. -- dnl In libxml2-2.5, <libxml/xmlversion.h> is self-contained. -- dnl In libxml2-2.6, it includes <libxml/xmlexports.h> which is -- dnl self-contained. -- libxml2_include_dir= -- AC_TRY_CPP([#include <libxml2/libxml/xmlexports.h>], -- [gl_ABSOLUTE_HEADER([libxml2/libxml/xmlexports.h]) -- libxml2_include_dir=`echo "$gl_cv_absolute_libxml2_libxml_xmlexports_h" | sed -e 's,.libxml.xmlexports\.h$,,'` -- ]) -- if test -z "$libxml2_include_dir"; then -- AC_TRY_CPP([#include <libxml2/libxml/xmlversion.h>], -- [gl_ABSOLUTE_HEADER([libxml2/libxml/xmlversion.h]) -- libxml2_include_dir=`echo "$gl_cv_absolute_libxml2_libxml_xmlversion_h" | sed -e 's,.libxml.xmlversion\.h$,,'` -- ]) -- fi -- if test -n "$libxml2_include_dir" && test -d "$libxml2_include_dir"; then -- CPPFLAGS="$gl_save_CPPFLAGS -I$libxml2_include_dir" -- AC_TRY_LINK([#include <libxml/xmlversion.h> -- #include <libxml/xmlmemory.h> -- #include <libxml/xpath.h> -- ], -- [xmlCheckVersion (0); -- xmlFree ((void *) 0); -- xmlXPathSetContextNode ((void *)0, (void *)0); -- ], -- [gl_cv_libxml=yes -- gl_cv_LIBXML="$LIBXML2 $LIBICONV" -- gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV" -- gl_cv_INCXML="-I$libxml2_include_dir" -- ]) -- fi -- fi -- CPPFLAGS="$gl_save_CPPFLAGS" -- fi -- LIBS="$gl_save_LIBS" -- ]) -- AC_MSG_CHECKING([for libxml]) -- AC_MSG_RESULT([$gl_cv_libxml]) -- if test $gl_cv_libxml = yes; then -- LIBXML="$gl_cv_LIBXML" -- LTLIBXML="$gl_cv_LTLIBXML" -- INCXML="$gl_cv_INCXML" -- else -- gl_cv_libxml_use_included=yes -- fi -+ PKG_CHECK_MODULES([XML], [libxml-2.0]) -+ LIBXML=$XML_LIBS -+ LTLIBXML=$XML_LIBS -+ INCXML=$XML_CFLAGS - fi - ]) - AC_SUBST([LIBXML]) -diff --git a/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c b/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c -index 2ff978f..5ffb17a 100644 ---- a/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c -+++ b/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c -@@ -22,15 +22,15 @@ - - #include <stdlib.h> - --#include <cr-om-parser.h> --#include <cr-sel-eng.h> --#include <cr-style.h> --#include <cr-rgb.h> -+#include <libcroco/cr-om-parser.h> -+#include <libcroco/cr-sel-eng.h> -+#include <libcroco/cr-style.h> -+#include <libcroco/cr-rgb.h> - /* <cr-fonts.h> has a broken double-inclusion guard in libcroco-0.6.1. */ - #ifndef __CR_FONTS_H__ --# include <cr-fonts.h> -+# include <libcroco/cr-fonts.h> - #endif --#include <cr-string.h> -+#include <libcroco/cr-string.h> - - #include "term-ostream.h" - #include "mem-hash-map.h" -diff --git a/libtextstyle/gnulib-local/m4/libcroco.m4 b/libtextstyle/gnulib-local/m4/libcroco.m4 -index bc53cc6..10b2455 100644 ---- a/libtextstyle/gnulib-local/m4/libcroco.m4 -+++ b/libtextstyle/gnulib-local/m4/libcroco.m4 -@@ -1,99 +1,34 @@ --# libcroco.m4 serial 3 --dnl Copyright (C) 2006-2007, 2019 Free Software Foundation, Inc. -+# libcroco.m4 serial 2 (gettext-0.17) -+dnl Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - - dnl From Bruno Haible. - --dnl gl_LIBCROCO --dnl gives the user the option to decide whether to use the included or --dnl an external libcroco. --dnl gl_LIBCROCO(FORCE-INCLUDED) --dnl forces the use of the included or an external libcroco. - AC_DEFUN([gl_LIBCROCO], - [ -- ifelse([$1], [yes], , [ -- dnl libcroco depends on libglib. -- AC_REQUIRE([gl_LIBGLIB]) -- ]) -+ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -+ dnl libcroco depends on libglib. -+ AC_REQUIRE([gl_LIBGLIB]) - -- ifelse([$1], , [ -- AC_MSG_CHECKING([whether included libcroco is requested]) -- AC_ARG_WITH([included-libcroco], -- [ --with-included-libcroco use the libcroco included here], -- [gl_cv_libcroco_force_included=$withval], -- [gl_cv_libcroco_force_included=no]) -- AC_MSG_RESULT([$gl_cv_libcroco_force_included]) -- ], [gl_cv_libcroco_force_included=$1]) -+ AC_MSG_CHECKING([whether included libcroco is requested]) -+ AC_ARG_WITH([included-libcroco], -+ [ --with-included-libcroco use the libcroco included here], -+ [gl_cv_libcroco_force_included=$withval], -+ [gl_cv_libcroco_force_included=no]) -+ AC_MSG_RESULT([$gl_cv_libcroco_force_included]) - - gl_cv_libcroco_use_included="$gl_cv_libcroco_force_included" - LIBCROCO= - LTLIBCROCO= - INCCROCO= -- ifelse([$1], [yes], , [ -- if test "$gl_cv_libcroco_use_included" != yes; then -- dnl Figure out whether we can use a preinstalled libcroco-0.6, or have to -- dnl use the included one. -- AC_CACHE_VAL([gl_cv_libcroco], [ -- gl_cv_libcroco=no -- gl_cv_LIBCROCO= -- gl_cv_LTLIBCROCO= -- gl_cv_INCCROCO= -- gl_save_LIBS="$LIBS" -- dnl Search for libcroco and define LIBCROCO_0_6, LTLIBCROCO_0_6 and -- dnl INCCROCO_0_6 accordingly. -- dnl Don't use croco-0.6-config nor pkg-config, since it doesn't work when -- dnl cross-compiling or when the C compiler in use is different from the -- dnl one that built the library. -- AC_LIB_LINKFLAGS_BODY([croco-0.6], [glib-2.0]) -- LIBS="$gl_save_LIBS $LIBCROCO_0_6" -- AC_TRY_LINK([#include <libcroco-config.h>], -- [const char *version = LIBCROCO_VERSION; return !version;], -- [gl_cv_libcroco=yes -- gl_cv_LIBCROCO="$LIBCROCO_0_6" -- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" -- ]) -- if test "$gl_cv_libcroco" != yes; then -- gl_save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $INCCROCO_0_6" -- AC_TRY_LINK([#include <libcroco-config.h>], -- [const char *version = LIBCROCO_VERSION; return !version;], -- [gl_cv_libcroco=yes -- gl_cv_LIBCROCO="$LIBCROCO_0_6" -- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" -- gl_cv_INCCROCO="$INCCROCO_0_6" -- ]) -- if test "$gl_cv_libcroco" != yes; then -- dnl Often the include files are installed in -- dnl /usr/include/libcroco-0.6/libcroco. -- AC_TRY_LINK([#include <libcroco-0.6/libcroco/libcroco-config.h>], -- [const char *version = LIBCROCO_VERSION; return !version;], -- [gl_ABSOLUTE_HEADER([libcroco-0.6/libcroco/libcroco-config.h]) -- libcroco_include_dir=`echo "$gl_cv_absolute_libcroco_0_6_libcroco_libcroco_config_h" | sed -e 's,.libcroco-config\.h$,,'` -- if test -d "$libcroco_include_dir"; then -- gl_cv_libcroco=yes -- gl_cv_LIBCROCO="$LIBCROCO_0_6" -- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" -- gl_cv_INCCROCO="-I$libcroco_include_dir" -- fi -- ]) -- fi -- CPPFLAGS="$gl_save_CPPFLAGS" -- fi -- LIBS="$gl_save_LIBS" -- ]) -- AC_MSG_CHECKING([for libcroco]) -- AC_MSG_RESULT([$gl_cv_libcroco]) -- if test $gl_cv_libcroco = yes; then -- LIBCROCO="$gl_cv_LIBCROCO" -- LTLIBCROCO="$gl_cv_LTLIBCROCO" -- INCCROCO="$gl_cv_INCCROCO" -- else -- gl_cv_libcroco_use_included=yes -- fi -- fi -- ]) -+ if test "$gl_cv_libcroco_use_included" != yes; then -+ PKG_CHECK_MODULES([CROCO], [libcroco-0.6]) -+ LIBCROCO=$CROCO_LIBS -+ LTLIBCROCO=$CROCO_LIBS -+ INCCROCO=$CROCO_CFLAGS -+ fi - AC_SUBST([LIBCROCO]) - AC_SUBST([LTLIBCROCO]) - AC_SUBST([INCCROCO]) -diff --git a/libtextstyle/gnulib-local/m4/libglib.m4 b/libtextstyle/gnulib-local/m4/libglib.m4 -index 5853772..767fba2 100644 ---- a/libtextstyle/gnulib-local/m4/libglib.m4 -+++ b/libtextstyle/gnulib-local/m4/libglib.m4 -@@ -6,100 +6,26 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl From Bruno Haible. - --dnl gl_LIBGLIB --dnl gives the user the option to decide whether to use the included or --dnl an external libglib. --dnl gl_LIBGLIB(FORCE-INCLUDED) --dnl forces the use of the included or an external libglib. - AC_DEFUN([gl_LIBGLIB], - [ -- ifelse([$1], , [ -- AC_MSG_CHECKING([whether included glib is requested]) -- AC_ARG_WITH([included-glib], -- [ --with-included-glib use the glib2 included here], -- [gl_cv_libglib_force_included=$withval], -- [gl_cv_libglib_force_included=no]) -- AC_MSG_RESULT([$gl_cv_libglib_force_included]) -- ], [gl_cv_libglib_force_included=$1]) -+ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -+ AC_MSG_CHECKING([whether included glib is requested]) -+ AC_ARG_WITH([included-glib], -+ [ --with-included-glib use the glib2 included here], -+ [gl_cv_libglib_force_included=$withval], -+ [gl_cv_libglib_force_included=no]) -+ AC_MSG_RESULT([$gl_cv_libglib_force_included]) - - gl_cv_libglib_use_included="$gl_cv_libglib_force_included" - LIBGLIB= - LTLIBGLIB= - INCGLIB= -- ifelse([$1], [yes], , [ -- if test "$gl_cv_libglib_use_included" != yes; then -- dnl Figure out whether we can use a preinstalled libglib-2.0, or have to use -- dnl the included one. -- AC_CACHE_VAL([gl_cv_libglib], [ -- gl_cv_libglib=no -- gl_cv_LIBGLIB= -- gl_cv_LTLIBGLIB= -- gl_cv_INCGLIB= -- gl_save_LIBS="$LIBS" -- dnl Search for libglib2 and define LIBGLIB_2_0, LTLIBGLIB_2_0 and -- dnl INCGLIB_2_0 accordingly. -- dnl Don't use glib-config nor pkg-config, since it doesn't work when -- dnl cross-compiling or when the C compiler in use is different from the -- dnl one that built the library. -- AC_LIB_LINKFLAGS_BODY([glib-2.0]) -- LIBS="$gl_save_LIBS $LIBGLIB_2_0" -- AC_TRY_LINK([#include <glib.h> --#ifndef G_BEGIN_DECLS --error this glib.h includes a glibconfig.h from a glib version 1.x --#endif --], -- [g_string_new ("foo");], -- [gl_cv_libglib=yes -- gl_cv_LIBGLIB="$LIBGLIB_2_0" -- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" -- ]) -- if test "$gl_cv_libglib" != yes; then -- gl_save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $INCGLIB_2_0" -- AC_TRY_LINK([#include <glib.h> --#ifndef G_BEGIN_DECLS --error this glib.h includes a glibconfig.h from a glib version 1.x --#endif --], -- [g_string_new ("foo");], -- [gl_cv_libglib=yes -- gl_cv_LIBGLIB="$LIBGLIB_2_0" -- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" -- gl_cv_INCGLIB="$INCGLIB_2_0" -- ]) -- if test "$gl_cv_libglib" != yes; then -- dnl Often the include files are installed in /usr/include/glib-2.0 -- dnl and /usr/lib/glib-2.0/include. -- if test -n "$LIBGLIB_2_0_PREFIX"; then -- CPPFLAGS="$gl_save_CPPFLAGS -I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include" -- AC_TRY_LINK([#include <glib.h> --#ifndef G_BEGIN_DECLS --error this glib.h includes a glibconfig.h from a glib version 1.x --#endif --], -- [g_string_new ("foo");], -- [gl_cv_libglib=yes -- gl_cv_LIBGLIB="$LIBGLIB_2_0" -- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" -- gl_cv_INCGLIB="-I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include" -- ]) -- fi -- fi -- CPPFLAGS="$gl_save_CPPFLAGS" -- fi -- LIBS="$gl_save_LIBS" -- ]) -- AC_MSG_CHECKING([for glib]) -- AC_MSG_RESULT([$gl_cv_libglib]) -- if test $gl_cv_libglib = yes; then -- LIBGLIB="$gl_cv_LIBGLIB" -- LTLIBGLIB="$gl_cv_LTLIBGLIB" -- INCGLIB="$gl_cv_INCGLIB" -- else -- gl_cv_libglib_use_included=yes -- fi -- fi -- ]) -+ if test "$gl_cv_libglib_use_included" != yes; then -+ PKG_CHECK_MODULES([GLIB], [glib-2.0]) -+ LIBGLIB="$GLIB_LIBS" -+ LTLIBGLIB="$GLIB_LIBS" -+ INCGLIB="$GLIB_CFLAGS" -+ fi - AC_SUBST([LIBGLIB]) - AC_SUBST([LTLIBGLIB]) - AC_SUBST([INCGLIB]) -diff --git a/libtextstyle/gnulib-m4/libcroco.m4 b/libtextstyle/gnulib-m4/libcroco.m4 -index bc53cc6..10b2455 100644 ---- a/libtextstyle/gnulib-m4/libcroco.m4 -+++ b/libtextstyle/gnulib-m4/libcroco.m4 -@@ -1,99 +1,34 @@ --# libcroco.m4 serial 3 --dnl Copyright (C) 2006-2007, 2019 Free Software Foundation, Inc. -+# libcroco.m4 serial 2 (gettext-0.17) -+dnl Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - - dnl From Bruno Haible. - --dnl gl_LIBCROCO --dnl gives the user the option to decide whether to use the included or --dnl an external libcroco. --dnl gl_LIBCROCO(FORCE-INCLUDED) --dnl forces the use of the included or an external libcroco. - AC_DEFUN([gl_LIBCROCO], - [ -- ifelse([$1], [yes], , [ -- dnl libcroco depends on libglib. -- AC_REQUIRE([gl_LIBGLIB]) -- ]) -+ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -+ dnl libcroco depends on libglib. -+ AC_REQUIRE([gl_LIBGLIB]) - -- ifelse([$1], , [ -- AC_MSG_CHECKING([whether included libcroco is requested]) -- AC_ARG_WITH([included-libcroco], -- [ --with-included-libcroco use the libcroco included here], -- [gl_cv_libcroco_force_included=$withval], -- [gl_cv_libcroco_force_included=no]) -- AC_MSG_RESULT([$gl_cv_libcroco_force_included]) -- ], [gl_cv_libcroco_force_included=$1]) -+ AC_MSG_CHECKING([whether included libcroco is requested]) -+ AC_ARG_WITH([included-libcroco], -+ [ --with-included-libcroco use the libcroco included here], -+ [gl_cv_libcroco_force_included=$withval], -+ [gl_cv_libcroco_force_included=no]) -+ AC_MSG_RESULT([$gl_cv_libcroco_force_included]) - - gl_cv_libcroco_use_included="$gl_cv_libcroco_force_included" - LIBCROCO= - LTLIBCROCO= - INCCROCO= -- ifelse([$1], [yes], , [ -- if test "$gl_cv_libcroco_use_included" != yes; then -- dnl Figure out whether we can use a preinstalled libcroco-0.6, or have to -- dnl use the included one. -- AC_CACHE_VAL([gl_cv_libcroco], [ -- gl_cv_libcroco=no -- gl_cv_LIBCROCO= -- gl_cv_LTLIBCROCO= -- gl_cv_INCCROCO= -- gl_save_LIBS="$LIBS" -- dnl Search for libcroco and define LIBCROCO_0_6, LTLIBCROCO_0_6 and -- dnl INCCROCO_0_6 accordingly. -- dnl Don't use croco-0.6-config nor pkg-config, since it doesn't work when -- dnl cross-compiling or when the C compiler in use is different from the -- dnl one that built the library. -- AC_LIB_LINKFLAGS_BODY([croco-0.6], [glib-2.0]) -- LIBS="$gl_save_LIBS $LIBCROCO_0_6" -- AC_TRY_LINK([#include <libcroco-config.h>], -- [const char *version = LIBCROCO_VERSION; return !version;], -- [gl_cv_libcroco=yes -- gl_cv_LIBCROCO="$LIBCROCO_0_6" -- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" -- ]) -- if test "$gl_cv_libcroco" != yes; then -- gl_save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $INCCROCO_0_6" -- AC_TRY_LINK([#include <libcroco-config.h>], -- [const char *version = LIBCROCO_VERSION; return !version;], -- [gl_cv_libcroco=yes -- gl_cv_LIBCROCO="$LIBCROCO_0_6" -- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" -- gl_cv_INCCROCO="$INCCROCO_0_6" -- ]) -- if test "$gl_cv_libcroco" != yes; then -- dnl Often the include files are installed in -- dnl /usr/include/libcroco-0.6/libcroco. -- AC_TRY_LINK([#include <libcroco-0.6/libcroco/libcroco-config.h>], -- [const char *version = LIBCROCO_VERSION; return !version;], -- [gl_ABSOLUTE_HEADER([libcroco-0.6/libcroco/libcroco-config.h]) -- libcroco_include_dir=`echo "$gl_cv_absolute_libcroco_0_6_libcroco_libcroco_config_h" | sed -e 's,.libcroco-config\.h$,,'` -- if test -d "$libcroco_include_dir"; then -- gl_cv_libcroco=yes -- gl_cv_LIBCROCO="$LIBCROCO_0_6" -- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6" -- gl_cv_INCCROCO="-I$libcroco_include_dir" -- fi -- ]) -- fi -- CPPFLAGS="$gl_save_CPPFLAGS" -- fi -- LIBS="$gl_save_LIBS" -- ]) -- AC_MSG_CHECKING([for libcroco]) -- AC_MSG_RESULT([$gl_cv_libcroco]) -- if test $gl_cv_libcroco = yes; then -- LIBCROCO="$gl_cv_LIBCROCO" -- LTLIBCROCO="$gl_cv_LTLIBCROCO" -- INCCROCO="$gl_cv_INCCROCO" -- else -- gl_cv_libcroco_use_included=yes -- fi -- fi -- ]) -+ if test "$gl_cv_libcroco_use_included" != yes; then -+ PKG_CHECK_MODULES([CROCO], [libcroco-0.6]) -+ LIBCROCO=$CROCO_LIBS -+ LTLIBCROCO=$CROCO_LIBS -+ INCCROCO=$CROCO_CFLAGS -+ fi - AC_SUBST([LIBCROCO]) - AC_SUBST([LTLIBCROCO]) - AC_SUBST([INCCROCO]) -diff --git a/libtextstyle/gnulib-m4/libglib.m4 b/libtextstyle/gnulib-m4/libglib.m4 -index 5853772..767fba2 100644 ---- a/libtextstyle/gnulib-m4/libglib.m4 -+++ b/libtextstyle/gnulib-m4/libglib.m4 -@@ -6,100 +6,26 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl From Bruno Haible. - --dnl gl_LIBGLIB --dnl gives the user the option to decide whether to use the included or --dnl an external libglib. --dnl gl_LIBGLIB(FORCE-INCLUDED) --dnl forces the use of the included or an external libglib. - AC_DEFUN([gl_LIBGLIB], - [ -- ifelse([$1], , [ -- AC_MSG_CHECKING([whether included glib is requested]) -- AC_ARG_WITH([included-glib], -- [ --with-included-glib use the glib2 included here], -- [gl_cv_libglib_force_included=$withval], -- [gl_cv_libglib_force_included=no]) -- AC_MSG_RESULT([$gl_cv_libglib_force_included]) -- ], [gl_cv_libglib_force_included=$1]) -+ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -+ AC_MSG_CHECKING([whether included glib is requested]) -+ AC_ARG_WITH([included-glib], -+ [ --with-included-glib use the glib2 included here], -+ [gl_cv_libglib_force_included=$withval], -+ [gl_cv_libglib_force_included=no]) -+ AC_MSG_RESULT([$gl_cv_libglib_force_included]) - - gl_cv_libglib_use_included="$gl_cv_libglib_force_included" - LIBGLIB= - LTLIBGLIB= - INCGLIB= -- ifelse([$1], [yes], , [ -- if test "$gl_cv_libglib_use_included" != yes; then -- dnl Figure out whether we can use a preinstalled libglib-2.0, or have to use -- dnl the included one. -- AC_CACHE_VAL([gl_cv_libglib], [ -- gl_cv_libglib=no -- gl_cv_LIBGLIB= -- gl_cv_LTLIBGLIB= -- gl_cv_INCGLIB= -- gl_save_LIBS="$LIBS" -- dnl Search for libglib2 and define LIBGLIB_2_0, LTLIBGLIB_2_0 and -- dnl INCGLIB_2_0 accordingly. -- dnl Don't use glib-config nor pkg-config, since it doesn't work when -- dnl cross-compiling or when the C compiler in use is different from the -- dnl one that built the library. -- AC_LIB_LINKFLAGS_BODY([glib-2.0]) -- LIBS="$gl_save_LIBS $LIBGLIB_2_0" -- AC_TRY_LINK([#include <glib.h> --#ifndef G_BEGIN_DECLS --error this glib.h includes a glibconfig.h from a glib version 1.x --#endif --], -- [g_string_new ("foo");], -- [gl_cv_libglib=yes -- gl_cv_LIBGLIB="$LIBGLIB_2_0" -- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" -- ]) -- if test "$gl_cv_libglib" != yes; then -- gl_save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $INCGLIB_2_0" -- AC_TRY_LINK([#include <glib.h> --#ifndef G_BEGIN_DECLS --error this glib.h includes a glibconfig.h from a glib version 1.x --#endif --], -- [g_string_new ("foo");], -- [gl_cv_libglib=yes -- gl_cv_LIBGLIB="$LIBGLIB_2_0" -- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" -- gl_cv_INCGLIB="$INCGLIB_2_0" -- ]) -- if test "$gl_cv_libglib" != yes; then -- dnl Often the include files are installed in /usr/include/glib-2.0 -- dnl and /usr/lib/glib-2.0/include. -- if test -n "$LIBGLIB_2_0_PREFIX"; then -- CPPFLAGS="$gl_save_CPPFLAGS -I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include" -- AC_TRY_LINK([#include <glib.h> --#ifndef G_BEGIN_DECLS --error this glib.h includes a glibconfig.h from a glib version 1.x --#endif --], -- [g_string_new ("foo");], -- [gl_cv_libglib=yes -- gl_cv_LIBGLIB="$LIBGLIB_2_0" -- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0" -- gl_cv_INCGLIB="-I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include" -- ]) -- fi -- fi -- CPPFLAGS="$gl_save_CPPFLAGS" -- fi -- LIBS="$gl_save_LIBS" -- ]) -- AC_MSG_CHECKING([for glib]) -- AC_MSG_RESULT([$gl_cv_libglib]) -- if test $gl_cv_libglib = yes; then -- LIBGLIB="$gl_cv_LIBGLIB" -- LTLIBGLIB="$gl_cv_LTLIBGLIB" -- INCGLIB="$gl_cv_INCGLIB" -- else -- gl_cv_libglib_use_included=yes -- fi -- fi -- ]) -+ if test "$gl_cv_libglib_use_included" != yes; then -+ PKG_CHECK_MODULES([GLIB], [glib-2.0]) -+ LIBGLIB="$GLIB_LIBS" -+ LTLIBGLIB="$GLIB_LIBS" -+ INCGLIB="$GLIB_CFLAGS" -+ fi - AC_SUBST([LIBGLIB]) - AC_SUBST([LTLIBGLIB]) - AC_SUBST([INCGLIB]) -diff --git a/libtextstyle/lib/term-styled-ostream.c b/libtextstyle/lib/term-styled-ostream.c -index 5484800..16793fa 100644 ---- a/libtextstyle/lib/term-styled-ostream.c -+++ b/libtextstyle/lib/term-styled-ostream.c -@@ -28,15 +28,15 @@ - - #include <stdlib.h> - --#include <cr-om-parser.h> --#include <cr-sel-eng.h> --#include <cr-style.h> --#include <cr-rgb.h> -+#include <libcroco/cr-om-parser.h> -+#include <libcroco/cr-sel-eng.h> -+#include <libcroco/cr-style.h> -+#include <libcroco/cr-rgb.h> - /* <cr-fonts.h> has a broken double-inclusion guard in libcroco-0.6.1. */ - #ifndef __CR_FONTS_H__ --# include <cr-fonts.h> -+# include <libcroco/cr-fonts.h> - #endif --#include <cr-string.h> -+#include <libcroco/cr-string.h> - - #include "term-ostream.h" - #include "mem-hash-map.h" -diff --git a/libtextstyle/lib/term-styled-ostream.oo.c b/libtextstyle/lib/term-styled-ostream.oo.c -index 2ff978f..5ffb17a 100644 ---- a/libtextstyle/lib/term-styled-ostream.oo.c -+++ b/libtextstyle/lib/term-styled-ostream.oo.c -@@ -22,15 +22,15 @@ - - #include <stdlib.h> - --#include <cr-om-parser.h> --#include <cr-sel-eng.h> --#include <cr-style.h> --#include <cr-rgb.h> -+#include <libcroco/cr-om-parser.h> -+#include <libcroco/cr-sel-eng.h> -+#include <libcroco/cr-style.h> -+#include <libcroco/cr-rgb.h> - /* <cr-fonts.h> has a broken double-inclusion guard in libcroco-0.6.1. */ - #ifndef __CR_FONTS_H__ --# include <cr-fonts.h> -+# include <libcroco/cr-fonts.h> - #endif --#include <cr-string.h> -+#include <libcroco/cr-string.h> - - #include "term-ostream.h" - #include "mem-hash-map.h" |