summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/libgsf-1-fixes.patch27
-rw-r--r--src/libgsf.mk2
2 files changed, 1 insertions, 28 deletions
diff --git a/src/libgsf-1-fixes.patch b/src/libgsf-1-fixes.patch
index faa7d7c..4fa91b9 100644
--- a/src/libgsf-1-fixes.patch
+++ b/src/libgsf-1-fixes.patch
@@ -6,7 +6,7 @@ Contains ad hoc patches for cross building.
From f2970c9c697dd6a6104495ea91ed2488ead297b7 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 24 Sep 2010 23:34:26 +0200
-Subject: [PATCH 1/2] s,DllMain,static _disabled_DllMain,
+Subject: [PATCH 1/1] s,DllMain,static _disabled_DllMain,
diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c
@@ -28,28 +28,3 @@ index d7a7247..cc52d99 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.mk b/src/libgsf.mk
index 7d103a5..c1c59e8 100644
--- a/src/libgsf.mk
+++ b/src/libgsf.mk
@@ -23,8 +23,6 @@ endef
define $(PKG)_BUILD
$(SED) -i 's,^\(Requires:.*\),\1 gio-2.0,' '$(1)'/libgsf-1.pc.in
echo 'Libs.private: -lz -lbz2' >> '$(1)'/libgsf-1.pc.in
- cd '$(1)' && aclocal -I m4
- cd '$(1)' && autoconf
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--disable-shared \