Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4ced9bd1b39cbfc7fb90bad7299e87457f647f82)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4ced9bd1b39cbfc7fb90bad7299e87457f647f82)
  • Date: Mon, 10 Jul 2017 08:13:37 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

qt5/qtbase/HISTORY | 3 +
qt5/qtbase/patches/0001-fix-config-tests-for-firebird.patch | 20
+++---------
2 files changed, 8 insertions(+), 15 deletions(-)

New commits:
commit 4ced9bd1b39cbfc7fb90bad7299e87457f647f82
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qtbase - fix broken patch

diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index ee5776f..655b84b 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,6 @@
+2017-07-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * patches/* : fix broken patch
+
2017-07-09 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: ibase plugin exclusion code is broken. Should work per
src/sql/README.module .

diff --git a/qt5/qtbase/patches/0001-fix-config-tests-for-firebird.patch
b/qt5/qtbase/patches/0001-fix-config-tests-for-firebird.patch
index 371874b..3160e1f 100644
--- a/qt5/qtbase/patches/0001-fix-config-tests-for-firebird.patch
+++ b/qt5/qtbase/patches/0001-fix-config-tests-for-firebird.patch
@@ -1,4 +1,4 @@
-From 62a2934c0ab6c42979efa37fc28f267aa86f7d97 Mon Sep 17 00:00:00 2001
+From a4e0b69e10123e5461b95482fd1c9428adc93a28 Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <treeve AT sourcemage.org>
Date: Mon, 9 May 2011 21:06:05 +0200
Subject: [PATCH 1/2] fix config tests for firebird fix linking with firebird
@@ -7,8 +7,8 @@ Subject: [PATCH 1/2] fix config tests for firebird fix
linking with firebird
firebird uses libtommath
---
config.tests/unix/ibase/ibase.pro | 1 +
- src/plugins/sqldrivers/configure.json | 5 +++--
- 2 files changed, 4 insertions(+), 2 deletions(-)
+ src/plugins/sqldrivers/configure.json | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/config.tests/unix/ibase/ibase.pro
b/config.tests/unix/ibase/ibase.pro
index 8c47f66954..2c165a25ad 100644
@@ -19,20 +19,10 @@ index 8c47f66954..2c165a25ad 100644
CONFIG -= qt dylib
+LIBS += -lfbclient -ltommath -lpthread
diff --git a/src/plugins/sqldrivers/configure.json
b/src/plugins/sqldrivers/configure.json
-index 5603ceb37b..18c03f5354 100644
+index 5603ceb37b..2345fe7d5a 100644
--- a/src/plugins/sqldrivers/configure.json
+++ b/src/plugins/sqldrivers/configure.json
-@@ -16,7 +16,8 @@
- "psql_config": "string",
- "sqlite": { "type": "enum", "name": "system-sqlite", "values":
{ "qt": "no", "system": "yes" } },
- "sql-db2": "boolean",
-- "sql-ibase": "boolean",
-+ "sql-
-+ibase": "boolean",
- "sql-mysql": "boolean",
- "sql-oci": "boolean",
- "sql-odbc": "boolean",
-@@ -50,7 +51,7 @@
+@@ -50,7 +50,7 @@
"test": "unix/ibase",
"sources": [
{ "libs": "-lgds32_ms", "condition": "config.win32" },




Archive powered by MHonArc 2.6.24.

Top of Page