summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2013-05-12 03:29:23 (GMT)
committerTony Theodore <tonyt@logyst.com>2013-05-12 03:29:23 (GMT)
commit9e2b2fdba25b70b2e432a2a6690655117e362c1c (patch)
tree9780d05c2f5446a90831c7a15f0bc0d1f929fd2f
parentd861e9fbdc7a98340ba36055411511c82f9a9719 (diff)
downloadmxe-9e2b2fdba25b70b2e432a2a6690655117e362c1c.zip
mxe-9e2b2fdba25b70b2e432a2a6690655117e362c1c.tar.gz
mxe-9e2b2fdba25b70b2e432a2a6690655117e362c1c.tar.bz2
package harfbuzz: add libs for static linking
-rw-r--r--src/harfbuzz-1-fixes.patch (renamed from src/harfbuzz-1-winxp-ugly.patch)36
1 files changed, 34 insertions, 2 deletions
diff --git a/src/harfbuzz-1-winxp-ugly.patch b/src/harfbuzz-1-fixes.patch
index b97f086..8280edc 100644
--- a/src/harfbuzz-1-winxp-ugly.patch
+++ b/src/harfbuzz-1-fixes.patch
@@ -1,11 +1,20 @@
This file is part of MXE.
See index.html for further information.
+Contains ad hoc patches for cross building.
+
+From a4f3f1b3f70d3f186c2f91a439637cc440653a29 Mon Sep 17 00:00:00 2001
+From: MXE
+Date: Sun, 12 May 2013 13:12:02 +1000
+Subject: [PATCH 1/2] winxp ugly
+
This patch has been taken from:
https://bugs.freedesktop.org/show_bug.cgi?id=55494
---- harfbuzz-0.9.6/src/hb-uniscribe.cc 2012-08-18 17:59:46 +0000
-+++ harfbuzz-0.9.6/src/hb-uniscribe.cc 2012-10-01 12:19:53 +0000
+diff --git a/src/hb-uniscribe.cc b/src/hb-uniscribe.cc
+index 2f01c28..1c2e06d 100644
+--- a/src/hb-uniscribe.cc
++++ b/src/hb-uniscribe.cc
@@ -312,161 +312,16 @@ retry:
bidi_state.uBidiLevel = HB_DIRECTION_IS_FORWARD (buffer->props.direction) ? 0 : 1;
bidi_state.fOverrideDirection = 1;
@@ -168,3 +177,26 @@ https://bugs.freedesktop.org/show_bug.cgi?id=55494
/* Wow, done! */
return true;
+--
+1.8.2.2
+
+
+From 037957b837680df02fc0776f19e8b4d9bdc8b876 Mon Sep 17 00:00:00 2001
+From: MXE
+Date: Sun, 12 May 2013 13:17:30 +1000
+Subject: [PATCH 2/2] add libs for static linking
+
+
+diff --git a/harfbuzz.pc.in b/harfbuzz.pc.in
+index e92319e..2a49f2e 100644
+--- a/harfbuzz.pc.in
++++ b/harfbuzz.pc.in
+@@ -8,4 +8,5 @@ Description: Text shaping library
+ Version: @VERSION@
+
+ Libs: -L${libdir} -lharfbuzz
++Libs.private: -lusp10 -lgdi32
+ Cflags: -I${includedir}/harfbuzz
+--
+1.8.2.2
+