summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorpingplug2018-04-21 22:16:24 +0800
committerpingplug2018-04-21 22:16:24 +0800
commit8086a2e6deef5b707ce8f0a9136397fe47c8c86a (patch)
tree57eff2299e263016921c8d601773cff0f9577af3
parent319c433cb8bf548a0792a46c6e75a137b15809f4 (diff)
downloadaur-8086a2e6deef5b707ce8f0a9136397fe47c8c86a.tar.gz
Updated to 1.3.11
-rw-r--r--.SRCINFO10
-rw-r--r--004-graphite2-1.3.8-dllimport-fix.patch84
-rw-r--r--PKGBUILD11
3 files changed, 7 insertions, 98 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a9a25156750..681cf6f2325 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Wed May 17 02:23:32 UTC 2017
pkgbase = mingw-w64-graphite
pkgdesc = reimplementation of the SIL Graphite text processing engine (mingw-w64)
- pkgver = 1.3.10
+ pkgver = 1.3.11
pkgrel = 1
url = https://github.com/silnrsi/graphite
arch = any
@@ -15,16 +13,14 @@ pkgbase = mingw-w64-graphite
options = staticlibs
options = !strip
options = !buildflags
- source = https://github.com/silnrsi/graphite/releases/download/1.3.10/graphite2-1.3.10.tgz
+ source = https://github.com/silnrsi/graphite/releases/download/1.3.11/graphite2-1.3.11.tgz
source = 001-graphite2-1.3.8-win64.patch
source = 002-graphite2-1.2.1-pkgconfig.patch
source = 003-graphite2-1.3.8-staticbuild.patch
- source = 004-graphite2-1.3.8-dllimport-fix.patch
- sha1sums = 668f3bce96fc02d90ea875b401ed36b2e8957d2f
+ sha1sums = 26b70897bac68868d964ef70002c384ec10b6572
sha1sums = 68c7b3c1c9e38f357a95e5b3b266d4afcfe78329
sha1sums = 4460d61e238892c421ae7771e3b36dc0b21d682c
sha1sums = da2c20e50cd50a6cac422fd69459060a02311988
- sha1sums = d872ba0db6040865cfb1227e83f0f02cbdbe083a
pkgname = mingw-w64-graphite
diff --git a/004-graphite2-1.3.8-dllimport-fix.patch b/004-graphite2-1.3.8-dllimport-fix.patch
deleted file mode 100644
index 76ff44df5a6..00000000000
--- a/004-graphite2-1.3.8-dllimport-fix.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- graphite2-1.3.8/include/graphite2/Types.h.orig 2016-09-16 23:16:38.006355900 -0400
-+++ graphite2-1.3.8/include/graphite2/Types.h 2016-09-16 23:18:12.217540500 -0400
-@@ -40,6 +40,31 @@
- gr_utf8 = 1/*sizeof(uint8)*/, gr_utf16 = 2/*sizeof(uint16)*/, gr_utf32 = 4/*sizeof(uint32)*/
- };
-
-+#if defined(__GNUC__) || defined(__clang__)
-+#define GR_MAYBE_UNUSED __attribute__((unused))
-+#else
-+#define GR_MAYBE_UNUSED
-+#endif
-+
-+#if defined(__clang__) && __cplusplus >= 201103L
-+ /* clang's fallthrough annotations are only available starting in C++11. */
-+ #define GR_FALLTHROUGH [[clang::fallthrough]]
-+#elif defined(_MSC_VER)
-+ /*
-+ * MSVC's __fallthrough annotations are checked by /analyze (Code Analysis):
-+ * https://msdn.microsoft.com/en-us/library/ms235402%28VS.80%29.aspx
-+ */
-+ #include <sal.h>
-+ #define GR_FALLTHROUGH __fallthrough
-+#else
-+ #define GR_FALLTHROUGH /* fallthrough */
-+#endif
-+
-+#ifdef _MSC_VER
-+#pragma warning(disable: 4800)
-+#pragma warning(disable: 4355)
-+#endif
-+
- // Definitions for library publicly exported symbols
- #if defined _WIN32 || defined __CYGWIN__
- #if defined GRAPHITE2_STATIC
---- graphite2-1.3.8/src/inc/Main.h.orig 2016-09-16 23:15:44.029355200 -0400
-+++ graphite2-1.3.8/src/inc/Main.h 2016-09-16 23:18:14.601872400 -0400
-@@ -120,27 +120,3 @@
- void operator delete[] (void * p)throw() { free(p); } \
- void operator delete[] (void *, void *) throw() {}
-
--#if defined(__GNUC__) || defined(__clang__)
--#define GR_MAYBE_UNUSED __attribute__((unused))
--#else
--#define GR_MAYBE_UNUSED
--#endif
--
--#if defined(__clang__) && __cplusplus >= 201103L
-- /* clang's fallthrough annotations are only available starting in C++11. */
-- #define GR_FALLTHROUGH [[clang::fallthrough]]
--#elif defined(_MSC_VER)
-- /*
-- * MSVC's __fallthrough annotations are checked by /analyze (Code Analysis):
-- * https://msdn.microsoft.com/en-us/library/ms235402%28VS.80%29.aspx
-- */
-- #include <sal.h>
-- #define GR_FALLTHROUGH __fallthrough
--#else
-- #define GR_FALLTHROUGH /* fallthrough */
--#endif
--
--#ifdef _MSC_VER
--#pragma warning(disable: 4800)
--#pragma warning(disable: 4355)
--#endif
---- graphite2-1.3.8/include/graphite2/Log.h.orig 2016-09-16 23:28:23.462998100 -0400
-+++ graphite2-1.3.8/include/graphite2/Log.h 2016-09-16 23:31:58.675576600 -0400
-@@ -56,7 +56,7 @@
- * @param face the gr_face whose segments you want to log to the given file
- * @param log_path a utf8 encoded file name and path to log to.
- */
--GR2_API bool gr_start_logging(gr_face * face, const char *log_path);
-+GR2_API bool gr_start_logging(GR_MAYBE_UNUSED gr_face * face, const char *log_path);
-
-
- /** Stop logging on the given face. This will close the log file created by
-@@ -64,7 +64,7 @@
- *
- * @param face the gr_face whose segments you want to stop logging
- */
--GR2_API void gr_stop_logging(gr_face * face);
-+GR2_API void gr_stop_logging(GR_MAYBE_UNUSED gr_face * face);
-
- /** Start logging to a FILE object.
- * This function is deprecated as of 1.2.0, use the _face versions instead.
diff --git a/PKGBUILD b/PKGBUILD
index 937bacbaced..86aea293485 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mingw-w64-graphite
-pkgver=1.3.10
+pkgver=1.3.11
pkgrel=1
arch=(any)
pkgdesc="reimplementation of the SIL Graphite text processing engine (mingw-w64)"
@@ -11,13 +11,11 @@ url="https://github.com/silnrsi/graphite"
source=("https://github.com/silnrsi/graphite/releases/download/${pkgver}/graphite2-${pkgver}.tgz"
"001-graphite2-1.3.8-win64.patch"
"002-graphite2-1.2.1-pkgconfig.patch"
-"003-graphite2-1.3.8-staticbuild.patch"
-"004-graphite2-1.3.8-dllimport-fix.patch")
-sha1sums=('668f3bce96fc02d90ea875b401ed36b2e8957d2f'
+"003-graphite2-1.3.8-staticbuild.patch")
+sha1sums=('26b70897bac68868d964ef70002c384ec10b6572'
'68c7b3c1c9e38f357a95e5b3b266d4afcfe78329'
'4460d61e238892c421ae7771e3b36dc0b21d682c'
- 'da2c20e50cd50a6cac422fd69459060a02311988'
- 'd872ba0db6040865cfb1227e83f0f02cbdbe083a')
+ 'da2c20e50cd50a6cac422fd69459060a02311988')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
@@ -26,7 +24,6 @@ prepare() {
patch -p1 -i "${srcdir}"/001-graphite2-1.3.8-win64.patch
patch -p1 -i "${srcdir}"/002-graphite2-1.2.1-pkgconfig.patch
patch -p1 -i "${srcdir}"/003-graphite2-1.3.8-staticbuild.patch
- patch -p1 -i "${srcdir}"/004-graphite2-1.3.8-dllimport-fix.patch
sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" tests/{corrupt.py,defuzz,fnttxtrender,fuzzbidi,fuzztest,hbspeeds,jsoncmp}
}