- enhanced icu59 patch to fix ICU detection; release 22

diff --git a/icu59.patch b/icu59.patch
index 3edcdef02b4e3b3217e4b203ab8f0073af2de293..6fd673da4bdbbb3b40268c86dd76f2d00dd29b6e 100644 (file)
--- 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

diff --git a/qt4.spec b/qt4.spec
index 32ae3f43153508c5b4e10c2cfe14ff4d0a83c0f8..8a40730fd341a777a08c2cd5967031817c781ac7 100644 (file)
--- 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