Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (38998a6dd4db3d2f4c143388f659966cd5bbe47b)

Chronological Thread  
    < 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 (38998a6dd4db3d2f4c143388f659966cd5bbe47b)
  • Date: Tue, 5 May 2009 12:41:43 -0500
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

database/qdbm/DETAILS | 4 ++--
database/qdbm/HISTORY | 3 +++
database/rlib/DETAILS | 2 +-
database/rlib/HISTORY | 3 +++
devel/bobcat/DETAILS | 4 ++--
devel/bobcat/HISTORY | 3 +++
doc/yodl/BUILD | 12 +++---------
doc/yodl/DETAILS | 4 ++--
doc/yodl/HISTORY | 8 ++++++++
doc/yodl/INSTALL | 9 ++++++---
doc/yodl/PRE_BUILD | 2 ++
kde4-support/akonadi/DETAILS | 4 ++--
kde4-support/akonadi/HISTORY | 3 +++
x11-toolkits/qt4/BUILD | 3 +--
x11-toolkits/qt4/DEPENDS | 11 ++++++-----
x11-toolkits/qt4/HISTORY | 11 +++++++++++
x11-toolkits/qt4/PRE_BUILD | 11 +++++++++--
17 files changed, 67 insertions(+), 30 deletions(-)

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

qt4 - allow choice between unixodbc/libiodbc

commit c6d170d6b282a59c797fe992eae74d79fc7e6da4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

akonadi: => 1.1.2

commit 1335fb23160e8fd5d4846fc1ecedec21273f8359
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

yodl: => 2.14.3

commit 517512fcc22d43f987d129bed59813b5813d0174
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

bobcat: => 2.02.02

commit 3a5eb14755db97fbfe2986148325954366ccb78d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

rlib - update sha5sum

commit e6c63cc8d81ddd2c6fd44f96274d7c17357e47cb
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qdbm: => 1.8.77

diff --git a/database/qdbm/DETAILS b/database/qdbm/DETAILS
index c40df64..66943f9 100755
--- a/database/qdbm/DETAILS
+++ b/database/qdbm/DETAILS
@@ -1,6 +1,6 @@
SPELL=qdbm
- VERSION=1.8.76
-
SOURCE_HASH=sha512:6d071d5bf12d5f28cd5356ceed40e1cb55320a387197ecfd565e245d7ee0034d4c0b8b92396f1acdf1fa93cfcd214873d544fb7fe235f5df98032436cc771097
+ VERSION=1.8.77
+
SOURCE_HASH=sha512:2a2d82e1998e5ece9ff9033e84363bebe6bb6ce5e7fa0775fe63297de88583b43afbbb4f8aa5f003ef9921472aa2ab29b905c6483aa3181777f4dadc59ffd8e4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://qdbm.sourceforge.net/$SOURCE
diff --git a/database/qdbm/HISTORY b/database/qdbm/HISTORY
index 42a2eb9..c1d18c5 100644
--- a/database/qdbm/HISTORY
+++ b/database/qdbm/HISTORY
@@ -1,3 +1,6 @@
+2009-05-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.8.77
+
2007-10-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.8.76

diff --git a/database/rlib/DETAILS b/database/rlib/DETAILS
index d6e1654..92d3fb1 100755
--- a/database/rlib/DETAILS
+++ b/database/rlib/DETAILS
@@ -1,6 +1,6 @@
SPELL=rlib
VERSION=1.3.8
-
SOURCE_HASH=sha512:ecefe1305452f372c6495d49460574e493c5fbde4cbecba339a4e9aa3300f041fa278a147c4a4f1f397bbc11e4e0fcb101ec38a1e3b13eafdb0b80c391536951
+
SOURCE_HASH=sha512:d8ffec3c39f88e5c258107855f578dc4276529ede0aad25042ccd8ee298235792686eb403ede3dbd38dcfc14455f7bdd74c6274c4c052337674862505a215f08
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://rlib.sicompos.com/
diff --git a/database/rlib/HISTORY b/database/rlib/HISTORY
index 9bcd3fc..b9957be 100644
--- a/database/rlib/HISTORY
+++ b/database/rlib/HISTORY
@@ -1,3 +1,6 @@
+2009-05-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: update sha5sum for latest test tarball
+
2007-01-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.8
prerelease
diff --git a/devel/bobcat/DETAILS b/devel/bobcat/DETAILS
index b7bdf19..5f1e508 100755
--- a/devel/bobcat/DETAILS
+++ b/devel/bobcat/DETAILS
@@ -1,6 +1,6 @@
SPELL=bobcat
- VERSION=2.02.01
-
SOURCE_HASH=sha512:a37c2a1b4ab81f53fa1304afc587aa4b333872df113b7e37f6805524039a8f316c467aafa78327e3d87358c1c9272244bcab3f4610e01118eec91d2541da8f24
+ VERSION=2.02.02
+
SOURCE_HASH=sha512:72b63a34795db9ded202f9966e3ea7cb0d2592c3838abaaa41e119b9211f5c322d8502a2df41480ab3f35ab81a70e8b581837946a2a222138d99950ddc2e16c2
SOURCE=${SPELL}_${VERSION}.orig.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/devel/bobcat/HISTORY b/devel/bobcat/HISTORY
index 2376d98..00a3763 100644
--- a/devel/bobcat/HISTORY
+++ b/devel/bobcat/HISTORY
@@ -1,3 +1,6 @@
+2009-05-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.02.02
+
2009-03-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.02.01
* PRE_BUILD: fix missing include
diff --git a/doc/yodl/BUILD b/doc/yodl/BUILD
index 4eb5823..5fdb016 100755
--- a/doc/yodl/BUILD
+++ b/doc/yodl/BUILD
@@ -1,11 +1,5 @@
CFLAGS="$CFLAGS -c" &&
-perl contrib/build.pl make &&
-cd scripts &&
-./configreplacements ../src/config.h yodl2whatever.in yodl2whatever &&
-chmod +x yodl2whatever &&
-ln -s yodl2whatever yodl2html &&
-ln -s yodl2whatever yodl2latex &&
-ln -s yodl2whatever yodl2man &&
-ln -s yodl2whatever yodl2txt &&
-ln -s yodl2whatever yodl2xml
+./build programs &&
+./build man &&
+./build macros

diff --git a/doc/yodl/DETAILS b/doc/yodl/DETAILS
index 42b3bbf..152a3b9 100755
--- a/doc/yodl/DETAILS
+++ b/doc/yodl/DETAILS
@@ -1,6 +1,6 @@
SPELL=yodl
- VERSION=2.13.2
-
SOURCE_HASH=sha512:dd58e1f0f5f251705e00d55103b876a9c986b9e24966c80f7ead96e2a02acd127f24e0f6228d3c8b794556aae55ce6b4a177d11a88342648f9248ce7919db799
+ VERSION=2.14.3
+
SOURCE_HASH=sha512:7aced2eebbada5b9ddffbe04686005d397263a22076ebf913c57b385dc633e03d207883b637e08d39792830993e74506bb23844c6d22f0d16c4141d42882e22b
SOURCE=${SPELL}_${VERSION}.orig.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/doc/yodl/HISTORY b/doc/yodl/HISTORY
index 6379b6f..4041c33 100644
--- a/doc/yodl/HISTORY
+++ b/doc/yodl/HISTORY
@@ -1,3 +1,11 @@
+2009-05-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.14.3
+ * PRE_BUILD: fix bad script
+ * BUILD, INSTALL: don't use perl script - does not work now
+
+2009-03-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.14.0
+
2008-10-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.13.2

diff --git a/doc/yodl/INSTALL b/doc/yodl/INSTALL
index 0facb4d..afa972c 100755
--- a/doc/yodl/INSTALL
+++ b/doc/yodl/INSTALL
@@ -1,3 +1,6 @@
-cd $SOURCE_DIRECTORY &&
-cp -a scripts/yodl* $INSTALL_ROOT/usr/bin &&
-perl contrib/build.pl install
+cd $SOURCE_DIRECTORY &&
+./build install programs $INSTALL_ROOT &&
+./build install man $INSTALL_ROOT &&
+./build install macros $INSTALL_ROOT &&
+./build install docs $INSTALL_ROOT
+
diff --git a/doc/yodl/PRE_BUILD b/doc/yodl/PRE_BUILD
index 7616b8d..aec4f1a 100755
--- a/doc/yodl/PRE_BUILD
+++ b/doc/yodl/PRE_BUILD
@@ -2,6 +2,8 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
sed -i -e "s|/usr|$INSTALL_ROOT/usr|;s|make_docformat|build_docformat|" \
contrib/build.pl &&
+# fix bad file
+sed -i '/trace/s|e\\|e:\\|' scripts/yodl2whatever.in &&
# provide dummy directories
cd manual &&
for DD in txt ps html pdf dvi latex;do
diff --git a/kde4-support/akonadi/DETAILS b/kde4-support/akonadi/DETAILS
index 2072297..28b7632 100755
--- a/kde4-support/akonadi/DETAILS
+++ b/kde4-support/akonadi/DETAILS
@@ -1,7 +1,7 @@
SPELL=akonadi
if [[ $AK_VER != devel ]]; then
- VERSION=1.1.1
-
SOURCE_HASH=sha512:975469ec968b4369a5700140568dc5a7941a9fa7dd55541faa7cc4e93bdb573241709a0bfd38c44c20e458c074fc3f190791bc50f9a8feeadb7ce90ce5012695
+ VERSION=1.1.2
+
SOURCE_HASH=sha512:6b268d45dcd95084d72309cb97a437cc05037c25e419738c9ed72b8889f5c738a81026b5efa3e72f783449079680967130231b30c78cdf5c11e69e5fd17ca307
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://download.akonadi-project.org/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/kde4-support/akonadi/HISTORY b/kde4-support/akonadi/HISTORY
index c33c5a3..fe6a8ac 100644
--- a/kde4-support/akonadi/HISTORY
+++ b/kde4-support/akonadi/HISTORY
@@ -1,3 +1,6 @@
+2009-05--05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.2
+
2009-04-12 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add shared-mime-info

diff --git a/x11-toolkits/qt4/BUILD b/x11-toolkits/qt4/BUILD
index 33e0b3b..9ac4c56 100755
--- a/x11-toolkits/qt4/BUILD
+++ b/x11-toolkits/qt4/BUILD
@@ -1,5 +1,4 @@
-export QTDIR="$SOURCE_DIRECTORY" &&
-export LD_LIBRARY_PATH="$SOURCE_DIRECTORY/lib:$LD_LIBRARY_PATH" &&
+QTDIR=$INSTALL_ROOT/usr &&

OPTS="$QT_DEBUG \
$QT_NIS \
diff --git a/x11-toolkits/qt4/DEPENDS b/x11-toolkits/qt4/DEPENDS
index 7eb759a..dbdd68e 100755
--- a/x11-toolkits/qt4/DEPENDS
+++ b/x11-toolkits/qt4/DEPENDS
@@ -67,11 +67,12 @@ optional_depends postgresql
'-no-sql-psql'
\
'for postgresql database support'
&&

-optional_depends unixodbc \
- "-plugin-sql-odbc -I$INSTALL_ROOT/usr/unixODBC/include \
- -L$INSTALL_ROOT/usr/unixODBC/lib -lodbc" \
- '-no-sql-odbc' \
- 'for ODBC database support'
+message choose libiodbc if you want to use soprano+virtuoso+kde4 &&
+optional_depends ODBC-MGR \
+ "-plugin-sql-odbc -I$INSTALL_ROOT/usr/include" \
+ '-no-sql-odbc' \
+ 'for ODBC database support' &&
+
optional_depends CUPS \
'-cups' \
'-no-cups' \
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index f515fe8..266ea47 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,9 +1,20 @@
+2009-05-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: force use of libiodbc
+ * DEPENDS: unixodbc -> ODBC-MGR
+ use libiodbc to avoid conflicts with virtuoso.
+ both virtuoso and qt4 are needed by soprano and kde4
+
2009-05-03 George Sherwood <gsherwood AT sourcemage.org>
* PRE_BUILD: apply patch to build with odbc
* odbc.patch: Added Fedora patch to fix build problem against
new unixODBC.
http://osdir.com/ml/fedora-extras-commits/2009-02/msg06899.html

+2009-04-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: remove some obsolete sedits
+ * CONFLICTS:removed
+ * BUILD: remove exports
+
2009-04-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* PRE_BUILD: apply patch, fix regresion which crashes plasma
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 753ffdd..f4d38f7 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -6,8 +6,7 @@ patch -p0 <
$SPELL_DIRECTORY/0279-svg-rendering-regression.diff &&
patch -p0 < $SPELL_DIRECTORY/odbc.patch &&

# add better optimisation flags
-# -O2 gives segmentation fault in moc when building tools
-sed -i "s|-O2|${CFLAGS/-O3/-O2}|" mkspecs/common/g++.conf \
+sed -i "s|-O2||" mkspecs/common/g++.conf \
mkspecs/linux-cxx/qmake.conf &&

# remove big direcotries
@@ -19,6 +18,14 @@ if [[ x${QT_DEBUG} != "x-debug" ]];then
sed -i "/-g/d" mkspecs/common/g++.conf \
mkspecs/linux-cxx/qmake.conf
fi &&
+
+if is_depends_enabled $SPELL libiodbc;then
+# force use of libiodbc
+ sed -i 's/-lodbc/-liodbc/' src/plugins/sqldrivers/odbc/odbc.pro \
+ src/sql/drivers/drivers.pri \
+ config.tests/unix/odbc/odbc.pro
+fi &&
+
# fix use of firebird
sed -i "s/-lgds/-lfbclient/" config.tests/unix/ibase/ibase.pro \
src/sql/drivers/drivers.pri \


  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (38998a6dd4db3d2f4c143388f659966cd5bbe47b), Treeve Jelbert, 05/05/2009

Archive powered by MHonArc 2.6.24.

Top of Page