Font stuff (#1930)

* mbedtls: Updated to 2.4.0 (#1868) * mingw-w64-clang 3.9.0 - rev 2 delete files created by patch (#1867) Delete files created by patches in case we are not deleting from srource directory. * jemalloc: Update to 4.2.1 (#1866) * lua sqlite3 wrapper (#1861) * Adds a TUI in GNU debugger, GDB. (#1869) * nghttp2 - 1.16.0 Update to latest version (#1871) Do not use --enable-lib-only for featureproofing. * Readline (#1872) * readline - 7.0 - Update to latest veersion - NOTE: Will probably break stuff - rebuild what depends upon it Rekeyed patch for new version and ifdef'ed out chown calls if not available * Rebuild some packages that depend upon readline for good measure * libssh2 - 1.8.0 - Upgrade to latest version (#1876) * Adding library: flickcurl (#1875) * Adding library:flickcurl * Flickcurl: fixing dependency on gtk-doc * Libarchive (#1878) * libarchive : 3.2.2 Update to altest version * libarchive: 3.2.2 - add back dependency on lz4 * Nsis (#1879) * nsis 3.0 update to release version * mingw-w64-nsis: 33. Download should point to main to main site, not mirror Use https when possible * g-i-parser: fix race condition (#1881) * Remove rmtree debugging patch It is shadowing exceptions thrown from the main "try" block of GDumpParser._execute_binary_get_tree(). There does seem to be a race condition, but it seems to be related to subprocess.check_call() and what it does on Windows. At the point xml.[blah].parse() is called, "dump.xml" is often absent! * More tolerant rmtreeing If shutil.rmtree() is failing due to some funky race condition that results in files the walk doesn't know about being left, then don't worry about it and continue. This may leave uniquely named junk lying around in the build tree, but that is by design not a problem with g-i-scanner. Just don't install the tmp-introspectXXXXXX folder by accident. * giscanner debugging: asserts and waits Make absence of dump.xml or functions.txt fatal, but only after giving them plenty of time time to appear. Yes, this is horrible code. But it fixes broken builds almost completely on my 64-bit Win7 with NTFS. * Wait for XML to be parsed completely It's possible that dump.xml might exist but be incompletely written. This nasty sleep-till-it-parses loop covers that case. Plus the usual logging so we can see if it's really needed ☺ * gobject-introspection: bump pkgrel * Updated to stable release 190600_20161030 (#1880) A fresh new stable release since January 30, 2014! * go: update to 1.7.3 (#1882) * Updates to some font handling stuff mingw-w64-freetype - Rebuild mingw-w64-graphite2 - Update to 1.3.9. Add gcc to target_link_librarires to try to fix bug https://github.com/Alexpux/MINGW-packages/issues/1877 mingw-w64-harfbuzz - Update to 1.3.3 * mingw-64-graphite2 - remove unneeded copies that I had been using to creating patches. OOPS!!!
2016-11-14 00:47:15 -05:00
parent b4b191b2c0
commit 1a4b3b5ead
4 changed files with 22 additions and 12 deletions
--- a/mingw-w64-freetype/PKGBUILD
+++ b/mingw-w64-freetype/PKGBUILD
@@ -5,7 +5,7 @@ _realname=freetype
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.7
-pkgrel=1
+pkgrel=2
 pkgdesc="TrueType font rendering library (mingw-w64)"
 arch=('any')
 url="http://www.freetype.org/"
--- a/mingw-w64-graphite2/003-graphite2-1.3.9-staticbuild.patch
+++ b/mingw-w64-graphite2/003-graphite2-1.3.9-staticbuild.patch
@@ -1,5 +1,5 @@
--- graphite2-1.3.8/src/CMakeLists.txt.orig	2016-09-17 06:30:02.570522500 -0400
-+++ graphite2-1.3.8/src/CMakeLists.txt	2016-09-17 06:33:57.962672400 -0400
+--- graphite2-1.3.9/src/CMakeLists.txt.orig	2016-11-13 06:34:20.164960700 -0500
+++ graphite2-1.3.9/src/CMakeLists.txt	2016-11-13 07:14:00.877066000 -0500
@@ -106,6 +106,48 @@
                                             LT_VERSION_REVISION ${GRAPHITE_API_REVISION}
                                             LT_VERSION_AGE ${GRAPHITE_API_AGE})
@@ -49,12 +49,22 @@
 if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     set_target_properties(graphite2 PROPERTIES 
         COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
-@@ -148,8 +190,11 @@
+@@ -148,8 +190,21 @@
 if  (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
     set_target_properties(graphite2 PROPERTIES 
         COMPILE_DEFINITIONS "_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;UNICODE;GRAPHITE2_EXPORTING")
 +    set_target_properties(graphite2_static PROPERTIES 
 +        COMPILE_DEFINITIONS "_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;UNICODE;GRAPHITE2_STATIC")
+
+    if(MINGW)
+        if (GRAPHITE2_ASAN)
+            target_link_libraries(graphite2 PRIVATE gcc_s)
+            target_link_libraries(graphite2_static PRIVATE gcc_s)
+        else (GRAPHITE2_ASAN)
+            target_link_libraries(graphite2 PRIVATE gcc)
+            target_link_libraries(graphite2_static PRIVATE gcc)
+        endif (GRAPHITE2_ASAN)
+    endif(MINGW)
 +
 endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 
--- a/mingw-w64-graphite2/PKGBUILD
+++ b/mingw-w64-graphite2/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=graphite2
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.3.8
-pkgrel=5
+pkgver=1.3.9
+pkgrel=1
 pkgdesc="Font rendering capabilities for complex non-Roman writing systems (mingw-w64)"
 arch=('any')
 url="https://github.com/silnrsi/graphite"
@@ -14,20 +14,20 @@ options=('strip' 'staticlibs')
 source=("https://github.com/silnrsi/graphite/releases/download/${pkgver}/${_realname}-${pkgver}.tgz"
        "001-graphite2-1.3.8-win64.patch"
        "002-graphite2-1.2.1-pkgconfig.patch"
-        "003-graphite2-1.3.8-staticbuild.patch"
+        "003-graphite2-1.3.9-staticbuild.patch"
        "004-graphite2-1.3.8-dllimport-fix.patch"
 )
-sha256sums=('9f3f25b3a8495ce0782e77f69075c0dd9b7c054847b9bf9ff130bec38f4c8cc2'
+sha256sums=('ec0185b663059553fd46e8c4a4f0dede60a02f13a7a1fefc2ce70332ea814567'
            'bd6e108929110fcbfd69434221974395a4839710432fe58a9aa432e95bdf4354'
            '22bef0d90c0266b3b0eff01859c1e002f84c165d12242c2bfc153f8f98fb272a'
-            '5fecf72c0d8231b78ecfce5f88e0b6d402d6000dec3106d78f89e820489184b6'
+            '40cec4873e60027cc2ca464cf9731ef55de329a657170bfc5c98a92a387d644f'
            'a84d16e160ac5911dbb442fa42f20b6a86fb281a37524d2acfaac5b2750697d2')

 prepare() {
  cd "${srcdir}"/${_realname}-${pkgver}
  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}"/003-graphite2-1.3.9-staticbuild.patch
  patch -p1 -i "${srcdir}"/004-graphite2-1.3.8-dllimport-fix.patch
 # python2 fixes
  sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" tests/{corrupt.py,defuzz,fnttxtrender,fuzzbidi,fuzztest,hbspeeds,jsoncmp}
--- a/mingw-w64-harfbuzz/PKGBUILD
+++ b/mingw-w64-harfbuzz/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=harfbuzz
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.3.2
+pkgver=1.3.3
 pkgrel=1
 pkgdesc="OpenType text shaping engine (mingw-w64)"
 arch=('any')
@@ -22,7 +22,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-cairo"
 options=('strip' 'staticlibs')
 optdepends=("${MINGW_PACKAGE_PREFIX}-icu: harfbuzz-icu support")
 source=("https://www.freedesktop.org/software/harfbuzz/release/${_realname}-${pkgver}.tar.bz2")
-sha256sums=('8543a6372f08c5987c632dfaa86210c7edb3f43fbacd96095c609bc3539ce027')
+sha256sums=('2620987115a4122b47321610dccbcc18f7f121115fd7b88dc8a695c8b66cb3c9')

 prepare() {
  cd "${srcdir}/${_realname}-${pkgver}"