[arch-commits] Commit in wqy-zenhei/trunk (PKGBUILD wqy-zenhei.install)

[Jan Steffens]

    Date: Sunday, March 28, 2021 @ 21:31:38
  Author: heftig
Revision: 907957

0.9.45-9

Modified:
  wqy-zenhei/trunk/PKGBUILD
  wqy-zenhei/trunk/wqy-zenhei.install

--------------------+
 PKGBUILD           |   32 +++++++++++++++++---------------
 wqy-zenhei.install |    3 +--
 2 files changed, 18 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-28 21:31:27 UTC (rev 907956)
+++ PKGBUILD	2021-03-28 21:31:38 UTC (rev 907957)
@@ -4,18 +4,21 @@
 
 pkgname=wqy-zenhei
 pkgver=0.9.45
-pkgrel=8
+pkgrel=9
 pkgdesc="A Hei Ti Style (sans-serif) Chinese Outline Font."
 arch=('any')
 license=('GPL2' 'custom:"font embedding exception"')
 install=wqy-zenhei.install
 url="https://wenq.org/enindex.cgi"
+depends=(sh)
 source=("https://downloads.sourceforge.net/project/wqy/wqy-zenhei/$pkgver%20%28Fighting-state%20RC1%29/wqy-zenhei-$pkgver.tar.gz"
 	"44-wqy-zenhei.conf.diff")
 md5sums=('4c6c3f4e902dd5ee0a121e8c41d040bd'
          '1cdbb5dd5ea90faf48cf1ba61077da15')
+b2sums=('00cb4c4f3c6d76f8d81192407813940634c634288a8945fbad0c74642759102d484db875ad5c5be0462ecb4a87c1038893a578c669a70aca80071ebb12c7b154'
+        '2390db80db8d8f95b0d893c0533c9d05be6f164800e6eb22399f899c671dcfabc7803f5c11228beb57981fc4a4a89ebb93a71f8c4b21068e261e62173b1d5cf8')
 
-package() {
+prepare() {
   cd "$srcdir"/$pkgname
 
   patch -p0 44-wqy-zenhei.conf <"$srcdir"/44-wqy-zenhei.conf.diff
@@ -22,19 +25,18 @@
 
   grep README -e "GPL v2 license with font embedding exception" -A 12 >| FONTEXCEPTION
 
-  mkdir -p "$pkgdir"/usr/share/fonts/wenquanyi/wqy-zenhei/
-  mkdir -p "$pkgdir"/etc/fonts/conf.avail/
-  mkdir -p "$pkgdir"/etc/fonts/conf.d
+  # https://bugs.archlinux.org/task/24177
+  mv 44-wqy-zenhei.conf 65-wqy-zenhei.conf
+}
 
-  install -m644 -D FONTEXCEPTION "$pkgdir"/usr/share/licenses/${pkgname}/FONTEXCEPTION
-  install -m644 *.ttc "$pkgdir"/usr/share/fonts/wenquanyi/wqy-zenhei/
-  install -m644 *.conf "$pkgdir"/etc/fonts/conf.avail/
-  install -m755 -D zenheiset "$pkgdir"/usr/bin/zenheiset
+package() {
+  cd "$srcdir"/$pkgname
 
-  # https://bugs.archlinux.org/task/24177
-  mv "$pkgdir"/etc/fonts/conf.avail/44-wqy-zenhei.conf "$pkgdir"/etc/fonts/conf.avail/65-wqy-zenhei.conf
-
-  cd "$pkgdir"/etc/fonts/conf.d/
-  ln -s ../conf.avail/65-wqy-zenhei.conf .
-#  ln -s ../conf.avail/66-wqy-zenhei-sharp.conf .
+  install -Dm644 FONTEXCEPTION -t "$pkgdir"/usr/share/licenses/$pkgname
+  install -Dm644 *.ttc -t "$pkgdir"/usr/share/fonts/wenquanyi/wqy-zenhei
+  install -Dm644 *.conf -t "$pkgdir"/usr/share/fontconfig/conf.avail
+  install -Dm755 zenheiset -t "$pkgdir"/usr/bin
+  install -d "$pkgdir"/usr/share/fontconfig/conf.default
+  ln -s ../conf.avail/65-wqy-zenhei.conf -t "$pkgdir"/usr/share/fontconfig/conf.default
+  # ln -s ../conf.avail/43-wqy-zenhei-sharp.conf -t "$pkgdir"/usr/share/fontconfig/conf.default
 }

Modified: wqy-zenhei.install
===================================================================
--- wqy-zenhei.install	2021-03-28 21:31:27 UTC (rev 907956)
+++ wqy-zenhei.install	2021-03-28 21:31:38 UTC (rev 907957)
@@ -1,5 +1,4 @@
 post_install() {
-  echo "wqy-zenhei post install message"
 cat <<EOF
 ==> Special Note: By default, we disabled the embedded bitmaps, so that the
     characters will be displayed as anti-aliased glyphs.  Those who want to 
@@ -7,7 +6,7 @@
 
 cd /etc/fonts/conf.d
 rm 65-wqy-zenhei.conf
-ln -s ../conf.avail/43-wqy-zenhei-sharp.conf .
+ln -s /usr/share/fontconfig/conf.avail/43-wqy-zenhei-sharp.conf
 
     Remove the symlinks 43-wqy-zenhei-sharp.conf and 65-wqy-zenhei.conf from 
     /etc/fonts/conf.d if you have problems with this package.