office-gobmx/liblangtag/liblangtag-0.4.0-mingw.patch
Jan Holesovsky ac449bffdc Fix MinGW build.
Change-Id: I12fb6b8b8fdb7b9b00070c6d2a87da5d7d2fed13
2012-11-07 14:31:19 +01:00

75 lines
2.6 KiB
Diff

--- 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 \
--- misc/liblangtag-0.4.0/extensions/lt-ext-ldml-u.c 2012-11-07 14:26:53.000000000 +0100
+++ misc/build/liblangtag-0.4.0/extensions/lt-ext-ldml-u.c 2012-11-07 14:27:39.000000000 +0100
@@ -14,7 +14,7 @@
#include "config.h"
#endif
-#ifndef _WIN32
+#if !defined( _WIN32 ) || defined( __MINGW32__ )
#include <stdint.h>
#else
typedef unsigned __int64 uint64_t;