From 1e635477ad375de521b2eb894552626b05ca81b2ae141974459cb176af63d468 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 26 Mar 2021 14:02:25 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/LibreOffice:Factory/libcdr?expand=0&rev=62

---
 icu-68.patch        | 27 ---------------------------
 libcdr-0.1.6.tar.xz |  3 ---
 libcdr-0.1.7.tar.xz |  3 +++
 libcdr.changes      | 13 +++++++++++++
 libcdr.spec         |  6 ++----
 5 files changed, 18 insertions(+), 34 deletions(-)
 delete mode 100644 icu-68.patch
 delete mode 100644 libcdr-0.1.6.tar.xz
 create mode 100644 libcdr-0.1.7.tar.xz

diff --git a/icu-68.patch b/icu-68.patch
deleted file mode 100644
index cfbafc6..0000000
--- a/icu-68.patch
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/libcdr-0.1.6.tar.xz b/libcdr-0.1.6.tar.xz
deleted file mode 100644
index 32e6fa4..0000000
--- a/libcdr-0.1.6.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861
-size 612068
diff --git a/libcdr-0.1.7.tar.xz b/libcdr-0.1.7.tar.xz
new file mode 100644
index 0000000..9b271a8
--- /dev/null
+++ b/libcdr-0.1.7.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4
+size 618528
diff --git a/libcdr.changes b/libcdr.changes
index c7cd996..4f8e301 100644
--- a/libcdr.changes
+++ b/libcdr.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+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 patch:
+  * icu-68.patch
+    + Integrated upstream
+
 -------------------------------------------------------------------
 Mon Dec 14 16:15:35 UTC 2020 - Callum Farmer <gmbr3@opensuse.org>
 
diff --git a/libcdr.spec b/libcdr.spec
index 9f27191..9fd2b86 100644
--- a/libcdr.spec
+++ b/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,7 +18,7 @@
 
 %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
@@ -26,7 +26,6 @@ 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++
@@ -83,7 +82,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"