[vlc-devel] [PATCH 19/19] contrib: qt: there's no such thing as libsicuind, libsicuucd and libsicudtd

Steve Lhomme robux4 at videolabs.io
Wed Jun 14 14:02:08 CEST 2017


There is however libsicuin, libsicuuc and libsicudt
---
 contrib/src/qt/qt-icu-link.patch | 11 +++++++++++
 contrib/src/qt/rules.mak         |  1 +
 2 files changed, 12 insertions(+)
 create mode 100644 contrib/src/qt/qt-icu-link.patch

diff --git a/contrib/src/qt/qt-icu-link.patch b/contrib/src/qt/qt-icu-link.patch
new file mode 100644
index 0000000000..a45dcc835d
--- /dev/null
+++ b/contrib/src/qt/qt-icu-link.patch
@@ -0,0 +1,11 @@
+--- qt/src/3rdparty/icu_dependency.pri	2016-09-16 07:49:42.000000000 +0200
++++ qt/src/3rdparty/icu_dependency.pri.mingw	2017-06-14 13:20:17.636501100 +0200
+@@ -1,7 +1,7 @@
+ win32 {
+     CONFIG(static, static|shared) {
+         CONFIG(debug, debug|release) {
+-            LIBS_PRIVATE += -lsicuind -lsicuucd -lsicudtd
++            LIBS_PRIVATE += -lsicuin -lsicuuc -lsicudt
+         } else {
+             LIBS_PRIVATE += -lsicuin -lsicuuc -lsicudt
+         }
diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 15d45c0772..d17705cd30 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -24,6 +24,7 @@ qt: qt-$(QT_VERSION).tar.xz .sum-qt
 	mv qtbase-opensource-src-$(QT_VERSION) qt-$(QT_VERSION)
 	$(APPLY) $(SRC)/qt/0001-Windows-QPA-Reimplement-calculation-of-window-frames_56.patch  
 	$(APPLY) $(SRC)/qt/0002-Windows-QPA-Use-new-EnableNonClientDpiScaling-for-Wi_56.patch
+	$(APPLY) $(SRC)/qt/qt-icu-link.patch
 	$(MOVE)
 
 ifdef HAVE_MACOSX
-- 
2.12.1



More information about the vlc-devel mailing list