* [gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/, dev-qt/qtsql/files/
@ 2014-07-16 10:32 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2014-07-16 10:32 UTC (permalink / raw
To: gentoo-commits
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 <kensington@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.buddenhagen@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)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/, dev-qt/qtsql/files/
@ 2014-09-11 2:18 Davide Pesavento
0 siblings, 0 replies; 3+ messages in thread
From: Davide Pesavento @ 2014-09-11 2:18 UTC (permalink / raw
To: gentoo-commits
commit: ad17694a94c6893a56b4abef999150c13abca41f
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 11 02:18:23 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Sep 11 02:18:23 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ad17694a
[dev-qt/qtsql:5] Sync with portage.
Package-Manager: portage-2.2.12
---
.../{qtsql-pathfiltering.patch => qtsql-5.3.1-path-filtering.patch} | 0
dev-qt/qtsql/qtsql-5.3.1.ebuild | 4 +++-
dev-qt/qtsql/qtsql-5.3.9999.ebuild | 4 +++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtsql/files/qtsql-pathfiltering.patch b/dev-qt/qtsql/files/qtsql-5.3.1-path-filtering.patch
similarity index 100%
rename from dev-qt/qtsql/files/qtsql-pathfiltering.patch
rename to dev-qt/qtsql/files/qtsql-5.3.1-path-filtering.patch
diff --git a/dev-qt/qtsql/qtsql-5.3.1.ebuild b/dev-qt/qtsql/qtsql-5.3.1.ebuild
index e287559..979dff5 100644
--- a/dev-qt/qtsql/qtsql-5.3.1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.3.1.ebuild
@@ -38,7 +38,9 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
)
-PATCHES=( "${FILESDIR}/${PN}-pathfiltering.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.3.1-path-filtering.patch"
+)
src_configure() {
local myconf=(
diff --git a/dev-qt/qtsql/qtsql-5.3.9999.ebuild b/dev-qt/qtsql/qtsql-5.3.9999.ebuild
index e287559..979dff5 100644
--- a/dev-qt/qtsql/qtsql-5.3.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-5.3.9999.ebuild
@@ -38,7 +38,9 @@ QT5_TARGET_SUBDIRS=(
src/plugins/sqldrivers
)
-PATCHES=( "${FILESDIR}/${PN}-pathfiltering.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.3.1-path-filtering.patch"
+)
src_configure() {
local myconf=(
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/, dev-qt/qtsql/files/
@ 2018-02-22 22:19 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2018-02-22 22:19 UTC (permalink / raw
To: gentoo-commits
commit: 2cb8d44372ae568c49ffb65e7b7535bd982c11c9
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Feb 22 10:11:06 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 22:14:06 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2cb8d443
dev-qt/qtsql: Extend the MariaDB define check
See also: https://mail.kde.org/pipermail/distributions/2018-February/000265.html
See also: https://codereview.qt-project.org/#/c/206850/
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch | 35 ++++++++++++++++++++++
...-5.11.0_alpha.ebuild => qtsql-5.10.1-r1.ebuild} | 5 ++++
dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild | 5 ++++
dev-qt/qtsql/qtsql-5.11.9999.ebuild | 5 ++++
dev-qt/qtsql/qtsql-5.9.9999.ebuild | 5 ++++
dev-qt/qtsql/qtsql-5.9999.ebuild | 5 ++++
6 files changed, 60 insertions(+)
diff --git a/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch b/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch
new file mode 100644
index 00000000..79de44dc
--- /dev/null
+++ b/dev-qt/qtsql/files/qtsql-5.9.5-mariadb-10.2.patch
@@ -0,0 +1,35 @@
+From 64588c9bae92ef79f9ca5e87653ffb0962691d0d Mon Sep 17 00:00:00 2001
+From: Andy Shaw <andy.shaw@qt.io>
+Date: Wed, 27 Sep 2017 09:23:10 +0200
+Subject: [PATCH] Extend the MariaDB define check to cover the later versions
+ too
+
+Change-Id: Ide89b4e07feb116bf152cbf3f5630d313e8ba0f1
+---
+ src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+index 6e428fb..b2d3e85 100644
+--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
++++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+@@ -1159,14 +1159,14 @@ static void qLibraryInit()
+ # endif // MYSQL_VERSION_ID
+ #endif // Q_NO_MYSQL_EMBEDDED
+
+-#ifdef MARIADB_BASE_VERSION
++#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID)
+ qAddPostRoutine([]() { mysql_server_end(); });
+ #endif
+ }
+
+ static void qLibraryEnd()
+ {
+-#if !defined(MARIADB_BASE_VERSION)
++#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
+ # if !defined(Q_NO_MYSQL_EMBEDDED)
+ # if MYSQL_VERSION_ID > 40000
+ # if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003
+--
+2.7.4
+
diff --git a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild b/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
similarity index 92%
copy from dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
copy to dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
index 8b17279a..7765a7bb 100644
--- a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
+++ b/dev-qt/qtsql/qtsql-5.10.1-r1.ebuild
@@ -28,6 +28,11 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
+ # See also: https://codereview.qt-project.org/#/c/206850/
+)
+
QT5_TARGET_SUBDIRS=(
src/sql
src/plugins/sqldrivers
diff --git a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild b/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
index 8b17279a..7765a7bb 100644
--- a/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
+++ b/dev-qt/qtsql/qtsql-5.11.0_alpha.ebuild
@@ -28,6 +28,11 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
+ # See also: https://codereview.qt-project.org/#/c/206850/
+)
+
QT5_TARGET_SUBDIRS=(
src/sql
src/plugins/sqldrivers
diff --git a/dev-qt/qtsql/qtsql-5.11.9999.ebuild b/dev-qt/qtsql/qtsql-5.11.9999.ebuild
index 8b17279a..7765a7bb 100644
--- a/dev-qt/qtsql/qtsql-5.11.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-5.11.9999.ebuild
@@ -28,6 +28,11 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
+ # See also: https://codereview.qt-project.org/#/c/206850/
+)
+
QT5_TARGET_SUBDIRS=(
src/sql
src/plugins/sqldrivers
diff --git a/dev-qt/qtsql/qtsql-5.9.9999.ebuild b/dev-qt/qtsql/qtsql-5.9.9999.ebuild
index 8b17279a..7765a7bb 100644
--- a/dev-qt/qtsql/qtsql-5.9.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-5.9.9999.ebuild
@@ -28,6 +28,11 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
+ # See also: https://codereview.qt-project.org/#/c/206850/
+)
+
QT5_TARGET_SUBDIRS=(
src/sql
src/plugins/sqldrivers
diff --git a/dev-qt/qtsql/qtsql-5.9999.ebuild b/dev-qt/qtsql/qtsql-5.9999.ebuild
index 8b17279a..7765a7bb 100644
--- a/dev-qt/qtsql/qtsql-5.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-5.9999.ebuild
@@ -28,6 +28,11 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-5.9.5-mariadb-10.2.patch"
+ # See also: https://codereview.qt-project.org/#/c/206850/
+)
+
QT5_TARGET_SUBDIRS=(
src/sql
src/plugins/sqldrivers
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-02-22 22:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-22 22:19 [gentoo-commits] proj/qt:master commit in: dev-qt/qtsql/, dev-qt/qtsql/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2014-09-11 2:18 Davide Pesavento
2014-07-16 10:32 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox