sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

From: Treeve Jelbert <scm AT mail.sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4b6274449b217f7b90692607d76184ae18c5b994)
Date: Sat, 10 Feb 2007 08:46:51 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

database/firebird/DETAILS | 5 +++--
database/firebird/HISTORY | 4 ++++
database/firebird/fb1.5.patch.bz2 |binary
x11-toolkits/qt4/BUILD | 4 ++--
x11-toolkits/qt4/DEPENDS | 36 ++++++++++++++++++------------------
x11-toolkits/qt4/HISTORY | 8 ++++++++
x11-toolkits/qt4/PRE_BUILD | 5 +++++
7 files changed, 40 insertions(+), 22 deletions(-)

New commits:
commit 4b6274449b217f7b90692607d76184ae18c5b994
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

firebird-1.5.4.4910

commit 76318632ef656f7411907ace35360f3959515b42
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

qt4 - depends & build changes

diff --git a/database/firebird/DETAILS b/database/firebird/DETAILS
index c9719b9..98adc7d 100755
--- a/database/firebird/DETAILS
+++ b/database/firebird/DETAILS
@@ -9,8 +9,9 @@ case $FB_VER in
# FORCE_DOWNLOAD=on
#;;
1.5)
- VERSION=1.5.3.4870
-
SOURCE_HASH=sha512:368380d720f381247a706ec93b41e81b9dde71f22280c52059dcf286554c3bf587214fae9c9b40266770147217a76c816cec1da43fe6ed92332474a41448a2c9
+# VERSION=1.5.3.4870
+ VERSION=1.5.4.4910
+
SOURCE_HASH=sha512:a42aebeabf3152e9b84c7e4fa5b728feb3588bc535ed1c8901b8ab3bc7a3c83b36a26f99bc11bcc2094888c13aea0ae16cbd55b1c284508a295f7611fdae3cb3
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/firebird/$SOURCE
;;
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index 6299d15..c8892be 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,7 @@
+2007-02-09 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: version 1.5.4.4910
+ * fb1.5.patch.bz2: update, mostly included upstream
+
2007-01-30 Treeve Jelbert <treeve AT pi.be>
* DETAILS: updated hash, source tarball renamed the install directory

diff --git a/database/firebird/fb1.5.patch.bz2
b/database/firebird/fb1.5.patch.bz2
index df466fb..325bafc 100644
Binary files a/database/firebird/fb1.5.patch.bz2 and
b/database/firebird/fb1.5.patch.bz2 differ
diff --git a/x11-toolkits/qt4/BUILD b/x11-toolkits/qt4/BUILD
index e99c7ef..71f437c 100755
--- a/x11-toolkits/qt4/BUILD
+++ b/x11-toolkits/qt4/BUILD
@@ -1,6 +1,6 @@
# add better optimisation flags
-sedit "s#-O2#$CFLAGS#" mkspecs/linux-g++/qmake.conf &&
-sedit "s#-O2#$CFLAGS#" mkspecs/linux-cxx/qmake.conf &&
+# following line causes segmentation fault in moc when using gcc-4.1.1
+sedit "s#-O2#${CFLAGS/-O3/-O2}#" mkspecs/common/g++.conf &&

export QTDIR=$SOURCE_DIRECTORY &&
export LD_LIBRARY_PATH=$SOURCE_DIRECTORY/lib:$LD_LIBRARY_PATH &&
diff --git a/x11-toolkits/qt4/DEPENDS b/x11-toolkits/qt4/DEPENDS
index defbc8b..faaed88 100755
--- a/x11-toolkits/qt4/DEPENDS
+++ b/x11-toolkits/qt4/DEPENDS
@@ -40,39 +40,39 @@ optional_depends stlport
'for stlport support' &&

optional_depends firebird \
- "-plugin-sql-ibase -I$TRACK_ROOT/usr/firebird/include \
- -L$TRACK_ROOT/usr/firebird/lib" \
- '' \
+ "-plugin-sql-ibase -I$INSTALL_ROOT/usr/firebird/include \
+ -L$INSTALL_ROOT/usr/firebird/lib" \
+ '-no-sql-ibase' \
'for firebird database support' &&

optional_depends mysql \
- "-plugin-sql-mysql -I$TRACK_ROOT/usr/include/mysql \
- -L$TRACK_ROOT/usr/lib -lmysqlclient" \
- '' \
+ "-plugin-sql-mysql -I$INSTALL_ROOT/usr/include/mysql \
+ -L$INSTALL_ROOT/usr/lib -lmysqlclient" \
+ '-no-sql-mysql' \
'for mysql database support' &&

optional_depends sqlite \
- "-plugin-sql-sqlite -I$TRACK_ROOT/usr/include \
- -L$TRACK_ROOT/usr/lib -lsqlite3" \
- '' \
+ "-plugin-sql-sqlite -I$INSTALL_ROOT/usr/include \
+ -L$INSTALL_ROOT/usr/lib -lsqlite3" \
+ '-no-sql-sqlite' \
'for sqlite 3.x database support' &&

optional_depends sqlite2 \
- "-plugin-sql-sqlite2 -I$TRACK_ROOT/usr/include \
- -L$TRACK_ROOT/usr/lib -lsqlite" \
- '' \
+ "-plugin-sql-sqlite2 -I$INSTALL_ROOT/usr/include \
+ -L$INSTALL_ROOT/usr/lib -lsqlite" \
+ '-no-sql-sqlite2' \
'for sqlite 2.x database support' &&

optional_depends postgresql
\
- "-plugin-sql-psql -I$TRACK_ROOT/src/include/postgresql
\
- -I$TRACK_ROOT/usr/include/server/libpq
-L$TRACK_ROOT/usr/lib -lpq" \
- ''
\
+ "-plugin-sql-psql -I$INSTALL_ROOT/src/include/postgresql
\
+ -I$INSTALL_ROOT/usr/include/server/libpq
-L$INSTALL_ROOT/usr/lib -lpq" \
+ '-no-sql-psql'
\
'for postgresql database support'
&&

optional_depends unixodbc \
- "-plugin-sql-odbc -I$TRACK_ROOT/usr/unixODBC/include \
- -L$TRACK_ROOT/usr/unixODBC/lib -lodbc" \
- '' \
+ "-plugin-sql-odbc -I$INSTALL_ROOT/usr/unixODBC/include \
+ -L$INSTALL_ROOT/usr/unixODBC/lib -lodbc" \
+ '-no-sql-odbc' \
'for ODBC database support' &&

optional_depends CUPS \
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index be84f3d..f33b04b 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,11 @@
+2007-02-10 Treeve Jelbert <treeve AT pi.be>
+ * DEPENDS: s/TRACK/INSTALL/
+ explicitly disable unwanted sql drivers
+ * PRE_BUILD: added, to fix firebird detection
+
+2007-01-19 Treeve Jelbert <treeve AT pi.be>
+ * BUILD: fix optimisations
+
2006-12-04 Eric Sandall <eric AT sandall.us>
* DEPENDS: Added dependencies on libxi, libxrender, libxrandr,
libxfixes,
libxcursor, libx11, and libxext for xorg-modular
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
new file mode 100755
index 0000000..fa8ecbd
--- /dev/null
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i "s/-lgds/-lfbclient/" config.tests/unix/ibase/ibase.pro \
+ src/sql/drivers/drivers.pri src/plugins/sqldrivers/ibase/ibase.pro
+#patch -p0 < $SPELL_DIRECTORY/xxx.diff

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4b6274449b217f7b90692607d76184ae18c5b994), Treeve Jelbert, 02/10/2007