Accepting request 881513 from LibreOffice:Factory

0.1.7 (Hackweek release)

OBS-URL: https://build.opensuse.org/request/show/881513
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcdr?expand=0&rev=26

icu-68.patch

@@ -1,27 +0,0 @@
-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

libcdr-0.1.1-pkgconfig.patch

@@ -1,8 +0,0 @@
---- libcdr-0.1.1/libcdr.pc.in	2014-04-16 19:06:20.000000000 +0200
-+++ libcdr-0.1.1/libcdr.pc.in	2014-07-25 09:14:23.096910474 +0200
-@@ -9,5 +9,3 @@
- Requires: librevenge-0.0
- Libs: -L${libdir} -lcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@
- Cflags: -I${includedir}/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@
--
--Requires.private: icu-i18n lcms2 zlib

libcdr-0.1.6.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861
-size 612068

libcdr.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Fri Mar 26 13:58:39 UTC 2021 - Fridrich Strba <fstrba@suse.com>
+
+- Version update to 0.1.7
+  * Extend support to the newest CDR format versions
+    + Supports currently CDR1 to 23, which is all released versions
+      to date.
+  * Improve conversion of paragraph text in versions 5 to 23
+  * Improve conversion of text on path for versions 6 to 15
+- Removed patches:
+  * icu-68.patch
+    + Integrated upstream
+  * libcdr-0.1.1-pkgconfig.patch
+    + This was a workaround for SLE11 build failures, not needed
+      any more
+
 -------------------------------------------------------------------
 Mon Dec 14 16:15:35 UTC 2020 - Callum Farmer <gmbr3@opensuse.org>
 

libcdr.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libcdr
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,15 +18,13 @@
 
 %define libname libcdr-0_1-1
 Name:           libcdr
-Version:        0.1.6
+Version:        0.1.7
 Release:        0
 Summary:        Library for parsing the Corel Draw file format structure
 License:        MPL-2.0
 Group:          Productivity/Publishing/Word
 URL:            http://www.freedesktop.org/wiki/Software/libcdr
 Source0:        http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.xz
-Patch0:         libcdr-0.1.1-pkgconfig.patch
-Patch1:         icu-68.patch
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -82,8 +80,6 @@ Tools to work with documents in Corel Draw file format.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden"