Fix build with ICU 61

This commit is contained in:
Robin Lee 2018-05-01 12:31:44 +08:00
parent 9bbe87f254
commit fb1077d269
2 changed files with 31 additions and 0 deletions

View File

@ -0,0 +1,25 @@
From d6a2a01b56f61a7736a5dae1f8c92becb7fbd2be Mon Sep 17 00:00:00 2001
From: Antonio Rojas <arojas@archlinux.org>
Date: Thu, 5 Apr 2018 22:26:34 +0200
Subject: [PATCH] Fix build with ICU 61
Starting from ICU 61, UnicodeString type needs to be properly namespaced
Differential Revision: https://phabricator.kde.org/D11883
---
src/io/encoderlatex.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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

View File

@ -7,6 +7,8 @@ Group: Applications/Editors
License: GPLv2+
URL: https://userbase.kde.org/KBibTeX
Source0: https://github.com/KDE/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
# Fix build with ICU 61, backported from upstream
Patch0: d6a2a01b56f61a7736a5dae1f8c92becb7fbd2be.patch
BuildRequires: cmake kdelibs4-devel libxslt-devel desktop-file-utils gettext-devel
BuildRequires: pkgconfig(QtWebKit)
@ -46,6 +48,7 @@ developing programs using KBibTeX libraries.
%prep
%setup -q
%patch0 -p1
%build
@ -109,6 +112,9 @@ fi
%changelog
* Tue May 1 2018 Robin Lee <cheeselee@fedoraproject.org> - 0.7-2
- Fix build with ICU 61
* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 0.7-2
- Rebuild for ICU 61.1