[arch-commits] Commit in adobe-source-han-sans-fonts/trunk (6 files)

Felix Yan fyan at archlinux.org
Fri Jul 18 08:30:35 UTC 2014


    Date: Friday, July 18, 2014 @ 10:30:35
  Author: fyan
Revision: 115897

upgpkg: adobe-source-han-sans-fonts 1.000-2

- add fontconfig files from chakra to workaround Qt bug.

Added:
  adobe-source-han-sans-fonts/trunk/44-source-han-sans-cn.conf
  adobe-source-han-sans-fonts/trunk/44-source-han-sans-jp.conf
  adobe-source-han-sans-fonts/trunk/44-source-han-sans-kr.conf
  adobe-source-han-sans-fonts/trunk/44-source-han-sans-otc.conf
  adobe-source-han-sans-fonts/trunk/44-source-han-sans-twhk.conf
Modified:
  adobe-source-han-sans-fonts/trunk/PKGBUILD

------------------------------+
 44-source-han-sans-cn.conf   |   18 +++++++++++++++++
 44-source-han-sans-jp.conf   |   18 +++++++++++++++++
 44-source-han-sans-kr.conf   |   18 +++++++++++++++++
 44-source-han-sans-otc.conf  |   42 +++++++++++++++++++++++++++++++++++++++++
 44-source-han-sans-twhk.conf |   18 +++++++++++++++++
 PKGBUILD                     |   37 ++++++++++++++++++++++++++++--------
 6 files changed, 143 insertions(+), 8 deletions(-)

Added: 44-source-han-sans-cn.conf
===================================================================
--- 44-source-han-sans-cn.conf	                        (rev 0)
+++ 44-source-han-sans-cn.conf	2014-07-18 08:30:35 UTC (rev 115897)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+	<!-- 
+	    - Medium variant is used instead of Regular on Qt apps:
+		https://bugs.launchpad.net/ubuntu-font-family/+bug/744812
+		- Medium and Bold looks the same in certain applications:
+		https://bugs.launchpad.net/ubuntu/+source/gnome-specimen/+bug/813373
+	-->
+	<match target="scan">
+		<test name="fullname" compare="eq">
+			<string>Source Han Sans CN Medium</string>
+		</test>
+		<edit name="weight" mode="assign">
+			<const>demibold</const>
+		</edit>
+	</match>
+</fontconfig>

Added: 44-source-han-sans-jp.conf
===================================================================
--- 44-source-han-sans-jp.conf	                        (rev 0)
+++ 44-source-han-sans-jp.conf	2014-07-18 08:30:35 UTC (rev 115897)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+    <!-- 
+        - Medium variant is used instead of Regular on Qt apps:
+        https://bugs.launchpad.net/ubuntu-font-family/+bug/744812
+        - Medium and Bold looks the same in certain applications:
+        https://bugs.launchpad.net/ubuntu/+source/gnome-specimen/+bug/813373
+    -->
+    <match target="scan">
+        <test name="fullname" compare="eq">
+            <string>Source Han Sans JP Medium</string>
+        </test>
+        <edit name="weight" mode="assign">
+            <const>demibold</const>
+        </edit>
+    </match>
+</fontconfig>

Added: 44-source-han-sans-kr.conf
===================================================================
--- 44-source-han-sans-kr.conf	                        (rev 0)
+++ 44-source-han-sans-kr.conf	2014-07-18 08:30:35 UTC (rev 115897)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+    <!-- 
+        - Medium variant is used instead of Regular on Qt apps:
+        https://bugs.launchpad.net/ubuntu-font-family/+bug/744812
+        - Medium and Bold looks the same in certain applications:
+        https://bugs.launchpad.net/ubuntu/+source/gnome-specimen/+bug/813373
+    -->
+    <match target="scan">
+        <test name="fullname" compare="eq">
+            <string>Source Han Sans KR Medium</string>
+        </test>
+        <edit name="weight" mode="assign">
+            <const>demibold</const>
+        </edit>
+    </match>
+</fontconfig>

Added: 44-source-han-sans-otc.conf
===================================================================
--- 44-source-han-sans-otc.conf	                        (rev 0)
+++ 44-source-han-sans-otc.conf	2014-07-18 08:30:35 UTC (rev 115897)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+	<!-- 
+	    - Medium variant is used instead of Regular on Qt apps:
+		https://bugs.launchpad.net/ubuntu-font-family/+bug/744812
+		- Medium and Bold looks the same in certain applications:
+		https://bugs.launchpad.net/ubuntu/+source/gnome-specimen/+bug/813373
+	-->
+	<match target="scan">
+		<test name="fullname" compare="eq">
+			<string>Source Han Sans J Medium</string>
+		</test>
+		<edit name="weight" mode="assign">
+			<const>demibold</const>
+		</edit>
+	</match>
+	<match target="scan">
+		<test name="fullname" compare="eq">
+			<string>Source Han Sans K Medium</string>
+		</test>
+		<edit name="weight" mode="assign">
+			<const>demibold</const>
+		</edit>
+	</match>
+	<match target="scan">
+		<test name="fullname" compare="eq">
+			<string>Source Han Sans SC Medium</string>
+		</test>
+		<edit name="weight" mode="assign">
+			<const>demibold</const>
+		</edit>
+	</match>
+	<match target="scan">
+		<test name="fullname" compare="eq">
+			<string>Source Han Sans TC Medium</string>
+		</test>
+		<edit name="weight" mode="assign">
+			<const>demibold</const>
+		</edit>
+	</match>
+</fontconfig>

Added: 44-source-han-sans-twhk.conf
===================================================================
--- 44-source-han-sans-twhk.conf	                        (rev 0)
+++ 44-source-han-sans-twhk.conf	2014-07-18 08:30:35 UTC (rev 115897)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+    <!-- 
+        - Medium variant is used instead of Regular on Qt apps:
+        https://bugs.launchpad.net/ubuntu-font-family/+bug/744812
+        - Medium and Bold looks the same in certain applications:
+        https://bugs.launchpad.net/ubuntu/+source/gnome-specimen/+bug/813373
+    -->
+    <match target="scan">
+        <test name="fullname" compare="eq">
+            <string>Source Han Sans TWHK Medium</string>
+        </test>
+        <edit name="weight" mode="assign">
+            <const>demibold</const>
+        </edit>
+    </match>
+</fontconfig>

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-18 06:27:04 UTC (rev 115896)
+++ PKGBUILD	2014-07-18 08:30:35 UTC (rev 115897)
@@ -14,6 +14,7 @@
 #   (This version is "the best of the worlds", but it cannot be used in Windows)
 #   -> adobe-source-han-sans-otc-fonts
 # * Regional subsets with only characters used in CN, JP, KR or TWHK:
+#   (This version is smaller and has better compatibility)
 #   * Regional subset with only Japanese glyphs + Latin
 #   -> adobe-source-han-sans-jp-fonts
 #   * Regional subset with only Korean glyphs + Latin
@@ -27,25 +28,35 @@
 pkgbase=$_pkgbase-fonts
 pkgname=($_pkgbase-jp-fonts $_pkgbase-kr-fonts $_pkgbase-cn-fonts $_pkgbase-twhk-fonts $_pkgbase-otc-fonts)
 pkgver=1.000
-pkgrel=1
+pkgrel=2
 pkgdesc='Adobe Source Han Sans - A set of Pan-CJK fonts designed to complement Source Sans Pro'
 arch=('any')
-url='https://github.com/adobe-fonts/source-han-sans'
+license=('Apache')
+url='http://sourceforge.net/adobe/source-han-sans'
+depends=('fontconfig')
+makedepends=('unzip')
+install="fonts.install"
 source=("http://sourceforge.net/projects/source-han-sans.adobe/files/SourceHanSansJP-$pkgver.zip"
         "http://sourceforge.net/projects/source-han-sans.adobe/files/SourceHanSansKR-$pkgver.zip"
         "http://sourceforge.net/projects/source-han-sans.adobe/files/SourceHanSansCN-$pkgver.zip"
         "http://sourceforge.net/projects/source-han-sans.adobe/files/SourceHanSansTWHK-$pkgver.zip"
-        "http://sourceforge.net/projects/source-han-sans.adobe/files/SourceHanSansOTC-$pkgver.zip")
+        "http://sourceforge.net/projects/source-han-sans.adobe/files/SourceHanSansOTC-$pkgver.zip"
+        44-source-han-sans-jp.conf
+        44-source-han-sans-kr.conf
+        44-source-han-sans-cn.conf
+        44-source-han-sans-twhk.conf
+        44-source-han-sans-otc.conf)
 noextract=(SourceHanSansJP-$pkgver.zip SourceHanSansKR-$pkgver.zip SourceHanSansCN-$pkgver.zip SourceHanSansTWHK-$pkgver.zip SourceHanSansOTC-$pkgver.zip)
 sha256sums=('c5930036660bea22ffceaa9e2df765776494800d330a59be7936ab3c763c4c82'
             '8eed4ad092fcf640e44f73ba510e0ed1c1cabf79776f68d02820734bbba21cf8'
             '88117aa8f8b4ab65d6f7a919a5e1b06d6c00f75b1abecccf120246536123754d'
             '2371a726757a51322243b1ed7a9fde562621b0813b5e6d6443e06847ad7bbd20'
-            'd6eb107eaf7f7b7e6b775905e2f5b335c989c7b06a46fc7286d3e71c4ffde4d8')
-license=('Apache')
-depends=('fontconfig')
-makedepends=('unzip')
-install="fonts.install"
+            'd6eb107eaf7f7b7e6b775905e2f5b335c989c7b06a46fc7286d3e71c4ffde4d8'
+            'f0e87368ffa91ac76b253846836da05baa120ab4f8a7bfd90fded36f4988c9e0'
+            'fa8d487c7ba67489bde7b4d8558e07abb6d8bcb4d4e9db1bf454c2db23af9547'
+            'd42ed0092a47cee5c7ff3972c90676109212dafc2cffb3388a8b339788a6cdb5'
+            'bfcdadbe66f70baaf617c582ec69ccc6b10175020ccb1ec2de26220b09270e60'
+            'd9ef4ab4db1ad22be57d7c4bfe1cc75e9e1ed5e41887fba49dd137a88401b5f2')
 
 _jp=(
 SourceHanSansJP-Bold.otf
@@ -100,22 +111,27 @@
         $_pkgbase-jp-fonts)
             fonts=(${_jp[@]})
             unzip -j SourceHanSansJP-$pkgver.zip
+            _fontconfig_filename=44-source-han-sans-jp.conf
             pkgdesc="Adobe Source Han Sans - Japanese OpenType/CFF fonts";;
         $_pkgbase-kr-fonts)
             fonts=(${_kr[@]})
             unzip -j SourceHanSansKR-$pkgver.zip
+            _fontconfig_filename=44-source-han-sans-kr.conf
             pkgdesc="Adobe Source Han Sans - Korean OpenType/CFF fonts";;
         $_pkgbase-cn-fonts)
             fonts=(${_cn[@]})
             unzip -j SourceHanSansCN-$pkgver.zip
+            _fontconfig_filename=44-source-han-sans-cn.conf
             pkgdesc="Adobe Source Han Sans - Simplified Chinese OpenType/CFF fonts";;
         $_pkgbase-twhk-fonts)
             fonts=(${_twhk[@]})
             unzip -j SourceHanSansTWHK-$pkgver.zip
+            _fontconfig_filename=44-source-han-sans-twhk.conf
             pkgdesc="Adobe Source Han Sans - Traditional Chinese OpenType/CFF fonts";;
         $_pkgbase-otc-fonts)
             fonts=(${_otc[@]})
             unzip -j SourceHanSansOTC-$pkgver.zip
+            _fontconfig_filename=44-source-han-sans-otc.conf
             pkgdesc="Adobe Source Han Sans - Pan-CJK OpenType/CFF Collection fonts";;
     esac
 
@@ -126,6 +142,11 @@
     for font in "${fonts[@]}"; do
         install -m644 "$font" "$pkgdir/usr/share/fonts/adobe-source-han-sans"
     done
+
+    # Install fontconfig fix
+    install -d "$pkgdir/etc/fonts/conf.d"
+    install -Dm644 "$srcdir/$_fontconfig_filename" "$pkgdir/etc/fonts/conf.avail/$_fontconfig_filename"
+    ln -s ../conf.avail/$_fontconfig_filename "$pkgdir/etc/fonts/conf.d/$_fontconfig_filename"
 }
 
 for _pkgname in ${pkgname[@]}; do




More information about the arch-commits mailing list