[crux-commits] ports/contrib (refs/remotes/origin/3.6): libcdr: 0.1.6 -> 0.1.7

crux at crux.nu crux at crux.nu
Sat Apr 10 19:05:41 UTC 2021


commit 4873c8b90d6c755d6b7639054114e73e26b98dee
Author: Tim Biermann <tbier at posteo.de>
Date:   Sat Mar 27 13:02:35 2021 +0000

    libcdr: 0.1.6 -> 0.1.7

diff --git a/libcdr/.footprint b/libcdr/.footprint
index b28911df4..bb6f04463 100644
--- a/libcdr/.footprint
+++ b/libcdr/.footprint
@@ -15,8 +15,8 @@ drwxr-xr-x	root/root	usr/include/libcdr-0.1/libcdr/
 -rw-r--r--	root/root	usr/include/libcdr-0.1/libcdr/libcdr_api.h
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libcdr-0.1.la
-lrwxrwxrwx	root/root	usr/lib/libcdr-0.1.so -> libcdr-0.1.so.1.0.6
-lrwxrwxrwx	root/root	usr/lib/libcdr-0.1.so.1 -> libcdr-0.1.so.1.0.6
--rwxr-xr-x	root/root	usr/lib/libcdr-0.1.so.1.0.6
+lrwxrwxrwx	root/root	usr/lib/libcdr-0.1.so -> libcdr-0.1.so.1.0.7
+lrwxrwxrwx	root/root	usr/lib/libcdr-0.1.so.1 -> libcdr-0.1.so.1.0.7
+-rwxr-xr-x	root/root	usr/lib/libcdr-0.1.so.1.0.7
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libcdr-0.1.pc
diff --git a/libcdr/.signature b/libcdr/.signature
index f5179eda8..caa2e952c 100644
--- a/libcdr/.signature
+++ b/libcdr/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF37iHX5w6f5eY8mnVlS1/NunJDeeYB+TkygosvxvwOE2YmV35jrTlDd4d6KCrys6N3wHRtNHyZffH+R36kJvWHQ8=
-SHA256 (Pkgfile) = aa71076f842a0ac69c06416ee0a3b57a4c569449d1d2688b29c605010443f20b
-SHA256 (.footprint) = 7e43c2b2d7455d5fb28c7d445017ec62cfb52d7249f302898490c6679c6ebb21
-SHA256 (libcdr-0.1.6.tar.xz) = 01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861
-SHA256 (libcdr-0.1.6-icu-68.patch) = 4c67e11090333c2d46403bb285f020fbca1c6f0b998d9e8b447dfe0b1206e3e7
+RWSagIOpLGJF33xUSt85ARJWwkUilxFHEfKve8AI3icyMNPcwl/5iLsQr68uv9WRzzMHcfAJLJkP1BnibQvqsf3HtcgL1LX5hA4=
+SHA256 (Pkgfile) = dbdf2be1e39bf5a51b29e4a22830b94a4978233d1d50f248bf343f49af13b947
+SHA256 (.footprint) = 78234c440ce69235ff87f7a263e6793cd7f627e172ac57908639ffb3594f8bfc
+SHA256 (libcdr-0.1.7.tar.xz) = 5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4
diff --git a/libcdr/Pkgfile b/libcdr/Pkgfile
index 50dd34417..c202fe492 100644
--- a/libcdr/Pkgfile
+++ b/libcdr/Pkgfile
@@ -4,15 +4,12 @@
 # Depends on: lcms2 librevenge icu
 
 name=libcdr
-version=0.1.6
+version=0.1.7
 release=1
-source=(https://dev-www.libreoffice.org/src/$name/$name-$version.tar.xz
-	libcdr-0.1.6-icu-68.patch)
+source=(https://dev-www.libreoffice.org/src/$name/$name-$version.tar.xz)
 
 build() {
   cd $name-$version
-  [ $(pkginfo -i | awk '/^icu / {split($2,a,"."); print a[1]}') -ge 68 ] && \
-    patch -p1 -i $SRC/libcdr-0.1.6-icu-68.patch
   ./configure --prefix=/usr \
     --without-docs
   make
diff --git a/libcdr/libcdr-0.1.6-icu-68.patch b/libcdr/libcdr-0.1.6-icu-68.patch
deleted file mode 100644
index b8e7ba919..000000000
--- a/libcdr/libcdr-0.1.6-icu-68.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0dc41f8f6bd099813acb3972f75e4bbb2a5cdb2d Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c at 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 at 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


More information about the crux-commits mailing list