Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-kde44 grimoire by Treeve Jelbert (ddf6cbe7b9f9dd3c8895db31d4d1cc594a428669)

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 devel-kde44 grimoire by Treeve Jelbert (ddf6cbe7b9f9dd3c8895db31d4d1cc594a428669)
  • Date: Sat, 17 Oct 2009 14:43:15 -0500

GIT changes to devel-kde44 grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

database/virtuoso/BUILD | 10 ++--------
database/virtuoso/CONFIGURE | 16 ++++++++--------
database/virtuoso/DETAILS | 11 ++++++++---
database/virtuoso/HISTORY | 9 +++++++++
database/virtuoso/INSTALL | 1 -
database/virtuoso/PREPARE | 8 ++++----
kde4/kdebindings4/DEPENDS | 10 +++++++---
kde4/kdebindings4/DETAILS | 4 ++--
kde4/kdebindings4/HISTORY | 5 +++++
kde4/kdelibs4/CONFLICTS | 2 ++
kde4/kdelibs4/HISTORY | 5 +++++
11 files changed, 52 insertions(+), 29 deletions(-)

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

kdebindings4: => 4.3.72svn1035674

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

kdelibs4 - add conflicts self

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

virtuoso-6.0.0 / 5.0.12

diff --git a/database/virtuoso/BUILD b/database/virtuoso/BUILD
index 2c7a3f8..04d63d1 100755
--- a/database/virtuoso/BUILD
+++ b/database/virtuoso/BUILD
@@ -1,8 +1,2 @@
-OPTS="$VT_OPT $OPTS" &&
-if [[ $VIRT_VER == stable ]];then
-make_single &&
-# fix for missing file
-echo 1.05.4401 > appsrc/ODS-Wiki/vad_version
-fi &&
-default_build &&
-make_normal
+OPTS+=" $VT_KDE $VT_OPT" &&
+default_build
diff --git a/database/virtuoso/CONFIGURE b/database/virtuoso/CONFIGURE
index 94698ac..afa586e 100755
--- a/database/virtuoso/CONFIGURE
+++ b/database/virtuoso/CONFIGURE
@@ -1,10 +1,12 @@
-if [[ $VIRT_VER == devel ]];then
message 'KDE4 does not need any of the optional vad'
-config_query VT_KDE 'only for use with KDE4?' y
- if [[ $VT_KDE == y ]];then
- persistent_add VT_OPT &&
- VT_OPT+=' --disable-all-vads'
- else
+config_query_option VT_KDE 'only for use with KDE4?' y '--disable-all-vads'
''
+if [[ -z "$VT_KDE" ]];then
+# persistent_add VT_OPT &&
+# VT_OPT+=' --disable-all-vads'
+#else
+if [[ $VIRT_VER == new ]];then
+config_query_option VT_OPT 'build Facet vad' n '--enable-fct-vad'
'--disable-fct-vad'
+fi &&
config_query_option VT_OPT 'build BPEL?' n '--enable-bpel-vad'
'--disable-bpel-vad' &&
config_query_option VT_OPT 'build Conductor?' n '--enable-conductor-vad'
'--disable-conductor-vad' &&
config_query_option VT_OPT 'build Demo?' n '--enable-demo-vad'
'--disable-demo-vad' &&
@@ -13,8 +15,6 @@ config_query_option VT_OPT 'build ODS?' n
'--enable-ods-vad' '--disable-o
config_query_option VT_OPT 'build RDF mapper?' n '--enable-rdfmappers-vad'
'--disable-rdfmappers-vad' &&
config_query_option VT_OPT 'build Sparql Demo? n '--enable-sparqldemo-vad'
'--disable-sparqldemo-vad' &&
config_query_option VT_OPT 'build Tutorial? n '--enable-tutorial-vad'
'--disable-tutorial-vad'
- fi
fi &&
config_query_option VT_OPT 'build debugger?' n '--enable-pldebug'
'--disable-pldebug' &&
config_query_option VT_OPT 'build static code?' n '--enable-static'
'--disable-static'
-#config_query_list VT_DOC 'install docs(very BIG)?' on off
diff --git a/database/virtuoso/DETAILS b/database/virtuoso/DETAILS
index bf5e5e1..d9a019c 100755
--- a/database/virtuoso/DETAILS
+++ b/database/virtuoso/DETAILS
@@ -3,14 +3,19 @@ if [[ $VIRT_VER == devel ]];then
VERSION=20091009

SOURCE_HASH=sha512:5482280286f8482cccb16b0f8111fa2867ea2654fa8cec77a0629626de6a3571bbcee875384a7343eff194916eb75a070b050fbf5ec6a8adcd670f6f0f2598df
else
- VERSION=5.0.11
-
SOURCE_HASH=sha512:49dd685ab8809b933f0feaf1eda399f67fd5a844a0338fbffdd6cf85031ae3f99202f8b51266e4e78b6f7ea6eaba702dc830dff31c32606966cd4b3004ddefe1
+ if [[ $VIRT_VER == new ]];then
+ VERSION=6.0.0
+
SOURCE_HASH=sha512:6f9b33a547ff59d5f29bb4f0e22226ca0c118e1f9900b1f3c42c601e4f3ec043d9d0c3720d24e7bca4feb9e97449d5ceb0c527eebf6ebc76a504ef8071424b41
+ else
+ VERSION=5.0.12
+
SOURCE_HASH=sha512:d9b3a52ad567928b567304c6d6975dd01878dbbfa862fbab22beb71b766a5f3abd480fe9864efef2695d07432262cfc385873d5d027810bad4eaf2b1be8d34d2
+ fi
fi
SOURCE=$SPELL-opensource-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-opensource-$VERSION
+ WEB_SITE=http://virtuoso.openlinksw.com/wiki/main/Main/
SOURCE_URL[0]=ftp://download.openlinksw.com/support/vos/$SOURCE
SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- WEB_SITE=http://virtuoso.openlinksw.com/wiki/main/Main/
LICENSE[0]=GPL
GATHER_DOCS=off
ENTERED=20090220
diff --git a/database/virtuoso/HISTORY b/database/virtuoso/HISTORY
index 98abda2..8d21507 100644
--- a/database/virtuoso/HISTORY
+++ b/database/virtuoso/HISTORY
@@ -1,3 +1,12 @@
+2009-10-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.0.12 / 6.0.0
+ * BUILD, CONFIGURE: disable special case for devel version
+ simplify logic
+ support Facet vad
+ * PREPARE: add missing '\'
+ add support for new/old/devel versions
+ * INSTALL: deleted
+
2009-10-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 20091009 (devel), for kde4.4
* PREPARE: expand message
diff --git a/database/virtuoso/INSTALL b/database/virtuoso/INSTALL
deleted file mode 100755
index 5a6f8f4..0000000
--- a/database/virtuoso/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-default_install
diff --git a/database/virtuoso/PREPARE b/database/virtuoso/PREPARE
index d87cee8..bba7a86 100755
--- a/database/virtuoso/PREPARE
+++ b/database/virtuoso/PREPARE
@@ -1,11 +1,11 @@
-config_query_list VIRT_VER 'which version to build?' stable devel &&
+config_query_list VIRT_VER 'which version to build?' new old devel &&
# check for running server
(ps -A | grep virtuoso) &&
message ${PROBLEM_COLOR}please stop the virtuoso server and try again\
This also implies quitting your KDE session \
- If there are any transaction log files (*.trx) in your virtuoso
directory
- ~/.kde4/share/apps/nepomuk/repository/main/data/virtuosobackend
- they should be deleted
+ If there are any transaction log files \(*.trx\) in your
virtuoso directory \
+ ~/.kde4/share/apps/nepomuk/repository/main/data/virtuosobackend \
+ they should be deleted \
${DEFAULT_COLOR} &&
return 1
return 0
diff --git a/kde4/kdebindings4/DEPENDS b/kde4/kdebindings4/DEPENDS
index 2b6433f..2b54294 100755
--- a/kde4/kdebindings4/DEPENDS
+++ b/kde4/kdebindings4/DEPENDS
@@ -1,11 +1,15 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
+optional_depends soprano '' '' 'Soprano bindings' &&
+optional_depends akonadi '' '' 'Akonadi bindings' &&
+optional_depends kdevplatform4 '' '' 'development tools' &&
+optional_depends kdepimlibs4 '' '' 'PIM support' &&
optional_depends kdegraphics4 '' '' 'Okular support' &&
-optional_depends falcon '' '' 'Falcon bindings' &&
+optional_depends falcon '-DENABLE_KROSSFALCON=1' '' 'Falcon bindings'
&&
optional_depends mono '' '' 'Mono C#/QT# bindings' &&
-optional_depends python '' '' 'Python bindings' &&
+optional_depends python '' '-DENABLE_KROSSPYTHON=0' 'Python bindings'
&&
optional_depends qscintilla '' '' 'editing component' &&
optional_depends qwt5 '' '' 'gui for technical apps' &&
-optional_depends ruby '' '' 'Ruby bindings' &&
+optional_depends ruby '' '-DENABLE_KROSSRUBY=0' 'Ruby bindings'
&&
#optional_depends ocaml '' '' 'OCaml bindings'
#optional_depends OPENGL '' '' '3D OpenGL modes' &&
#optional_depends JAVA '' '' 'Java support' 'z-rejected' &&
diff --git a/kde4/kdebindings4/DETAILS b/kde4/kdebindings4/DETAILS
index e63c563..684c5c8 100755
--- a/kde4/kdebindings4/DETAILS
+++ b/kde4/kdebindings4/DETAILS
@@ -2,8 +2,8 @@
SPELLX=${SPELL//4}
persistent_read kdelibs4 KDE_VER KDE_VER
if [[ ${KDE_VER} == unstable ]];then
- VERSION=4.3.69svn1027298
-
SOURCE_HASH=sha512:0169ab94d7e0d2e03c6cd526b779a6eb3b289b5cad974d769330441618d8d3518bb1d407dae862ad8813e26d536a40e31c88ef533f1612435f0a438fe2a5b4b6
+ VERSION=4.3.72svn1035674
+
SOURCE_HASH=sha512:045ae8200010898c92e6fd4fd7491185b67e6fe26bc3d395ebbbe2327cdc50587a21c65bca78dcb0cf2531db4cb5487ca2105df9b089161857167ec11e91f86d
else
VERSION=4.3.2

SOURCE_HASH=sha512:8eef1fef399a6b5cf32a09ec27058343e9350f4f382e0df4efbb7e7740dfe00252ed006add5d2dd35bb3f1a9b13e19577c502fcb5e15504b1f5f10caa588d2c5
diff --git a/kde4/kdebindings4/HISTORY b/kde4/kdebindings4/HISTORY
index 990aad0..b7e32af 100644
--- a/kde4/kdebindings4/HISTORY
+++ b/kde4/kdebindings4/HISTORY
@@ -1,3 +1,8 @@
+2009-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.3.72svn1035674 (unstable)
+ * DEPENDS: more optional packages
+ add soem explicit flags
+
2009-10-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.2 (stable)

diff --git a/kde4/kdelibs4/CONFLICTS b/kde4/kdelibs4/CONFLICTS
index 3a2f942..9080cb3 100755
--- a/kde4/kdelibs4/CONFLICTS
+++ b/kde4/kdelibs4/CONFLICTS
@@ -1,3 +1,5 @@
+# prevent finding the existing install
+conflicts kdelibs4 y &&
if [[ "${KDE_VER}" == "unstable" ]];then
conflicts kdelibs4-experimental y
fi
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index 175cfcb..71e6409 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,8 @@
+2009-10-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: add kdelibs4
+ prevent finding the existing installation, which then slows down
the install step
+ by rebuilding stuff
+
2009-10-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.72svn1035674 (unstable)
this version now requires qt-4.6



  • [SM-Commit] GIT changes to devel-kde44 grimoire by Treeve Jelbert (ddf6cbe7b9f9dd3c8895db31d4d1cc594a428669), Treeve Jelbert, 10/17/2009

Archive powered by MHonArc 2.6.24.

Top of Page