[arch-commits] Commit in kbibtex/trunk (PKGBUILD kbibtex-icu61.patch)

[Antonio Rojas]

    Date: Monday, April 2, 2018 @ 11:40:44
  Author: arojas
Revision: 313858

Fix build with ICU 61

Added:
  kbibtex/trunk/kbibtex-icu61.patch
Modified:
  kbibtex/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   11 ++++++-----
 kbibtex-icu61.patch |   13 +++++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-02 11:40:33 UTC (rev 313857)
+++ PKGBUILD	2018-04-02 11:40:44 UTC (rev 313858)
@@ -14,21 +14,22 @@
 depends=(poppler-qt5 qt5-webengine qoauth kparts)
 optdepends=('okular: Document preview')
 makedepends=(extra-cmake-modules git kdoctools qca-qt5)
-source=(git://git.kde.org/$pkgname#commit=$_commit)
+source=(git://git.kde.org/$pkgname#commit=$_commit kbibtex-icu61.patch)
 #source=("https://download.kde.org/stable/KBibTeX/$pkgname-$pkgver.tar.xz"{,.asc})
-sha256sums=('SKIP')
+sha256sums=('SKIP'
+            '75b6e114efb1cea49254fd448dfc7dab6ac8ea549d9f577ca43e73d853c020f5')
 validpgpkeys=('1808CB466328F4380685A3B1A264FD738D861F41') # Thomas Fischer <fischer at unix-ag.uni-kl.de>
 
 prepare() {
   mkdir -p build
+
+  cd $pkgname
+  patch -p1 -i ../kbibtex-icu61.patch # Fix build with ICU 61
 }
 
 build() {
   cd build
 
-  # http://site.icu-project.org/download/61#TOC-Migration-Issues
-  CXXFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
-
   cmake ../$pkgname \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib

Added: kbibtex-icu61.patch
===================================================================
--- kbibtex-icu61.patch	                        (rev 0)
+++ kbibtex-icu61.patch	2018-04-02 11:40:44 UTC (rev 313858)
@@ -0,0 +1,13 @@
+diff --git a/src/io/encoderlatex.cpp b/src/io/encoderlatex.cpp
+index 2d666970..2ba30ab0 100644
+--- a/src/io/encoderlatex.cpp
++++ b/src/io/encoderlatex.cpp
+@@ -1099,7 +1099,7 @@ QString EncoderLaTeX::convertToPlainAscii(const QString &ninput) const
+     for (int i = 0; i < ninputLen; ++i)
+         uChars[i] = ninput.at(i).unicode();
+     /// Create an ICU-specific unicode string
+-    UnicodeString uString = UnicodeString(uChars, ninputLen);
++    icu::UnicodeString uString = icu::UnicodeString(uChars, ninputLen);
+     /// Perform the actual transliteration, modifying Unicode string
+     m_trans->transliterate(uString);
+     /// Create regular C++ string from Unicode string