[gentoo-commits] repo/gentoo:master commit in: media-libs/libcdr/, media-libs/libcdr/files/

2020-10-31 Thread Andreas Sturmlechner 
commit: 66ffd5f887e627b27dad0536861f9229c74aef37
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Oct 30 16:36:23 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 31 09:20:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66ffd5f8

media-libs/libcdr: Fix build with ICU-68

Thanks-to: Lars Wendler  gentoo.org>
Closes: https://bugs.gentoo.org/751934
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch | 27 +++
 media-libs/libcdr/libcdr-0.1.6.ebuild |  2 ++
 2 files changed, 29 insertions(+)

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 000..b8e7ba919a9
--- /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();
+ if (U_FAILURE(status) || !csd)
+   return 0;
+-ucsdet_enableInputFilter(csd, TRUE);
++ucsdet_enableInputFilter(csd, true);
+ ucsdet_setText(csd, (const char *)buffer, bufferLength, );
+ 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 24045430a37..42908656ba4 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"

[gentoo-commits] repo/gentoo:master commit in: media-libs/libcdr/, media-libs/libcdr/files/

2017-08-02 Thread Andreas Sturmlechner 
commit: b401850905c0a3c1ec5da2b1b33caeb60eb78b0a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Aug  2 12:55:44 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug  2 19:35:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4018509

media-libs/libcdr: Drop old

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-libs/libcdr/Manifest |  1 -
 .../libcdr/files/libcdr-0.1.1-boost-1.59.patch | 32 --
 media-libs/libcdr/libcdr-0.1.1.ebuild  | 51 --
 3 files changed, 84 deletions(-)

diff --git a/media-libs/libcdr/Manifest b/media-libs/libcdr/Manifest
index ff8e2ca9356..132971d 100644
--- a/media-libs/libcdr/Manifest
+++ b/media-libs/libcdr/Manifest
@@ -1,2 +1 @@
-DIST libcdr-0.1.1.tar.xz 564668 SHA256 
d0a6e0667e5a37fe059bcb81d5077fc2abffc7e7bac86fe302fbcf927d58df1f SHA512 
a655b5390022fb5049d2f75fe836a693033943060d820942d59eb0a34548363ff183e0f32d22ec277d1f8b5c7ab89ab1fba933f17ef1239d14d053bd6a5cf624
 WHIRLPOOL 
f7d5b6b1655f86ac3b843957e476ab17f2ef234bb5073678d182760cd6a370d24c98b14570474221d9f5ef9b24ffc76a5f4f82d596f466a7324dac95a04b9d77
 DIST libcdr-0.1.3.tar.xz 596772 SHA256 
66e28e502abef7f6f494ce03de037d532f5e7888cfdee62c01203c8325b33f22 SHA512 
9811efb13f7dd72c69a98e81b44a261e913ffe87200486c8e07200d75790004d4fdf30e29f779b0ddd2ad09e3d1e8813ef501e9448c1789f89256f71bdb5fadd
 WHIRLPOOL 
6772ac928a66f21c689f39a3abc762d043baf89d009d86ce79d68aa8b1354a4965a2f489bf8bd754c4a76bee3ac3695658ee4ec14ed7cf19986e48c22b0e4f97

diff --git a/media-libs/libcdr/files/libcdr-0.1.1-boost-1.59.patch 
b/media-libs/libcdr/files/libcdr-0.1.1-boost-1.59.patch
deleted file mode 100644
index e32f3fe8a66..000
--- a/media-libs/libcdr/files/libcdr-0.1.1-boost-1.59.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 882a4b3f83a4b5097da53670c720a26f4e2750eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fridrich=20=C5=A0trba?= 
-Date: Sun, 13 Dec 2015 20:37:16 +0100
-Subject: [PATCH] Some boost 1.59 fixes
-
-Change-Id: I0054c977a6d8ff5a9b93c147578e890476365999

- src/lib/Makefile.am | 11 +--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
-index 3f00cc5..e14fa8c 100644
 a/src/lib/Makefile.am
-+++ b/src/lib/Makefile.am
-@@ -13,8 +13,16 @@ 
libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_include_HEADERS = \
-   $(top_srcdir)/inc/libcdr/CDRDocument.h \
-   $(top_srcdir)/inc/libcdr/CMXDocument.h
- 
--AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(LCMS2_CFLAGS) 
$(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBCDR_BUILD=1
-+AM_CXXFLAGS = -I$(top_srcdir)/inc \
-+  $(REVENGE_CFLAGS) \
-+  $(LCMS2_CFLAGS) \
-+  $(ZLIB_CFLAGS) \
-+  $(ICU_CFLAGS) \
-+  $(DEBUG_CXXFLAGS) \
-+  -DLIBCDR_BUILD=1 \
-+  -DBOOST_ERROR_CODE_HEADER_ONLY \
-+  -DBOOST_SYSTEM_NO_DEPRECATED
- 
- libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LIBADD  = $(REVENGE_LIBS) 
$(LCMS2_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBCDR_WIN32_RESOURCE@
- libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_DEPENDENCIES = 
@LIBCDR_WIN32_RESOURCE@
- libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LDFLAGS = $(version_info) 
-export-dynamic -no-undefined

diff --git a/media-libs/libcdr/libcdr-0.1.1.ebuild 
b/media-libs/libcdr/libcdr-0.1.1.ebuild
deleted file mode 100644
index 987e9711596..000
--- a/media-libs/libcdr/libcdr-0.1.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libcdr/"
-inherit autotools eutils
-[[ ${PV} ==  ]] && inherit git-r3
-
-DESCRIPTION="Library parsing the Corel cdr documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr;
-[[ ${PV} ==  ]] || 
SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz;
-
-LICENSE="MPL-2.0"
-SLOT="0"
-[[ ${PV} ==  ]] || \
-KEYWORDS="hppa"
-IUSE="doc static-libs"
-
-RDEPEND="
-   dev-libs/icu:=
-   dev-libs/librevenge
-   media-libs/lcms:2
-   sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-   dev-libs/boost
-   sys-devel/libtool
-   virtual/pkgconfig
-   doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-   epatch "${FILESDIR}/${PN}-0.1.1-boost-1.59.patch"
-   epatch_user
-   [[ -d m4 ]] || mkdir "m4"
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   --docdir="${EPREFIX}/usr/share/doc/${PF}" \
-   $(use_enable static-libs static) \
-   --disable-werror \
-   $(use_with doc docs)
-}
-
-src_install() {
-   default
-   prune_libtool_files --all
-}