aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Postnikov <apostnikov@gmail.com>2021-10-14 06:36:01 +0300
committerAndy Postnikov <apostnikov@gmail.com>2021-10-14 06:36:01 +0300
commit7d6eceff9792c1f5fc32ba41a3d239dff97de3e9 (patch)
tree9d3f97e68aad28cca9f7c5dd669acade3153e70f
parent1481be74c67f815d33dd033b5a7ab1db9ae213e8 (diff)
downloadaports-7d6eceff9792c1f5fc32ba41a3d239dff97de3e9.tar.gz
aports-7d6eceff9792c1f5fc32ba41a3d239dff97de3e9.tar.bz2
aports-7d6eceff9792c1f5fc32ba41a3d239dff97de3e9.tar.xz
testing/libvmime: add patch for icu 69.1
Ref https://github.com/kisli/vmime/pull/249
-rw-r--r--testing/libvmime/APKBUILD5
-rw-r--r--testing/libvmime/fix-icu-69-1.patch38
2 files changed, 42 insertions, 1 deletions
diff --git a/testing/libvmime/APKBUILD b/testing/libvmime/APKBUILD
index 6ee510edeb..86967661c6 100644
--- a/testing/libvmime/APKBUILD
+++ b/testing/libvmime/APKBUILD
@@ -10,7 +10,9 @@ license="GPL-3.0-only"
makedepends="libgsasl-dev openssl-dev cmake gtk+3.0-dev doxygen
cppunit-dev graphviz !gnutls-dev"
subpackages="$pkgname-dbg $pkgname-dev"
-source="libvmime-$pkgver.tar.gz::https://github.com/Kopano-dev/vmime/archive/v$pkgver.tar.gz"
+source="libvmime-$pkgver.tar.gz::https://github.com/Kopano-dev/vmime/archive/v$pkgver.tar.gz
+ fix-icu-69-1.patch
+ "
builddir="$srcdir/vmime-$pkgver"
@@ -36,4 +38,5 @@ package() {
sha512sums="
90ebce51151944fe9cf09a8385b4ffe4db199c87e79579f66d70221f45a4bf4b048f3115077cff83536119af40ebe89eddacc301b54b7fb017438f44bd0f273c libvmime-0.9.2k4.tar.gz
+65c0c1ec56a9a56167bb8b18e01feee4ea65fa958f5e2f233aa13d0472a803574d8b2751b2e6011edcd1db119f91c66e2401fd4916eecbb3af04dc2e527c125c fix-icu-69-1.patch
"
diff --git a/testing/libvmime/fix-icu-69-1.patch b/testing/libvmime/fix-icu-69-1.patch
new file mode 100644
index 0000000000..4b362e1c83
--- /dev/null
+++ b/testing/libvmime/fix-icu-69-1.patch
@@ -0,0 +1,38 @@
+--- a/src/vmime/charsetConverter_icu.cpp
++++ b/src/vmime/charsetConverter_icu.cpp
+@@ -413,7 +413,7 @@
+
+ ucnv_toUnicode(
+ m_from, &uniTarget, uniTargetLimit,
+- &uniSource, uniSourceLimit, NULL, /* flush */ FALSE, &toErr
++ &uniSource, uniSourceLimit, NULL, /* flush */ UBool(0), &toErr
+ );
+
+ if (U_FAILURE(toErr) && toErr != U_BUFFER_OVERFLOW_ERROR) {
+@@ -453,7 +453,7 @@
+
+ ucnv_fromUnicode(
+ m_to, &cpTarget, cpTargetLimit,
+- &cpSource, cpSourceLimit, NULL, /* flush */ FALSE, &fromErr
++ &cpSource, cpSourceLimit, NULL, /* flush */ UBool(0), &fromErr
+ );
+
+ if (fromErr != U_BUFFER_OVERFLOW_ERROR && U_FAILURE(fromErr)) {
+@@ -509,7 +509,7 @@
+
+ ucnv_toUnicode(
+ m_from, &uniTarget, uniTargetLimit,
+- &uniSource, uniSourceLimit, NULL, /* flush */ TRUE, &toErr
++ &uniSource, uniSourceLimit, NULL, /* flush */ UBool(1), &toErr
+ );
+
+ if (U_FAILURE(toErr) && toErr != U_BUFFER_OVERFLOW_ERROR) {
+@@ -540,7 +540,7 @@
+
+ ucnv_fromUnicode(
+ m_to, &cpTarget, cpTargetLimit,
+- &cpSource, cpSourceLimit, NULL, /* flush */ TRUE, &fromErr
++ &cpSource, cpSourceLimit, NULL, /* flush */ UBool(1), &fromErr
+ );
+
+ if (fromErr != U_BUFFER_OVERFLOW_ERROR && U_FAILURE(fromErr)) {