diff options
| -rw-r--r-- | src/libgsf-1-fixes.patch (renamed from src/libgsf-2-fixes.patch) | 33 | ||||
| -rw-r--r-- | src/libgsf-1-no-gettext.patch | 17 |
2 files changed, 29 insertions, 21 deletions
diff --git a/src/libgsf-2-fixes.patch b/src/libgsf-1-fixes.patch index 754079e..faa7d7c 100644 --- a/src/libgsf-2-fixes.patch +++ b/src/libgsf-1-fixes.patch @@ -3,17 +3,17 @@ See doc/index.html for further information. Contains ad hoc patches for cross building. -From 908f4325d4977e67dc1d1840ce3e67bb9492de71 Mon Sep 17 00:00:00 2001 +From f2970c9c697dd6a6104495ea91ed2488ead297b7 Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Fri, 24 Sep 2010 23:34:26 +0200 -Subject: [PATCH] s,DllMain,static _disabled_DllMain, +Subject: [PATCH 1/2] s,DllMain,static _disabled_DllMain, diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c -index 4e54b09..b8261e5 100644 +index d7a7247..cc52d99 100644 --- a/gsf/gsf-utils.c +++ b/gsf/gsf-utils.c -@@ -109,9 +109,9 @@ static GTypeModule *static_type_module = NULL; +@@ -119,9 +119,9 @@ static GTypeModule *static_type_module = NULL; #include <windows.h> static HMODULE gsf_dll_hmodule; BOOL WINAPI @@ -28,3 +28,28 @@ index 4e54b09..b8261e5 100644 -- 1.7.1 + +From ab87b1b623f774244935bf9f1d82365a3203d8db Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Wed, 29 Sep 2010 20:15:48 +0200 +Subject: [PATCH 2/2] no gettext + + +diff --git a/configure.in b/configure.in +index af40c28..7ce5f7b 100644 +--- a/configure.in ++++ b/configure.in +@@ -53,10 +53,6 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + + dnl Gettext/i18n stuff + +-IT_PROG_INTLTOOL([0.35.0]) +- +-AM_GLIB_GNU_GETTEXT +- + GETTEXT_PACKAGE=AC_PACKAGE_NAME + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) +-- +1.7.1 + diff --git a/src/libgsf-1-no-gettext.patch b/src/libgsf-1-no-gettext.patch deleted file mode 100644 index cc3edf2..0000000 --- a/src/libgsf-1-no-gettext.patch +++ /dev/null @@ -1,17 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -ru libgsf-1.14.17.orig/configure.in libgsf-1.14.17/configure.in ---- libgsf-1.14.17.orig/configure.in 2009-11-19 01:52:56.000000000 +0100 -+++ libgsf-1.14.17/configure.in 2010-02-23 16:17:17.000000000 +0100 -@@ -53,10 +53,6 @@ - - dnl Gettext/i18n stuff - --IT_PROG_INTLTOOL([0.35.0]) -- --AM_GLIB_GNU_GETTEXT -- - GETTEXT_PACKAGE=AC_PACKAGE_NAME - AC_SUBST(GETTEXT_PACKAGE) - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) |