Skip to Content.
Sympa Menu

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

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 (1a42f31f4d741ea650736ac79ac8d42962fd155e)
  • Date: Tue, 9 Jun 2015 10:15:37 +0000

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

qt5/qtbase/HISTORY | 3 +++
qt5/qtbase/firebird.patch | 20 +++++++++++---------
2 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 1a42f31f4d741ea650736ac79ac8d42962fd155e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qtbase - update firebird patch

diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index f7a529d..84720bb 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,6 @@
+2015-06-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * firebird.patch: update for firebird3
+
2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.4.2

diff --git a/qt5/qtbase/firebird.patch b/qt5/qtbase/firebird.patch
index b7c0e0d..64500b1 100644
--- a/qt5/qtbase/firebird.patch
+++ b/qt5/qtbase/firebird.patch
@@ -1,35 +1,37 @@
-From ad488571f8001dd1cc671a42dc123071f89b412e Mon Sep 17 00:00:00 2001
+From c784aba62c64b7966c4365e7537daf6bddee0f2e 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] fix config tests for firebird fix linking with firebird
+Subject: [PATCH] fix config tests for firebird fix linking with firebird it
+ also use -lpthread now

---
config.tests/unix/ibase/ibase.pro | 2 +-
- src/sql/drivers/ibase/qsql_ibase.pri | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ src/sql/drivers/ibase/qsql_ibase.pri | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config.tests/unix/ibase/ibase.pro
b/config.tests/unix/ibase/ibase.pro
-index 5878785..742a4e9 100644
+index 5878785..2e2128e 100644
--- a/config.tests/unix/ibase/ibase.pro
+++ b/config.tests/unix/ibase/ibase.pro
@@ -1,3 +1,3 @@
SOURCES = ibase.cpp
CONFIG -= qt dylib
-LIBS += -lgds
-+LIBS += -lfbclient
++LIBS += -lfbclient -lpthread
diff --git a/src/sql/drivers/ibase/qsql_ibase.pri
b/src/sql/drivers/ibase/qsql_ibase.pri
-index ef3b68d..3ad51ba 100644
+index ef3b68d..5cb9169 100644
--- a/src/sql/drivers/ibase/qsql_ibase.pri
+++ b/src/sql/drivers/ibase/qsql_ibase.pri
-@@ -2,7 +2,7 @@ HEADERS += $$PWD/qsql_ibase_p.h
+@@ -2,7 +2,8 @@ HEADERS += $$PWD/qsql_ibase_p.h
SOURCES += $$PWD/qsql_ibase.cpp

unix {
- !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lgds
+ !contains(LIBS, .*gds.*):!contains(LIBS, .*fb.*):LIBS += -lfbclient
++ LIBS += -lpthread
} else {
!contains(LIBS, .*gds.*):!contains(LIBS, .*fbclient.*) {
LIBS += -lgds32_ms
--
-2.2.0
+2.4.1




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1a42f31f4d741ea650736ac79ac8d42962fd155e), Treeve Jelbert, 06/09/2015

Archive powered by MHonArc 2.6.24.

Top of Page