[arch-commits] Commit in lib32-fontconfig/repos/multilib-testing-x86_64 (6 files)
Jan Steffens
heftig at archlinux.org
Mon Oct 14 13:41:12 UTC 2019
Date: Monday, October 14, 2019 @ 13:41:12
Author: heftig
Revision: 515701
archrelease: copy trunk to multilib-testing-x86_64
Added:
lib32-fontconfig/repos/multilib-testing-x86_64/PKGBUILD
(from rev 515700, lib32-fontconfig/trunk/PKGBUILD)
lib32-fontconfig/repos/multilib-testing-x86_64/fontconfig-32.hook
(from rev 515700, lib32-fontconfig/trunk/fontconfig-32.hook)
lib32-fontconfig/repos/multilib-testing-x86_64/lib32-fontconfig.install
(from rev 515700, lib32-fontconfig/trunk/lib32-fontconfig.install)
Deleted:
lib32-fontconfig/repos/multilib-testing-x86_64/PKGBUILD
lib32-fontconfig/repos/multilib-testing-x86_64/fontconfig-32.hook
lib32-fontconfig/repos/multilib-testing-x86_64/lib32-fontconfig.install
--------------------------+
PKGBUILD | 146 ++++++++++++++++++++++-----------------------
fontconfig-32.hook | 22 +++---
lib32-fontconfig.install | 20 +++---
3 files changed, 94 insertions(+), 94 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-10-14 13:38:13 UTC (rev 515700)
+++ PKGBUILD 2019-10-14 13:41:12 UTC (rev 515701)
@@ -1,73 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-_pkgbasename=fontconfig
-pkgname=lib32-$_pkgbasename
-pkgver=2.13.91+23+g65087ac
-pkgrel=1
-epoch=2
-pkgdesc="A library for configuring and customizing font access (32-bit)"
-arch=(x86_64)
-url="https://www.freedesktop.org/wiki/Software/fontconfig/"
-license=(custom)
-depends=(lib32-expat lib32-freetype2 $_pkgbasename)
-makedepends=(git autoconf-archive gperf python-lxml python-six lib32-json-c)
-install=lib32-fontconfig.install
-_commit=65087ac7ce4cc5f2109967c1380b474955dcb590 # master
-source=("git+https://anongit.freedesktop.org/git/fontconfig#commit=$_commit"
- fontconfig-32.hook)
-sha256sums=('SKIP'
- 'd97c0c5b88023da5a2acf64cf560265390a9365305c43b8e86b4f89348e727b3')
-
-# a nice page to test font matching:
-# http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
-# http://getemoji.com/
-
-pkgver() {
- cd $_pkgbasename
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd $_pkgbasename
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $_pkgbasename
-
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- ./configure --prefix=/usr \
- --libdir=/usr/lib32 \
- --sysconfdir=/etc \
- --with-templatedir=/etc/fonts/conf.avail \
- --with-xmldir=/etc/fonts \
- --localstatedir=/var \
- --disable-static \
- --with-default-fonts=/usr/share/fonts \
- --with-add-fonts=/usr/local/share/fonts
- make
-}
-
-check() {
- cd $_pkgbasename
- make -k check
-}
-
-package() {
- cd $_pkgbasename
- make DESTDIR="$pkgdir" install
-
- rm -r "$pkgdir"/{etc,usr/{include,share}}
- find "$pkgdir/usr/bin" -not -type d -not -name fc-cache -delete
- mv "$pkgdir"/usr/bin/fc-cache{,-32}
-
- install -Dm644 ../fontconfig-32.hook "$pkgdir/usr/share/libalpm/hooks/fontconfig-32.hook"
-
- # Install license
- mkdir -p "$pkgdir/usr/share/licenses"
- ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
Copied: lib32-fontconfig/repos/multilib-testing-x86_64/PKGBUILD (from rev 515700, lib32-fontconfig/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-10-14 13:41:12 UTC (rev 515701)
@@ -0,0 +1,73 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=lib32-fontconfig
+pkgver=2.13.91+24+g75eadca
+pkgrel=1
+epoch=2
+pkgdesc="A library for configuring and customizing font access (32-bit)"
+arch=(x86_64)
+url="https://www.freedesktop.org/wiki/Software/fontconfig/"
+license=(custom)
+depends=(lib32-expat lib32-freetype2 fontconfig)
+makedepends=(git autoconf-archive gperf python-lxml python-six lib32-json-c)
+install=lib32-fontconfig.install
+_commit=75eadca26648abf69497691ff0f4c7803b9ff23c # master
+source=("git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#commit=$_commit"
+ fontconfig-32.hook)
+sha256sums=('SKIP'
+ 'd97c0c5b88023da5a2acf64cf560265390a9365305c43b8e86b4f89348e727b3')
+
+# a nice page to test font matching:
+# http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
+# http://getemoji.com/
+
+pkgver() {
+ cd fontconfig
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd fontconfig
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd fontconfig
+
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
+
+ ./configure --prefix=/usr \
+ --libdir=/usr/lib32 \
+ --sysconfdir=/etc \
+ --with-templatedir=/etc/fonts/conf.avail \
+ --with-xmldir=/etc/fonts \
+ --localstatedir=/var \
+ --disable-static \
+ --with-default-fonts=/usr/share/fonts \
+ --with-add-fonts=/usr/local/share/fonts
+ make
+}
+
+check() {
+ cd fontconfig
+ make -k check
+}
+
+package() {
+ cd fontconfig
+ make DESTDIR="$pkgdir" install
+
+ rm -r "$pkgdir"/{etc,usr/{include,share}}
+
+ mv "$pkgdir"/usr/bin/fc-cache{,-32}
+ find "$pkgdir/usr/bin" -type f -not -name '*-32' -delete
+
+ install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../*.hook
+
+ # Install license
+ mkdir -p "$pkgdir/usr/share/licenses"
+ ln -s fontconfig "$pkgdir/usr/share/licenses/$pkgname"
+}
Deleted: fontconfig-32.hook
===================================================================
--- fontconfig-32.hook 2019-10-14 13:38:13 UTC (rev 515700)
+++ fontconfig-32.hook 2019-10-14 13:41:12 UTC (rev 515701)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/share/fonts/*
-
-[Action]
-Description = Updating 32-bit fontconfig cache...
-When = PostTransaction
-Exec = /usr/bin/fc-cache-32 -s
Copied: lib32-fontconfig/repos/multilib-testing-x86_64/fontconfig-32.hook (from rev 515700, lib32-fontconfig/trunk/fontconfig-32.hook)
===================================================================
--- fontconfig-32.hook (rev 0)
+++ fontconfig-32.hook 2019-10-14 13:41:12 UTC (rev 515701)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/fonts/*
+
+[Action]
+Description = Updating 32-bit fontconfig cache...
+When = PostTransaction
+Exec = /usr/bin/fc-cache-32 -s
Deleted: lib32-fontconfig.install
===================================================================
--- lib32-fontconfig.install 2019-10-14 13:38:13 UTC (rev 515700)
+++ lib32-fontconfig.install 2019-10-14 13:41:12 UTC (rev 515701)
@@ -1,10 +0,0 @@
-post_install() {
- post_upgrade $1
-}
-
-post_upgrade() {
- echo -n "Rebuilding 32-bit fontconfig cache..."
- # a full forced directory scan is required here
- /usr/bin/fc-cache-32 -rs
- echo " done."
-}
Copied: lib32-fontconfig/repos/multilib-testing-x86_64/lib32-fontconfig.install (from rev 515700, lib32-fontconfig/trunk/lib32-fontconfig.install)
===================================================================
--- lib32-fontconfig.install (rev 0)
+++ lib32-fontconfig.install 2019-10-14 13:41:12 UTC (rev 515701)
@@ -0,0 +1,10 @@
+post_install() {
+ post_upgrade $1
+}
+
+post_upgrade() {
+ echo -n "Rebuilding 32-bit fontconfig cache..."
+ # a full forced directory scan is required here
+ /usr/bin/fc-cache-32 -rs
+ echo " done."
+}
More information about the arch-commits
mailing list