From 090d2a3ab0c91edef5cb9889b5a86179c11dc57d Mon Sep 17 00:00:00 2001 From: Graham Inggs Date: Tue, 21 Dec 2021 15:09:54 +0200 Subject: [PATCH] Refresh use-unicode-data.patch --- debian/changelog | 1 + debian/patches/use-unicode-data.patch | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index e5ddd07..446a6b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ utf8proc (2.7.0-1) UNRELEASED; urgency=medium [ Graham Inggs ] * New upstream release + * Refresh use-unicode-data.patch -- Debian Janitor Fri, 18 Sep 2020 05:52:35 -0000 diff --git a/debian/patches/use-unicode-data.patch b/debian/patches/use-unicode-data.patch index 7f370c5..13848d0 100644 --- a/debian/patches/use-unicode-data.patch +++ b/debian/patches/use-unicode-data.patch @@ -3,49 +3,49 @@ Description: Use unicode-data instead of downloading external files provided by the packages unicode-data and ttf-unifont, respectively. Author: Peter Colberg Forwarded: not-needed -Last-Update: 2020-03-30 +Last-Update: 2021-12-21 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/data/Makefile +++ b/data/Makefile @@ -25,31 +25,31 @@ - UNICODE_VERSION=13.0.0 + UNICODE_VERSION=14.0.0 UnicodeData.txt: -- $(CURL) $(CURLFLAGS) -o $@ -O http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/UnicodeData.txt +- $(CURL) $(CURLFLAGS) -o $@ https://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/UnicodeData.txt + cp /usr/share/unicode/UnicodeData.txt $@ EastAsianWidth.txt: -- $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/EastAsianWidth.txt +- $(CURL) $(CURLFLAGS) -o $@ $(URLCACHE)https://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/EastAsianWidth.txt + cp /usr/share/unicode/extracted/DerivedEastAsianWidth.txt $@ GraphemeBreakProperty.txt: -- $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/auxiliary/GraphemeBreakProperty.txt +- $(CURL) $(CURLFLAGS) -o $@ $(URLCACHE)https://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/auxiliary/GraphemeBreakProperty.txt + cp /usr/share/unicode/auxiliary/GraphemeBreakProperty.txt $@ DerivedCoreProperties.txt: -- $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/DerivedCoreProperties.txt +- $(CURL) $(CURLFLAGS) -o $@ $(URLCACHE)https://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/DerivedCoreProperties.txt + cp /usr/share/unicode/DerivedCoreProperties.txt $@ CompositionExclusions.txt: -- $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/CompositionExclusions.txt +- $(CURL) $(CURLFLAGS) -o $@ $(URLCACHE)https://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/CompositionExclusions.txt + cp /usr/share/unicode/CompositionExclusions.txt $@ CaseFolding.txt: -- $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/CaseFolding.txt +- $(CURL) $(CURLFLAGS) -o $@ $(URLCACHE)https://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/CaseFolding.txt + cp /usr/share/unicode/CaseFolding.txt $@ NormalizationTest.txt: -- $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/NormalizationTest.txt +- $(CURL) $(CURLFLAGS) -o $@ $(URLCACHE)https://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/NormalizationTest.txt + bzip2 -d < /usr/share/unicode/NormalizationTest.txt.bz2 > $@ GraphemeBreakTest.txt: -- $(CURL) $(CURLFLAGS) $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/auxiliary/GraphemeBreakTest.txt | $(PERL) -pe 's,÷,/,g;s,×,+,g' > $@ +- $(CURL) $(CURLFLAGS) -o $@ $(URLCACHE)https://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/auxiliary/GraphemeBreakTest.txt + $(PERL) -pe 's,÷,/,g;s,×,+,g' < /usr/share/unicode/auxiliary/GraphemeBreakTest.txt > $@ emoji-data.txt: -- $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://unicode.org/Public/$(UNICODE_VERSION)/ucd/emoji/emoji-data.txt +- $(CURL) $(CURLFLAGS) -o $@ $(URLCACHE)https://unicode.org/Public/$(UNICODE_VERSION)/ucd/emoji/emoji-data.txt + cp /usr/share/unicode/emoji/emoji-data.txt $@ - clean: - rm -f UnicodeData.txt EastAsianWidth.txt GraphemeBreakProperty.txt DerivedCoreProperties.txt CompositionExclusions.txt CaseFolding.txt NormalizationTest.txt GraphemeBreakTest.txt CharWidths.txt emoji-data.txt + Uppercase.txt: DerivedCoreProperties.txt + $(RUBY) -e 'puts File.read("DerivedCoreProperties.txt")[/# Derived Property: Uppercase.*?# Total code points:/m]' > $@ -- 2.30.2