diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-11-06 14:54:38 +0100 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-11-06 14:56:07 +0100 |
commit | 2254f5022d9e1b1320f9bbd7a9df8292e2dee9f4 (patch) | |
tree | 4e7b5cfbbce7669734a574fd231bbe2353675541 /liblangtag | |
parent | 85ea03ae536831649b104694d08dced4d4c8663f (diff) |
Upgrading to liblangtag 0.4.0
Change-Id: Ia3e08af69fd3f7a3d2d523272ba849fc43a42c67
Diffstat (limited to 'liblangtag')
-rw-r--r-- | liblangtag/liblangtag-0.2-0001-Fix-a-memory-leak.patch | 44 | ||||
-rw-r--r-- | liblangtag/liblangtag-0.2-0002-Fix-invalid-memory-access.patch | 50 | ||||
-rw-r--r-- | liblangtag/liblangtag-0.2-configure.patch | 46 | ||||
-rw-r--r-- | liblangtag/liblangtag-0.2-datadir.patch | 104 | ||||
-rw-r--r-- | liblangtag/liblangtag-0.2-mingw.patch | 73 | ||||
-rw-r--r-- | liblangtag/liblangtag-0.2-msc-configure.patch | 116 | ||||
-rw-r--r-- | liblangtag/liblangtag-0.2-xmlCleanupParser.patch | 20 | ||||
-rw-r--r-- | liblangtag/liblangtag-0.4.0-cross.patch (renamed from liblangtag/liblangtag-0.2-cross.patch) | 43 | ||||
-rw-r--r-- | liblangtag/liblangtag-0.4.0-mingw.patch | 64 | ||||
-rw-r--r-- | liblangtag/liblangtag-0.4.0-msc-configure.patch | 112 | ||||
-rw-r--r-- | liblangtag/liblangtag-0.4.0-msvc-warning.patch (renamed from liblangtag/liblangtag-0.2-msvc-warning.patch) | 6 | ||||
-rw-r--r-- | liblangtag/liblangtag-0.4.0-reg2xml-encoding-problem.patch (renamed from liblangtag/liblangtag-0.2-reg2xml-encoding-problem.patch) | 8 | ||||
-rw-r--r-- | liblangtag/makefile.mk | 27 | ||||
-rw-r--r-- | liblangtag/prj/build.lst | 2 | ||||
-rw-r--r-- | liblangtag/prj/d.lst | 7 |
15 files changed, 221 insertions, 501 deletions
diff --git a/liblangtag/liblangtag-0.2-0001-Fix-a-memory-leak.patch b/liblangtag/liblangtag-0.2-0001-Fix-a-memory-leak.patch deleted file mode 100644 index 985a7ad274e7..000000000000 --- a/liblangtag/liblangtag-0.2-0001-Fix-a-memory-leak.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 132170753ea9cbd63cda8f3a80498c144f75b8ba Mon Sep 17 00:00:00 2001 -Message-Id: <132170753ea9cbd63cda8f3a80498c144f75b8ba.1337190143.git.erack@redhat.com> -From: Akira TAGOH <akira@tagoh.org> -Date: Mon, 6 Feb 2012 16:38:37 +0900 -Subject: [PATCH] Fix a memory leak -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------erAck-patch-parts" - -This is a multi-part message in MIME format. ---------------erAck-patch-parts -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - ---- - liblangtag/lt-extension.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - - ---------------erAck-patch-parts -Content-Type: text/x-patch; name="0001-Fix-a-memory-leak.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: attachment; filename="0001-Fix-a-memory-leak.patch" - -diff --git a/liblangtag/lt-extension.c b/liblangtag/lt-extension.c -index eb84b12..466ebce 100644 ---- a/liblangtag/lt-extension.c -+++ misc/build/liblangtag-0.2/liblangtag/lt-extension.c -@@ -231,8 +231,11 @@ lt_extension_copy(lt_extension_t *extension) - (lt_destroy_func_t)lt_ext_module_unref); - retval->singleton = extension->singleton; - for (i = 0; i < LT_MAX_EXT_MODULES; i++) { -- if (extension->extensions[i]) -+ if (extension->extensions[i]) { - retval->extensions[i] = lt_ext_module_data_ref(extension->extensions[i]); -+ lt_mem_add_ref(&retval->parent, retval->extensions[i], -+ (lt_destroy_func_t)lt_ext_module_data_unref); -+ } - } - } - } - ---------------erAck-patch-parts-- - - diff --git a/liblangtag/liblangtag-0.2-0002-Fix-invalid-memory-access.patch b/liblangtag/liblangtag-0.2-0002-Fix-invalid-memory-access.patch deleted file mode 100644 index b3b0ff316e3e..000000000000 --- a/liblangtag/liblangtag-0.2-0002-Fix-invalid-memory-access.patch +++ /dev/null @@ -1,50 +0,0 @@ -From cf8dfcf1604e534f4c9eccbd9a05571c8a9dc74d Mon Sep 17 00:00:00 2001 -Message-Id: <cf8dfcf1604e534f4c9eccbd9a05571c8a9dc74d.1337190149.git.erack@redhat.com> -From: Akira TAGOH <akira@tagoh.org> -Date: Mon, 5 Mar 2012 18:10:10 +0900 -Subject: [PATCH] Fix invalid memory access -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------erAck-patch-parts" - -This is a multi-part message in MIME format. ---------------erAck-patch-parts -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - ---- - liblangtag/lt-extension.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - - ---------------erAck-patch-parts -Content-Type: text/x-patch; name="0001-Fix-invalid-memory-access.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: attachment; filename="0001-Fix-invalid-memory-access.patch" - -diff --git a/liblangtag/lt-extension.c b/liblangtag/lt-extension.c -index 806712e..502bfd5 100644 ---- a/liblangtag/lt-extension.c -+++ misc/build/liblangtag-0.2/liblangtag/lt-extension.c -@@ -196,6 +196,8 @@ lt_extension_cancel_tag(lt_extension_t *extension) - if (ll->prev) - ll->prev->next = NULL; - ll->prev = NULL; -+ if (ll == l) -+ l = NULL; - g_list_free(ll); - break; - } -@@ -204,7 +206,8 @@ lt_extension_cancel_tag(lt_extension_t *extension) - else - g_string_append(extension->cached_tag, ll->data); - } -- g_list_free(l); -+ if (l) -+ g_list_free(l); - g_strfreev(tags); - } - } - ---------------erAck-patch-parts-- - - diff --git a/liblangtag/liblangtag-0.2-configure.patch b/liblangtag/liblangtag-0.2-configure.patch deleted file mode 100644 index d78f4dde3098..000000000000 --- a/liblangtag/liblangtag-0.2-configure.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- misc/liblangtag-0.2/configure 2012-02-02 11:04:11.000000000 +0100 -+++ misc/build/liblangtag-0.2/configure 2012-05-24 22:50:18.991459556 +0200 -@@ -13514,7 +13514,9 @@ - no_glib="" - - if test "x$PKG_CONFIG" = x ; then -- no_glib=yes -+ if test "x$LIBO_GLIB_CHEAT" = x ; then -+ no_glib=yes -+ fi - PKG_CONFIG=no - fi - -@@ -13537,18 +13539,20 @@ - fi - - if test x"$no_glib" = x ; then -- GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` -- GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` -- GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` -- -- GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` -- GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` -- glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ -- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -- glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ -- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -- glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ -- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -+ if test "x$LIBO_GLIB_CHEAT" = x ; then -+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` -+ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` -+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` -+ -+ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` -+ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` -+ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -+ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -+ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -+ fi - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" diff --git a/liblangtag/liblangtag-0.2-datadir.patch b/liblangtag/liblangtag-0.2-datadir.patch deleted file mode 100644 index 55b2a3a3d06b..000000000000 --- a/liblangtag/liblangtag-0.2-datadir.patch +++ /dev/null @@ -1,104 +0,0 @@ ---- misc/liblangtag-0.2/liblangtag/lt-database.c 2012-01-31 11:27:16.000000000 +0100 -+++ misc/build/liblangtag-0.2/liblangtag/lt-database.c 2012-06-12 01:32:57.354123185 +0200 -@@ -26,6 +26,7 @@ - #include "lt-mem.h" - #include "lt-ext-module.h" - #include "lt-database.h" -+#include <string.h> - - - /** -@@ -44,10 +45,41 @@ - static lt_grandfathered_db_t *__db_grandfathered = NULL; - static lt_redundant_db_t *__db_redundant = NULL; - -+/* this is a hack and might need some proper runtime de/allocation, but ... */ -+#define DATADIR_MAX_PATH_LEN 512 -+static char lt_db_datadir[DATADIR_MAX_PATH_LEN] = { 0 }; -+ - - /*< private >*/ - - /*< public >*/ -+ -+/** -+ * lt_db_set_datadir: -+ * -+ * Set the directory where database files are installed. -+ * This overrides the default prefix= location if called before -+ * lt_db_initialize(). -+ */ -+void -+lt_db_set_datadir(const char* path) -+{ -+ strncpy( lt_db_datadir, path, DATADIR_MAX_PATH_LEN-1); -+ lt_db_datadir[DATADIR_MAX_PATH_LEN-1] = 0; -+} -+ -+/** -+ * lt_db_get_datadir: -+ * -+ * Obtain the directory where database files are installed. -+ * Only if set with lt_db_set_datadir(). -+ */ -+const char* -+lt_db_get_datadir(void) -+{ -+ return lt_db_datadir; -+} -+ - /** - * lt_db_initialize: - * ---- misc/liblangtag-0.2/liblangtag/lt-database.h 2012-01-31 11:27:04.000000000 +0100 -+++ misc/build/liblangtag-0.2/liblangtag/lt-database.h 2012-06-12 00:23:04.345618028 +0200 -@@ -37,6 +37,8 @@ - - G_BEGIN_DECLS - -+void lt_db_set_datadir (const char*); -+const char* lt_db_get_datadir (void); - void lt_db_initialize (void); - void lt_db_finalize (void); - lt_lang_db_t *lt_db_get_lang (void); ---- misc/liblangtag-0.2/liblangtag/lt-xml.c 2012-02-02 09:54:51.000000000 +0100 -+++ misc/build/liblangtag-0.2/liblangtag/lt-xml.c 2012-06-12 00:23:04.477618565 +0200 -@@ -45,7 +45,20 @@ - - G_LOCK_DEFINE_STATIC (lt_xml); - -+ -+/* defined in lt-database.c */ -+extern const char* lt_db_get_datadir(void); -+ - /*< private >*/ -+static const char* -+lt_xml_get_datadir() -+{ -+ const char* datadir = lt_db_get_datadir(); -+ if (datadir && *datadir) -+ return datadir; -+ return REGDATADIR; -+} -+ - static gboolean - lt_xml_read_subtag_registry(lt_xml_t *xml, - GError **error) -@@ -62,7 +75,7 @@ - if (!g_file_test(regfile, G_FILE_TEST_EXISTS)) { - g_free(regfile); - #endif -- regfile = g_build_filename(REGDATADIR, "language-subtag-registry.xml", NULL); -+ regfile = g_build_filename(lt_xml_get_datadir(), "language-subtag-registry.xml", NULL); - #ifdef GNOME_ENABLE_DEBUG - } - #endif -@@ -120,7 +133,7 @@ - if (!g_file_test(regfile, G_FILE_TEST_EXISTS)) { - g_free(regfile); - #endif -- regfile = g_build_filename(REGDATADIR, "common", "bcp47", filename, NULL); -+ regfile = g_build_filename(lt_xml_get_datadir(), "common", "bcp47", filename, NULL); - #ifdef GNOME_ENABLE_DEBUG - } - #endif diff --git a/liblangtag/liblangtag-0.2-mingw.patch b/liblangtag/liblangtag-0.2-mingw.patch deleted file mode 100644 index e3cf185125c5..000000000000 --- a/liblangtag/liblangtag-0.2-mingw.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- misc/build/liblangtag-0.2/Makefile.in.sav 2012-09-13 17:01:57.000000000 +0200 -+++ misc/build/liblangtag-0.2/Makefile.in 2012-09-13 17:02:27.000000000 +0200 -@@ -315,7 +315,7 @@ NULL = - AUTOMAKE_OPTIONS = dist-bzip2 - - #SUBDIRS += docs tests --SUBDIRS = liblangtag data docs $(am__append_1) tests -+SUBDIRS = liblangtag data docs $(am__append_1) - CONFIGURE_DEPENDENCIES = \ - requires \ - $(NULL) ---- misc/build/liblangtag-0.2/liblangtag-gobject/Makefile.in.sav 2012-02-02 13:31:17.000000000 +0100 -+++ misc/build/liblangtag-0.2/liblangtag-gobject/Makefile.in 2012-09-13 17:05:22.000000000 +0200 -@@ -425,6 +425,7 @@ liblangtag_gobject_la_CFLAGS = \ - liblangtag_gobject_la_LDFLAGS = \ - $(LDFLAGS) \ - -version-info $(LT_G_CURRENT):$(LT_G_REVISION):$(LT_G_AGE) \ -+ -no-undefined \ - $(NULL) - - # ---- misc/build/liblangtag-0.2/liblangtag-gobject/Makefile.am.sav 2012-02-02 13:31:15.000000000 +0100 -+++ misc/build/liblangtag-0.2/liblangtag-gobject/Makefile.am 2012-09-13 17:05:05.000000000 +0200 -@@ -137,6 +137,7 @@ liblangtag_gobject_la_CFLAGS = \ - liblangtag_gobject_la_LDFLAGS = \ - $(LDFLAGS) \ - -version-info $(LT_G_CURRENT):$(LT_G_REVISION):$(LT_G_AGE) \ -+ -no-undefined \ - $(NULL) - # - if HAVE_INTROSPECTION ---- misc/build/liblangtag-0.2/Makefile.am.sav 2012-09-13 17:01:57.000000000 +0200 -+++ misc/build/liblangtag-0.2/Makefile.am 2012-09-13 17:02:27.000000000 +0200 -@@ -7,7 +7,7 @@ SUBDIRS += liblangtag-gobject - endif - - #SUBDIRS += docs tests --SUBDIRS += tests -+#SUBDIRS += tests - - ACLOCAL_AMFLAGS = \ - -I m4macros \ ---- misc/build/liblangtag-0.2/liblangtag/Makefile.in.sav 2012-02-02 11:04:10.000000000 +0100 -+++ misc/build/liblangtag-0.2/liblangtag/Makefile.in 2012-09-13 17:04:35.000000000 +0200 -@@ -487,6 +487,7 @@ liblangtag_la_CFLAGS = \ - liblangtag_la_LDFLAGS = \ - $(LDFLAGS) \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -+ -no-undefined \ - $(NULL) - - all: all-recursive ---- misc/build/liblangtag-0.2/liblangtag/Makefile.am.sav 2012-02-02 09:54:40.000000000 +0100 -+++ misc/build/liblangtag-0.2/liblangtag/Makefile.am 2012-09-13 17:04:19.000000000 +0200 -@@ -149,4 +149,5 @@ liblangtag_la_CFLAGS = \ - liblangtag_la_LDFLAGS = \ - $(LDFLAGS) \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -+ -no-undefined \ - $(NULL) ---- misc/build/liblangtag-0.2/liblangtag/lt-ext-module.c.sav 2012-02-02 07:57:44.000000000 +0100 -+++ misc/build/liblangtag-0.2/liblangtag/lt-ext-module.c 2012-09-13 17:33:24.000000000 +0200 -@@ -584,8 +584,8 @@ lt_ext_modules_load(void) - gsize len; - - while (1) { -- if (readdir_r(dir, &dent, &dresult) || dresult == NULL) -- break; -+/* if (readdir_r(dir, &dent, &dresult) || dresult == NULL) -+ break;*/ abort(); /* we do not use liblangtag-gobject anyway */ - - len = strlen(dent.d_name); - if (len > suffix_len && diff --git a/liblangtag/liblangtag-0.2-msc-configure.patch b/liblangtag/liblangtag-0.2-msc-configure.patch deleted file mode 100644 index df7594105d4f..000000000000 --- a/liblangtag/liblangtag-0.2-msc-configure.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- misc/liblangtag-0.2/configure 2012-06-03 03:21:20.513755000 +0200 -+++ misc/build/liblangtag-0.2/configure 2012-06-02 23:04:17.742605700 +0200 -@@ -3751,6 +3751,8 @@ - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag - fi -+# MSVC displays only " Command line warning D9002 : ignoring unknown option '-g'", explicitly set to no. -+ac_cv_prog_cc_g=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 - $as_echo "$ac_cv_prog_cc_g" >&6; } - if test "$ac_test_CFLAGS" = set; then ---- misc/liblangtag-0.2/data/Makefile.in 2012-02-02 11:04:10.000000000 +0100 -+++ misc/build/liblangtag-0.2/data/Makefile.in 2012-06-03 03:20:28.045005000 +0200 -@@ -59,7 +59,7 @@ - reg2xml_OBJECTS = $(am_reg2xml_OBJECTS) - reg2xml_LDADD = $(LDADD) - reg2xml_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(reg2xml_CFLAGS) $(CFLAGS) \ -+ --mode=link $(CCLD) \ - $(reg2xml_LDFLAGS) $(LDFLAGS) -o $@ - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp -@@ -70,9 +70,9 @@ - LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) -+CCLD = link - LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ --mode=link $(CCLD) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ - SOURCES = $(reg2xml_SOURCES) - DIST_SOURCES = $(reg2xml_SOURCES) -@@ -422,18 +422,18 @@ - @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - reg2xml-reg2xml.o: reg2xml.c --@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -MT reg2xml-reg2xml.o -MD -MP -MF $(DEPDIR)/reg2xml-reg2xml.Tpo -c -o reg2xml-reg2xml.o `test -f 'reg2xml.c' || echo '$(srcdir)/'`reg2xml.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -MT reg2xml-reg2xml.o -MD -MP -MF $(DEPDIR)/reg2xml-reg2xml.Tpo -c -Foreg2xml-reg2xml.o `test -f 'reg2xml.c' || echo '$(srcdir)/'`reg2xml.c - @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/reg2xml-reg2xml.Tpo $(DEPDIR)/reg2xml-reg2xml.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='reg2xml.c' object='reg2xml-reg2xml.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -c -o reg2xml-reg2xml.o `test -f 'reg2xml.c' || echo '$(srcdir)/'`reg2xml.c -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -c -Foreg2xml-reg2xml.o `test -f 'reg2xml.c' || echo '$(srcdir)/'`reg2xml.c - - reg2xml-reg2xml.obj: reg2xml.c --@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -MT reg2xml-reg2xml.obj -MD -MP -MF $(DEPDIR)/reg2xml-reg2xml.Tpo -c -o reg2xml-reg2xml.obj `if test -f 'reg2xml.c'; then $(CYGPATH_W) 'reg2xml.c'; else $(CYGPATH_W) '$(srcdir)/reg2xml.c'; fi` -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -MT reg2xml-reg2xml.obj -MD -MP -MF $(DEPDIR)/reg2xml-reg2xml.Tpo -c -Foreg2xml-reg2xml.obj `if test -f 'reg2xml.c'; then $(CYGPATH_W) 'reg2xml.c'; else $(CYGPATH_W) '$(srcdir)/reg2xml.c'; fi` - @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/reg2xml-reg2xml.Tpo $(DEPDIR)/reg2xml-reg2xml.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='reg2xml.c' object='reg2xml-reg2xml.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -c -o reg2xml-reg2xml.obj `if test -f 'reg2xml.c'; then $(CYGPATH_W) 'reg2xml.c'; else $(CYGPATH_W) '$(srcdir)/reg2xml.c'; fi` -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -c -Foreg2xml-reg2xml.obj `if test -f 'reg2xml.c'; then $(CYGPATH_W) 'reg2xml.c'; else $(CYGPATH_W) '$(srcdir)/reg2xml.c'; fi` - - mostlyclean-libtool: - -rm -f *.lo ---- misc/liblangtag-0.2/liblangtag/Makefile.in 2012-02-02 11:04:10.000000000 +0100 -+++ misc/build/liblangtag-0.2/liblangtag/Makefile.in 2012-06-02 23:04:17.757766800 +0200 -@@ -97,8 +97,8 @@ - am_liblangtag_la_OBJECTS = $(am__objects_3) $(am__objects_1) - liblangtag_la_OBJECTS = $(am_liblangtag_la_OBJECTS) - liblangtag_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(liblangtag_la_CFLAGS) \ -- $(CFLAGS) $(liblangtag_la_LDFLAGS) $(LDFLAGS) -o $@ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(liblangtag_la_LDFLAGS) $(LDFLAGS) -o $@ - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -@@ -108,9 +108,9 @@ - LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) -+CCLD = link - LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ --mode=link $(CCLD) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ - SOURCES = $(liblangtag_la_SOURCES) - DIST_SOURCES = $(liblangtag_la_SOURCES) ---- misc/liblangtag-0.2/ltmain.sh 2011-12-27 11:43:05.000000000 +0100 -+++ misc/build/liblangtag-0.2/ltmain.sh 2012-06-02 23:04:17.772927900 +0200 -@@ -8969,7 +8969,7 @@ - fi - - # Replace the output file specification. -- link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` -+ link_command=`$ECHO "$link_command" | $SED 's%-o \+@OUTPUT@%/OUT:'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname ---- misc/liblangtag-0.2/tests/Makefile.in 2012-02-02 11:04:10.000000000 +0100 -+++ misc/build/liblangtag-0.2/tests/Makefile.in 2012-06-03 03:21:02.982505000 +0200 -@@ -149,9 +149,9 @@ - LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) -+CCLD = link - LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ --mode=link $(CCLD) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ - SOURCES = $(check_extlang_SOURCES) $(check_grandfathered_SOURCES) \ - $(check_lang_SOURCES) $(check_region_SOURCES) \ -@@ -286,6 +286,8 @@ - @LDFLAGS@ \ - $(top_builddir)/liblangtag/liblangtag.la \ - $(CHECK_LIBS) \ -+ $(LIBXML2_LIBS) \ -+ $(GLIB_LIBS) \ - $(NULL) - - LIBTOOL = @LIBTOOL@ diff --git a/liblangtag/liblangtag-0.2-xmlCleanupParser.patch b/liblangtag/liblangtag-0.2-xmlCleanupParser.patch deleted file mode 100644 index 3617125016c6..000000000000 --- a/liblangtag/liblangtag-0.2-xmlCleanupParser.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- misc/liblangtag-0.2/liblangtag/lt-xml.c -+++ misc/build/liblangtag-0.2/liblangtag/lt-xml.c -@@ -101,8 +101,6 @@ lt_xml_read_subtag_registry(lt_xml_t *x - if (xmlparser) - xmlFreeParserCtxt(xmlparser); - -- xmlCleanupParser(); -- - if (err) { - if (error) - *error = g_error_copy(err); -@@ -158,8 +156,6 @@ lt_xml_read_cldr_bcp47(lt_xml_t *xml - if (xmlparser) - xmlFreeParserCtxt(xmlparser); - -- xmlCleanupParser(); -- - if (err) { - if (error) - *error = g_error_copy(err); diff --git a/liblangtag/liblangtag-0.2-cross.patch b/liblangtag/liblangtag-0.4.0-cross.patch index 66cbc4d25c6e..af6c392e15a7 100644 --- a/liblangtag/liblangtag-0.2-cross.patch +++ b/liblangtag/liblangtag-0.4.0-cross.patch @@ -1,17 +1,6 @@ ---- misc/build/liblangtag-0.2/data/Makefile.in.sav 2012-02-02 11:04:10.000000000 +0100 -+++ misc/build/liblangtag-0.2/data/Makefile.in 2012-09-13 14:38:02.000000000 +0200 -@@ -691,7 +691,7 @@ uninstall-am: uninstall-ldmldataDATA uni - language-subtag-registry: - wget -O $@ http://www.iana.org/assignments/language-subtag-registry || \ - curl -o $@ http://www.iana.org/assignments/language-subtag-registry --language-subtag-registry.xml: language-subtag-registry reg2xml Makefile -+language-subtag-registry.xml: language-subtag-registry - $(builddir)/reg2xml $(srcdir)/language-subtag-registry > $@ - stamp-core-zip: - [ -f core.zip ] && rm core.zip ---- misc/build/liblangtag-0.2/data/language-subtag-registry.xml.sav 2012-09-13 14:37:05.000000000 +0200 -+++ misc/build/liblangtag-0.2/data/language-subtag-registry.xml 2012-09-13 14:35:37.000000000 +0200 -@@ -0,0 +1,45298 @@ +--- misc/liblangtag-0.4.0/data/language-subtag-registry.xml 2012-10-22 06:58:50.000000000 +0200 ++++ misc/build/liblangtag-0.4.0/data/language-subtag-registry.xml 2012-11-06 14:23:56.998945962 +0100 +@@ -1,3 +1,45301 @@ +<?xml version="1.0"?> +<registry> + <language> @@ -45310,14 +45299,28 @@ + </redundant> +</registry> + ---- misc/build/liblangtag-0.2/data/Makefile.am.sav 2012-02-02 09:58:40.000000000 +0100 -+++ misc/build/liblangtag-0.2/data/Makefile.am 2012-09-13 14:37:45.000000000 +0200 -@@ -38,7 +38,7 @@ bcp47_xml_files = \ + <?xml version="1.0" encoding="UTF-8"?> + <registry> + <language> +--- misc/liblangtag-0.4.0/data/Makefile.am 2012-10-16 07:39:20.000000000 +0200 ++++ misc/build/liblangtag-0.4.0/data/Makefile.am 2012-11-06 14:25:29.489175992 +0100 +@@ -59,7 +59,7 @@ + language-subtag-registry: + $(AM_V_DL) wget -O $@ http://www.iana.org/assignments/language-subtag-registry || \ + curl -o $@ http://www.iana.org/assignments/language-subtag-registry +-language-subtag-registry.xml: language-subtag-registry reg2xml Makefile ++language-subtag-registry.xml: language-subtag-registry + $(AM_V_GEN) $(builddir)/reg2xml $(srcdir)/language-subtag-registry $@.tmp; \ + head -1 $@.tmp | grep -E '^<\?xml version'>/dev/null 2>&1 && mv $@.tmp $@ || (echo "E: $@ isn't an expected result"; rm $@.tmp) + stamp-core-zip: +--- misc/liblangtag-0.4.0/data/Makefile.in 2012-10-22 05:47:23.000000000 +0200 ++++ misc/build/liblangtag-0.4.0/data/Makefile.in 2012-11-06 14:26:06.487085669 +0100 +@@ -780,7 +780,7 @@ language-subtag-registry: - wget -O $@ http://www.iana.org/assignments/language-subtag-registry || \ + $(AM_V_DL) wget -O $@ http://www.iana.org/assignments/language-subtag-registry || \ curl -o $@ http://www.iana.org/assignments/language-subtag-registry -language-subtag-registry.xml: language-subtag-registry reg2xml Makefile +language-subtag-registry.xml: language-subtag-registry - $(builddir)/reg2xml $(srcdir)/language-subtag-registry > $@ + $(AM_V_GEN) $(builddir)/reg2xml $(srcdir)/language-subtag-registry $@.tmp; \ + head -1 $@.tmp | grep -E '^<\?xml version'>/dev/null 2>&1 && mv $@.tmp $@ || (echo "E: $@ isn't an expected result"; rm $@.tmp) stamp-core-zip: - [ -f core.zip ] && rm core.zip diff --git a/liblangtag/liblangtag-0.4.0-mingw.patch b/liblangtag/liblangtag-0.4.0-mingw.patch new file mode 100644 index 000000000000..b3ea9431997d --- /dev/null +++ b/liblangtag/liblangtag-0.4.0-mingw.patch @@ -0,0 +1,64 @@ +--- misc/liblangtag-0.4.0/liblangtag/lt-ext-module.c 2012-10-16 04:48:31.000000000 +0200 ++++ misc/build/liblangtag-0.4.0/liblangtag/lt-ext-module.c 2012-11-06 14:35:11.226099206 +0100 +@@ -605,8 +605,8 @@ + size_t len; + + while (1) { +- if (readdir_r(dir, &dent, &dresult) || dresult == NULL) +- break; ++/* if (readdir_r(dir, &dent, &dresult) || dresult == NULL) ++ break;*/ abort(); /* we do not use liblangtag-gobject anyway */ + + len = strlen(dent.d_name); + if (len > suffix_len && +--- misc/liblangtag-0.4.0/liblangtag/Makefile.am 2012-10-12 04:07:20.000000000 +0200 ++++ misc/build/liblangtag-0.4.0/liblangtag/Makefile.am 2012-11-06 14:35:11.226099206 +0100 +@@ -184,6 +184,7 @@ + liblangtag_la_LDFLAGS = \ + $(LDFLAGS) \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ ++ -no-undefined \ + $(NULL) + + -include $(top_srcdir)/git.mk +--- misc/liblangtag-0.4.0/liblangtag/Makefile.in 2012-10-22 05:47:23.000000000 +0200 ++++ misc/build/liblangtag-0.4.0/liblangtag/Makefile.in 2012-11-06 14:35:11.226099206 +0100 +@@ -548,6 +548,7 @@ + liblangtag_la_LDFLAGS = \ + $(LDFLAGS) \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ ++ -no-undefined \ + $(NULL) + + all: $(BUILT_SOURCES) +--- misc/liblangtag-0.4.0/liblangtag-gobject/Makefile.am 2012-10-22 05:35:13.000000000 +0200 ++++ misc/build/liblangtag-0.4.0/liblangtag-gobject/Makefile.am 2012-11-06 14:35:11.225099235 +0100 +@@ -145,6 +145,7 @@ + liblangtag_gobject_la_LDFLAGS = \ + $(LDFLAGS) \ + -version-info $(LT_G_CURRENT):$(LT_G_REVISION):$(LT_G_AGE) \ ++ -no-undefined \ + $(NULL) + # + if HAVE_INTROSPECTION +--- misc/liblangtag-0.4.0/liblangtag-gobject/Makefile.in 2012-10-22 05:47:23.000000000 +0200 ++++ misc/build/liblangtag-0.4.0/liblangtag-gobject/Makefile.in 2012-11-06 14:35:11.225099235 +0100 +@@ -461,6 +461,7 @@ + liblangtag_gobject_la_LDFLAGS = \ + $(LDFLAGS) \ + -version-info $(LT_G_CURRENT):$(LT_G_REVISION):$(LT_G_AGE) \ ++ -no-undefined \ + $(NULL) + + # +--- misc/liblangtag-0.4.0/Makefile.am 2012-10-22 05:26:12.000000000 +0200 ++++ misc/build/liblangtag-0.4.0/Makefile.am 2012-11-06 14:35:11.225099235 +0100 +@@ -6,7 +6,7 @@ + SUBDIRS += liblangtag-gobject + endif + #SUBDIRS += docs tests +-SUBDIRS += tests ++#SUBDIRS += tests + + ACLOCAL_AMFLAGS = \ + -I m4macros \ diff --git a/liblangtag/liblangtag-0.4.0-msc-configure.patch b/liblangtag/liblangtag-0.4.0-msc-configure.patch new file mode 100644 index 000000000000..41b7e5875400 --- /dev/null +++ b/liblangtag/liblangtag-0.4.0-msc-configure.patch @@ -0,0 +1,112 @@ +--- misc/liblangtag-0.4.0/configure 2012-10-22 05:47:24.000000000 +0200 ++++ misc/build/liblangtag-0.4.0/configure 2012-11-06 14:40:01.653623759 +0100 +@@ -3871,6 +3871,8 @@ + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag + fi ++# MSVC displays only " Command line warning D9002 : ignoring unknown option '-g'", explicitly set to no. ++ac_cv_prog_cc_g=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 + $as_echo "$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then +--- misc/liblangtag-0.4.0/data/Makefile.in 2012-10-22 05:47:23.000000000 +0200 ++++ misc/build/liblangtag-0.4.0/data/Makefile.in 2012-11-06 14:47:23.173704887 +0100 +@@ -80,8 +80,8 @@ + am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) + am__v_lt_0 = --silent + reg2xml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(reg2xml_CFLAGS) \ +- $(CFLAGS) $(reg2xml_LDFLAGS) $(LDFLAGS) -o $@ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(reg2xml_LDFLAGS) $(LDFLAGS) -o $@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -98,9 +98,9 @@ + AM_V_at = $(am__v_at_@AM_V@) + am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) + am__v_at_0 = @ +-CCLD = $(CC) ++CCLD = link + LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + AM_V_CCLD = $(am__v_CCLD_@AM_V@) + am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +@@ -485,14 +485,14 @@ + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/reg2xml-reg2xml.Tpo $(DEPDIR)/reg2xml-reg2xml.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='reg2xml.c' object='reg2xml-reg2xml.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -c -o reg2xml-reg2xml.o `test -f 'reg2xml.c' || echo '$(srcdir)/'`reg2xml.c ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -c -Foreg2xml-reg2xml.o `test -f 'reg2xml.c' || echo '$(srcdir)/'`reg2xml.c + + reg2xml-reg2xml.obj: reg2xml.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -MT reg2xml-reg2xml.obj -MD -MP -MF $(DEPDIR)/reg2xml-reg2xml.Tpo -c -o reg2xml-reg2xml.obj `if test -f 'reg2xml.c'; then $(CYGPATH_W) 'reg2xml.c'; else $(CYGPATH_W) '$(srcdir)/reg2xml.c'; fi` ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -MT reg2xml-reg2xml.obj -MD -MP -MF $(DEPDIR)/reg2xml-reg2xml.Tpo -c -Foreg2xml-reg2xml.obj `if test -f 'reg2xml.c'; then $(CYGPATH_W) 'reg2xml.c'; else $(CYGPATH_W) '$(srcdir)/reg2xml.c'; fi` + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/reg2xml-reg2xml.Tpo $(DEPDIR)/reg2xml-reg2xml.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='reg2xml.c' object='reg2xml-reg2xml.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -c -o reg2xml-reg2xml.obj `if test -f 'reg2xml.c'; then $(CYGPATH_W) 'reg2xml.c'; else $(CYGPATH_W) '$(srcdir)/reg2xml.c'; fi` ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reg2xml_CFLAGS) $(CFLAGS) -c -Foreg2xml-reg2xml.obj `if test -f 'reg2xml.c'; then $(CYGPATH_W) 'reg2xml.c'; else $(CYGPATH_W) '$(srcdir)/reg2xml.c'; fi` + + mostlyclean-libtool: + -rm -f *.lo +--- misc/liblangtag-0.4.0/liblangtag/Makefile.in 2012-10-22 05:47:23.000000000 +0200 ++++ misc/build/liblangtag-0.4.0/liblangtag/Makefile.in 2012-11-06 14:51:04.551628998 +0100 +@@ -136,8 +136,8 @@ + am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) + am__v_lt_0 = --silent + liblangtag_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(liblangtag_la_CFLAGS) \ +- $(CFLAGS) $(liblangtag_la_LDFLAGS) $(LDFLAGS) -o $@ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(liblangtag_la_LDFLAGS) $(LDFLAGS) -o $@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -154,9 +154,9 @@ + AM_V_at = $(am__v_at_@AM_V@) + am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) + am__v_at_0 = @ +-CCLD = $(CC) ++CCLD = link + LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + AM_V_CCLD = $(am__v_CCLD_@AM_V@) + am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +--- misc/liblangtag-0.4.0/ltmain.sh 2012-10-09 11:00:50.000000000 +0200 ++++ misc/build/liblangtag-0.4.0/ltmain.sh 2012-11-06 14:40:01.656623672 +0100 +@@ -8985,7 +8985,7 @@ + fi + + # Replace the output file specification. +- link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` ++ link_command=`$ECHO "$link_command" | $SED 's%-o \+@OUTPUT@%/OUT:'"$output_objdir/$outputname"'%g'` + + # Delete the old output files. + $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname +--- misc/liblangtag-0.4.0/tests/Makefile.in 2012-10-22 05:47:23.000000000 +0200 ++++ misc/build/liblangtag-0.4.0/tests/Makefile.in 2012-11-06 14:49:08.108344563 +0100 +@@ -187,9 +187,9 @@ + AM_V_at = $(am__v_at_@AM_V@) + am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) + am__v_at_0 = @ +-CCLD = $(CC) ++CCLD = link + LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + AM_V_CCLD = $(am__v_CCLD_@AM_V@) + am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +@@ -324,6 +324,7 @@ + @LDFLAGS@ \ + $(top_builddir)/liblangtag/liblangtag.la \ + $(CHECK_LIBS) \ ++ $(LIBXML2_LIBS) \ + $(NULL) + + LIBTOOL = @LIBTOOL@ diff --git a/liblangtag/liblangtag-0.2-msvc-warning.patch b/liblangtag/liblangtag-0.4.0-msvc-warning.patch index 5b3c16d3fe4f..2d34fe8f0941 100644 --- a/liblangtag/liblangtag-0.2-msvc-warning.patch +++ b/liblangtag/liblangtag-0.4.0-msvc-warning.patch @@ -1,6 +1,6 @@ ---- misc/liblangtag-0.2/liblangtag/lt-ext-module.h 2012-02-02 06:02:45.000000000 +0100 -+++ misc/build/liblangtag-0.2/liblangtag/lt-ext-module.h 2012-08-08 08:46:57.810860044 +0200 -@@ -151,12 +151,12 @@ +--- misc/liblangtag-0.4.0/liblangtag/lt-ext-module.h 2012-02-02 06:02:45.000000000 +0100 ++++ misc/build/liblangtag-0.4.0/liblangtag/lt-ext-module.h 2012-08-08 08:46:57.810860044 +0200 +@@ -143,12 +143,12 @@ * and #lt_ext_module_t and extend features. */ struct _lt_ext_module_funcs_t { diff --git a/liblangtag/liblangtag-0.2-reg2xml-encoding-problem.patch b/liblangtag/liblangtag-0.4.0-reg2xml-encoding-problem.patch index cae5df5b9917..d63a571c989a 100644 --- a/liblangtag/liblangtag-0.2-reg2xml-encoding-problem.patch +++ b/liblangtag/liblangtag-0.4.0-reg2xml-encoding-problem.patch @@ -6,10 +6,10 @@ # document encoding is specified at all no conversion happens and non-ASCII # values are correctly written as entities. ---- misc/liblangtag-0.2/data/reg2xml.c 2012-01-30 13:20:57.000000000 +0100 -+++ misc/build/liblangtag-0.2/data/reg2xml.c 2012-08-11 02:30:39.147779753 +0200 -@@ -144,7 +144,6 @@ - gboolean retval; +--- misc/liblangtag-0.4.0/data/reg2xml.c 2012-01-30 13:20:57.000000000 +0100 ++++ misc/build/liblangtag-0.4.0/data/reg2xml.c 2012-08-11 02:30:39.147779753 +0200 +@@ -134,7 +134,6 @@ + lt_bool_t retval; doc = xmlNewDoc((const xmlChar *)"1.0"); - doc->encoding = xmlStrdup((const xmlChar *)"UTF-8"); diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk index b13b1734361f..221c2c9825fd 100644 --- a/liblangtag/makefile.mk +++ b/liblangtag/makefile.mk @@ -12,7 +12,7 @@ PRJNAME=liblangtag TARGET=liblangtag LIBLANGTAG_MAJOR=0 -LIBLANGTAG_MINOR=2 +LIBLANGTAG_MINOR=4 LIBLANGTAG_MICRO=0 # Currently liblangtag.so.0.1.0 is generated instead of 0.2.0, presumably a bug? # For new versions adapt symlink in prj/d.lst @@ -31,20 +31,11 @@ LIBLANGTAG_MICRO=0 @echo "Not building liblangtag." .ENDIF -TARFILE_NAME=liblangtag-$(LIBLANGTAG_MAJOR).$(LIBLANGTAG_MINOR) -TARFILE_MD5=fa6a2f85bd28baab035b2c95e722713f - -# liblangtag 132170753ea9cbd63cda8f3a80498c144f75b8ba -PATCH_FILES=liblangtag-0.2-0001-Fix-a-memory-leak.patch -# liblangtag cf8dfcf1604e534f4c9eccbd9a05571c8a9dc74d -PATCH_FILES+=liblangtag-0.2-0002-Fix-invalid-memory-access.patch -PATCH_FILES+=liblangtag-0.2-configure.patch -PATCH_FILES+=liblangtag-0.2-datadir.patch -PATCH_FILES+=liblangtag-0.2-msvc-warning.patch -PATCH_FILES+=liblangtag-0.2-reg2xml-encoding-problem.patch -PATCH_FILES+=liblangtag-0.2-xmlCleanupParser.patch - # addressed upstream as <https://github.com/tagoh/liblangtag/pull/7> "Do not - # call xmlCleanupParser from liblangtag" +TARFILE_NAME=liblangtag-$(LIBLANGTAG_MAJOR).$(LIBLANGTAG_MINOR).$(LIBLANGTAG_MICRO) +TARFILE_MD5=54e578c91b1b68e69c72be22adcb2195 + +PATCH_FILES=liblangtag-0.4.0-msvc-warning.patch +PATCH_FILES+=liblangtag-0.4.0-reg2xml-encoding-problem.patch CONFIGURE_DIR=. BUILD_DIR=$(CONFIGURE_DIR) @@ -118,11 +109,11 @@ CONFIGURE_FLAGS+= LDFLAGS=-Wl,-R\'\$$\$$ORIGIN:\$$\$$ORIGIN/../ure-link/lib\' CONFIGURE_FLAGS+= LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2 -PATCH_FILES+=liblangtag-0.2-mingw.patch +PATCH_FILES+=liblangtag-0.4.0-mingw.patch .ELSE # "$(COM)"=="GCC" -PATCH_FILES+=liblangtag-0.2-msc-configure.patch +PATCH_FILES+=liblangtag-0.4.0-msc-configure.patch .ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)"=="WNT" @@ -130,7 +121,7 @@ PATCH_FILES+=liblangtag-0.2-msc-configure.patch .IF "$(CROSS_COMPILING)"=="YES" # There's a tool used only at build time to create the .xml file, and this does not work # with cross-compiling. The file for this case is from a normal (non-cross) build. -PATCH_FILES+=liblangtag-0.2-cross.patch +PATCH_FILES+=liblangtag-0.4.0-cross.patch CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF diff --git a/liblangtag/prj/build.lst b/liblangtag/prj/build.lst index 8e388c2bf23f..44e648451821 100644 --- a/liblangtag/prj/build.lst +++ b/liblangtag/prj/build.lst @@ -1,3 +1,3 @@ -lt liblangtag : soltools GLIB:glib LIBXML2:libxml2 NULL +lt liblangtag : soltools LIBXML2:libxml2 NULL lt liblangtag usr1 - all lt_mkout NULL lt liblangtag nmake - all lt_liblangtag NULL diff --git a/liblangtag/prj/d.lst b/liblangtag/prj/d.lst index a508333c057d..ace729936bd3 100644 --- a/liblangtag/prj/d.lst +++ b/liblangtag/prj/d.lst @@ -8,15 +8,18 @@ mkdir: %_DEST%\inc\liblangtag ..\%__SRC%\lib\liblangtag.dll.a %_DEST%\lib\ ..\%__SRC%\misc\liblangtag_data.zip %_DEST%\pck\ -symlink: %_DEST%\lib\liblangtag.so.0.1.0 %_DEST%\lib\liblangtag.so.0 -symlink: %_DEST%\lib\liblangtag.so.0.1.0 %_DEST%\lib\liblangtag.so +symlink: %_DEST%\lib\liblangtag.so.1.0.0 %_DEST%\lib\liblangtag.so.1 +symlink: %_DEST%\lib\liblangtag.so.1.0.0 %_DEST%\lib\liblangtag.so # Unpacked data needed for test_languagetag in i18npool. mkdir: %_DEST%\share mkdir: %_DEST%\share\liblangtag mkdir: %_DEST%\share\liblangtag\common mkdir: %_DEST%\share\liblangtag\common\bcp47 +mkdir: %_DEST%\share\liblangtag\common\supplemental ..\%__SRC%\misc\install\install-liblangtag\share\liblangtag\* %_DEST%\share\liblangtag\ ..\%__SRC%\misc\install\install-liblangtag\share\liblangtag\common\bcp47\* %_DEST%\share\liblangtag\common\bcp47\ +..\%__SRC%\misc\install\install-liblangtag\share\liblangtag\common\supplemental\* %_DEST%\share\liblangtag\common\supplemental\ ..\%__SRC%\misc\install\@.__________________________________________________OOO\share\liblangtag\* %_DEST%\share\liblangtag\ ..\%__SRC%\misc\install\@.__________________________________________________OOO\share\liblangtag\common\bcp47\* %_DEST%\share\liblangtag\common\bcp47\ +..\%__SRC%\misc\install\@.__________________________________________________OOO\share\liblangtag\common\supplemental\* %_DEST%\share\liblangtag\common\supplemental\ |