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

Andreas Radke andyrtr at gemini.archlinux.org
Thu Dec 2 14:25:55 UTC 2021


    Date: Thursday, December 2, 2021 @ 14:25:55
  Author: andyrtr
Revision: 430289

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 430288, freetype2/trunk/0001-Enable-table-validation-modules.patch)
  freetype2/repos/testing-x86_64/0002-Enable-subpixel-rendering.patch
    (from rev 430288, freetype2/trunk/0002-Enable-subpixel-rendering.patch)
  freetype2/repos/testing-x86_64/0003-Enable-infinality-subpixel-hinting.patch
    (from rev 430288, freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch)
  freetype2/repos/testing-x86_64/0004-Enable-long-PCF-family-names.patch
    (from rev 430288, freetype2/trunk/0004-Enable-long-PCF-family-names.patch)
  freetype2/repos/testing-x86_64/PKGBUILD
    (from rev 430288, freetype2/trunk/PKGBUILD)
  freetype2/repos/testing-x86_64/freetype2.install
    (from rev 430288, freetype2/trunk/freetype2.install)
  freetype2/repos/testing-x86_64/freetype2.sh
    (from rev 430288, freetype2/trunk/freetype2.sh)

-----------------------------------------------+
 0001-Enable-table-validation-modules.patch    |   42 ++++++++++
 0002-Enable-subpixel-rendering.patch          |   22 +++++
 0003-Enable-infinality-subpixel-hinting.patch |   24 +++++
 0004-Enable-long-PCF-family-names.patch       |   22 +++++
 PKGBUILD                                      |   98 ++++++++++++++++++++++++
 freetype2.install                             |    8 +
 freetype2.sh                                  |   12 ++
 7 files changed, 228 insertions(+)

Copied: freetype2/repos/testing-x86_64/0001-Enable-table-validation-modules.patch (from rev 430288, 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	2021-12-02 14:25:55 UTC (rev 430289)
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 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] Enable table validation modules
+
+---
+ modules.cfg | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.cfg b/modules.cfg
+index 30f7fac45a..a9a4703989 100644
+--- a/modules.cfg
++++ b/modules.cfg
+@@ -114,26 +114,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.
+ #

Copied: freetype2/repos/testing-x86_64/0002-Enable-subpixel-rendering.patch (from rev 430288, freetype2/trunk/0002-Enable-subpixel-rendering.patch)
===================================================================
--- testing-x86_64/0002-Enable-subpixel-rendering.patch	                        (rev 0)
+++ testing-x86_64/0002-Enable-subpixel-rendering.patch	2021-12-02 14:25:55 UTC (rev 430289)
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 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] 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 4227fd376e..32da3fa039 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -123,7 +123,7 @@ FT_BEGIN_HEADER
+    * When this macro is not defined, FreeType offers alternative LCD
+    * rendering technology that produces excellent output.
+    */
+-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+ 
+ 
+   /**************************************************************************

Copied: freetype2/repos/testing-x86_64/0003-Enable-infinality-subpixel-hinting.patch (from rev 430288, freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch)
===================================================================
--- testing-x86_64/0003-Enable-infinality-subpixel-hinting.patch	                        (rev 0)
+++ testing-x86_64/0003-Enable-infinality-subpixel-hinting.patch	2021-12-02 14:25:55 UTC (rev 430289)
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 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] 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 32da3fa039..0dd4021e24 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -688,8 +688,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 )
+ 
+ 
+   /**************************************************************************

Copied: freetype2/repos/testing-x86_64/0004-Enable-long-PCF-family-names.patch (from rev 430288, freetype2/trunk/0004-Enable-long-PCF-family-names.patch)
===================================================================
--- testing-x86_64/0004-Enable-long-PCF-family-names.patch	                        (rev 0)
+++ testing-x86_64/0004-Enable-long-PCF-family-names.patch	2021-12-02 14:25:55 UTC (rev 430289)
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 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] 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 0dd4021e24..8da3073b6d 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -877,7 +877,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
+ 
+ 
+   /*************************************************************************/

Copied: freetype2/repos/testing-x86_64/PKGBUILD (from rev 430288, freetype2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2021-12-02 14:25:55 UTC (rev 430289)
@@ -0,0 +1,98 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=freetype2
+pkgname=(freetype2 freetype2-demos freetype2-docs)
+pkgver=2.11.1
+pkgrel=1
+pkgdesc="Font rasterization library"
+url="https://www.freetype.org/"
+arch=(x86_64)
+license=(GPL)
+# 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 brotli)
+makedepends=(libx11 qt5-base meson)
+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-subpixel-rendering.patch
+        0003-Enable-infinality-subpixel-hinting.patch
+        0004-Enable-long-PCF-family-names.patch
+        freetype2.sh)
+sha256sums=('3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8'
+            'SKIP'
+            '755e29908093c19138a38775784b0accf7e838ffa28a25b8722b3dfe651d80fa'
+            'SKIP'
+            'c60620d49d0f16d95586eb868c01b129569409e6cfdcb87a78e0482a12604672'
+            'SKIP'
+            'e606bdba5c0ee698902886140e4643551ffc8327b1b7d2b0c9129d1f93b1f36c'
+            '17ab1609cdbcaba3c5975f5cf1ffd078e067d560f906d5507390d41997e6c468'
+            '561d2f2503d180b796f868470612610f6d7fcb34efa0620ecab38fd39002e27a'
+            '9c068a984e7b9a27ff9e709839d522b66815ac4e8c7a5bd4ea0224335f7f2ef6'
+            'f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467')
+validpgpkeys=(58E0C111E39F5408C5D3EC76C1A60EACE707FDA5) # Werner Lemberg <wl at gnu.org>
+
+prepare() {
+  pushd freetype-$pkgver
+  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
+
+  ln -sr . ../ft2demos-$pkgver/subprojects/freetype2
+  popd
+}
+
+build() {
+  arch-meson ft2demos-$pkgver build \
+    -D freetype2:default_library=shared
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+    d="$srcdir/$p/${f#$pkgdir/}"
+    mkdir -p "$(dirname "$d")"
+    mv "$f" "$d"
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
+}
+
+package_freetype2() {
+  provides=(libfreetype.so)
+  install=freetype2.install
+  backup=(etc/profile.d/freetype2.sh)
+
+  meson install -C build --destdir="$pkgdir"
+  install -Dt "$pkgdir/etc/profile.d" -m644 freetype2.sh
+  install -Dt "$pkgdir/usr/share/aclocal" -m644 \
+    freetype-$pkgver/builds/unix/freetype2.m4
+
+  cd "$pkgdir"
+  _pick demos usr/bin
+  _pick demos usr/share/man/man1
+}
+
+package_freetype2-demos() {
+  pkgdesc="Freetype tools and demos"
+  depends=(freetype2 libx11)
+  optdepends=('qt5-base: ftinspect')
+  mv demos/* "$pkgdir"
+}
+
+package_freetype2-docs() {
+  pkgdesc="Freetype documentation"
+  depends=(freetype2)
+
+  mkdir -p "${pkgdir}/usr/share/doc"
+  cp -r freetype-$pkgver/docs "$pkgdir/usr/share/doc/freetype2"
+}
+
+# vim:set sw=2 et:

Copied: freetype2/repos/testing-x86_64/freetype2.install (from rev 430288, freetype2/trunk/freetype2.install)
===================================================================
--- testing-x86_64/freetype2.install	                        (rev 0)
+++ testing-x86_64/freetype2.install	2021-12-02 14:25:55 UTC (rev 430289)
@@ -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 430288, freetype2/trunk/freetype2.sh)
===================================================================
--- testing-x86_64/freetype2.sh	                        (rev 0)
+++ testing-x86_64/freetype2.sh	2021-12-02 14:25:55 UTC (rev 430289)
@@ -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