commit: aab43277583618454c98f2083a23adccfba309be
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 16 10:30:40 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 16 10:30:40 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=aab43277
[dev-qt/qtsql] Backport patch from upstream to avoid linking against
already-installed version wrt bug #511042.
Package-Manager: portage-2.2.10
---
dev-qt/qtsql/files/qtsql-pathfiltering.patch | 31 ++++++++++++++++++++++++++++
dev-qt/qtsql/qtsql-5.3.1.ebuild | 2 ++
dev-qt/qtsql/qtsql-5.3.9999.ebuild | 2 ++
3 files changed, 35 insertions(+)
diff --git a/dev-qt/qtsql/files/qtsql-pathfiltering.patch
b/dev-qt/qtsql/files/qtsql-pathfiltering.patch
new file mode 100644
index 0000000..6571896
--- /dev/null
+++ b/dev-qt/qtsql/files/qtsql-pathfiltering.patch
@@ -0,0 +1,31 @@
+From 9de7b4d7501c7e8e9eb561d02149a52b05a2bc1d Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensing...@gentoo.org>
+Date: Fri, 27 Jun 2014 04:25:52 +1000
+Subject: [PATCH] Canonicalize inputs when filtering default system paths
+
+Contrary to expectations, various <foo>-config tools sometimes spit out
+denormalized paths, which breaks the text-based filtering, as it relies
+on exact matches with normalized paths.
+
+Change-Id: I0613ed24953a3bde19939d28d09572c88b43a361
+Task-number: QTBUG-39216
+Reviewed-by: Oswald Buddenhagen <oswald.buddenha...@digia.com>
+---
+ configure | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure b/configure
+index 8c16b12..96cc82b 100755
+--- a/configure
++++ b/configure
+@@ -364,6 +364,7 @@ filterDefaultPaths()
+ {
+ local path
+ path=`cat`
++ path=`"$relpath/config.tests/unix/makeabs" "$path"`
+ echo "$1" | grep "^$path\$" > /dev/null || echo "$path"
+ }
+
+--
+1.8.5.5
+
diff --git a/dev-qt/qtsql/qtsql-5.3.1.ebuild b/dev-qt/qtsql/qtsql-5.3.1.ebuild
index dc22e1c..2713a7f 100644
--- a/dev-qt/qtsql/qtsql-5.3.1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.3.1.ebuild
@@ -38,6 +38,8 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
)
+PATCHES=( "${FILESDIR}/${PN}-pathfiltering.patch" )
+
src_configure() {
local myconf=(
$(qt_use freetds sql-tds plugin)
diff --git a/dev-qt/qtsql/qtsql-5.3.9999.ebuild
b/dev-qt/qtsql/qtsql-5.3.9999.ebuild
index dc22e1c..2713a7f 100644
--- a/dev-qt/qtsql/qtsql-5.3.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-5.3.9999.ebuild
@@ -38,6 +38,8 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
)
+PATCHES=( "${FILESDIR}/${PN}-pathfiltering.patch" )
+
src_configure() {
local myconf=(
$(qt_use freetds sql-tds plugin)
