[arch-commits] Commit in wqy-bitmapfont/trunk (85-wqy-bitmapsong.conf.diff PKGBUILD)

[Jan Steffens]

    Date: Sunday, March 28, 2021 @ 21:18:33
  Author: heftig
Revision: 907932

1.0.0RC1-5: fontconfig changes

Modified:
  wqy-bitmapfont/trunk/PKGBUILD
Deleted:
  wqy-bitmapfont/trunk/85-wqy-bitmapsong.conf.diff

-----------------------------+
 85-wqy-bitmapsong.conf.diff |   51 ------------------------------------------
 PKGBUILD                    |   22 ++++++------------
 2 files changed, 8 insertions(+), 65 deletions(-)

Deleted: 85-wqy-bitmapsong.conf.diff
===================================================================
--- 85-wqy-bitmapsong.conf.diff	2021-03-28 21:17:56 UTC (rev 907931)
+++ 85-wqy-bitmapsong.conf.diff	2021-03-28 21:18:33 UTC (rev 907932)
@@ -1,51 +0,0 @@
-diff -wbBur wqy-bitmapfont/85-wqy-bitmapsong.conf wqy-bitmapfont.my/85-wqy-bitmapsong.conf
---- wqy-bitmapfont/85-wqy-bitmapsong.conf	2007-11-04 08:55:50.000000000 +0300
-+++ wqy-bitmapfont.my/85-wqy-bitmapsong.conf	2013-02-05 13:46:31.485788374 +0400
-@@ -23,12 +23,22 @@
-         Updated by Qianqian Fang on May 9,2007 
- -->
-     <match target="pattern">
--        <test equal="any" compare="eq" name="lang">
-+        <test qual="any" compare="eq" name="lang">
-                 <string>en</string>
-+        </test> 
-+        <test qual="any" compare="eq" name="lang">
-                 <string>en-us</string>
-+        </test> 
-+        <test qual="any" compare="eq" name="lang">
-                 <string>zh-cn</string>
-+        </test> 
-+        <test qual="any" compare="eq" name="lang">
-                 <string>zh-tw</string>
-+        </test> 
-+        <test qual="any" compare="eq" name="lang">
-                 <string>zh-hk</string>
-+        </test> 
-+        <test qual="any" compare="eq" name="lang">
-                 <string>zh-sg</string>
-         </test> 
-         <test compare="more_eq" name="pixelsize">
-@@ -45,12 +55,22 @@
-         </edit>
-     </match>
-     <match target="pattern">
--        <test equal="any" compare="eq" name="lang">
-+        <test qual="any" compare="eq" name="lang">
-                 <string>en</string>
-+        </test> 
-+        <test qual="any" compare="eq" name="lang">
-                 <string>en-us</string>
-+        </test> 
-+        <test qual="any" compare="eq" name="lang">
-                 <string>zh-cn</string>
-+        </test> 
-+        <test qual="any" compare="eq" name="lang">
-                 <string>zh-tw</string>
-+        </test> 
-+        <test qual="any" compare="eq" name="lang">
-                 <string>zh-hk</string>
-+        </test> 
-+        <test qual="any" compare="eq" name="lang">
-                 <string>zh-sg</string>
-         </test>
-         <test compare="more_eq" name="size">

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-28 21:17:56 UTC (rev 907931)
+++ PKGBUILD	2021-03-28 21:18:33 UTC (rev 907932)
@@ -4,28 +4,22 @@
 
 pkgname=wqy-bitmapfont
 pkgver=1.0.0RC1
-pkgrel=4
+pkgrel=5
 pkgdesc="A bitmapped Song Ti (serif) Chinese font"
 arch=('any')
 url="https://wenq.org/"
 license=('GPL2' 'custom:"font embedding exception"')
-source=("https://downloads.sourceforge.net/project/wqy/wqy-bitmapfont/${pkgver/RC/-RC}/wqy-bitmapsong-pcf-${pkgver/RC/-RC}.tar.gz"
-	"85-wqy-bitmapsong.conf.diff")
-sha256sums=('d2ebf091151bbc9d2b7a64e794ff1d12546368155dea2ba435805313f0933bbb'
-            '6c8b9da14c2b6f9b62ad2baf978c21c4b03dc48fac3c5a41d5ab1e5af8e4913c')
+source=("https://downloads.sourceforge.net/project/wqy/wqy-bitmapfont/${pkgver/RC/-RC}/wqy-bitmapsong-pcf-${pkgver/RC/-RC}.tar.gz")
+sha256sums=('d2ebf091151bbc9d2b7a64e794ff1d12546368155dea2ba435805313f0933bbb')
 
 package() {
   cd "$srcdir"/wqy-bitmapsong
 
-#  patch -p0 85-wqy-bitmapsong.conf <"$srcdir"/85-wqy-bitmapsong.conf.diff
+  install -Dm644 *.pcf -t "$pkgdir"/usr/share/fonts/wenquanyi
 
-  mkdir -p  "$pkgdir"/usr/share/fonts/wenquanyi
-  cp *.pcf "$pkgdir"/usr/share/fonts/wenquanyi
+  install -Dm644 85-wqy-bitmapsong.conf -t "$pkgdir"/usr/share/fontconfig/conf.avail
+  install -d "$pkgdir"/usr/share/fontconfig/conf.default
+  ln -s ../conf.avail/85-wqy-bitmapsong.conf -t "$pkgdir"/usr/share/fontconfig/conf.default
 
-  mkdir -p "$pkgdir"/etc/fonts/conf.avail
-  mkdir -p "$pkgdir"/etc/fonts/conf.d
-  cp 85-wqy-bitmapsong.conf "$pkgdir"/etc/fonts/conf.avail
-  (cd "$pkgdir"/etc/fonts/conf.d && ln -s ../conf.avail/85-wqy-bitmapsong.conf .)
-
-  install -D -m0644 COPYING "$pkgdir"/usr/share/licenses/wqy-bitmapfont/COPYING
+  install -D -m644 COPYING -t "$pkgdir"/usr/share/licenses/$pkgname
 }