diff options
author | Solomon Choina | 2018-03-25 16:39:15 -0400 |
---|---|---|
committer | Solomon Choina | 2018-03-25 16:39:15 -0400 |
commit | 2fb3f03fae1160b66057e16772558f9590cde965 (patch) | |
tree | bf1e7ed8d87802ebe301ae7408448d0ebfee3bf8 | |
parent | 6ae174e5f81160668e3aa1bc006afd627c1db82a (diff) | |
download | aur-2fb3f03fae1160b66057e16772558f9590cde965.tar.gz |
update to 2.13.0
-rw-r--r-- | .SRCINFO | 27 | ||||
-rw-r--r-- | 0001-configure-20180325.patch (renamed from 0001-configure-20171017.patch) | 42 | ||||
-rw-r--r-- | 0002-configure-20180325.ac.patch (renamed from 0002-configure-20171017.ac.patch) | 0 | ||||
-rw-r--r-- | 0003-Makefile-20171017.in.patch | 245 | ||||
-rw-r--r-- | 0003-Makefile-20180325.in.patch | 247 | ||||
-rw-r--r-- | 0004-Makefile-20180325.conf.d.patch (renamed from 0004-Makefile-20171017.conf.d.patch) | 42 | ||||
-rw-r--r-- | 0005-Makefile-20171017.am.in.patch | 48 | ||||
-rw-r--r-- | 0005-Makefile-20180325.am.in.patch | 49 | ||||
-rw-r--r-- | PKGBUILD | 26 |
9 files changed, 369 insertions, 357 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sun Nov 26 15:43:00 UTC 2017 +# Sun Mar 25 20:38:15 UTC 2018 pkgbase = fontconfig-infinality-ultimate pkgdesc = A library for configuring and customizing font access, optimized for freetype2-infinality-ultimate. - pkgver = 2.12.6+5+g665584a + pkgver = 2.13.0 pkgrel = 1 url = http://www.fontconfig.org/release/ install = fontconfig-ultimate.install @@ -13,8 +13,9 @@ pkgbase = fontconfig-infinality-ultimate license = MIT makedepends = gperf makedepends = python-lxml + makedepends = python-six depends = expat - depends = freetype2-infinality-ultimate + depends = freetype2 provides = fontconfig=$pkgver provides = fontconfig-infinality provides = fontconfig-infinality-ultimate @@ -33,22 +34,22 @@ pkgbase = fontconfig-infinality-ultimate backup = etc/fonts/conf.avail.infinality/35-repl-custom.conf backup = etc/fonts/conf.avail.infinality/38-repl-webfonts-custom.conf backup = etc/fonts/conf.avail.infinality/97-selective-rendering-custom.conf - source = git+https://anongit.freedesktop.org/git/fontconfig#commit=665584a19b0ec227c93643ffb0540d11ac8ecf7f + source = git+https://anongit.freedesktop.org/git/fontconfig#tag=2.13.0 source = https://raw.githubusercontent.com/archfan/infinality_bundle/820e74be8345a0da2cdcff0a05bf5fa10fd85740/02_fontconfig-iu/fontconfig-ultimate-git.tar.bz2 source = fc-cache-ib.hook - source = 0001-configure-20171017.patch - source = 0002-configure-20171017.ac.patch - source = 0003-Makefile-20171017.in.patch - source = 0004-Makefile-20171017.conf.d.patch - source = 0005-Makefile-20171017.am.in.patch + source = 0001-configure-20180325.patch + source = 0002-configure-20180325.ac.patch + source = 0003-Makefile-20180325.in.patch + source = 0004-Makefile-20180325.conf.d.patch + source = 0005-Makefile-20180325.am.in.patch sha256sums = SKIP sha256sums = b4977cfb0dc64167be3b58ae63022ffb2648e08519b0c061ee2ca43620d8b980 sha256sums = 026971a9fac1ee4fb0ef74d5833ce5e12b4645de8ebdf1cadb3cb943cf46abd3 - sha256sums = 7cb8401c2acbc4ac7a9e4a948a4b04d3b5446cb1153fab351c8d92d1306719ac + sha256sums = 7a0597c3a926176b5c844aa15f3fc98007398eb24db336b059c30f1cec8510cf sha256sums = ba8815b38d5d6e307d2107966c8b2ce0d2d48212ab99b55a56c6d66621b705ce - sha256sums = 253392c84479aa2b539a0cac4311a28a30663fd806bfe40bd9e8284a9e194431 - sha256sums = 8ee8dd7ee5b85ab410dc59127db8fc09ba2a1070949fa2e03b9ddeb43c8466a8 - sha256sums = 82dfce9f9e3c340ff075b6a4957004fdcaa765b94c1a0aca74f0159fa5e18db1 + sha256sums = 039f53ede54db124ab55bf084c22359bf31e667e18e0abf660ce4b450610ae49 + sha256sums = 6d1296fa0d86b95b41017e0c424c1cffea85606edaf80ed5e1d52b1d21486e5d + sha256sums = 61d6c1ecd4516a4b836c0dea3e0f70a4703ca326ffc830e9c135f907c464cfae pkgname = fontconfig-infinality-ultimate diff --git a/0001-configure-20171017.patch b/0001-configure-20180325.patch index 0abebfe85117..7e78c8830ff1 100644 --- a/0001-configure-20171017.patch +++ b/0001-configure-20180325.patch @@ -1,6 +1,17 @@ ---- a/configure 2016-04-06 14:07:58.000000000 +0200 -+++ b/configure 2016-04-10 05:09:21.455507196 +0200 -@@ -655,6 +655,7 @@ XMLDIR +From 1127988d78956f86880f85314a3d1169378a5db8 Mon Sep 17 00:00:00 2001 +From: Solomon Choina <shlomochoina@gmail.com> +Date: Sun, 25 Mar 2018 14:05:26 -0400 +Subject: [PATCH] configure-20180325 + +--- + configure | 24 +++++++++++++++++++++++- + 1 file changed, 23 insertions(+), 1 deletion(-) + +diff --git a/configure b/configure +index f7609c9..886ce06 100755 +--- a/configure ++++ b/configure +@@ -656,6 +656,7 @@ XMLDIR CONFIGDIR BASECONFIGDIR TEMPLATEDIR @@ -8,7 +19,7 @@ FC_FONTDATE FC_CACHEDIR fc_cachedir -@@ -844,6 +845,7 @@ with_default_fonts +@@ -866,6 +867,7 @@ with_default_fonts with_add_fonts with_cache_dir with_templatedir @@ -16,7 +27,7 @@ with_baseconfigdir with_configdir with_xmldir -@@ -1530,6 +1532,10 @@ Optional Packages: +@@ -1567,6 +1569,10 @@ Optional Packages: [default=LOCALSTATEDIR/cache/fontconfig] --with-templatedir=DIR Use DIR to store the configuration template files [default=DATADIR/fontconfig/conf.avail] @@ -27,7 +38,7 @@ --with-baseconfigdir=DIR Use DIR to store the base configuration files [default=SYSCONFDIR/fonts] -@@ -15206,6 +15212,12 @@ else +@@ -17808,6 +17814,12 @@ else templatedir=yes fi @@ -40,10 +51,11 @@ # Check whether --with-baseconfigdir was given. if test "${with_baseconfigdir+set}" = set; then : -@@ -15238,6 +15250,13 @@ no|yes) +@@ -17840,6 +17852,15 @@ no|yes) *) ;; esac ++ +case "$templateinfdir" in +no|yes) + templateinfdir='${datadir}'/fontconfig/conf.avail.infinality @@ -51,10 +63,11 @@ +*) + ;; +esac ++ case "$baseconfigdir" in no|yes) baseconfigdir='${sysconfdir}'/fonts -@@ -15261,6 +15280,7 @@ no|yes) +@@ -17863,6 +17884,7 @@ no|yes) esac TEMPLATEDIR=${templatedir} @@ -62,14 +75,15 @@ BASECONFIGDIR=${baseconfigdir} CONFIGDIR=${configdir} XMLDIR=${xmldir} -@@ -16324,8 +16344,8 @@ _ACEOF +@@ -18926,7 +18948,7 @@ _ACEOF --ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-glyphname/Makefile fc-blanks/Makefile fc-case/Makefile src/Makefile conf.d/Makefile fc-cache/Makefile fc-cat/Makefile fc-list/Makefile fc-match/Makefile fc-pattern/Makefile fc-query/Makefile fc-scan/Makefile fc-validate/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc fontconfig-zip" -- -+ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-glyphname/Makefile fc-blanks/Makefile fc-case/Makefile src/Makefile conf.d/Makefile conf.d.infinality/Makefile fc-cache/Makefile fc-cat/Makefile fc-list/Makefile fc-match/Makefile fc-pattern/Makefile fc-query/Makefile fc-scan/Makefile fc-validate/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc fontconfig-zip" -+ +-ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-case/Makefile src/Makefile conf.d/Makefile fc-cache/Makefile fc-cat/Makefile fc-conflist/Makefile fc-list/Makefile fc-match/Makefile fc-pattern/Makefile fc-query/Makefile fc-scan/Makefile fc-validate/Makefile doc/Makefile doc/version.sgml its/Makefile po/Makefile.in po-conf/Makefile.in test/Makefile fontconfig.spec fontconfig.pc fontconfig-zip" ++ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-case/Makefile src/Makefile conf.d/Makefile conf.d.infinality/Makefile fc-cache/Makefile fc-cat/Makefile fc-conflist/Makefile fc-list/Makefile fc-match/Makefile fc-pattern/Makefile fc-query/Makefile fc-scan/Makefile fc-validate/Makefile doc/Makefile doc/version.sgml its/Makefile po/Makefile.in po-conf/Makefile.in test/Makefile fontconfig.spec fontconfig.pc fontconfig-zip" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure +-- +2.16.3 + diff --git a/0002-configure-20171017.ac.patch b/0002-configure-20180325.ac.patch index 91f91aa9a5e5..91f91aa9a5e5 100644 --- a/0002-configure-20171017.ac.patch +++ b/0002-configure-20180325.ac.patch diff --git a/0003-Makefile-20171017.in.patch b/0003-Makefile-20171017.in.patch deleted file mode 100644 index 9845519b9da0..000000000000 --- a/0003-Makefile-20171017.in.patch +++ /dev/null @@ -1,245 +0,0 @@ -From db6f2915ea4b759d4c7a7515b7336ab5c83b0d89 Mon Sep 17 00:00:00 2001 -From: Solomon Choina <shlomochoina@gmail.com> -Date: Tue, 17 Oct 2017 13:05:00 -0400 -Subject: [PATCH] makefile-20171017.in - ---- - Makefile.in | 1 + - conf.d/Makefile.in | 1 + - doc/Makefile.in | 1 + - fc-blanks/Makefile.in | 1 + - fc-cache/Makefile.in | 1 + - fc-case/Makefile.in | 1 + - fc-cat/Makefile.in | 1 + - fc-glyphname/Makefile.in | 1 + - fc-lang/Makefile.in | 1 + - fc-list/Makefile.in | 1 + - fc-match/Makefile.in | 1 + - fc-pattern/Makefile.in | 1 + - fc-query/Makefile.in | 1 + - fc-scan/Makefile.in | 1 + - fc-validate/Makefile.in | 1 + - fontconfig/Makefile.in | 1 + - src/Makefile.in | 1 + - test/Makefile.in | 1 + - 18 files changed, 18 insertions(+) - -diff --git a/Makefile.in b/Makefile.in -index ad85d64..7ac4ecf 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -373,6 +373,7 @@ SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ - TEMPLATEDIR = @TEMPLATEDIR@ -+TEMPLATEINFDIR = @TEMPLATEINFDIR@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ - XMLDIR = @XMLDIR@ -diff --git a/conf.d/Makefile.in b/conf.d/Makefile.in -index a75b3ec..017b626 100644 ---- a/conf.d/Makefile.in -+++ b/conf.d/Makefile.in -@@ -285,6 +285,7 @@ SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ - TEMPLATEDIR = @TEMPLATEDIR@ -+TEMPLATEINFDIR = @TEMPLATEINFDIR@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ - XMLDIR = @XMLDIR@ -diff --git a/doc/Makefile.in b/doc/Makefile.in -index f23f90d..84535c3 100644 ---- a/doc/Makefile.in -+++ b/doc/Makefile.in -@@ -530,6 +530,7 @@ SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ - TEMPLATEDIR = @TEMPLATEDIR@ -+TEMPLATEINFDIR = @TEMPLATEINFDIR@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ - XMLDIR = @XMLDIR@ -diff --git a/fc-blanks/Makefile.in b/fc-blanks/Makefile.in -index 51e1dff..26cb169 100644 ---- a/fc-blanks/Makefile.in -+++ b/fc-blanks/Makefile.in -@@ -277,6 +277,7 @@ SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ - TEMPLATEDIR = @TEMPLATEDIR@ -+TEMPLATEINFDIR = @TEMPLATEINFDIR@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ - XMLDIR = @XMLDIR@ -diff --git a/fc-cache/Makefile.in b/fc-cache/Makefile.in -index fe9d57b..e522315 100644 ---- a/fc-cache/Makefile.in -+++ b/fc-cache/Makefile.in -@@ -334,6 +334,7 @@ SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ - TEMPLATEDIR = @TEMPLATEDIR@ -+TEMPLATEINFDIR = @TEMPLATEINFDIR@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ - XMLDIR = @XMLDIR@ -diff --git a/fc-case/Makefile.in b/fc-case/Makefile.in -index 483354e..b005101 100644 ---- a/fc-case/Makefile.in -+++ b/fc-case/Makefile.in -@@ -303,6 +303,7 @@ SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ - TEMPLATEDIR = @TEMPLATEDIR@ -+TEMPLATEINFDIR = @TEMPLATEINFDIR@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ - XMLDIR = @XMLDIR@ -diff --git a/fc-cat/Makefile.in b/fc-cat/Makefile.in -index 83ab9cc..8648e6b 100644 ---- a/fc-cat/Makefile.in -+++ b/fc-cat/Makefile.in -@@ -334,6 +334,7 @@ SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ - TEMPLATEDIR = @TEMPLATEDIR@ -+TEMPLATEINFDIR = @TEMPLATEINFDIR@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ - XMLDIR = @XMLDIR@ -diff --git a/fc-glyphname/Makefile.in b/fc-glyphname/Makefile.in -index cc902c9..17eb876 100644 ---- a/fc-glyphname/Makefile.in -+++ b/fc-glyphname/Makefile.in -@@ -303,6 +303,7 @@ SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ - TEMPLATEDIR = @TEMPLATEDIR@ -+TEMPLATEINFDIR = @TEMPLATEINFDIR@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ - XMLDIR = @XMLDIR@ -diff --git a/fc-lang/Makefile.in b/fc-lang/Makefile.in -index 54a2539..149ccd6 100644 ---- a/fc-lang/Makefile.in -+++ b/fc-lang/Makefile.in -@@ -303,6 +303,7 @@ SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ - TEMPLATEDIR = @TEMPLATEDIR@ -+TEMPLATEINFDIR = @TEMPLATEINFDIR@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ - XMLDIR = @XMLDIR@ -diff --git a/fc-list/Makefile.in b/fc-list/Makefile.in -index a239616..edab1e0 100644 ---- a/fc-list/Makefile.in -+++ b/fc-list/Makefile.in -@@ -334,6 +334,7 @@ SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ - TEMPLATEDIR = @TEMPLATEDIR@ -+TEMPLATEINFDIR = @TEMPLATEINFDIR@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ - XMLDIR = @XMLDIR@ -diff --git a/fc-match/Makefile.in b/fc-match/Makefile.in -index 4b5af2c..5f5fa50 100644 ---- a/fc-match/Makefile.in -+++ b/fc-match/Makefile.in -@@ -334,6 +334,7 @@ SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ - TEMPLATEDIR = @TEMPLATEDIR@ -+TEMPLATEINFDIR = @TEMPLATEINFDIR@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ - XMLDIR = @XMLDIR@ -diff --git a/fc-pattern/Makefile.in b/fc-pattern/Makefile.in -index 54d99d3..1f13272 100644 ---- a/fc-pattern/Makefile.in -+++ b/fc-pattern/Makefile.in -@@ -334,6 +334,7 @@ SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ - TEMPLATEDIR = @TEMPLATEDIR@ -+TEMPLATEINFDIR = @TEMPLATEINFDIR@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ - XMLDIR = @XMLDIR@ -diff --git a/fc-query/Makefile.in b/fc-query/Makefile.in -index 2e8d3d2..362ee25 100644 ---- a/fc-query/Makefile.in -+++ b/fc-query/Makefile.in -@@ -336,6 +336,7 @@ SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ - TEMPLATEDIR = @TEMPLATEDIR@ -+TEMPLATEINFDIR = @TEMPLATEINFDIR@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ - XMLDIR = @XMLDIR@ -diff --git a/fc-scan/Makefile.in b/fc-scan/Makefile.in -index 17af97f..6ebbd95 100644 ---- a/fc-scan/Makefile.in -+++ b/fc-scan/Makefile.in -@@ -334,6 +334,7 @@ SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ - TEMPLATEDIR = @TEMPLATEDIR@ -+TEMPLATEINFDIR = @TEMPLATEINFDIR@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ - XMLDIR = @XMLDIR@ -diff --git a/fc-validate/Makefile.in b/fc-validate/Makefile.in -index 0a7e19a..98f09e0 100644 ---- a/fc-validate/Makefile.in -+++ b/fc-validate/Makefile.in -@@ -336,6 +336,7 @@ SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ - TEMPLATEDIR = @TEMPLATEDIR@ -+TEMPLATEINFDIR = @TEMPLATEINFDIR@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ - XMLDIR = @XMLDIR@ -diff --git a/fontconfig/Makefile.in b/fontconfig/Makefile.in -index 29ce210..9e3c7e6 100644 ---- a/fontconfig/Makefile.in -+++ b/fontconfig/Makefile.in -@@ -281,6 +281,7 @@ SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ - TEMPLATEDIR = @TEMPLATEDIR@ -+TEMPLATEINFDIR = @TEMPLATEINFDIR@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ - XMLDIR = @XMLDIR@ -diff --git a/src/Makefile.in b/src/Makefile.in -index b500a70..0e5ca95 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -349,6 +349,7 @@ SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ - TEMPLATEDIR = @TEMPLATEDIR@ -+TEMPLATEINFDIR = @TEMPLATEINFDIR@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ - XMLDIR = @XMLDIR@ -diff --git a/test/Makefile.in b/test/Makefile.in -index 6be47e9..2cb45e1 100644 ---- a/test/Makefile.in -+++ b/test/Makefile.in -@@ -513,6 +513,7 @@ SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ - TEMPLATEDIR = @TEMPLATEDIR@ -+TEMPLATEINFDIR = @TEMPLATEINFDIR@ - VERSION = @VERSION@ - WARN_CFLAGS = @WARN_CFLAGS@ - XMLDIR = @XMLDIR@ --- -2.14.2 - diff --git a/0003-Makefile-20180325.in.patch b/0003-Makefile-20180325.in.patch new file mode 100644 index 000000000000..7a8e181ccfda --- /dev/null +++ b/0003-Makefile-20180325.in.patch @@ -0,0 +1,247 @@ +From 6db25311e1a1d817ee1a1115d23847329348b23c Mon Sep 17 00:00:00 2001 +From: Solomon Choina <shlomochoina@gmail.com> +Date: Sun, 25 Mar 2018 14:42:19 -0400 +Subject: [PATCH] Makefile-20180325.in + +---:w + Makefile.in | 1 + + conf.d/Makefile.in | 1 + + doc/Makefile.in | 1 + + fc-cache/Makefile.in | 1 + + fc-case/Makefile.in | 1 + + fc-cat/Makefile.in | 1 + + fc-conflist/Makefile.in | 1 + + fc-lang/Makefile.in | 1 + + fc-list/Makefile.in | 1 + + fc-match/Makefile.in | 1 + + fc-pattern/Makefile.in | 1 + + fc-query/Makefile.in | 1 + + fc-scan/Makefile.in | 1 + + fc-validate/Makefile.in | 1 + + fontconfig/Makefile.in | 1 + + its/Makefile.in | 1 + + src/Makefile.in | 1 + + test/Makefile.in | 1 + + 19 files changed, 107 insertions(+) + create mode 100644 0001-configure-20180325.patch + + +diff --git a/Makefile.in b/Makefile.in +index 30734df..7476ab5 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -389,6 +389,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/conf.d/Makefile.in b/conf.d/Makefile.in +index b984aac..2c33f6f 100644 +--- a/conf.d/Makefile.in ++++ b/conf.d/Makefile.in +@@ -301,6 +301,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/doc/Makefile.in b/doc/Makefile.in +index 9e03624..e9d3332 100644 +--- a/doc/Makefile.in ++++ b/doc/Makefile.in +@@ -546,6 +546,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-cache/Makefile.in b/fc-cache/Makefile.in +index d291623..0d1c033 100644 +--- a/fc-cache/Makefile.in ++++ b/fc-cache/Makefile.in +@@ -350,6 +350,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-case/Makefile.in b/fc-case/Makefile.in +index d342751..6f01df0 100644 +--- a/fc-case/Makefile.in ++++ b/fc-case/Makefile.in +@@ -319,6 +319,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-cat/Makefile.in b/fc-cat/Makefile.in +index 07e35c5..080d152 100644 +--- a/fc-cat/Makefile.in ++++ b/fc-cat/Makefile.in +@@ -350,6 +350,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-conflist/Makefile.in b/fc-conflist/Makefile.in +index 4db0122..82067a1 100644 +--- a/fc-conflist/Makefile.in ++++ b/fc-conflist/Makefile.in +@@ -352,6 +352,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-lang/Makefile.in b/fc-lang/Makefile.in +index 45fb91e..c34d3e6 100644 +--- a/fc-lang/Makefile.in ++++ b/fc-lang/Makefile.in +@@ -319,6 +319,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-list/Makefile.in b/fc-list/Makefile.in +index 5e048f9..5d0145f 100644 +--- a/fc-list/Makefile.in ++++ b/fc-list/Makefile.in +@@ -350,6 +350,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-match/Makefile.in b/fc-match/Makefile.in +index fff0c0b..67032d9 100644 +--- a/fc-match/Makefile.in ++++ b/fc-match/Makefile.in +@@ -350,6 +350,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-pattern/Makefile.in b/fc-pattern/Makefile.in +index 31c7ece..0bad3b7 100644 +--- a/fc-pattern/Makefile.in ++++ b/fc-pattern/Makefile.in +@@ -350,6 +350,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-query/Makefile.in b/fc-query/Makefile.in +index 5fefdc4..86140d4 100644 +--- a/fc-query/Makefile.in ++++ b/fc-query/Makefile.in +@@ -350,6 +350,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-scan/Makefile.in b/fc-scan/Makefile.in +index f5169a3..770fe9a 100644 +--- a/fc-scan/Makefile.in ++++ b/fc-scan/Makefile.in +@@ -350,6 +350,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fc-validate/Makefile.in b/fc-validate/Makefile.in +index 32e29f0..aecd457 100644 +--- a/fc-validate/Makefile.in ++++ b/fc-validate/Makefile.in +@@ -352,6 +352,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/fontconfig/Makefile.in b/fontconfig/Makefile.in +index c36c8bf..11a4bde 100644 +--- a/fontconfig/Makefile.in ++++ b/fontconfig/Makefile.in +@@ -297,6 +297,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/its/Makefile.in b/its/Makefile.in +index 4bc26b1..4b0597b 100644 +--- a/its/Makefile.in ++++ b/its/Makefile.in +@@ -278,6 +278,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/src/Makefile.in b/src/Makefile.in +index 9996941..9646b89 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -366,6 +366,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +diff --git a/test/Makefile.in b/test/Makefile.in +index c389d31..8494d13 100644 +--- a/test/Makefile.in ++++ b/test/Makefile.in +@@ -523,6 +523,7 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TEMPLATEDIR = @TEMPLATEDIR@ ++TEMPLATEINFDIR = @TEMPLATEINFDIR@ + USE_NLS = @USE_NLS@ + UUID_CFLAGS = @UUID_CFLAGS@ + UUID_LIBS = @UUID_LIBS@ +-- +2.16.3 + diff --git a/0004-Makefile-20171017.conf.d.patch b/0004-Makefile-20180325.conf.d.patch index b4e88794ffaa..892d2fc5fe89 100644 --- a/0004-Makefile-20171017.conf.d.patch +++ b/0004-Makefile-20180325.conf.d.patch @@ -1,23 +1,24 @@ -From 8021f934890cb3c9c3f6dd626c73f8f33f010586 Mon Sep 17 00:00:00 2001 +From f7e2933b792c7f7d55fac0c99a4426437f07854f Mon Sep 17 00:00:00 2001 From: Solomon Choina <shlomochoina@gmail.com> -Date: Tue, 17 Oct 2017 13:25:52 -0400 -Subject: [PATCH] Makefile-20171017.conf.d +Date: Sun, 25 Mar 2018 16:26:59 -0400 +Subject: [PATCH] Makefile-20180325.conf.d --- - conf.d/Makefile.am | 42 +----------------------------------------- - conf.d/Makefile.in | 30 +++--------------------------- - 2 files changed, 4 insertions(+), 68 deletions(-) + conf.d/Makefile.am | 42 ++---------------------------------------- + conf.d/Makefile.in | 28 +++------------------------- + 2 files changed, 5 insertions(+), 65 deletions(-) diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am -index ff03fb2..d37ecb9 100644 +index ff03fb2..a892b04 100644 --- a/conf.d/Makefile.am +++ b/conf.d/Makefile.am -@@ -21,29 +21,9 @@ +@@ -21,28 +21,10 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -BUILT_SOURCES = README -DOC_SOURCES = README.in ++ DOC_FILES = $(DOC_SOURCES:.in=) -CONF_LINKS = \ @@ -38,12 +39,11 @@ index ff03fb2..d37ecb9 100644 - 69-unifont.conf \ - 80-delicious.conf \ - 90-synthetic.conf -- -+CONF_LINKS = ++CONF_LINKS = + EXTRA_DIST = $(template_DATA) $(DOC_SOURCES) CLEANFILES = $(DOC_FILES) - -@@ -87,24 +67,4 @@ template_DATA = \ +@@ -87,24 +69,4 @@ template_DATA = \ 80-delicious.conf \ 90-synthetic.conf @@ -69,10 +69,10 @@ index ff03fb2..d37ecb9 100644 - -include $(top_srcdir)/git.mk diff --git a/conf.d/Makefile.in b/conf.d/Makefile.in -index 017b626..aee1797 100644 +index 2c33f6f..7f6ddeb 100644 --- a/conf.d/Makefile.in +++ b/conf.d/Makefile.in -@@ -175,7 +175,7 @@ am__uninstall_files_from_dir = { \ +@@ -180,7 +180,7 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } @@ -81,7 +81,7 @@ index 017b626..aee1797 100644 DATA = $(config_DATA) $(template_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in README -@@ -349,28 +349,8 @@ target_alias = @target_alias@ +@@ -367,27 +367,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -106,12 +106,11 @@ index 017b626..aee1797 100644 - 69-unifont.conf \ - 80-delicious.conf \ - 90-synthetic.conf -- +CONF_LINKS = + EXTRA_DIST = $(template_DATA) $(DOC_SOURCES) CLEANFILES = $(DOC_FILES) - configdir = $(CONFIGDIR) -@@ -535,7 +515,7 @@ check: $(BUILT_SOURCES) +@@ -553,7 +534,7 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(DATA) installdirs: @@ -120,11 +119,10 @@ index 017b626..aee1797 100644 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) -@@ -657,10 +637,6 @@ uninstall-am: uninstall-configDATA uninstall-local \ - +@@ -676,9 +657,6 @@ uninstall-am: uninstall-configDATA uninstall-local \ .PRECIOUS: Makefile -- + -README: $(srcdir)/README.in - sed "s|\@TEMPLATEDIR\@|$(templatedir)|" $< > $@ - @@ -132,5 +130,5 @@ index 017b626..aee1797 100644 mkdir -p $(DESTDIR)$(configdir) @(echo cd $(DESTDIR)$(configdir); \ -- -2.14.2 +2.16.3 diff --git a/0005-Makefile-20171017.am.in.patch b/0005-Makefile-20171017.am.in.patch deleted file mode 100644 index 2cf675a5ab12..000000000000 --- a/0005-Makefile-20171017.am.in.patch +++ /dev/null @@ -1,48 +0,0 @@ -From b8863b45a5c9fd43666ec05b5a2499f99f769161 Mon Sep 17 00:00:00 2001 -From: Solomon Choina <shlomochoina@gmail.com> -Date: Tue, 17 Oct 2017 13:51:43 -0400 -Subject: [PATCH] Makefile-20171017.am.in - ---- - Makefile.am | 2 +- - Makefile.in | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 2b4a5b8..411eb03 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -23,7 +23,7 @@ - - SUBDIRS=fontconfig fc-blanks fc-case fc-lang fc-glyphname src \ - fc-cache fc-cat fc-list fc-match fc-pattern fc-query fc-scan \ -- fc-validate conf.d test -+ fc-validate conf.d conf.d.infinality test - if ENABLE_DOCS - SUBDIRS += doc - endif -diff --git a/Makefile.in b/Makefile.in -index 7ac4ecf..1ca269b 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -220,7 +220,7 @@ CTAGS = ctags - CSCOPE = cscope - DIST_SUBDIRS = fontconfig fc-blanks fc-case fc-lang fc-glyphname src \ - fc-cache fc-cat fc-list fc-match fc-pattern fc-query fc-scan \ -- fc-validate conf.d test doc -+ fc-validate conf.d conf.d.infinality test doc - am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/fontconfig-zip.in $(srcdir)/fontconfig.pc.in \ - $(srcdir)/fontconfig.spec.in AUTHORS COPYING ChangeLog INSTALL \ -@@ -439,7 +439,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - SUBDIRS = fontconfig fc-blanks fc-case fc-lang fc-glyphname src \ - fc-cache fc-cat fc-list fc-match fc-pattern fc-query fc-scan \ -- fc-validate conf.d test $(am__append_1) -+ fc-validate conf.d conf.d.infinality test $(am__append_1) - ACLOCAL_AMFLAGS = -I m4 - EXTRA_DIST = fontconfig.pc.in fonts.conf.in fonts.dtd \ - fontconfig.spec.in fontconfig.spec fontconfig-zip.in \ --- -2.14.2 - diff --git a/0005-Makefile-20180325.am.in.patch b/0005-Makefile-20180325.am.in.patch new file mode 100644 index 000000000000..e2a3b00056a9 --- /dev/null +++ b/0005-Makefile-20180325.am.in.patch @@ -0,0 +1,49 @@ +From 742bdc47854f8104a712136fdcce1c92ec1b6a79 Mon Sep 17 00:00:00 2001 +From: Solomon Choina <shlomochoina@gmail.com> +Date: Sun, 25 Mar 2018 16:33:46 -0400 +Subject: [PATCH] Makefile-20180325.am.in + +--- + + Makefile.am | 2 +- + Makefile.in | 4 +- + 3 files changed, 137 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index cc3024e..ba45eed 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -24,7 +24,7 @@ + SUBDIRS=fontconfig fc-case fc-lang src \ + fc-cache fc-cat fc-conflist fc-list fc-match \ + fc-pattern fc-query fc-scan fc-validate conf.d \ +- its po po-conf test ++ conf.d.infinality its po po-conf test + if ENABLE_DOCS + SUBDIRS += doc + endif +diff --git a/Makefile.in b/Makefile.in +index 7476ab5..976cb97 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -225,7 +225,7 @@ CTAGS = ctags + CSCOPE = cscope + DIST_SUBDIRS = fontconfig fc-case fc-lang src fc-cache fc-cat \ + fc-conflist fc-list fc-match fc-pattern fc-query fc-scan \ +- fc-validate conf.d its po po-conf test doc ++ fc-validate conf.d conf.d.infinality its po po-conf test doc + am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/fontconfig-zip.in $(srcdir)/fontconfig.pc.in \ + $(srcdir)/fontconfig.spec.in ABOUT-NLS AUTHORS COPYING \ +@@ -457,7 +457,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + SUBDIRS = fontconfig fc-case fc-lang src fc-cache fc-cat fc-conflist \ + fc-list fc-match fc-pattern fc-query fc-scan fc-validate \ +- conf.d its po po-conf test $(am__append_1) ++ conf.d conf.d.infinality its po po-conf test $(am__append_1) + ACLOCAL_AMFLAGS = -I m4 + EXTRA_DIST = config.rpath fontconfig.pc.in fonts.conf.in fonts.dtd \ + fontconfig.spec.in fontconfig.spec fontconfig-zip.in \ +-- +2.16.3 + @@ -4,16 +4,16 @@ pkgname=fontconfig-infinality-ultimate _basename=fontconfig pkgdesc="A library for configuring and customizing font access, optimized for freetype2-infinality-ultimate." -date=20171017 +date=20180325 url='http://www.fontconfig.org/release/' license=('custom' 'MIT') -pkgver=2.12.6+5+g665584a +pkgver=2.13.0 pkgrel=1 _commit=665584a19b0ec227c93643ffb0540d11ac8ecf7f arch=('i686' 'x86_64') groups=('infinality-bundle') -depends=('expat' 'freetype2-infinality-ultimate') -makedepends=('gperf' 'python-lxml') +depends=('expat' 'freetype2') +makedepends=('gperf' 'python-lxml' 'python-six') options=('libtool') provides=('fontconfig=$pkgver' 'fontconfig-infinality' 'fontconfig-infinality-ultimate') conflicts=('fontconfig' 'fontconfig-infinality' 'fontconfig-infinality-git' 'fontconfig-infinality-ultimate-git') @@ -28,7 +28,7 @@ backup=('etc/fonts/fonts.conf' 'etc/fonts/conf.avail.infinality/38-repl-webfonts-custom.conf' 'etc/fonts/conf.avail.infinality/97-selective-rendering-custom.conf') install=fontconfig-ultimate.install -source=("git+https://anongit.freedesktop.org/git/fontconfig#commit=${_commit}" +source=("git+https://anongit.freedesktop.org/git/fontconfig#tag=${pkgver}" https://raw.githubusercontent.com/archfan/infinality_bundle/820e74be8345a0da2cdcff0a05bf5fa10fd85740/02_fontconfig-iu/fontconfig-ultimate-git.tar.bz2 fc-cache-ib.hook 0001-configure-${date}.patch @@ -41,18 +41,14 @@ source=("git+https://anongit.freedesktop.org/git/fontconfig#commit=${_commit}" # a nice page to test font matching: # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html -pkgver() { - cd ${_basename} - git describe --tags | sed 's/-/+/g' - -} prepare() { patches=(0001-configure-${date}.patch 0002-configure-${date}.ac.patch 0003-Makefile-${date}.in.patch 0004-Makefile-${date}.conf.d.patch - 0005-Makefile-${date}.am.in.patch) + 0005-Makefile-${date}.am.in.patch + ) # copy fontconfig-ib patches & stuff cd "${_basename}-ultimate-git" @@ -121,8 +117,8 @@ package() { sha256sums=('SKIP' 'b4977cfb0dc64167be3b58ae63022ffb2648e08519b0c061ee2ca43620d8b980' '026971a9fac1ee4fb0ef74d5833ce5e12b4645de8ebdf1cadb3cb943cf46abd3' - '7cb8401c2acbc4ac7a9e4a948a4b04d3b5446cb1153fab351c8d92d1306719ac' + '7a0597c3a926176b5c844aa15f3fc98007398eb24db336b059c30f1cec8510cf' 'ba8815b38d5d6e307d2107966c8b2ce0d2d48212ab99b55a56c6d66621b705ce' - '253392c84479aa2b539a0cac4311a28a30663fd806bfe40bd9e8284a9e194431' - '8ee8dd7ee5b85ab410dc59127db8fc09ba2a1070949fa2e03b9ddeb43c8466a8' - '82dfce9f9e3c340ff075b6a4957004fdcaa765b94c1a0aca74f0159fa5e18db1') + '039f53ede54db124ab55bf084c22359bf31e667e18e0abf660ce4b450610ae49' + '6d1296fa0d86b95b41017e0c424c1cffea85606edaf80ed5e1d52b1d21486e5d' + '61d6c1ecd4516a4b836c0dea3e0f70a4703ca326ffc830e9c135f907c464cfae') |