[mingw-qt5-qtwebkit] Update ICU patch
Erik van Pienbroek
epienbro at fedoraproject.org
Mon Mar 23 18:33:05 UTC 2015
commit 5a5699d8c465d0b27432aea0407d0ec0d508f13e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Mon Mar 23 19:29:47 2015 +0100
Update ICU patch
mingw-qt5-qtwebkit.spec | 2 +-
qt5-qtwebkit-use-correct-icu-libs.patch | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/mingw-qt5-qtwebkit.spec b/mingw-qt5-qtwebkit.spec
index b58c2a9..9505412 100644
--- a/mingw-qt5-qtwebkit.spec
+++ b/mingw-qt5-qtwebkit.spec
@@ -161,7 +161,7 @@ Fedora Windows cross-compiler.
%prep
%setup -q -n %{source_folder}
-%patch0 -p0 -b .icu
+%patch0 -p1 -b .icu
%patch2 -p0 -b .pkgconfig
%patch3 -p1 -b .angle
%patch4 -p1 -b .no_icu
diff --git a/qt5-qtwebkit-use-correct-icu-libs.patch b/qt5-qtwebkit-use-correct-icu-libs.patch
index f350ed2..e686d24 100644
--- a/qt5-qtwebkit-use-correct-icu-libs.patch
+++ b/qt5-qtwebkit-use-correct-icu-libs.patch
@@ -1,11 +1,11 @@
---- Source/WTF/WTF.pri.orig 2012-09-13 20:58:45.888254227 +0200
-+++ Source/WTF/WTF.pri 2012-09-13 20:59:01.874364654 +0200
+--- qtwebkit-opensource-src-5.4.1/Source/WTF/WTF.pri.icu 2015-03-23 19:21:26.013831236 +0100
++++ qtwebkit-opensource-src-5.4.1/Source/WTF/WTF.pri 2015-03-23 19:22:46.668582720 +0100
@@ -14,7 +14,7 @@
INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH
LIBS += -licucore
} else:!use?(wchar_unicode): {
-- win32: LIBS += -licuin -licuuc -licudt
-+ win32:!mingw: LIBS += -licuin -licuuc -licudt
- else:!contains(QT_CONFIG,no-pkg-config):packagesExist("icu-i18n"): PKGCONFIG *= icu-i18n
- else:android: LIBS += -licui18n -licuuc
- else: LIBS += -licui18n -licuuc -licudata
+- win32 {
++ win32:!mingw {
+ CONFIG(static, static|shared) {
+ CONFIG(debug, debug|release) {
+ LIBS += -lsicuind -lsicuucd -lsicudtd
More information about the scm-commits
mailing list