[arch-commits] Commit in lib32-freetype2/trunk (5 files)

Jan Steffens heftig at gemini.archlinux.org
Thu Jul 22 17:13:32 UTC 2021


    Date: Thursday, July 22, 2021 @ 17:13:31
  Author: heftig
Revision: 983189

2.11.0-1

Modified:
  lib32-freetype2/trunk/0001-Enable-table-validation-modules.patch
  lib32-freetype2/trunk/0002-Enable-subpixel-rendering.patch
  lib32-freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch
  lib32-freetype2/trunk/0004-Enable-long-PCF-family-names.patch
  lib32-freetype2/trunk/PKGBUILD

-----------------------------------------------+
 0001-Enable-table-validation-modules.patch    |    4 +-
 0002-Enable-subpixel-rendering.patch          |    4 +-
 0003-Enable-infinality-subpixel-hinting.patch |    4 +-
 0004-Enable-long-PCF-family-names.patch       |    4 +-
 PKGBUILD                                      |   37 +++++++++++-------------
 5 files changed, 26 insertions(+), 27 deletions(-)

Modified: 0001-Enable-table-validation-modules.patch
===================================================================
--- 0001-Enable-table-validation-modules.patch	2021-07-22 17:10:40 UTC (rev 983188)
+++ 0001-Enable-table-validation-modules.patch	2021-07-22 17:13:31 UTC (rev 983189)
@@ -8,10 +8,10 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/modules.cfg b/modules.cfg
-index d6cdbe523..181f91541 100644
+index 30f7fac45a..a9a4703989 100644
 --- a/modules.cfg
 +++ b/modules.cfg
-@@ -111,26 +111,26 @@ AUX_MODULES += cache
+@@ -114,26 +114,26 @@ AUX_MODULES += cache
  
  # TrueType GX/AAT table validation.  Needs `ftgxval.c' below.
  #

Modified: 0002-Enable-subpixel-rendering.patch
===================================================================
--- 0002-Enable-subpixel-rendering.patch	2021-07-22 17:10:40 UTC (rev 983188)
+++ 0002-Enable-subpixel-rendering.patch	2021-07-22 17:13:31 UTC (rev 983189)
@@ -8,10 +8,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 097f19b8a..e5de62e35 100644
+index 4227fd376e..32da3fa039 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -124,7 +124,7 @@ FT_BEGIN_HEADER
+@@ -123,7 +123,7 @@ FT_BEGIN_HEADER
     * When this macro is not defined, FreeType offers alternative LCD
     * rendering technology that produces excellent output.
     */

Modified: 0003-Enable-infinality-subpixel-hinting.patch
===================================================================
--- 0003-Enable-infinality-subpixel-hinting.patch	2021-07-22 17:10:40 UTC (rev 983188)
+++ 0003-Enable-infinality-subpixel-hinting.patch	2021-07-22 17:13:31 UTC (rev 983189)
@@ -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 e5de62e35..acb4d6d6a 100644
+index 32da3fa039..0dd4021e24 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -672,8 +672,8 @@ FT_BEGIN_HEADER
+@@ -688,8 +688,8 @@ FT_BEGIN_HEADER
     * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
     */
  /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  1         */

Modified: 0004-Enable-long-PCF-family-names.patch
===================================================================
--- 0004-Enable-long-PCF-family-names.patch	2021-07-22 17:10:40 UTC (rev 983188)
+++ 0004-Enable-long-PCF-family-names.patch	2021-07-22 17:13:31 UTC (rev 983189)
@@ -8,10 +8,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index acb4d6d6a..efa13b9c6 100644
+index 0dd4021e24..8da3073b6d 100644
 --- a/include/freetype/config/ftoption.h
 +++ b/include/freetype/config/ftoption.h
-@@ -861,7 +861,7 @@ FT_BEGIN_HEADER
+@@ -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.
     */

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-22 17:10:40 UTC (rev 983188)
+++ PKGBUILD	2021-07-22 17:13:31 UTC (rev 983189)
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=lib32-freetype2
-pkgver=2.10.4
+pkgver=2.11.0
 pkgrel=1
 pkgdesc="Font rasterization library (32-bit)"
 url="https://www.freetype.org/"
@@ -11,7 +11,9 @@
 license=(GPL)
 # adding harfbuzz for improved OpenType features auto-hinting
 # introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
-depends=(lib32-zlib lib32-bzip2 lib32-libpng lib32-harfbuzz freetype2)
+depends=(lib32-zlib lib32-bzip2 lib32-libpng lib32-harfbuzz lib32-brotli
+         freetype2)
+makedepends=(meson)
 provides=(libfreetype.so)
 source=(https://download.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz{,.sig}
         0001-Enable-table-validation-modules.patch
@@ -18,19 +20,17 @@
         0002-Enable-subpixel-rendering.patch
         0003-Enable-infinality-subpixel-hinting.patch
         0004-Enable-long-PCF-family-names.patch)
-sha256sums=('86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784'
+sha256sums=('8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7'
             'SKIP'
-            'f41df4f336d5e82e58733c7a4594476c9216cfc85c096327745a7e1b559e17e1'
-            'dc77c1cfee4bf8e7e0690628c95d211df09e0d0750e4c8f075b78b5f105514f7'
-            '21a62bc12b848320c686d602d8d4e3bcd51294a9def4dc9c301736e077b59f3f'
-            '266384222f87a02fb02b2179828f6c26fe6d7b1fd09d1f7e3734e7fcb09cda2e')
+            'e606bdba5c0ee698902886140e4643551ffc8327b1b7d2b0c9129d1f93b1f36c'
+            '17ab1609cdbcaba3c5975f5cf1ffd078e067d560f906d5507390d41997e6c468'
+            '561d2f2503d180b796f868470612610f6d7fcb34efa0620ecab38fd39002e27a'
+            '9c068a984e7b9a27ff9e709839d522b66815ac4e8c7a5bd4ea0224335f7f2ef6')
 validpgpkeys=(58E0C111E39F5408C5D3EC76C1A60EACE707FDA5) # Werner Lemberg <wl at gnu.org>
 
 prepare() {
-  # Rename source dir to allow building the demos
-  mv freetype-$pkgver freetype2
+  cd freetype-$pkgver
 
-  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
@@ -42,21 +42,20 @@
   export CXX="g++ -m32"
   export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
 
-  cd freetype2
-  ./configure --prefix=/usr --disable-static --libdir=/usr/lib32
-  make
+  arch-meson freetype-$pkgver build \
+    --libdir=/usr/lib32 \
+    -D default_library=shared
+  meson compile -C build
 }
 
 check() {
-  cd freetype2
-  make -k check
+  meson test -C build --print-errorlogs
 }
 
 package() {
-  cd freetype2
-  make DESTDIR="$pkgdir" install
+  meson install -C build --destdir="$pkgdir"
 
-  rm -r "$pkgdir"/usr/{include,share}
+  rm -r "$pkgdir"/usr/include
 }
 
-# vim:set ts=2 sw=2 et:
+# vim:set sw=2 et:




More information about the arch-commits mailing list