summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-10-31 07:53:00 +0100
committerDavid Tardon <dtardon@redhat.com>2012-10-31 13:22:27 +0100
commita17b98bc88736ca4a6fc6ccadcbed2c11f5f2351 (patch)
tree4c9b4867bb35b338b35d97c24c9d230662614a94
parentbf176d11892d6ebe949c3c73841800f3a0c8a0d6 (diff)
fix mingw build of graphite
Change-Id: Ie4ac8f71de1816325f40d8c276b07e9e126a85b5
-rw-r--r--graphite/UnpackedTarball_graphite.mk2
-rw-r--r--graphite/graphite2.issue1030.patch.112
2 files changed, 14 insertions, 0 deletions
diff --git a/graphite/UnpackedTarball_graphite.mk b/graphite/UnpackedTarball_graphite.mk
index d50ef19bca82..53b73b197922 100644
--- a/graphite/UnpackedTarball_graphite.mk
+++ b/graphite/UnpackedTarball_graphite.mk
@@ -11,8 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,graphite))
$(eval $(call gb_UnpackedTarball_set_tarball,graphite,$(GRAPHITE_TARBALL)))
+# http://projects.palaso.org/issues/1030
$(eval $(call gb_UnpackedTarball_add_patches,graphite,\
graphite/graphite2.patch \
+ graphite/graphite2.issue1030.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/graphite/graphite2.issue1030.patch.1 b/graphite/graphite2.issue1030.patch.1
new file mode 100644
index 000000000000..2bfe1a1a12fc
--- /dev/null
+++ b/graphite/graphite2.issue1030.patch.1
@@ -0,0 +1,12 @@
+diff -up workdir/wntgcci.pro/UnpackedTarball/graphite/src/gr_logging.cpp.dt workdir/wntgcci.pro/UnpackedTarball/graphite/src/gr_logging.cpp
+--- graphite/src/gr_logging.cpp.dt 2012-10-31 07:40:57.527381144 +0100
++++ graphite/src/gr_logging.cpp 2012-10-31 07:40:59.522333851 +0100
+@@ -33,7 +33,7 @@ of the License or (at your option) any l
+ #include "inc/Segment.h"
+
+ #if defined _WIN32
+-#include "Windows.h"
++#include "windows.h"
+ #endif
+
+ using namespace graphite2;