package/wqy-zenhei: new package
PATCH 1/1 package/wqy-zenhei: new package
--- DEVELOPERS | 3 +++ package/Config.in | 1 + package/wqy-zenhei/Config.in | 13 +++++++++++++ package/wqy-zenhei/wqy-zenhei.hash | 3 +++ package/wqy-zenhei/wqy-zenhei.mk | 28 ++++++++++++++++++++++++++++ 5 files changed, 48 insertions(+) create mode 100644 package/wqy-zenhei/Config.in create mode 100644 package/wqy-zenhei/wqy-zenhei.hash create mode 100644 package/wqy-zenhei/wqy-zenhei.mk
DEVELOPERS +3 -0
@@ -1461,6 +1461,9 @@ F: package/ramsmp/ N: Kieran Bingham <[email protected]> F: package/libcamera/ +N: Klaus Heinrich Kiwi <[email protected]> +F: package/wqy-zenhei/ + N: Koen Martens <[email protected]> F: package/capnproto/ F: package/linuxconsoletools/
package/Config.in +1 -0
@@ -240,6 +240,7 @@ comment "Fonts" source "package/ghostscript-fonts/Config.in" source "package/inconsolata/Config.in" source "package/liberation/Config.in" + source "package/wqy-zenhei/Config.in" comment "Icons" source "package/adwaita-icon-theme/Config.in"
package/wqy-zenhei/Config.in new file +13 -0
@@ -0,0 +1,13 @@ +config BR2_PACKAGE_WQY_ZENHEI + bool "wqy-zenhei (Free Chinese-capable fonts)" + help + "WenQuanYi Zen Hei" is a Hei-Ti Style (sans-serif) Chinese + font capable of text formatting and on-screen display of both + simplified and traditional forms of Chinese Hanzi glyphs + (among many other languages). Both the proportional + "WenQuanYi Zen Hei", as well as the monospaced typeface + "WenQuanYi Zen Hei Mono" provides over 35,000 glyphs, + including over 21,000 Chinese Hanzi. This font provides full + coverage of GBK (CP936) charset, CJK Unified Ideographs, as + well as the code-points needed for zh_CN, zh_SG, zh_TW, zh_HK, + zh_MO, ja (Japanese) and ko (Korean) locales for fontconfig.
package/wqy-zenhei/wqy-zenhei.hash new file +3 -0
@@ -0,0 +1,3 @@ +# locally computed sha256 from: +# https://downloads.sourceforge.net/project/wqy/wqy-zenhei/0.9.45%20%28Fighting-state%20RC1%29/wqy-zenhei-0.9.45.tar.gz +sha256 e4b7e306475bf9427d1757578f0e4528930c84c44eaa3f167d4c42f110ee75d6 wqy-zenhei-0.9.45.tar.gz
package/wqy-zenhei/wqy-zenhei.mk new file +28 -0
@@ -0,0 +1,28 @@ +################################################################################ +# +# wqy-zenhei +# +################################################################################ + +WQY_ZENHEI_VERSION = 0.9.45 +WQY_ZENHEI_SITE = https://downloads.sourceforge.net/project/wqy/wqy-zenhei/$(WQY_ZENHEI_VERSION)%20%28Fighting-state%20RC1%29 +WQY_ZENHEI_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/wqy-zenhei +WQY_ZENHEI_LICENSE = GPL-v2 +WQY_ZENHEI_LICENSE_FILES = COPYING + +ifeq ($(BR2_PACKAGE_FONTCONFIG),y) +define WQY_ZENHEI_FONTCONFIG_CONF_INSTALL_CMDS + $(INSTALL) -D -m 0644 $(@D)/43-wqy-zenhei-sharp.conf \ + $(TARGET_DIR)/usr/share/fontconfig/conf.avail/43-wqy-zenhei-sharp.conf + $(INSTALL) -D -m 0644 $(@D)/44-wqy-zenhei.conf \ + $(TARGET_DIR)/usr/share/fontconfig/conf.avail/44-wqy-zenhei.conf +endef +endif + +define WQY_ZENHEI_INSTALL_TARGET_CMDS + mkdir -p $(WQY_ZENHEI_TARGET_DIR) + $(INSTALL) -m 644 $(@D)/wqy-zenhei.ttc $(WQY_ZENHEI_TARGET_DIR) + $(WQY_ZENHEI_FONTCONFIG_CONF_INSTALL_CMDS) +endef + +$(eval $(generic-package))
Signature · 1 line
2.17.1
PATCH 1/1 package/wqy-zenhei: new package
Hello Klaus,
Thanks for this contribution! I have applied your patch to master, with a number of changes. See below for details.
package/wqy-zenhei/Config.in line 2
Quoted 8 lines · On Fri, 4 Dec 2020 11:17:37 -0300 Klaus Heinrich Kiwi…
package/wqy-zenhei/Config.in new file +2
-0@@ -0,0 +1,13 @@ +config BR2_PACKAGE_WQY_ZENHEI + bool "wqy-zenhei (Free Chinese-capable fonts)"
Changed to:
bool "wqy-zenhei (Free Chinese-capable fonts)"
Indeed for consistency reason, we try to only use the lower-case package name as the short prompt for packags.
package/wqy-zenhei/Config.in line 13
Quoted 11 lines
package/wqy-zenhei/Config.in new file +11
-0+ help + "WenQuanYi Zen Hei" is a Hei-Ti Style (sans-serif) Chinese + font capable of text formatting and on-screen display of both + simplified and traditional forms of Chinese Hanzi glyphs + (among many other languages). Both the proportional + "WenQuanYi Zen Hei", as well as the monospaced typeface + "WenQuanYi Zen Hei Mono" provides over 35,000 glyphs, + including over 21,000 Chinese Hanzi. This font provides full + coverage of GBK (CP936) charset, CJK Unified Ideographs, as + well as the code-points needed for zh_CN, zh_SG, zh_TW, zh_HK, + zh_MO, ja (Japanese) and ko (Korean) locales for fontconfig.
I've added some upstream URL for the project here:
package/wqy-zenhei/wqy-zenhei.hash line 2
Quoted 8 lines
package/wqy-zenhei/wqy-zenhei.hash new file +2
-0@@ -0,0 +1,3 @@ +# locally computed sha256 from: +# https://downloads.sourceforge.net/project/wqy/wqy-zenhei/0.9.45%20%28Fighting-state%20RC1%29/wqy-zenhei-0.9.45.tar.gz
Indicating the URL from which the tarball is downloaded and then the hash calculated locally is not very useful. Also, SourceForge provides md5 and sha1 hashes, and the hash of the license file was missing. So, I've changed to:
+# from https://sourceforge.net/projects/wqy/files/wqy-zenhei/0.9.45%20%28Fighting-state%20RC1%29/
+md5 4c6c3f4e902dd5ee0a121e8c41d040bd wqy-zenhei-0.9.45.tar.gz
+sha1 b86b65d3048ade868fcc89229cfac6baf80a3e54 wqy-zenhei-0.9.45.tar.gz
+# locally calculated
+sha256 e4b7e306475bf9427d1757578f0e4528930c84c44eaa3f167d4c42f110ee75d6 wqy-zenhei-0.9.45.tar.gz +sha256 871c2a85e6bbf7bec65043820b706a265ed95d4e58c577fbb2c9f60c39c26ca7 COPYING
package/wqy-zenhei/wqy-zenhei.hash
Quoted 3 lines
package/wqy-zenhei/wqy-zenhei.hash new file +3
-0+WQY_ZENHEI_VERSION = 0.9.45 +WQY_ZENHEI_SITE = https://downloads.sourceforge.net/project/wqy/wqy-zenhei/$(WQY_ZENHEI_VERSION)%20%28Fighting-state%20RC1%29 +WQY_ZENHEI_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/wqy-zenhei
This was not needed, as it was used only once.
Quoted 1 line
+WQY_ZENHEI_LICENSE = GPL-v2
This should have been:
+WQY_ZENHEI_LICENSE = GPL-2.0-with-font-exception
Quoted 4 lines
package/wqy-zenhei/wqy-zenhei.hash new file +4
-0+WQY_ZENHEI_LICENSE_FILES = COPYING + +ifeq ($(BR2_PACKAGE_FONTCONFIG),y) +define WQY_ZENHEI_FONTCONFIG_CONF_INSTALL_CMDS
package/wqy-zenhei/wqy-zenhei.hash
Quoted 10 lines
package/wqy-zenhei/wqy-zenhei.hash new file +10
-0+ $(INSTALL) -D -m 0644 $(@D)/43-wqy-zenhei-sharp.conf \ + $(TARGET_DIR)/usr/share/fontconfig/conf.avail/43-wqy-zenhei-sharp.conf + $(INSTALL) -D -m 0644 $(@D)/44-wqy-zenhei.conf \ + $(TARGET_DIR)/usr/share/fontconfig/conf.avail/44-wqy-zenhei.conf +endef +endif + +define WQY_ZENHEI_INSTALL_TARGET_CMDS + mkdir -p $(WQY_ZENHEI_TARGET_DIR) + $(INSTALL) -m 644 $(@D)/wqy-zenhei.ttc $(WQY_ZENHEI_TARGET_DIR)
Replaced those two lines with:
+ $(INSTALL) -D -m 0644 $(@D)/wqy-zenhei.ttc \
+ $(TARGET_DIR)/usr/share/fonts/wqy-zenhei/wqy-zenhei.ttc
package/wqy-zenhei/wqy-zenhei.hash
Quoted 4 lines
package/wqy-zenhei/wqy-zenhei.hash new file +4
-0+ $(WQY_ZENHEI_FONTCONFIG_CONF_INSTALL_CMDS) +endef + +$(eval $(generic-package))
Applied with those changes. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/wqy-zenhei: new package
Hi Thomas,
Quoted 4 lines · Thomas Petazzoni
Hello Klaus,
Thanks for this contribution! I have applied your patch to master, with a number of changes. See below for details.
Thanks! Those look good and thank you for taking the time to write down useful explanations about the changes!
Quoted 9 lines
package/wqy-zenhei/Config.in line 2
Quoted 2 lines
package/wqy-zenhei/Config.in new file +2
-0+config BR2_PACKAGE_WQY_ZENHEI + bool "wqy-zenhei (Free Chinese-capable fonts)"Changed to:
bool "wqy-zenhei (Free Chinese-capable fonts)"
Indeed for consistency reason, we try to only use the lower-case package name as the short prompt for packags.
I was puzzled by this comment so I looked at the commit and I think you meant to say that you removed the "(Free Chinese-capable fonts)" from the bool. That makes sense, thanks!
Quoted 5 lines
Quoted 5 lines
package/wqy-zenhei/wqy-zenhei.hash new file +0
-0
Quoted 8 lines
package/wqy-zenhei/wqy-zenhei.hash line 2
Quoted 3 lines
package/wqy-zenhei/wqy-zenhei.hash new file +2
-0@@ -0,0 +1,3 @@ +# locally computed sha256 from: +# https://downloads.sourceforge.net/project/wqy/wqy-zenhei/0.9.45%20%28Fighting-state%20RC1%29/wqy-zenhei-0.9.45.tar.gzIndicating the URL from which the tarball is downloaded and then the hash calculated locally is not very useful. Also, SourceForge provides md5 and sha1 hashes, and the hash of the license file was missing. So, I've changed to:
I understand the md5 and sha1 hashes that I completely missed, but couldn't decode why the locally computed/calculated sha256 is not useful.
Quoted 9 lines
(quoted diff) +6
-0+# from https://sourceforge.net/projects/wqy/files/wqy-zenhei/0.9.45%20%28Fighting-state%20RC1%29/ +md5 4c6c3f4e902dd5ee0a121e8c41d040bd wqy-zenhei-0.9.45.tar.gz +sha1 b86b65d3048ade868fcc89229cfac6baf80a3e54 wqy-zenhei-0.9.45.tar.gz +# locally calculated +sha256 e4b7e306475bf9427d1757578f0e4528930c84c44eaa3f167d4c42f110ee75d6 wqy-zenhei-0.9.45.tar.gz +sha256 871c2a85e6bbf7bec65043820b706a265ed95d4e58c577fbb2c9f60c39c26ca7 COPYING
Quoted 4 lines
Applied with those changes. Thanks!
Thomas
Thanks again!
Signature · 1 line
Klaus Heinrich Kiwi <[email protected]>
PATCH 1/1 package/wqy-zenhei: new package
Hello Klaus,
Quoted 6 lines · On Mon, 4 Jan 2021 16:42:39 -0300 Klaus Heinrich Kiwi…
Quoted 2 lines
Indeed for consistency reason, we try to only use the lower-case package name as the short prompt for packags.
I was puzzled by this comment so I looked at the commit and I think you meant to say that you removed the "(Free Chinese-capable fonts)" from the bool. That makes sense, thanks!
Gah, absolutely. I made a bogus copy/paste which made my whole explanation confusing indeed, but it seems you understood what I meant anyway :-)
Quoted 7 lines
Quoted 4 lines
Indicating the URL from which the tarball is downloaded and then the hash calculated locally is not very useful. Also, SourceForge provides md5 and sha1 hashes, and the hash of the license file was missing. So, I've changed to:
I understand the md5 and sha1 hashes that I completely missed, but couldn't decode why the locally computed/calculated sha256 is not useful.
The locally computed sha256 is useful. What was not is the comment:
# locally calculated from http://.....tar.gz
because it's obvious from where it has been calculated, so we tend to say just:
# locally calculated
or, if indeed there was another verification method:
# locally calculated, after checking the signature with ...
Does that make sense? But really, this is very tiny minor detail.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/wqy-zenhei: new package
Quoted 11 lines · Thomas Petazzoni
Hello Klaus,
The locally computed sha256 is useful. What was not is the comment:
# locally calculated from http://.....tar.gzbecause it's obvious from where it has been calculated, so we tend to say just:
# locally calculated
Quoted 7 lines
or, if indeed there was another verification method:
# locally calculated, after checking the signature with ...Does that make sense? But really, this is very tiny minor detail.
Thomas
Ah, got it now. Thanks for the explanation!
-Klaus
Signature · 1 line
Klaus Heinrich Kiwi <[email protected]>