Skip to Content.
Sympa Menu

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

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 (195f744dfff9264e3af5440e72c60496932d967a)
  • Date: Sun, 26 Oct 2008 02:56:21 -0500

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

database/dbd-interbase/BUILD | 18 +++++-------------
database/dbd-interbase/DETAILS | 1 +
database/dbd-interbase/HISTORY | 4 ++++
database/dbd-interbase/Makefile.PL.bz2 |binary
database/sqlite/BUILD | 3 +++
database/sqlite/CONFIGURE | 1 +
database/sqlite/HISTORY | 3 +++
gnome2-apps/gramps/DEPENDS | 4 +---
gnome2-apps/gramps/DETAILS | 5 +++--
gnome2-apps/gramps/HISTORY | 7 +++++++
gnome2-apps/gramps/PRE_BUILD | 9 ++-------
libs/clucene/BUILD | 4 ++++
libs/clucene/DEPENDS | 9 +++++++--
libs/clucene/DETAILS | 32
+++++++++++++++++++++++---------
libs/clucene/HISTORY | 10 ++++++++++
libs/clucene/PREPARE | 6 +++++-
16 files changed, 79 insertions(+), 37 deletions(-)

New commits:
commit 9c43f148caa1297c19fa8f237ce639ba9c731c03
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

"dbd-interbase-0.48"

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

sqlite - extra configure option

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

gramps-3.0.3

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

clucene-0.9.21b

diff --git a/database/dbd-interbase/BUILD b/database/dbd-interbase/BUILD
index 2ff7b8d..53d79d1 100755
--- a/database/dbd-interbase/BUILD
+++ b/database/dbd-interbase/BUILD
@@ -1,24 +1,16 @@
+FBDEST=$INSTALL_ROOT/opt/firebird
answer()
{
cat <<EOF
-/usr/firebird/bin
-/usr/firebird/include
-/usr/firebird/lib
+$FBDEST/bin
+$FBDEST/include
+FBDEST/lib
localhost://$SOURCE_DIRECTORY/test.fdb
sysdba
masterkey
EOF
}
-# chgrp firebird $SOURCE_DIRECTORY &&
-# chmod g+rw $SOURCE_DIRECTORY &&
-# sedit \
-#"298,304d;s#/opt/fire#/usr/fire#;s#=> ''#=> '$CFLAGS'#" \
-# Makefile.PL &&
-# answer | perl Makefile.PL &&
-# make &&
-# make test

bzcat $SPELL_DIRECTORY/Makefile.PL.bz2 >./Makefile.PL &&
perl Makefile.PL &&
-
- make
+ make
diff --git a/database/dbd-interbase/DETAILS b/database/dbd-interbase/DETAILS
index 6ca72c0..d3b7880 100755
--- a/database/dbd-interbase/DETAILS
+++ b/database/dbd-interbase/DETAILS
@@ -1,6 +1,7 @@
SPELL=dbd-interbase
VERSION=0.48

SOURCE_HASH=sha512:65e4e4a367b79f692cd102ff4494521804c5b5194338c4057eabe7472a5a64c9d26ebdfcc60c5fdd14199ffa9af92926baffa39bd75bc37bf6691dcf07526b05
+ PATCHLEVEL=1
SOURCE=DBD-InterBase-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/DBD-InterBase-$VERSION

SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/E/ED/EDPRATOMO/$SOURCE
diff --git a/database/dbd-interbase/HISTORY b/database/dbd-interbase/HISTORY
index 427aec4..63a9321 100644
--- a/database/dbd-interbase/HISTORY
+++ b/database/dbd-interbase/HISTORY
@@ -1,3 +1,7 @@
+2008-10-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD, Makefile.PL.bz2: firebird is now in /opt/firebird
+ * DETAILS: PATCHLEVEL=1
+
2008-03-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.48
url now at cpan
diff --git a/database/dbd-interbase/Makefile.PL.bz2
b/database/dbd-interbase/Makefile.PL.bz2
index cd0c5ed..ffde591 100644
Binary files a/database/dbd-interbase/Makefile.PL.bz2 and
b/database/dbd-interbase/Makefile.PL.bz2 differ
diff --git a/database/sqlite/BUILD b/database/sqlite/BUILD
index c04e97f..b076b4d 100755
--- a/database/sqlite/BUILD
+++ b/database/sqlite/BUILD
@@ -1,2 +1,5 @@
+if [[ $SQLITE_META == y ]];then
+ CFLAGS="$CFLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1"
+fi &&
OPTS="$OPTS $SQLITE_TSAFE" &&
default_build
diff --git a/database/sqlite/CONFIGURE b/database/sqlite/CONFIGURE
index e4b835f..3f9c270 100755
--- a/database/sqlite/CONFIGURE
+++ b/database/sqlite/CONFIGURE
@@ -1,2 +1,3 @@
+config_query SQLITE_META "enable column metadata?" y &&
config_query_option SQLITE_TSAFE "Build thread-safe SQLite?" y \
"--enable-threadsafe" "--disable-threadsafe"
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 38e43e6..56bf86a 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,6 @@
+2008-10-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD, CONFIGURE: extra option "enable column metadata?"
+
2008-10-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.6.4

diff --git a/gnome2-apps/gramps/DEPENDS b/gnome2-apps/gramps/DEPENDS
index c3c76c2..a67eae7 100755
--- a/gnome2-apps/gramps/DEPENDS
+++ b/gnome2-apps/gramps/DEPENDS
@@ -1,6 +1,4 @@
-depends python &&
-depends bsddb3 &&
-#depends -sub db python &&
+depends -sub db python &&
depends libgnomeui &&
depends -sub NUMPY pygtk2 &&
depends gnome-python2 &&
diff --git a/gnome2-apps/gramps/DETAILS b/gnome2-apps/gramps/DETAILS
index 5776a9f..9392700 100755
--- a/gnome2-apps/gramps/DETAILS
+++ b/gnome2-apps/gramps/DETAILS
@@ -1,6 +1,6 @@
SPELL=gramps
- VERSION=3.0.2
-
SOURCE_HASH=sha512:f3b9c3ac603b523cd5ca61eb60f7755794ac4c3ac42156874158cfcec9eb40958dcfc0d61e46e9774dd3e87be7ca14251a39c6b9d0ef7aa2a3a5249cc58de04e
+ VERSION=3.0.3
+
SOURCE_HASH=sha512:cf1fd34bf3724794fc08eb685fdd80ef809b9b66ddc0020e73e249182102c5a363fe7eef1fdd22a3c153a27afeae995ee26786c869ab44c0476171c766a953da
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
@@ -8,6 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
ENTERED=20030216
LICENSE[0]="GPL"
DOCS="FAQ NEWS README ChangeLog"
+ GATHER_DOCS=off
KEYWORDS="python gnome2"
SHORT="Gnome2 genealogy program written in Python"
cat << EOF
diff --git a/gnome2-apps/gramps/HISTORY b/gnome2-apps/gramps/HISTORY
index 92ae7f9..fb9650b 100644
--- a/gnome2-apps/gramps/HISTORY
+++ b/gnome2-apps/gramps/HISTORY
@@ -1,3 +1,10 @@
+2008-10-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0.3
+
+2008-10-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: fix for db-4.7.25
+ * DEPENDS: remove bsddb3, use 'python -sub db' again
+
2008-09-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.0.2
* DEPENDS: add bsddb3, as the db support in python-2.5 is broken
diff --git a/gnome2-apps/gramps/PRE_BUILD b/gnome2-apps/gramps/PRE_BUILD
index f207970..d81d808 100755
--- a/gnome2-apps/gramps/PRE_BUILD
+++ b/gnome2-apps/gramps/PRE_BUILD
@@ -1,9 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sed -i 's/bsddb/bsddb3/' \
-src/gen/db/base.py \
-src/gen/db/dbdir.py \
-src/plugins/Leak.py \
-src/Editors/_EditFamily.py \
-src/GrampsDbUtils/_GrampsBSDDB.py \
-src/GrampsLogger/_ErrorReportAssistant.py
+# db-4.7.25 does not have DB_LOG_AUTOREMOVE
+sed -i '/DB_LOG_AUTOREMOVE/'D src/gen/db/dbdir.py
src/GrampsDbUtils/_GrampsBSDDB.py
diff --git a/libs/clucene/BUILD b/libs/clucene/BUILD
index 581529d..2ae07ac 100755
--- a/libs/clucene/BUILD
+++ b/libs/clucene/BUILD
@@ -1,2 +1,6 @@
+if [[ $CLUC_VER != stable ]];then
+ cmake_build
+else
OPTS="--disable-static $OPTS" &&
default_build
+fi
diff --git a/libs/clucene/DEPENDS b/libs/clucene/DEPENDS
index 33f8005..bde06e9 100755
--- a/libs/clucene/DEPENDS
+++ b/libs/clucene/DEPENDS
@@ -1,2 +1,7 @@
-depends g++
-
+depends g++ &&
+if [[ $CLUC_VER != stable ]];then
+ depends cmake
+fi &&
+if [[ $CLUC_VER == svn ]]; then
+ depends subversion
+fi
diff --git a/libs/clucene/DETAILS b/libs/clucene/DETAILS
index 5e0d372..5a4d2a5 100755
--- a/libs/clucene/DETAILS
+++ b/libs/clucene/DETAILS
@@ -1,17 +1,31 @@
SPELL=clucene
-if [[ $CLUC_VER = devel ]];then
- VERSION=0.9.21
-
SOURCE_HASH=sha512:5fc61dde396486e97ea4ee8387aa3d4ef32abad599a0356f1377f662ffe1c607a4e544c16718885363dd5b5b7eeeb38b1445a7b8432ca4d479e7145bcb41db7b
+if [[ $CLUC_VER == svn ]];then
+ if [[ "$CLUC_SVN_AUTOUPDATE" == "y" ]]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=svn
+ fi
+ FORCE_DOWNLOAD=on
+ SPELLX=$SPELL-svn
+ SOURCE=$SPELLX.tar.bz2
+ SOURCE_IGNORE=volatile
+
SOURCE_URL[0]=svn_http://clucene.svn.sourceforge.net/svnroot/clucene/trunk/clucene:clucene
else
- VERSION=0.9.21
-
SOURCE_HASH=sha512:5fc61dde396486e97ea4ee8387aa3d4ef32abad599a0356f1377f662ffe1c607a4e544c16718885363dd5b5b7eeeb38b1445a7b8432ca4d479e7145bcb41db7b
-fi
- SOURCE=$SPELL-core-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-core-$VERSION
+# if [[ $CLUC_VER == devel ]];then
+# VERSION=0.9.23.0
+# SOURCE_HASH=sha512:
+# SPELLX=$SPELL-core-$VERSION-Source
+# else
+ VERSION=0.9.21b
+
SOURCE_HASH=sha512:706e8ad1fc944ffe12f0b0057169bca63131ae2263a3e46dd9750bfe2e7401870dac8dc494e0159f9302afb285473d89b5bd62f9c2339a1a1954e4cb98391ee3
+ SPELLX=$SPELL-core-$VERSION
+# fi
+ SOURCE=$SPELLX.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+fi
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX
WEB_SITE=http://sourceforge.net/projects/clucene/
ENTERED=20050531
- PATCHLEVEL=1
LICENSE[0]=LGPL
KEYWORDS="libs"
SHORT="C++ port of Lucene"
diff --git a/libs/clucene/HISTORY b/libs/clucene/HISTORY
index 1c8c897..4267c17 100644
--- a/libs/clucene/HISTORY
+++ b/libs/clucene/HISTORY
@@ -1,3 +1,13 @@
+2008-10-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.21b (stable)
+
+2008-10-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.23 (devel)
+ add svn support
+ * DEPENDS, BUILD: use cmake for devel/svn version
+ * DEPENDS: add subversion for svn version
+ * PREPARE: added, for svn and devel versions
+
2008-10-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.21

diff --git a/libs/clucene/PREPARE b/libs/clucene/PREPARE
index 343d227..b3c11c8 100755
--- a/libs/clucene/PREPARE
+++ b/libs/clucene/PREPARE
@@ -1 +1,5 @@
-config_query_list CLUC_VER 'which version?' stable devel
+config_query_list CLUC_VER 'which version?' stable svn
+if [[ $CLUC_VER == svn ]]; then
+ config_query CLUC_SVN_AUTOUPDATE "Update to the latest SVN on every cast?"
${DEFAULT:-n}
+fi
+



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (195f744dfff9264e3af5440e72c60496932d967a), Treeve Jelbert, 10/26/2008

Archive powered by MHonArc 2.6.24.

Top of Page