summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig)2016-09-08 20:53:59 +0200
committerJan Alexander Steffens (heftig)2016-09-08 20:54:02 +0200
commit64d55947eb1750474a429531da25231cc7f9d92d (patch)
tree75e4112704b900887cef0b6dca967ded973e7f36
parent7a4e2fea278e1b59bc84d98194a6d73f220c862c (diff)
downloadaur-64d55947eb1750474a429531da25231cc7f9d92d.tar.gz
Sync with testing
-rw-r--r--.SRCINFO8
-rw-r--r--0005-freetype-2.5.2-more-demos.patch17
-rw-r--r--PKGBUILD5
3 files changed, 26 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 191d104de70..21e690ce643 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Fri Sep 2 18:44:28 UTC 2016
+# Thu Sep 8 18:52:57 UTC 2016
pkgbase = freetype2-git
pkgdesc = TrueType font rendering library (from git)
- pkgver = 2.6.5+p67+g77e4d1b
+ pkgver = 2.7+p0+gd2d5968
pkgrel = 1
epoch = 1
url = http://www.freetype.org/
@@ -19,7 +19,7 @@ pkgbase = freetype2-git
depends = libpng
depends = harfbuzz
provides = libfreetype.so
- provides = freetype2=2.6.5+p67+g77e4d1b
+ provides = freetype2=2.7+p0+gd2d5968
conflicts = freetype2
backup = etc/profile.d/freetype2.sh
source = git://git.sv.gnu.org/freetype/freetype2.git
@@ -27,12 +27,14 @@ pkgbase = freetype2-git
source = 0001-Enable-table-validation-modules.patch
source = 0002-Enable-subpixel-rendering.patch
source = 0003-Enable-infinality-subpixel-hinting.patch
+ source = 0005-freetype-2.5.2-more-demos.patch
source = freetype2.sh
sha1sums = SKIP
sha1sums = SKIP
sha1sums = b31882ef5e8447e761acee1c4a44c0630cd4d465
sha1sums = b1494810ed3aca25cdd8e8cedf634e5adfe6c09e
sha1sums = 41d27140fd590945e22e012c9dce62de3d6f11e6
+ sha1sums = 72cfecbe738085eec475e012617661ad0cc9b76f
sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
pkgname = freetype2-git
diff --git a/0005-freetype-2.5.2-more-demos.patch b/0005-freetype-2.5.2-more-demos.patch
new file mode 100644
index 00000000000..e737cb7dafe
--- /dev/null
+++ b/0005-freetype-2.5.2-more-demos.patch
@@ -0,0 +1,17 @@
+--- ft2demos-2.5.2/Makefile
++++ ft2demos-2.5.2/Makefile
+@@ -296,10 +296,10 @@ else
+ # The following programs are not compiled automatically; either comment
+ # out the affected line or use the program name as a Makefile target.
+ #
+- # EXES += ftchkwd
+- # EXES += ftmemchk
+- # EXES += ftpatchk
+- # EXES += fttimer
++ EXES += ftchkwd
++ EXES += ftmemchk
++ EXES += ftpatchk
++ EXES += fttimer
+ # EXES += testname
+
+ exes: $(EXES:%=$(BIN_DIR_2)/%$E)
diff --git a/PKGBUILD b/PKGBUILD
index f7252b656be..ff26d313b89 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=freetype2-git
epoch=1
-pkgver=2.6.5+p67+g77e4d1b
+pkgver=2.7+p0+gd2d5968
pkgrel=1
pkgdesc="TrueType font rendering library (from git)"
arch=(i686 x86_64)
@@ -22,12 +22,14 @@ source=(git://git.sv.gnu.org/freetype/freetype2.git
0001-Enable-table-validation-modules.patch
0002-Enable-subpixel-rendering.patch
0003-Enable-infinality-subpixel-hinting.patch
+ 0005-freetype-2.5.2-more-demos.patch
freetype2.sh)
sha1sums=('SKIP'
'SKIP'
'b31882ef5e8447e761acee1c4a44c0630cd4d465'
'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e'
'41d27140fd590945e22e012c9dce62de3d6f11e6'
+ '72cfecbe738085eec475e012617661ad0cc9b76f'
'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
@@ -43,6 +45,7 @@ prepare() {
./autogen.sh
cd ../freetype2-demos
+ patch -Np1 -i ../0005-freetype-2.5.2-more-demos.patch
# Suppress RPATH
sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk