Merge pull request #9052 from Rmys/master

libcdr rebuild
2021-02-27 15:16:42 +03:00
parent e4301e962d 04e264b106
commit 9ea0dc8dca
2 changed files with 20 additions and 0 deletions
@@ -0,0 +1,17 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+libcdr_utils.cpp:111:35: error: use of undeclared identifier 'TRUE'
+    ucsdet_enableInputFilter(csd, TRUE);
+                                  ^
+
+--- src/lib/libcdr_utils.cpp.orig	2020-02-02 15:30:44 UTC
+++ src/lib/libcdr_utils.cpp
+@@ -108,7 +108,7 @@ static unsigned short getEncoding(const unsigned char 
+     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();
@@ -25,6 +25,9 @@
            <Dependency>librevenge-devel</Dependency>
            <Dependency>cppunit-devel</Dependency>
        </BuildDependencies>
+        <Patches>
+            <Patch>icu68.patch</Patch>
+        </Patches>
    </Source>

    <Package>