From 695137c050f001924abfc9e3081878744dffcb0a Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Fri, 14 Jul 2023 21:58:33 +0300 Subject: [PATCH] upg icu libnghttp2 --- icu/ICU-22132.patch | 25 +++++++++++++++++++++++++ icu/PKGBUILD | 23 +++++++++++++---------- icu/PKGBUILD-arch | 13 ++++++++++--- icu/deps | 1 + libnghttp2/PKGBUILD | 7 +++---- libnghttp2/PKGBUILD-arch | 4 ++-- 6 files changed, 54 insertions(+), 19 deletions(-) create mode 100644 icu/ICU-22132.patch diff --git a/icu/ICU-22132.patch b/icu/ICU-22132.patch new file mode 100644 index 0000000..3b93c92 --- /dev/null +++ b/icu/ICU-22132.patch @@ -0,0 +1,25 @@ +diff -u a/i18n/vtzone.cpp a/i18n/vtzone.cpp +--- a/i18n/vtzone.cpp 2023-07-14 09:05:38.000000000 +0100 ++++ b/i18n/vtzone.cpp 2023-07-14 09:05:38.000000000 +0100 +@@ -1735,14 +1735,14 @@ + } + } + } else { +- UnicodeString icutzprop; +- UVector customProps(nullptr, uhash_compareUnicodeString, status); ++ UVector customProps(uprv_deleteUObject, uhash_compareUnicodeString, status); + if (olsonzid.length() > 0 && icutzver.length() > 0) { +- icutzprop.append(olsonzid); +- icutzprop.append(u'['); +- icutzprop.append(icutzver); +- icutzprop.append(u']'); +- customProps.addElement(&icutzprop, status); ++ LocalPointer icutzprop(new UnicodeString(ICU_TZINFO_PROP), status); ++ icutzprop->append(olsonzid); ++ icutzprop->append(u'['); ++ icutzprop->append(icutzver); ++ icutzprop->append(u']'); ++ customProps.adoptElement(icutzprop.orphan(), status); + } + writeZone(writer, *tz, &customProps, status); + } \ No newline at end of file diff --git a/icu/PKGBUILD b/icu/PKGBUILD index a858917..2e3d85d 100644 --- a/icu/PKGBUILD +++ b/icu/PKGBUILD @@ -10,7 +10,7 @@ pkgname=icu pkgver=73.2 -pkgrel=01 +pkgrel=02 pkgdesc="International Components for Unicode library" groups=( jobbot ) url="https://icu.unicode.org" @@ -19,13 +19,13 @@ makedepends=('python') provides=(libicu{data,i18n,io,test,tu,uc}.so) # options=('debug') ### uncomment this for debug pkg source=(https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/${pkgname}4c-${pkgver//./_}-src.tgz{,.asc} - https://github.com/unicode-org/icu/releases/download/release-73-2/SHASUM512.txt) + https://github.com/unicode-org/icu/releases/download/release-73-2/SHASUM512.txt + ICU-22132.patch) -#prepare() { -# cd icu/source -# # https://unicode-org.atlassian.net/browse/ICU-22356 -# patch -Np3 -i ../../ICU-22356.patch -#} +prepare() { + cd icu/source + patch -Np1 < "../../ICU-22132.patch" +} build() { cd icu/source @@ -65,13 +65,16 @@ validpgpkeys=('3DA35301A7C330257B8755754058F67406EAA6AB') # Craig Cornelius " #validpgpkeys+=('9731166CD8E23A83BEE7C6D3ACA5DBE1FD8FABF1') # "Steven R. Loomis (ICU Project) " #validpgpkeys+=('FFA9129A180D765B7A5BEA1C9B432B27D1BA20D7') # "Fredrik Roubert " @@ -23,6 +25,11 @@ sha512sums=('76dd782db6205833f289d7eb68b60860dddfa3f614f0ba03fe7ec13117077f82109 #validpgpkeys=('0E51E7F06EF719FBD072782A5F56E5AFA63CCD33') #"Craig Cornelius (For use with ICU releases) " validpgpkeys=('3DA35301A7C330257B8755754058F67406EAA6AB') # Craig Cornelius +prepare() { + cd icu/source + patch -Np1 < "../../ICU-22132.patch" +} + build() { cd icu/source ./configure --prefix=/usr \ diff --git a/icu/deps b/icu/deps index ec0dfda..9a63c6b 100644 --- a/icu/deps +++ b/icu/deps @@ -1,3 +1,4 @@ python + diff --git a/libnghttp2/PKGBUILD b/libnghttp2/PKGBUILD index 2db0ac7..6647ca4 100644 --- a/libnghttp2/PKGBUILD +++ b/libnghttp2/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=libnghttp2 -pkgver=1.55.0 +pkgver=1.55.1 pkgrel=01 pkgdesc='Framing layer of HTTP/2 is implemented as a reusable C library' url='https://nghttp2.org/' @@ -14,7 +14,7 @@ depends=(glibc) makedepends=('automake' 'autoconf' 'git') conflicts=('nghttp2<1.20.0-2') #source=(https://github.com/nghttp2/nghttp2/releases/download/v$pkgver/nghttp2-$pkgver.tar.xz) -_tag='5d6207e43bfd34411164dac166e09b0bf5f02574' # git rev-parse v${pkgver} +_tag='85304007a6802bbb4067a1fc27e7325a4c82f06b' # git rev-parse v${pkgver} source=("git+https://github.com/nghttp2/nghttp2.git#tag=${_tag}?signed") prepare() { @@ -58,5 +58,4 @@ validpgpkeys=('F4F3B91474D1EB29889BD0EF7E8403D5D673C366') # Tatsuhiro Tsujikawa sha256sums=(SKIP) -## 79d6e8b63c8c0ba2ee7815a3505dad82a505953dab1407bc26900be32239c699 libnghttp2-1.55.0-01-x86_64.pkg.tar.lz - +## 2f60b785511ba17acbe2222a78fb97825cdc1c0d57510d704afc9b260f22771d libnghttp2-1.55.1-01-x86_64.pkg.tar.lz diff --git a/libnghttp2/PKGBUILD-arch b/libnghttp2/PKGBUILD-arch index aaca9e8..8f39b8c 100644 --- a/libnghttp2/PKGBUILD-arch +++ b/libnghttp2/PKGBUILD-arch @@ -2,8 +2,8 @@ # Contributor: Zhuoyun Wei pkgname=libnghttp2 -_tag='5d6207e43bfd34411164dac166e09b0bf5f02574' # git rev-parse v${pkgver} -pkgver=1.55.0 +_tag='85304007a6802bbb4067a1fc27e7325a4c82f06b' # git rev-parse v${pkgver} +pkgver=1.55.1 pkgrel=1 pkgdesc='Framing layer of HTTP/2 is implemented as a reusable C library' arch=('x86_64')