diff options
| author | Martin Hosken <martin_hosken@sil.org> | 2013-08-27 16:28:54 +0700 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-08-28 12:17:08 +0000 |
| commit | 36e1de2239a92b3969925167dd52d37021fb99d8 (patch) | |
| tree | d011b8493b89d56ed147415f2d8f4769c0f191c7 /graphite | |
| parent | fc1f68d5b9f3ce7a77a13b959692a1027c6e2ada (diff) | |
Fix windows libo crash with graphite fonts.
New master to base off, hoping it will build everywhere to pass gerrit.
Updates graphite library with bug fixes (and minimal improvements)
Proposed for stable branch update as well.
Change-Id: I6c5825420d9ea5768564253789a28412f3c1900a
Reviewed-on: https://gerrit.libreoffice.org/5644
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'graphite')
| -rw-r--r-- | graphite/UnpackedTarball_graphite.mk | 1 | ||||
| -rw-r--r-- | graphite/graphite2.issue1030.patch.1 | 12 |
2 files changed, 0 insertions, 13 deletions
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; |