[arch-commits] Commit in freetype2/trunk (5 files)
Jan Steffens
heftig at gemini.archlinux.org
Thu Jul 22 17:13:46 UTC 2021
Date: Thursday, July 22, 2021 @ 17:13:45
Author: heftig
Revision: 420290
2.11.0-1
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/0004-Enable-long-PCF-family-names.patch
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 | 79 +++++++++++-------------
5 files changed, 47 insertions(+), 48 deletions(-)
Modified: 0001-Enable-table-validation-modules.patch
===================================================================
--- 0001-Enable-table-validation-modules.patch 2021-07-22 15:10:10 UTC (rev 420289)
+++ 0001-Enable-table-validation-modules.patch 2021-07-22 17:13:45 UTC (rev 420290)
@@ -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 15:10:10 UTC (rev 420289)
+++ 0002-Enable-subpixel-rendering.patch 2021-07-22 17:13:45 UTC (rev 420290)
@@ -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 15:10:10 UTC (rev 420289)
+++ 0003-Enable-infinality-subpixel-hinting.patch 2021-07-22 17:13:45 UTC (rev 420290)
@@ -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 15:10:10 UTC (rev 420289)
+++ 0004-Enable-long-PCF-family-names.patch 2021-07-22 17:13:45 UTC (rev 420290)
@@ -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 15:10:10 UTC (rev 420289)
+++ PKGBUILD 2021-07-22 17:13:45 UTC (rev 420290)
@@ -3,7 +3,7 @@
pkgbase=freetype2
pkgname=(freetype2 freetype2-demos freetype2-docs)
-pkgver=2.10.4
+pkgver=2.11.0
pkgrel=1
pkgdesc="Font rasterization library"
url="https://www.freetype.org/"
@@ -11,8 +11,8 @@
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)
-makedepends=(libx11)
+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}
@@ -21,70 +21,70 @@
0003-Enable-infinality-subpixel-hinting.patch
0004-Enable-long-PCF-family-names.patch
freetype2.sh)
-sha256sums=('86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784'
+sha256sums=('8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7'
'SKIP'
- 'cca1c19d1efa911bb685d919b5b0fe1279b0699bf8eb6a3d3bf9f02784758212'
+ '5b0b5f504f3547ab6123049917b36cfe6944837eaa7baa86ae742a596b5c206c'
'SKIP'
- '3f873ebe4fb387da3859149459f9be95320ce1fd56b50f8fdb9d2a8492887083'
+ 'eb0622296c6dfb38fc305c99ebbfb5c770db7e344b94f63042ec03f3db164550'
'SKIP'
- 'f41df4f336d5e82e58733c7a4594476c9216cfc85c096327745a7e1b559e17e1'
- 'dc77c1cfee4bf8e7e0690628c95d211df09e0d0750e4c8f075b78b5f105514f7'
- '21a62bc12b848320c686d602d8d4e3bcd51294a9def4dc9c301736e077b59f3f'
- '266384222f87a02fb02b2179828f6c26fe6d7b1fd09d1f7e3734e7fcb09cda2e'
+ 'e606bdba5c0ee698902886140e4643551ffc8327b1b7d2b0c9129d1f93b1f36c'
+ '17ab1609cdbcaba3c5975f5cf1ffd078e067d560f906d5507390d41997e6c468'
+ '561d2f2503d180b796f868470612610f6d7fcb34efa0620ecab38fd39002e27a'
+ '9c068a984e7b9a27ff9e709839d522b66815ac4e8c7a5bd4ea0224335f7f2ef6'
'f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467')
validpgpkeys=(58E0C111E39F5408C5D3EC76C1A60EACE707FDA5) # Werner Lemberg <wl at gnu.org>
prepare() {
- # Rename source dir to allow building the demos
- mv freetype-$pkgver freetype2
- mv ft2demos-$pkgver freetype2-demos
+ 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
patch -Np1 -i ../0004-Enable-long-PCF-family-names.patch
- cd ../freetype2-demos
-
- # Suppress RPATH
- sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
+ ln -sr . ../ft2demos-$pkgver/subprojects/freetype2
}
build() {
- cd freetype2
- ./configure --prefix=/usr --disable-static
- make
-
- # Build demos
- cd ../freetype2-demos
- make
+ arch-meson ft2demos-$pkgver build \
+ -D freetype2:default_library=shared
+ meson compile -C build
}
check() {
- cd freetype2
- make -k 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)
- cd freetype2
- make DESTDIR="$pkgdir" install
- install -Dt "$pkgdir/etc/profile.d" -m644 ../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)
-
- 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
+ optdepends=('qt5-base: ftinspect')
+ mv demos/* "$pkgdir"
}
package_freetype2-docs() {
@@ -91,9 +91,8 @@
pkgdesc="Freetype documentation"
depends=(freetype2)
- cd freetype2
- install -d "${pkgdir}/usr/share/doc"
- cp -a docs "${pkgdir}/usr/share/doc/freetype2"
+ mkdir -p "${pkgdir}/usr/share/doc"
+ cp -r freetype-$pkgver/docs "$pkgdir/usr/share/doc/freetype2"
}
-# vim:set ts=2 sw=2 et:
+# vim:set sw=2 et:
More information about the arch-commits
mailing list