[arch-commits] Commit in qt4/trunk (PKGBUILD qt4-glibc-2.25.patch)

[Antonio Rojas]

    Date: Monday, March 13, 2017 @ 15:43:58
  Author: arojas
Revision: 290790

Add Fedora patch to fix build of Qt4 applications with glibc 2.25

Added:
  qt4/trunk/qt4-glibc-2.25.patch
Modified:
  qt4/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   18 +++++++++++-------
 qt4-glibc-2.25.patch |   13 +++++++++++++
 2 files changed, 24 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-13 15:10:31 UTC (rev 290789)
+++ PKGBUILD	2017-03-13 15:43:58 UTC (rev 290790)
@@ -5,13 +5,13 @@
 
 pkgname=qt4
 pkgver=4.8.7
-pkgrel=13
+pkgrel=14
 arch=('i686' 'x86_64')
 url='http://www.qt.io'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 pkgdesc='A cross-platform application and UI framework'
 depends=('sqlite' 'ca-certificates' 'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
-        'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng' 'dbus' 'openssl-1.0')
+        'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng' 'dbus') # 'openssl-1.0'
 makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
              'mesa')
 optdepends=('postgresql-libs: PostgreSQL driver'
@@ -37,7 +37,7 @@
         'disable-sslv3.patch'
         'l-qclipboard_fix_recursive.patch'
         'l-qclipboard_delay.patch'
-        'qt4-gcc6.patch')
+        'qt4-gcc6.patch' 'qt4-glibc-2.25.patch')
 md5sums=('d990ee66bf7ab0c785589776f35ba6ad'
          'a16638f4781e56e7887ff8212a322ecc'
          '8a28b3f52dbeb685d4b69440b520a3e1'
@@ -52,7 +52,8 @@
          '1803ab6313df762d807678e58fc85f53'
          '009de09b4e589a7770fba74405656c99'
          'addc5e88d538ee55e17bd49ba337ca67'
-         '98e00c5c7e5fee12e11ecbedd03f01ff')
+         '98e00c5c7e5fee12e11ecbedd03f01ff'
+         'a6e217c159d9c0f588d4b5611493f0ea')
 
 prepare() {
   cd ${_pkgfqn}
@@ -90,6 +91,9 @@
 
   # Fix build with GCC6 (Fedora)
   patch -p1 -i "$srcdir"/qt4-gcc6.patch
+
+  # Fix build of Qt4 applications with glibc 2.25 (Fedora)
+  patch -p1 -i "$srcdir"/qt4-glibc-2.25.patch
 }
 
 build() {
@@ -96,9 +100,9 @@
   export QT4DIR="${srcdir}"/${_pkgfqn}
   export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
   export CXXFLAGS+=" -std=gnu++98" # Fix build with GCC 6
-  export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig/
-  export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
-  export CXXFLAGS+=" -I/usr/include/openssl-1.0"
+#  export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig/
+#  export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
+#  export CXXFLAGS+=" -I/usr/include/openssl-1.0"
 
   cd ${_pkgfqn}
 

Added: qt4-glibc-2.25.patch
===================================================================
--- qt4-glibc-2.25.patch	                        (rev 0)
+++ qt4-glibc-2.25.patch	2017-03-13 15:43:58 UTC (rev 290790)
@@ -0,0 +1,13 @@
+diff -up qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h.majmin 
+qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h
+--- qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h.majmin	2015-05-07 09:14:48.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h	2016-12-08 12:10:29.677359701 -0600
+@@ -52,7 +52,7 @@
+ /*
+    can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
+ */
+-#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
++#define QT_VERSION_CHECK(qt_version_check_major, qt_version_check_minor, qt_version_check_patch) ((qt_version_check_major<<16)|(qt_version_check_minor<<8)|(qt_version_check_patch))
+ 
+ #define QT_PACKAGEDATE_STR "2015-05-07"
+