upg icu libnghttp2
This commit is contained in:
parent
8a05a892b7
commit
695137c050
6 changed files with 54 additions and 19 deletions
25
icu/ICU-22132.patch
Normal file
25
icu/ICU-22132.patch
Normal file
|
|
@ -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<UnicodeString> 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);
|
||||
}
|
||||
23
icu/PKGBUILD
23
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 <cco
|
|||
|
||||
sha512sums=('76dd782db6205833f289d7eb68b60860dddfa3f614f0ba03fe7ec13117077f82109f0dc1becabcdf4c8a9c628b94478ab0a46134bdb06f4302be55f74027ce62'
|
||||
'SKIP'
|
||||
SKIP)
|
||||
SKIP
|
||||
'1178062ccfcf7ecc698c64132b3612e73f9c4b0bbfaa668ae2039f3eb4cb2722d0b08a9f45b057da10def7a308d5c8d14c0c644892e7f11092c9cc488c850ab7')
|
||||
|
||||
## https://github.com/unicode-org/icu/releases/download/release-73-2/SHASUM512.txt
|
||||
## 76dd782db6205833f289d7eb68b60860dddfa3f614f0ba03fe7ec13117077f82109f0dc1becabcdf4c8a9c628b94478ab0a46134bdb06f4302be55f74027ce62 icu4c-73_2-src.tgz
|
||||
|
||||
sha256sums=(818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1 # icu4c-73_2-src.tgz
|
||||
ee0759320a3093fb3bd55345bfc38acc1b660414b9dde0ce36779616eda76ca7 # icu4c-73_2-src.tgz.asc
|
||||
645fb72d95d845bf994724ea7d9c51a9109c0d65abd514e77ec444bc25b22ce2) # SHASUM512.txt
|
||||
645fb72d95d845bf994724ea7d9c51a9109c0d65abd514e77ec444bc25b22ce2 # SHASUM512.txt
|
||||
f534b472dd7a6961591466eef542e2c3ad698d3008c9b6af813c66cbc0b4dd8e) # ICU-22132.patch
|
||||
|
||||
## c29a836adf51164541c7d15b23e3d0b2adaa987d9958f4f967fa567fd93b16d4 icu-73.2-02-x86_64.pkg.tar.lz
|
||||
|
||||
## d44ea5460e66d83d649329afcabadbff22c182b1fb67b92d5619b31d4e6b210f icu-73.2-01-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
pkgname=icu
|
||||
pkgver=73.2
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="International Components for Unicode library"
|
||||
arch=(x86_64)
|
||||
url="https://icu.unicode.org"
|
||||
|
|
@ -11,10 +11,12 @@ license=('custom:icu')
|
|||
depends=('gcc-libs' 'glibc' 'sh')
|
||||
makedepends=('python')
|
||||
provides=(libicu{data,i18n,io,test,tu,uc}.so)
|
||||
source=(https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/${pkgname}4c-${pkgver//./_}-src.tgz{,.asc})
|
||||
source=(https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/${pkgname}4c-${pkgver//./_}-src.tgz{,.asc}
|
||||
ICU-22132.patch)
|
||||
# https://github.com/unicode-org/icu/releases/download/release-73-2/SHASUM512.txt
|
||||
sha512sums=('76dd782db6205833f289d7eb68b60860dddfa3f614f0ba03fe7ec13117077f82109f0dc1becabcdf4c8a9c628b94478ab0a46134bdb06f4302be55f74027ce62'
|
||||
'SKIP')
|
||||
'SKIP'
|
||||
'1178062ccfcf7ecc698c64132b3612e73f9c4b0bbfaa668ae2039f3eb4cb2722d0b08a9f45b057da10def7a308d5c8d14c0c644892e7f11092c9cc488c850ab7')
|
||||
#validpgpkeys=('BA90283A60D67BA0DD910A893932080F4FB419E3') # "Steven R. Loomis (filfla-signing) <srloomis@us.ibm.com>"
|
||||
#validpgpkeys+=('9731166CD8E23A83BEE7C6D3ACA5DBE1FD8FABF1') # "Steven R. Loomis (ICU Project) <srl@icu-project.org>"
|
||||
#validpgpkeys+=('FFA9129A180D765B7A5BEA1C9B432B27D1BA20D7') # "Fredrik Roubert <fredrik@roubert.name>"
|
||||
|
|
@ -23,6 +25,11 @@ sha512sums=('76dd782db6205833f289d7eb68b60860dddfa3f614f0ba03fe7ec13117077f82109
|
|||
#validpgpkeys=('0E51E7F06EF719FBD072782A5F56E5AFA63CCD33') #"Craig Cornelius (For use with ICU releases) <ccornelius@google.com>"
|
||||
validpgpkeys=('3DA35301A7C330257B8755754058F67406EAA6AB') # Craig Cornelius <ccornelius@google.com>
|
||||
|
||||
prepare() {
|
||||
cd icu/source
|
||||
patch -Np1 < "../../ICU-22132.patch"
|
||||
}
|
||||
|
||||
build() {
|
||||
cd icu/source
|
||||
./configure --prefix=/usr \
|
||||
|
|
|
|||
1
icu/deps
1
icu/deps
|
|
@ -1,3 +1,4 @@
|
|||
python
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
# Contributor: Zhuoyun Wei <wzyboy@wzyboy.org>
|
||||
|
||||
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')
|
||||
|
|
|
|||
Loading…
Reference in a new issue