diff options
author | Philip Deljanov | 2020-12-11 22:41:32 -0500 |
---|---|---|
committer | Philip Deljanov | 2020-12-11 22:41:32 -0500 |
commit | df451552b2358ae7002e9911fcd0a8d817808242 (patch) | |
tree | c8d5cd66a08d761b7d5f0d337c9ac1d13a25aa53 | |
parent | 8b01d1052ce6d7abfe25cec6da41f3333a21ba50 (diff) | |
download | aur-df451552b2358ae7002e9911fcd0a8d817808242.tar.gz |
Remove freetype2-demos, do not use a split package anymore.
-rw-r--r-- | .SRCINFO | 21 | ||||
-rw-r--r-- | 0005-freetype-2.5.2-more-demos.patch | 17 | ||||
-rw-r--r-- | PKGBUILD | 43 |
3 files changed, 5 insertions, 76 deletions
@@ -1,7 +1,7 @@ pkgbase = freetype2-infinality-remix pkgdesc = TrueType font rendering library with Infinality Remix patches pkgver = 2.10.1 - pkgrel = 1 + pkgrel = 2 url = http://www.freetype.org/ install = freetype2.install arch = i686 @@ -12,14 +12,9 @@ pkgbase = freetype2-infinality-remix makedepends = harfbuzz source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.10.1.tar.xz source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.10.1.tar.xz.sig - source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-doc-2.10.1.tar.xz - source = https://download-mirror.savannah.gnu.org/releases/freetype/freetype-doc-2.10.1.tar.xz.sig - source = https://download-mirror.savannah.gnu.org/releases/freetype/ft2demos-2.10.1.tar.xz - source = https://download-mirror.savannah.gnu.org/releases/freetype/ft2demos-2.10.1.tar.xz.sig source = 0001-Enable-table-validation-modules.patch source = 0002-infinality-2.10.1-2019.08.21.patch source = 0004-Enable-long-PCF-family-names.patch - source = 0005-freetype-2.5.2-more-demos.patch source = 0006-infinality-remix-tweaks.patch source = freetype2.sh source = infinality-settings.sh @@ -27,14 +22,9 @@ pkgbase = freetype2-infinality-remix validpgpkeys = 58E0C111E39F5408C5D3EC76C1A60EACE707FDA5 sha256sums = 16dbfa488a21fe827dc27eaf708f42f7aa3bb997d745d31a19781628c36ba26f sha256sums = SKIP - sha256sums = 2fc160eda64cb6ee9f357c3fd6ef5f1f2b6039f10da650c726b0db49f863341f - sha256sums = SKIP - sha256sums = b1857376bd3eaad4fdb4bc7894cb557310186856099494f32e8998ddc32b41e8 - sha256sums = SKIP sha256sums = ac11a24b62a6c044cc245ea9fa2a0cbd9e2e62f2371873dd33084c28a76e7176 sha256sums = afdc909def9d7e839f227a83a4e3b58d4060a28861739f9e1ab5540e60929cc8 sha256sums = 54800d4da18611cf9232aad8b63d74a83153a51bb56dd39191678c738ffc8b53 - sha256sums = 36484db4b926ed026e7f32570573493b5a9793a129f08d54383a26d65a6af89b sha256sums = 94493ed2865fd32e5ef8ef3493fcb2ccaaf8be4c9e0eaa7b417fcbc47fe4314d sha256sums = f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467 sha256sums = 1a5c12aa96e2ee66f7316b8ccb7012520b231a2d8ee21cfe4064aa28db35a57c @@ -54,12 +44,3 @@ pkgname = freetype2-infinality-remix conflicts = freetype2-infinality conflicts = freetype2-infinality-ultimate -pkgname = freetype2-demos-infinality-remix - pkgdesc = Freetype tools and demos - depends = freetype2 - depends = libx11 - conflicts = freetype2-demos - conflicts = freetype2-demos-git - conflicts = freetype2-demos-infinality - conflicts = freetype2-infinality-ultimate - diff --git a/0005-freetype-2.5.2-more-demos.patch b/0005-freetype-2.5.2-more-demos.patch deleted file mode 100644 index e737cb7dafe7..000000000000 --- a/0005-freetype-2.5.2-more-demos.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- 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) @@ -1,10 +1,9 @@ # Maintainer: Philip Deljanov <philip dot deljanov at gmail dot com> # Contributor: bohoomil <bohoomil at zoho dot com> -pkgbase=freetype2-infinality-remix -pkgname=(freetype2-infinality-remix freetype2-demos-infinality-remix) +pkgname=freetype2-infinality-remix pkgver=2.10.1 -pkgrel=1 +pkgrel=2 _patchrel=2019.08.21 pkgdesc="TrueType font rendering library with Infinality Remix patches" arch=(i686 x86_64) @@ -18,12 +17,9 @@ makedepends=('libx11' 'libpng' 'harfbuzz') install=freetype2.install 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-infinality-${pkgver}-${_patchrel}.patch 0004-Enable-long-PCF-family-names.patch - 0005-freetype-2.5.2-more-demos.patch 0006-infinality-remix-tweaks.patch freetype2.sh infinality-settings.sh @@ -31,14 +27,9 @@ source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pk sha256sums=('16dbfa488a21fe827dc27eaf708f42f7aa3bb997d745d31a19781628c36ba26f' 'SKIP' - '2fc160eda64cb6ee9f357c3fd6ef5f1f2b6039f10da650c726b0db49f863341f' - 'SKIP' - 'b1857376bd3eaad4fdb4bc7894cb557310186856099494f32e8998ddc32b41e8' - 'SKIP' 'ac11a24b62a6c044cc245ea9fa2a0cbd9e2e62f2371873dd33084c28a76e7176' 'afdc909def9d7e839f227a83a4e3b58d4060a28861739f9e1ab5540e60929cc8' '54800d4da18611cf9232aad8b63d74a83153a51bb56dd39191678c738ffc8b53' - '36484db4b926ed026e7f32570573493b5a9793a129f08d54383a26d65a6af89b' '94493ed2865fd32e5ef8ef3493fcb2ccaaf8be4c9e0eaa7b417fcbc47fe4314d' 'f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467' '1a5c12aa96e2ee66f7316b8ccb7012520b231a2d8ee21cfe4064aa28db35a57c' @@ -48,7 +39,6 @@ validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5') prepare() { mv freetype-${pkgver} freetype2 - mv ft2demos-${pkgver} freetype2-demos # Patching FreeType cd freetype2 @@ -56,25 +46,12 @@ prepare() { patch -Np1 --verbose -i ../0002-infinality-${pkgver}-${_patchrel}.patch patch -Np1 -i ../0004-Enable-long-PCF-family-names.patch patch -Np1 --verbose -i ../0006-infinality-remix-tweaks.patch - - - # Patching FreeType Demos - cd ../freetype2-demos - patch -Np1 -i ../0005-freetype-2.5.2-more-demos.patch - - # Suppress RPATH - sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk } build() { - # Build FreeType cd freetype2 ./configure --prefix=/usr --disable-static --with-harfbuzz --with-png make - - # Build FreeType demos - cd ../freetype2-demos - make } check() { @@ -82,7 +59,7 @@ check() { make -k check } -package_freetype2-infinality-remix() { +package() { groups=('infinality-remix') depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz') provides=("freetype2=$pkgver" 'freetype2-infinality' 'libfreetype.so') @@ -96,16 +73,4 @@ package_freetype2-infinality-remix() { install -Dm755 ../xft-settings.sh "${pkgdir}/etc/X11/xinit/xinitrc.d/xft-settings.sh" # Configures global default Infinality settings. install -Dm755 ../infinality-settings.sh "${pkgdir}/etc/X11/xinit/xinitrc.d/infinality-settings.sh" -} - -package_freetype2-demos-infinality-remix() { - pkgdesc="Freetype tools and demos" - depends=('freetype2' 'libx11') - conflicts=('freetype2-demos' 'freetype2-demos-git' 'freetype2-demos-infinality' 'freetype2-infinality-ultimate') - - 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 -} +}
\ No newline at end of file |