summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig)2017-05-14 18:28:18 +0200
committerJan Alexander Steffens (heftig)2017-05-14 18:32:32 +0200
commit98ff7fc3d94e9683e2d5505c8ddcebe67aa85b10 (patch)
tree612498f5ae603fad91977ecf90f93f167e65c07b
parent96e063a09f7bcfb7a17cfe19b681c49cfe4c9fd2 (diff)
downloadaur-98ff7fc3d94e9683e2d5505c8ddcebe67aa85b10.tar.gz
Sync with testing
-rw-r--r--.SRCINFO31
-rw-r--r--0001-Enable-table-validation-modules.patch27
-rw-r--r--0002-Enable-subpixel-rendering.patch8
-rw-r--r--0003-Enable-infinality-subpixel-hinting.patch10
-rw-r--r--0004-Enable-long-PCF-family-names.patch25
-rw-r--r--PKGBUILD45
6 files changed, 103 insertions, 43 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4cbfb61a7b5..bf683f79b23 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
# Generated by mksrcinfo v8
-# Sat May 13 11:21:55 UTC 2017
+# Sun May 14 16:32:25 UTC 2017
pkgbase = freetype2-git
- pkgdesc = TrueType font rendering library (from git)
- pkgver = 2.7.1+p206+g538d571a
- pkgrel = 1
+ pkgdesc = Font rasterization library (from git)
+ pkgver = 2.8+p0+ga12a3445
+ pkgrel = 2
epoch = 1
url = https://www.freetype.org/
- install = freetype2.install
arch = i686
arch = x86_64
license = GPL
@@ -18,24 +17,32 @@ pkgbase = freetype2-git
depends = sh
depends = libpng
depends = harfbuzz
- provides = libfreetype.so
- provides = freetype2=2.7.1+p206+g538d571a
- conflicts = freetype2
- backup = etc/profile.d/freetype2.sh
source = git://git.sv.gnu.org/freetype/freetype2.git
source = git://git.sv.gnu.org/freetype/freetype2-demos.git
source = 0001-Enable-table-validation-modules.patch
source = 0002-Enable-subpixel-rendering.patch
source = 0003-Enable-infinality-subpixel-hinting.patch
+ source = 0004-Enable-long-PCF-family-names.patch
source = 0005-freetype-2.5.2-more-demos.patch
source = freetype2.sh
sha1sums = SKIP
sha1sums = SKIP
- sha1sums = b31882ef5e8447e761acee1c4a44c0630cd4d465
- sha1sums = b1494810ed3aca25cdd8e8cedf634e5adfe6c09e
- sha1sums = 41d27140fd590945e22e012c9dce62de3d6f11e6
+ sha1sums = c3e91e668936206d3c158bffde0f69788a086a5b
+ sha1sums = 4ff958229a7f87e04a9894d5a6ed2df227071931
+ sha1sums = 81586014ea44375ddc85dd9dbcabae6e91c34d62
+ sha1sums = 334f229875039794adeb574e27d365bb445fb314
sha1sums = 72cfecbe738085eec475e012617661ad0cc9b76f
sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
pkgname = freetype2-git
+ install = freetype2.install
+ provides = libfreetype.so
+ provides = freetype2=2.8+p0+ga12a3445
+ conflicts = freetype2
+ backup = etc/profile.d/freetype2.sh
+
+pkgname = freetype2-demos-git
+ pkgdesc = Freetype tools and demos (from git)
+ depends = freetype2-git
+ depends = libx11
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
index 3e9451fa8b8..5508d421e0c 100644
--- a/0001-Enable-table-validation-modules.patch
+++ b/0001-Enable-table-validation-modules.patch
@@ -1,17 +1,17 @@
-From c3680bf8d38cf759c1e33dcc2d2d51e0a4fea2f9 Mon Sep 17 00:00:00 2001
+From 17dd2751813c3c8b37dac474cc5024473eb9bece Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 23 Jun 2015 08:40:29 +0200
-Subject: [PATCH 1/3] Enable table validation modules
+Subject: [PATCH 1/4] Enable table validation modules
---
modules.cfg | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules.cfg b/modules.cfg
-index f30049c38cc45159..7b8e50fe1b34584a 100644
+index 517111efeb642459..64b2a34d510ce8f7 100644
--- a/modules.cfg
+++ b/modules.cfg
-@@ -120,7 +120,7 @@ AUX_MODULES += cache
+@@ -120,30 +120,30 @@ AUX_MODULES += cache
# TrueType GX/AAT table validation. Needs ftgxval.c below.
#
# No FT_CONFIG_OPTION_PIC support.
@@ -20,7 +20,22 @@ index f30049c38cc45159..7b8e50fe1b34584a 100644
# Support for streams compressed with gzip (files with suffix .gz).
#
-@@ -143,7 +143,7 @@ AUX_MODULES += bzip2
+ # See include/freetype/ftgzip.h for the API.
+ # No FT_CONFIG_OPTION_PIC support.
+ AUX_MODULES += gzip
+
+ # Support for streams compressed with LZW (files with suffix .Z).
+ #
+ # See include/freetype/ftlzw.h for the API.
+ # No FT_CONFIG_OPTION_PIC support.
+ AUX_MODULES += lzw
+
+ # Support for streams compressed with bzip2 (files with suffix .bz2).
+ #
+ # See include/freetype/ftbzip2.h for the API.
+ # No FT_CONFIG_OPTION_PIC support.
+ AUX_MODULES += bzip2
+
# OpenType table validation. Needs ftotval.c below.
#
# No FT_CONFIG_OPTION_PIC support.
@@ -30,5 +45,5 @@ index f30049c38cc45159..7b8e50fe1b34584a 100644
# Auxiliary PostScript driver component to share common code.
#
--
-2.9.3
+2.13.0
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
index dfb57966e2f..66b41029b3f 100644
--- a/0002-Enable-subpixel-rendering.patch
+++ b/0002-Enable-subpixel-rendering.patch
@@ -1,14 +1,14 @@
-From 96f09f08417887b2618c177bccfb6da2906568d9 Mon Sep 17 00:00:00 2001
+From a8f7f3068a8a5f94adfc77f4ddf03bf08da38f9b Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 23 Jun 2015 08:43:07 +0200
-Subject: [PATCH 2/3] Enable subpixel rendering
+Subject: [PATCH 2/4] Enable subpixel rendering
---
include/freetype/config/ftoption.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 90c123ef93e9ea04..67a361dd41e0b026 100644
+index 1bf6e8f534ff0734..1126716626b570df 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -122,7 +122,7 @@ FT_BEGIN_HEADER
@@ -21,5 +21,5 @@ index 90c123ef93e9ea04..67a361dd41e0b026 100644
/*************************************************************************/
--
-2.9.3
+2.13.0
diff --git a/0003-Enable-infinality-subpixel-hinting.patch b/0003-Enable-infinality-subpixel-hinting.patch
index bbfa2a2cd8c..b8f74de22e9 100644
--- a/0003-Enable-infinality-subpixel-hinting.patch
+++ b/0003-Enable-infinality-subpixel-hinting.patch
@@ -1,17 +1,17 @@
-From 220e96a9a8d7aff6ad0f0f1aa12c79cdb563331c Mon Sep 17 00:00:00 2001
+From 239cd8209c8d15a641d4548d386aeae4853b7d23 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Mon, 29 Aug 2016 08:43:10 +0200
-Subject: [PATCH 3/3] Enable infinality subpixel hinting
+Subject: [PATCH 3/4] Enable infinality subpixel hinting
---
include/freetype/config/ftoption.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 67a361dd41e0b026..c4812862518b66a6 100644
+index 1126716626b570df..ebb44acdbbef9a47 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
-@@ -675,8 +675,8 @@ FT_BEGIN_HEADER
+@@ -684,8 +684,8 @@ FT_BEGIN_HEADER
/* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
/* */
/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
@@ -23,5 +23,5 @@ index 67a361dd41e0b026..c4812862518b66a6 100644
/*************************************************************************/
--
-2.9.3
+2.13.0
diff --git a/0004-Enable-long-PCF-family-names.patch b/0004-Enable-long-PCF-family-names.patch
new file mode 100644
index 00000000000..675423a7c47
--- /dev/null
+++ b/0004-Enable-long-PCF-family-names.patch
@@ -0,0 +1,25 @@
+From 62da6a0f7f5cb77859a793863c386c452411e2a6 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Sun, 14 May 2017 18:09:31 +0200
+Subject: [PATCH 4/4] Enable long PCF family names
+
+---
+ include/freetype/config/ftoption.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index ebb44acdbbef9a47..0b39b417162707e4 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -865,7 +865,7 @@ FT_BEGIN_HEADER
+ /* If this option is activated, it can be controlled with the */
+ /* `no-long-family-names' property of the pcf driver module. */
+ /* */
+-/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
++#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+
+
+ /*************************************************************************/
+--
+2.13.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 85e8444ba7b..6743f03946a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
-pkgname=freetype2-git
+pkgbase=freetype2-git
+pkgname=('freetype2-git' 'freetype2-demos-git')
+pkgver=2.8+p0+ga12a3445
+pkgrel=2
epoch=1
-pkgver=2.7.1+p206+g538d571a
-pkgrel=1
-pkgdesc="TrueType font rendering library (from git)"
+pkgdesc="Font rasterization library (from git)"
arch=(i686 x86_64)
license=('GPL')
url="https://www.freetype.org/"
@@ -13,22 +14,20 @@ url="https://www.freetype.org/"
# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
makedepends=('libx11' 'git' 'python2')
-provides=('libfreetype.so' "freetype2=$pkgver")
-conflicts=('freetype2')
-install=freetype2.install
-backup=('etc/profile.d/freetype2.sh')
source=(git://git.sv.gnu.org/freetype/freetype2.git
git://git.sv.gnu.org/freetype/freetype2-demos.git
0001-Enable-table-validation-modules.patch
0002-Enable-subpixel-rendering.patch
0003-Enable-infinality-subpixel-hinting.patch
+ 0004-Enable-long-PCF-family-names.patch
0005-freetype-2.5.2-more-demos.patch
freetype2.sh)
sha1sums=('SKIP'
'SKIP'
- 'b31882ef5e8447e761acee1c4a44c0630cd4d465'
- 'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e'
- '41d27140fd590945e22e012c9dce62de3d6f11e6'
+ 'c3e91e668936206d3c158bffde0f69788a086a5b'
+ '4ff958229a7f87e04a9894d5a6ed2df227071931'
+ '81586014ea44375ddc85dd9dbcabae6e91c34d62'
+ '334f229875039794adeb574e27d365bb445fb314'
'72cfecbe738085eec475e012617661ad0cc9b76f'
'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
@@ -41,10 +40,12 @@ prepare() {
patch -Np1 -i ../0001-Enable-table-validation-modules.patch
patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
+ patch -Np1 -i ../0004-Enable-long-PCF-family-names.patch
./autogen.sh
cd ../freetype2-demos
+ # enable more demos
patch -Np1 -i ../0005-freetype-2.5.2-more-demos.patch
# Suppress RPATH
@@ -79,18 +80,30 @@ check() {
make -k check
}
-package() {
+package_freetype2-git() {
+ provides=('libfreetype.so' "freetype2=$pkgver")
+ conflicts=('freetype2')
+ install=freetype2.install
+ backup=('etc/profile.d/freetype2.sh')
+
cd freetype2
make DESTDIR="${pkgdir}" install
install -Dm644 ../freetype2.sh "${pkgdir}/etc/profile.d/freetype2.sh"
# Package docs
- install -dm755 "${pkgdir}/usr/share/doc"
+ install -d "${pkgdir}/usr/share/doc"
cp -a docs "${pkgdir}/usr/share/doc/freetype2"
+}
- # Package demos
- cd ../freetype2-demos
+package_freetype2-demos-git() {
+ pkgdesc="Freetype tools and demos (from git)"
+ depends=('freetype2-git' 'libx11')
+
+ cd freetype2-demos
+ install -d "${pkgdir}/usr/bin"
for _i in bin/{f,t}t*; do
- libtool --mode=install install $_i "$pkgdir/usr/bin/"
+ libtool --mode=install install $_i "${pkgdir}/usr/bin"
done
}
+
+# vim:set ts=2 sw=2 et: