[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.6+git64-g5dc8b2b+dfsg-3-16-g3acca91

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=3acca91

The following commit has been merged in the experimental branch:
commit 3acca912f7215bab829983016fdfde11b99910b6
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Apr 8 23:21:12 2015 -0300

    Add remove_functions_not_in_qt4.patch for solving QTBUG-45463.
---
 debian/changelog                                 |  1 +
 debian/patches/remove_functions_not_in_qt4.patch | 32 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7840a12..b46fb0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ qt4-x11 (4:4.8.6+git155-g716fbae+dfsg-1) UNRELEASED; urgency=medium
     - cve-2015-0295.diff
   * Refresh multiple patches.
   * Update symbols files with buildds' logs.
+  * Add remove_functions_not_in_qt4.patch for solving QTBUG-45463.
 
   [ Dmitry Shachnev ]
   * Make qt4-qmake suggest libqtcore4, as that package contains configuration
diff --git a/debian/patches/remove_functions_not_in_qt4.patch b/debian/patches/remove_functions_not_in_qt4.patch
new file mode 100644
index 0000000..91cd63a
--- /dev/null
+++ b/debian/patches/remove_functions_not_in_qt4.patch
@@ -0,0 +1,32 @@
+From 5827d6733f092ff6a79d53557c0a7f0c7f62b4d1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?=
+ <perezmeyer at gmail.com>
+Date: Wed, 8 Apr 2015 21:45:37 -0300
+Subject: [PATCH] Remove filterIncludePath and filterLibraryPath usage.
+
+They are only defined in qt5's configure script.
+
+Task-number: QTBUG-45463
+Change-Id: Ibce2bd1d06e35de5174b15919c939b41cf013d05
+---
+ configure | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index c24b87c..10ad7ca 100755
+--- a/configure
++++ b/configure
+@@ -5575,8 +5575,8 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
+                 [ -z "$CFG_PSQL_CONFIG" ] && CFG_PSQL_CONFIG=`"$WHICH" pg_config`
+                 # Be careful not to use native pg_config when cross building.
+                 if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x "$CFG_PSQL_CONFIG" ]; then
+-                    QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null | filterIncludePath`
+-                    QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null | filterLibraryPath`
++                    QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null`
++                    QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null`
+                 fi
+                 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
+                 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 368f4b7..6e316ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,7 @@ xmlpatterns_stack_overflow_fix.diff
 
 # Patches submitted upstream but still not accepted
 aarch64_arm64_qatomic_support.patch
+remove_functions_not_in_qt4.patch
 
 # qt-copy patches
 0195-compositing-properties.diff

-- 
Qt 4 packaging