diff options
| -rw-r--r-- | download.lst | 2 | ||||
| -rw-r--r-- | graphite/UnpackedTarball_graphite.mk | 1 | ||||
| -rw-r--r-- | graphite/graphite2.issue1030.patch.1 | 12 |
3 files changed, 1 insertions, 14 deletions
diff --git a/download.lst b/download.lst index 092aecb8daec..8e233bf3edad 100644 --- a/download.lst +++ b/download.lst @@ -42,7 +42,7 @@ export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1. export FONT_SOURCECODE_TARBALL := 0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz export FONT_SOURCESANS_TARBALL := 1e9ddfe25ac9577da709d7b2ea36f939-source-sans-font-1.036.tar.gz export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2 -export GRAPHITE_TARBALL := f5ef3f7f10fa8c3542c6a085a233080b-graphite2-1.2.0.tgz +export GRAPHITE_TARBALL := 7042305e4208af4c2d5249d814ccce58-graphite2-1.2.3.tgz export GLIBC_TARBALL := 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip export HUNSPELL_TARBALL := 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz diff --git a/graphite/UnpackedTarball_graphite.mk b/graphite/UnpackedTarball_graphite.mk index a25b3166e280..a690ac3c3a91 100644 --- a/graphite/UnpackedTarball_graphite.mk +++ b/graphite/UnpackedTarball_graphite.mk @@ -15,7 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,graphite,$(GRAPHITE_TARBALL))) # http://projects.palaso.org/issues/1115 $(eval $(call gb_UnpackedTarball_add_patches,graphite,\ graphite/graphite2.patch \ - graphite/graphite2.issue1030.patch.1 \ graphite/graphite2.issue1115.patch.1 \ )) diff --git a/graphite/graphite2.issue1030.patch.1 b/graphite/graphite2.issue1030.patch.1 deleted file mode 100644 index 2bfe1a1a12fc..000000000000 --- a/graphite/graphite2.issue1030.patch.1 +++ /dev/null @@ -1,12 +0,0 @@ -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; |