summaryrefslogtreecommitdiffstats
path: root/src/pango-1-fixes.patch
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2012-11-17 21:19:30 (GMT)
committerMark Brand <mabrand@mabrand.nl>2012-11-17 21:19:30 (GMT)
commit1186223fc249114298025ab0d694754c90143afc (patch)
tree57c8cc15e03d58328020e312ee0dc120caa33d38 /src/pango-1-fixes.patch
parentf93c6601b5e7ee79cbaf2992e6c1c3da20a7323a (diff)
downloadmxe-1186223fc249114298025ab0d694754c90143afc.zip
mxe-1186223fc249114298025ab0d694754c90143afc.tar.gz
mxe-1186223fc249114298025ab0d694754c90143afc.tar.bz2
update package pango
Diffstat (limited to 'src/pango-1-fixes.patch')
-rw-r--r--src/pango-1-fixes.patch24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/pango-1-fixes.patch b/src/pango-1-fixes.patch
index f496a19..aeee98f 100644
--- a/src/pango-1-fixes.patch
+++ b/src/pango-1-fixes.patch
@@ -1,7 +1,7 @@
This file is part of MXE.
See index.html for further information.
-From 6dc99b57932d52db33413b9f054ef8843f697ec0 Mon Sep 17 00:00:00 2001
+From 745968578f3b0e7d270a14062c175fcebecdbd08 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Wed, 29 Sep 2010 00:52:59 +0200
Subject: [PATCH 1/4] s,DllMain,static _disabled_DllMain,
@@ -30,7 +30,7 @@ index 18ffa26..aac59ab 100644
1.7.10.4
-From e5359406f68e5bb4bd5f1b9516f9d28f41e8b38e Mon Sep 17 00:00:00 2001
+From 525d3bc5b5f7e7d2c705c2b53cc8bf91d56e4641 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Wed, 29 Sep 2010 00:50:08 +0200
Subject: [PATCH 2/4] add missing lib to pango.pc for static linking
@@ -51,16 +51,16 @@ index 17a8b7a..16c5981 100644
1.7.10.4
-From 8a4c71a44d76896fcdb610f50eaa07be3d108c3d Mon Sep 17 00:00:00 2001
+From 27cdbbc3b9e514457c0f898a9e866ee785a1b4b6 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Fri, 15 Jun 2012 16:21:40 +0200
Subject: [PATCH 3/4] do not force shared for win32
-diff --git a/configure.in b/configure.in
-index a0e0057..fe1f7fe 100644
---- a/configure.in
-+++ b/configure.in
+diff --git a/configure.ac b/configure.ac
+index f11a5c8..ac62a89 100644
+--- a/configure.ac
++++ b/configure.ac
@@ -142,20 +142,6 @@ AC_CHECK_HEADERS(unistd.h sys/mman.h)
# Win32 stuff
#
@@ -114,7 +114,7 @@ index 73b42f4..19c5a4f 100644
1.7.10.4
-From ed84a78833202e38407f47e1fcd28fa8e612d536 Mon Sep 17 00:00:00 2001
+From 93cb665f6fcfa4d3cbe1edb06a09850c47807b0d Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 18 Jun 2012 21:36:53 +0200
Subject: [PATCH 4/4] kill gtk-doc (MXE specific)
@@ -151,10 +151,10 @@ index bc7c59c..4e1918c 100755
AUTORECONF=`which autoreconf`
if test -z $AUTORECONF; then
echo "*** No autoreconf found, please install it ***"
-diff --git a/configure.in b/configure.in
-index fe1f7fe..23c4311 100644
---- a/configure.in
-+++ b/configure.in
+diff --git a/configure.ac b/configure.ac
+index ac62a89..96837d6 100644
+--- a/configure.ac
++++ b/configure.ac
@@ -568,14 +568,7 @@ dnl **************************
dnl *** Checks for gtk-doc ***
dnl **************************