summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-10-30 17:36:23 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2020-10-31 10:20:32 +0100
commit66ffd5f887e627b27dad0536861f9229c74aef37 (patch)
tree2be370aeb7cfaa3605bf3205793a19b642f17ff9
parentdev-libs/libical: Fix build with ICU-68 (diff)
downloadgentoo-66ffd5f887e627b27dad0536861f9229c74aef37.tar.gz
gentoo-66ffd5f887e627b27dad0536861f9229c74aef37.tar.bz2
gentoo-66ffd5f887e627b27dad0536861f9229c74aef37.zip
media-libs/libcdr: Fix build with ICU-68
Thanks-to: Lars Wendler <polynomial-c@gentoo.org> Closes: https://bugs.gentoo.org/751934 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch27
-rw-r--r--media-libs/libcdr/libcdr-0.1.6.ebuild2
2 files changed, 29 insertions, 0 deletions
diff --git a/media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch b/media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch
new file mode 100644
index 000000000000..b8e7ba919a96
--- /dev/null
+++ b/media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch
@@ -0,0 +1,27 @@
+From 0dc41f8f6bd099813acb3972f75e4bbb2a5cdb2d Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 30 Oct 2020 14:28:08 +0100
+Subject: [PATCH] Fix build with icu-68.1
+
+icu-68.1 removed public macro definitions for TRUE and FALSE
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/lib/libcdr_utils.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/libcdr_utils.cpp b/src/lib/libcdr_utils.cpp
+index 09ab42e..250f0a0 100644
+--- a/src/lib/libcdr_utils.cpp
++++ b/src/lib/libcdr_utils.cpp
+@@ -108,7 +108,7 @@ static unsigned short getEncoding(const unsigned char *buffer, unsigned bufferLe
+ csd = ucsdet_open(&status);
+ if (U_FAILURE(status) || !csd)
+ return 0;
+- ucsdet_enableInputFilter(csd, TRUE);
++ ucsdet_enableInputFilter(csd, true);
+ ucsdet_setText(csd, (const char *)buffer, bufferLength, &status);
+ if (U_FAILURE(status))
+ throw libcdr::EncodingException();
+--
+2.29.2
diff --git a/media-libs/libcdr/libcdr-0.1.6.ebuild b/media-libs/libcdr/libcdr-0.1.6.ebuild
index 24045430a370..42908656ba43 100644
--- a/media-libs/libcdr/libcdr-0.1.6.ebuild
+++ b/media-libs/libcdr/libcdr-0.1.6.ebuild
@@ -36,6 +36,8 @@ BDEPEND="
test? ( dev-util/cppunit )
"
+PATCHES=( "${FILESDIR}/${P}-icu-68.patch" ) # bug 751934
+
src_prepare() {
default
[[ -d m4 ]] || mkdir "m4"