[packages/qt4] - enhanced icu59 patch to fix ICU detection; release 22

qboosh qboosh at pld-linux.org
Thu Apr 18 22:00:53 CEST 2019


commit 03ffb4fe5511a2eaa10d56671fe5f08a06bcfaf7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Apr 18 22:00:50 2019 +0200

    - enhanced icu59 patch to fix ICU detection; release 22

 icu59.patch | 15 +++++++++++++++
 qt4.spec    |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/qt4.spec b/qt4.spec
index 32ae3f4..8a40730 100644
--- a/qt4.spec
+++ b/qt4.spec
@@ -63,7 +63,7 @@ Summary(pl.UTF-8):	Biblioteka Qt do tworzenia GUI
 Summary(pt_BR.UTF-8):	Estrutura para rodar aplicações GUI Qt
 Name:		qt4
 Version:	4.8.7
-Release:	21
+Release:	22
 License:	LGPL v2.1 or GPL v3.0
 Group:		X11/Libraries
 Source0:	http://download.qt-project.org/official_releases/qt/4.8/%{version}/qt-everywhere-opensource-src-%{version}.tar.gz
diff --git a/icu59.patch b/icu59.patch
index 3edcdef..6fd673d 100644
--- a/icu59.patch
+++ b/icu59.patch
@@ -26,3 +26,18 @@ Index: qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri
      DEFINES += QT_USE_ICU
  }
  
+--- qt-everywhere-opensource-src-4.8.7/config.tests/unix/icu/icu.pro.orig	2015-05-07 16:14:42.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.7/config.tests/unix/icu/icu.pro	2019-04-18 17:14:05.122419116 +0200
+@@ -1,4 +1,11 @@
+-SOURCES = icu.cpp
++cpp11.name = cpp11
++cpp11.input = SOURCES_CPP11
++cpp11.dependency_type = TYPE_C
++cpp11.variable_out = OBJECTS
++cpp11.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_IN_BASE}$${first(QMAKE_EXT_OBJ)}
++cpp11.commands = $${QMAKE_CXX} $(CXXFLAGS) -std=c++11 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
++QMAKE_EXTRA_COMPILERS += cpp11
++SOURCES_CPP11 = icu.cpp
+ CONFIG -= qt dylib app_bundle
+ unix:LIBS += -licuuc -licui18n
+ win32:LIBS += -licuin
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt4.git/commitdiff/03ffb4fe5511a2eaa10d56671fe5f08a06bcfaf7



More information about the pld-cvs-commit mailing list