From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- media-libs/libcdr/Manifest | 5 +++-- media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch | 27 +++++++++++++++++++++++ media-libs/libcdr/libcdr-0.1.6.ebuild | 6 +++-- media-libs/libcdr/libcdr-9999.ebuild | 4 ++-- 4 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch (limited to 'media-libs/libcdr') diff --git a/media-libs/libcdr/Manifest b/media-libs/libcdr/Manifest index 69eac1b3a503..3948c744f0f4 100644 --- a/media-libs/libcdr/Manifest +++ b/media-libs/libcdr/Manifest @@ -1,4 +1,5 @@ +AUX libcdr-0.1.6-icu-68.patch 977 BLAKE2B ef4fa0e61607847aa0f7d1105775224f7ebed349d163cf0dd2d190f719aef041415ec87833d39fdc90c8a128b1aa052d1b7b8dda7c1cfeed962506d6556a04ec SHA512 fd0d109a48208596a86ba6df3a022bf60a02295af686a5fe924a866e808ef00023e92b40c9dceed701dac9c4243e61c017cf04b1ced9e73903e870ca379cd1e6 DIST libcdr-0.1.6.tar.xz 612068 BLAKE2B ec5226a28f101472ea3044e9e5b87dba57b584fc813dfda29e00281182d067126bf8a5740c32bc5cb545f230f6f96163aac2fdf08879ec64379b7845839bc88a SHA512 629d55da71c7333f41f60a32e2880deffcf80088096af1bbc8c572b80ef21d851102fdebce56f77245ed60822ca98e02c0867b192abef496a2313fde54a97bb6 -EBUILD libcdr-0.1.6.ebuild 1122 BLAKE2B 402cdb2ed262e4350268d2d2caa4e01b311c660a421641db4c69b7ed7e017b64c6b3299d0b556b6e4c1081658934100bf81fc8f4156355e5a2b6b49d5f8f6861 SHA512 23ddee4eb4fdf67e6795627b54fa77d717a0ef8bdd0d3e4f9cec46ac3acda5819f0a697d0ee2721cb579ad067ee0f589b53f4bed114282583b59b571d67eebc5 -EBUILD libcdr-9999.ebuild 1127 BLAKE2B 74fb23765b40c9dfd07e08ddd36a4c24f8faeb95b0832f14f9f6d82c23df1ba2e19a863aa20efa7ecb2e95b4c40136a12fa79283fe03bb927376d40a6f600e17 SHA512 8ade7a79f4e57083628dab0b914484c7d083f37fa2fefa3a10488e71cb7ee5c777cf8a22776e83bfd653dd71e8af96ee9a574ce17c4ccf9ea612975cc98f9a97 +EBUILD libcdr-0.1.6.ebuild 1152 BLAKE2B a59172d3b3950e253f94c167f6398ff1587bc268d528b05b1f8d3c112369c1c04ba7413600b5a3d897b5d287909ae721707ccca17da7c5c003acd902b4e46e90 SHA512 8ae02a13f6ab9e0acc47821afc731c6a7d04991b99248c9cb1740f46753601d6977805ce339e5d64cb3638a4bf93f8c1695bc3b602b8f802ea9672fab67efba3 +EBUILD libcdr-9999.ebuild 1099 BLAKE2B c0ca8298f6f3d222a9d94bee445be4f079bfe381db7b334a5dd3146096938b637e454383eee00f8dcdcf3257264e2be022f87f4693e864cb50489c669c771498 SHA512 2f505734658a48e57552aebf7d216a737443712da0178500a21bb6408212adb55e4c20c914b4b8e1cc4f739c90b1fb1655bc6d17b5cf056ca05bd2dcf6169545 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3 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 +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 +--- + 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..1e277da8ed11 100644 --- a/media-libs/libcdr/libcdr-0.1.6.ebuild +++ b/media-libs/libcdr/libcdr-0.1.6.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr" LICENSE="MPL-2.0" SLOT="0" -IUSE="doc static-libs test" +IUSE="doc test" RESTRICT="!test? ( test )" @@ -36,6 +36,8 @@ BDEPEND=" test? ( dev-util/cppunit ) " +PATCHES=( "${FILESDIR}/${P}-icu-68.patch" ) # bug 751934 + src_prepare() { default [[ -d m4 ]] || mkdir "m4" @@ -44,8 +46,8 @@ src_prepare() { src_configure() { local myeconfargs=( + --disable-static $(use_with doc docs) - $(use_enable static-libs static) $(use_enable test tests) ) econf "${myeconfargs[@]}" diff --git a/media-libs/libcdr/libcdr-9999.ebuild b/media-libs/libcdr/libcdr-9999.ebuild index 3397e4658eb6..2cb99bbeb299 100644 --- a/media-libs/libcdr/libcdr-9999.ebuild +++ b/media-libs/libcdr/libcdr-9999.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr" LICENSE="MPL-2.0" SLOT="0" -IUSE="doc static-libs test" +IUSE="doc test" RESTRICT="!test? ( test )" @@ -44,8 +44,8 @@ src_prepare() { src_configure() { local myeconfargs=( + --disable-static $(use_with doc docs) - $(use_enable static-libs static) $(use_enable test tests) ) econf "${myeconfargs[@]}" -- cgit v1.2.3