[arch-commits] Commit in freetype2/repos (8 files)

Jan Steffens heftig at archlinux.org
Sat May 9 18:15:12 UTC 2020


    Date: Saturday, May 9, 2020 @ 18:15:11
  Author: heftig
Revision: 382963

archrelease: copy trunk to testing-x86_64

Added:
  freetype2/repos/testing-x86_64/
  freetype2/repos/testing-x86_64/0001-Enable-table-validation-modules.patch
    (from rev 382962, freetype2/trunk/0001-Enable-table-validation-modules.patch)
  freetype2/repos/testing-x86_64/0002-Enable-infinality-subpixel-hinting.patch
    (from rev 382962, freetype2/trunk/0002-Enable-infinality-subpixel-hinting.patch)
  freetype2/repos/testing-x86_64/0003-Enable-long-PCF-family-names.patch
    (from rev 382962, freetype2/trunk/0003-Enable-long-PCF-family-names.patch)
  freetype2/repos/testing-x86_64/PKGBUILD
    (from rev 382962, freetype2/trunk/PKGBUILD)
  freetype2/repos/testing-x86_64/freetype-2.5.2-more-demos.patch
    (from rev 382962, freetype2/trunk/freetype-2.5.2-more-demos.patch)
  freetype2/repos/testing-x86_64/freetype2.install
    (from rev 382962, freetype2/trunk/freetype2.install)
  freetype2/repos/testing-x86_64/freetype2.sh
    (from rev 382962, freetype2/trunk/freetype2.sh)

-----------------------------------------------+
 0001-Enable-table-validation-modules.patch    |   45 ++++++++++
 0002-Enable-infinality-subpixel-hinting.patch |   27 ++++++
 0003-Enable-long-PCF-family-names.patch       |   25 ++++++
 PKGBUILD                                      |   99 ++++++++++++++++++++++++
 freetype-2.5.2-more-demos.patch               |   17 ++++
 freetype2.install                             |    8 +
 freetype2.sh                                  |   12 ++
 7 files changed, 233 insertions(+)

Copied: freetype2/repos/testing-x86_64/0001-Enable-table-validation-modules.patch (from rev 382962, freetype2/trunk/0001-Enable-table-validation-modules.patch)
===================================================================
--- testing-x86_64/0001-Enable-table-validation-modules.patch	                        (rev 0)
+++ testing-x86_64/0001-Enable-table-validation-modules.patch	2020-05-09 18:15:11 UTC (rev 382963)
@@ -0,0 +1,45 @@
+From c29e554b370dd9e283a53b81527434415f4572c2 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
+
+---
+ modules.cfg | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.cfg b/modules.cfg
+index d6cdbe523..181f91541 100644
+--- a/modules.cfg
++++ b/modules.cfg
+@@ -111,26 +111,26 @@ AUX_MODULES += cache
+ 
+ # TrueType GX/AAT table validation.  Needs `ftgxval.c' below.
+ #
+-# AUX_MODULES += gxvalid
++AUX_MODULES += gxvalid
+ 
+ # Support for streams compressed with gzip (files with suffix .gz).
+ #
+ # See include/freetype/ftgzip.h for the API.
+ AUX_MODULES += gzip
+ 
+ # Support for streams compressed with LZW (files with suffix .Z).
+ #
+ # See include/freetype/ftlzw.h for the API.
+ AUX_MODULES += lzw
+ 
+ # Support for streams compressed with bzip2 (files with suffix .bz2).
+ #
+ # See include/freetype/ftbzip2.h for the API.
+ AUX_MODULES += bzip2
+ 
+ # OpenType table validation.  Needs `ftotval.c' below.
+ #
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+ 
+ # Auxiliary PostScript driver component to share common code.
+ #
+-- 
+2.26.2
+

Copied: freetype2/repos/testing-x86_64/0002-Enable-infinality-subpixel-hinting.patch (from rev 382962, freetype2/trunk/0002-Enable-infinality-subpixel-hinting.patch)
===================================================================
--- testing-x86_64/0002-Enable-infinality-subpixel-hinting.patch	                        (rev 0)
+++ testing-x86_64/0002-Enable-infinality-subpixel-hinting.patch	2020-05-09 18:15:11 UTC (rev 382963)
@@ -0,0 +1,27 @@
+From 9f26c483bbc0e96967963905ea824e20a0f30778 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 2/3] 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 426806d2e..1cadffe8a 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -674,8 +674,8 @@ FT_BEGIN_HEADER
+    * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
+    */
+ /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  1         */
+-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING  2
+-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 ) */
++/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  2         */
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )
+ 
+ 
+   /**************************************************************************
+-- 
+2.26.2
+

Copied: freetype2/repos/testing-x86_64/0003-Enable-long-PCF-family-names.patch (from rev 382962, freetype2/trunk/0003-Enable-long-PCF-family-names.patch)
===================================================================
--- testing-x86_64/0003-Enable-long-PCF-family-names.patch	                        (rev 0)
+++ testing-x86_64/0003-Enable-long-PCF-family-names.patch	2020-05-09 18:15:11 UTC (rev 382963)
@@ -0,0 +1,25 @@
+From cd916f63dc53e7116aa99c4775e13caca7b3c59c 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 3/3] 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 1cadffe8a..569d1c638 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -863,7 +863,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.26.2
+

Copied: freetype2/repos/testing-x86_64/PKGBUILD (from rev 382962, freetype2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2020-05-09 18:15:11 UTC (rev 382963)
@@ -0,0 +1,99 @@
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=freetype2
+pkgname=('freetype2' 'freetype2-demos' 'freetype2-docs')
+pkgver=2.10.2
+pkgrel=1
+pkgdesc="Font rasterization library"
+arch=(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
+depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
+makedepends=('libx11')
+source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.xz{,.sig}
+        https://download-mirror.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.xz{,.sig}
+        https://download-mirror.savannah.gnu.org/releases/freetype/ft2demos-${pkgver}.tar.xz{,.sig}
+        0001-Enable-table-validation-modules.patch
+        0002-Enable-infinality-subpixel-hinting.patch
+        0003-Enable-long-PCF-family-names.patch
+        freetype-2.5.2-more-demos.patch
+        freetype2.sh)
+sha1sums=('b074d5c34dc0e3cc150be6e7aa6b07c9ec4ed875'
+          'SKIP'
+          '97060579e8e66ff870e07567cba3c21e5b6f0e1a'
+          'SKIP'
+          '7b2001a0269be6c619d81d21944dd054fa9f2328'
+          'SKIP'
+          '43919bfbf8fcc0e8df2659af6a1f09d338286fcf'
+          'a3267cfeb115a06ad5dd6e4a74b44778e3e6bbb6'
+          'c3903dc78dd0c233075fb33077d1e134b9d148d8'
+          '72cfecbe738085eec475e012617661ad0cc9b76f'
+          'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
+validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
+
+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-infinality-subpixel-hinting.patch
+  patch -Np1 -i ../0003-Enable-long-PCF-family-names.patch
+
+  cd ../freetype2-demos
+  # enable more demos
+  patch -Np1 -i ../freetype-2.5.2-more-demos.patch
+
+  # Suppress RPATH
+  sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
+}
+
+build() {
+  cd freetype2
+  ./configure --prefix=/usr --disable-static
+  make
+
+  # Build demos
+  cd ../freetype2-demos
+  make
+}
+
+check() {
+  cd freetype2
+  make -k check
+}
+
+package_freetype2() {
+  provides=('libfreetype.so')
+  install=freetype2.install
+  backup=('etc/profile.d/freetype2.sh')
+
+  cd freetype2
+  make DESTDIR="${pkgdir}" install
+  install -Dt "${pkgdir}/etc/profile.d" -m644 ../freetype2.sh
+}
+
+package_freetype2-demos() {
+  pkgdesc="Freetype tools and demos"
+  depends=('freetype2' '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"
+  done
+}
+
+package_freetype2-docs() {
+  pkgdesc="Freetype documentation"
+  depends=('freetype2')
+
+  cd freetype2
+  install -d "${pkgdir}/usr/share/doc"
+  cp -a docs "${pkgdir}/usr/share/doc/freetype2"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: freetype2/repos/testing-x86_64/freetype-2.5.2-more-demos.patch (from rev 382962, freetype2/trunk/freetype-2.5.2-more-demos.patch)
===================================================================
--- testing-x86_64/freetype-2.5.2-more-demos.patch	                        (rev 0)
+++ testing-x86_64/freetype-2.5.2-more-demos.patch	2020-05-09 18:15:11 UTC (rev 382963)
@@ -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)

Copied: freetype2/repos/testing-x86_64/freetype2.install (from rev 382962, freetype2/trunk/freetype2.install)
===================================================================
--- testing-x86_64/freetype2.install	                        (rev 0)
+++ testing-x86_64/freetype2.install	2020-05-09 18:15:11 UTC (rev 382963)
@@ -0,0 +1,8 @@
+post_upgrade() {
+  if (( $(vercmp $2 2.7-1) < 0 )); then
+    cat <<MSG
+  The Arch-specific FT2_SUBPIXEL_HINTING has been removed.
+  Subpixel hinting is now configured in /etc/profile.d/freetype2.sh .
+MSG
+  fi
+}

Copied: freetype2/repos/testing-x86_64/freetype2.sh (from rev 382962, freetype2/trunk/freetype2.sh)
===================================================================
--- testing-x86_64/freetype2.sh	                        (rev 0)
+++ testing-x86_64/freetype2.sh	2020-05-09 18:15:11 UTC (rev 382963)
@@ -0,0 +1,12 @@
+# Subpixel hinting mode can be chosen by setting the right TrueType interpreter
+# version. The available settings are:
+#
+#     truetype:interpreter-version=35  # Classic mode (default in 2.6)
+#     truetype:interpreter-version=38  # Infinality mode
+#     truetype:interpreter-version=40  # Minimal mode (default in 2.7)
+#
+# There are more properties that can be set, separated by whitespace. Please
+# refer to the FreeType documentation for details.
+
+# Uncomment and configure below
+#export FREETYPE_PROPERTIES="truetype:interpreter-version=40"


More information about the arch-commits mailing list