[arch-commits] Commit in freetype2/trunk (5 files)
Jan Steffens
heftig at archlinux.org
Sun May 14 16:28:09 UTC 2017
Date: Sunday, May 14, 2017 @ 16:28:08
Author: heftig
Revision: 295993
2.8-2: Enable long family names, simplify installing demos, reduce differences to -git package
Added:
freetype2/trunk/0004-Enable-long-PCF-family-names.patch
Modified:
freetype2/trunk/0001-Enable-table-validation-modules.patch
freetype2/trunk/0002-Enable-subpixel-rendering.patch
freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch
freetype2/trunk/PKGBUILD
-----------------------------------------------+
0001-Enable-table-validation-modules.patch | 27 ++++++++++++----
0002-Enable-subpixel-rendering.patch | 8 ++--
0003-Enable-infinality-subpixel-hinting.patch | 10 +++---
0004-Enable-long-PCF-family-names.patch | 25 +++++++++++++++
PKGBUILD | 39 ++++++++++++------------
5 files changed, 75 insertions(+), 34 deletions(-)
Modified: 0001-Enable-table-validation-modules.patch
===================================================================
--- 0001-Enable-table-validation-modules.patch 2017-05-14 16:02:37 UTC (rev 295992)
+++ 0001-Enable-table-validation-modules.patch 2017-05-14 16:28:08 UTC (rev 295993)
@@ -1,7 +1,7 @@
-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 at 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 ++--
@@ -8,10 +8,10 @@
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 @@
# 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 @@
# Auxiliary PostScript driver component to share common code.
#
--
-2.9.3
+2.13.0
Modified: 0002-Enable-subpixel-rendering.patch
===================================================================
--- 0002-Enable-subpixel-rendering.patch 2017-05-14 16:02:37 UTC (rev 295992)
+++ 0002-Enable-subpixel-rendering.patch 2017-05-14 16:28:08 UTC (rev 295993)
@@ -1,7 +1,7 @@
-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 at 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 +-
@@ -8,7 +8,7 @@
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 @@
/*************************************************************************/
--
-2.9.3
+2.13.0
Modified: 0003-Enable-infinality-subpixel-hinting.patch
===================================================================
--- 0003-Enable-infinality-subpixel-hinting.patch 2017-05-14 16:02:37 UTC (rev 295992)
+++ 0003-Enable-infinality-subpixel-hinting.patch 2017-05-14 16:28:08 UTC (rev 295993)
@@ -1,7 +1,7 @@
-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 at 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 ++--
@@ -8,10 +8,10 @@
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 @@
/*************************************************************************/
--
-2.9.3
+2.13.0
Added: 0004-Enable-long-PCF-family-names.patch
===================================================================
--- 0004-Enable-long-PCF-family-names.patch (rev 0)
+++ 0004-Enable-long-PCF-family-names.patch 2017-05-14 16:28:08 UTC (rev 295993)
@@ -0,0 +1,25 @@
+From 62da6a0f7f5cb77859a793863c386c452411e2a6 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-05-14 16:02:37 UTC (rev 295992)
+++ PKGBUILD 2017-05-14 16:28:08 UTC (rev 295993)
@@ -4,13 +4,15 @@
pkgbase=freetype2
pkgname=('freetype2' 'freetype2-demos')
pkgver=2.8
-pkgrel=1
+pkgrel=2
+pkgdesc="Font rasterization library"
arch=(i686 x86_64)
license=('GPL')
url="https://www.freetype.org/"
# adding harfbuzz for improved OpenType features auto-hinting
# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
-makedepends=('libx11' 'zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
+depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
+makedepends=('libx11')
source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
https://download-mirror.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.bz2{,.sig}
https://download-mirror.savannah.gnu.org/releases/freetype/ft2demos-${pkgver}.tar.bz2{,.sig}
@@ -17,6 +19,7 @@
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=('42c6b1f733fe13a3eba135f5025b22cb68450f91'
@@ -25,9 +28,10 @@
'SKIP'
'7849f1ac4a352971fab61a5fc2e5c6a597201201'
'SKIP'
- 'b31882ef5e8447e761acee1c4a44c0630cd4d465'
- 'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e'
- '41d27140fd590945e22e012c9dce62de3d6f11e6'
+ 'c3e91e668936206d3c158bffde0f69788a086a5b'
+ '4ff958229a7f87e04a9894d5a6ed2df227071931'
+ '81586014ea44375ddc85dd9dbcabae6e91c34d62'
+ '334f229875039794adeb574e27d365bb445fb314'
'72cfecbe738085eec475e012617661ad0cc9b76f'
'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
@@ -35,13 +39,15 @@
prepare() {
# Rename source dir to allow building the demos
mv freetype-${pkgver} freetype2
+ mv ft2demos-${pkgver} freetype2-demos
cd freetype2
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
- cd ../ft2demos-${pkgver}
+ cd ../freetype2-demos
# enable more demos
patch -Np1 -i ../0005-freetype-2.5.2-more-demos.patch
@@ -55,7 +61,7 @@
make
# Build demos
- cd ../ft2demos-${pkgver}
+ cd ../freetype2-demos
make
}
@@ -65,8 +71,6 @@
}
package_freetype2() {
- pkgdesc="TrueType font rendering library"
- depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
provides=('libfreetype.so')
install=freetype2.install
backup=('etc/profile.d/freetype2.sh')
@@ -76,14 +80,8 @@
install -Dm644 ../freetype2.sh "${pkgdir}/etc/profile.d/freetype2.sh"
# Package docs
- install -dm755 "${pkgdir}/usr/share/doc"
- cp -a docs "${pkgdir}/usr/share/doc/${pkgname}"
-
- cd ../ft2demos-${pkgver}
- mkdir -p $srcdir/ft-demos
- for _i in bin/{f,t}t*; do
- libtool --mode=install install $_i "$srcdir/ft-demos"
- done
+ install -d "${pkgdir}/usr/share/doc"
+ cp -a docs "${pkgdir}/usr/share/doc/freetype2"
}
package_freetype2-demos() {
@@ -90,8 +88,11 @@
pkgdesc="Freetype tools and demos"
depends=('freetype2' 'libx11')
- install -dm755 "${pkgdir}/usr/bin"
- cp -a $srcdir/ft-demos/* "${pkgdir}/usr/bin"
+ cd freetype2-demos
+ install -d "${pkgdir}/usr/bin"
+ for _i in bin/{f,t}t*; do
+ libtool --mode=install install $_i "${pkgdir}/usr/bin"
+ done
}
# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list