Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Bor Kraljič (e669c8e2936b5c674242c5b219e1221e29646b9b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (e669c8e2936b5c674242c5b219e1221e29646b9b)
  • Date: Wed, 14 Sep 2011 02:08:58 -0500

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

kde4-support/soprano/DEPENDS | 14 ++++----------
kde4-support/soprano/HISTORY | 5 +++++
kde4-support/soprano/PREPARE | 1 -
kde4-support/soprano/PRE_SUB_DEPENDS | 8 ++++++++
kde4-support/soprano/SUB_DEPENDS | 12 ++++++++++++
kde4/kdelibs4/DEPENDS | 23 +++++++++++++++++++++--
kde4/kdelibs4/HISTORY | 4 ++++
kde4/kdenetwork4/DEPENDS | 3 ++-
kde4/kdenetwork4/HISTORY | 3 +++
kde4/kdenetwork4/WIP | 7 -------
10 files changed, 59 insertions(+), 21 deletions(-)

New commits:
commit e669c8e2936b5c674242c5b219e1221e29646b9b
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kdenetwork4: qca2 is mandatory dependency (fixes #222)

commit 2df1bfcd7603acd116db7c3151d545944e14998a
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kdelibs4: request soprano with REDLAND RAPTOR DBUS VIRTUOSO support
(issue #223)

commit db7583489500f005614e66fb91cc357dc3c90dd7
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

soprano: added SUB_DEPENDS and cleaned DEPENDS

* DEPENDS: only optional dependencies will do since we have SUB_DEPENDS
now
* {,PRE_}SUB_DEPENDS: added option to request REDLAND RAPTOR DBUS
VIRTUOSO support
* PREPARE: removed query for kde4 (we will now request support)

commit 09c1d71393aba964db8a48c12de941dc8f23f98c
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kdelibs4: added dependencies from KDE_DEPENDS

diff --git a/kde4-support/soprano/DEPENDS b/kde4-support/soprano/DEPENDS
index 18205a4..3b9c186 100755
--- a/kde4-support/soprano/DEPENDS
+++ b/kde4-support/soprano/DEPENDS
@@ -1,17 +1,11 @@
depends qt4 &&
depends cmake &&

-if [[ $SOP_KDE == y ]];then
- depends redland &&
- depends raptor
- depends dbus &&
- runtime_depends virtuoso
-else
- optional_depends redland '' '-DSOPRANO_DISABLE_REDLAND_BACKEND=1' 'Redland
backend' &&
+optional_depends redland '' '-DSOPRANO_DISABLE_REDLAND_BACKEND=1' 'Redland
backend' &&
optional_depends raptor '' '-DSOPRANO_DISABLE_RAPTOR_PARSER=1' 'raptor
parser and serializer plugins' &&
- suggest_depends virtuoso '' '-DSOPRANO_DISABLE_VIRTUOSO_BACKEND=1'
'full-text search database' &&
- optional_depends dbus '' '-DSOPRANO_DISABLE_DBUS=1' 'dbus integration'
-fi &&
+suggest_depends virtuoso '' '-DSOPRANO_DISABLE_VIRTUOSO_BACKEND=1'
'full-text search database' &&
+optional_depends dbus '' '-DSOPRANO_DISABLE_DBUS=1' 'dbus integration'
+
if is_depends_enabled $SPELL dbus;then
sub_depends qt4 DBUS
fi &&
diff --git a/kde4-support/soprano/HISTORY b/kde4-support/soprano/HISTORY
index 8819346..143e1e7 100644
--- a/kde4-support/soprano/HISTORY
+++ b/kde4-support/soprano/HISTORY
@@ -1,3 +1,8 @@
+2011-09-14 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: only optional dependencies will do since we have
SUB_DEPENDS now
+ * {,PRE_}SUB_DEPENDS: added option to request REDLAND RAPTOR DBUS
VIRTUOSO support
+ * PREPARE: removed query for kde4 (we will now request support)
+
2011-09-04 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: PATCHLEVEL++ for /opt/kde4 -> /usr change

diff --git a/kde4-support/soprano/PREPARE b/kde4-support/soprano/PREPARE
deleted file mode 100755
index 3ab87dd..0000000
--- a/kde4-support/soprano/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query SOP_KDE 'build for use with KDE4?' y
diff --git a/kde4-support/soprano/PRE_SUB_DEPENDS
b/kde4-support/soprano/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..f2116b2
--- /dev/null
+++ b/kde4-support/soprano/PRE_SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+ REDLAND) is_depends_enabled $SPELL redland ;;
+ RAPTOR) is_depends_enabled $SPELL raptor ;;
+ DBUS) is_depends_enabled $SPELL dbus ;;
+ VIRTUOSO) is_depends_enabled $SPELL virtuoso ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/kde4-support/soprano/SUB_DEPENDS
b/kde4-support/soprano/SUB_DEPENDS
new file mode 100755
index 0000000..64aa2bb
--- /dev/null
+++ b/kde4-support/soprano/SUB_DEPENDS
@@ -0,0 +1,12 @@
+case $THIS_SUB_DEPENDS in
+ REDLAND) message "Redland support requested forcing dependency" &&
+ depends redland ;;
+ RAPTOR) message "Raptor support requested forcing dependency" &&
+ depends raptor ;;
+ DBUS) message "Dbus support requested forcing dependency" &&
+ depends dbus ;;
+ VIRTUOSO) message "Redland support requested forcing dependency" &&
+ runtime_depends virtuoso ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/kde4/kdelibs4/DEPENDS b/kde4/kdelibs4/DEPENDS
index d3c6a59..8acb1d5 100755
--- a/kde4/kdelibs4/DEPENDS
+++ b/kde4/kdelibs4/DEPENDS
@@ -1,8 +1,27 @@
-source $SECTION_DIRECTORY/KDE_DEPENDS &&
+depends -sub "WEBKIT DBUS SSL OPENGL QT3 TOOLS ACCESS" qt4 &&
+depends iceauth &&
+depends libice &&
+depends libsm &&
+depends libxtst &&
+depends libxext &&
+depends phonon &&
+depends desktop-file-utils &&
+depends dbus &&
+depends pkgconfig &&
+depends openssl &&
+depends pcre &&
+depends strigi &&
+depends -sub "QT4" strigi &&
+depends shared-mime-info &&
+depends perl &&
+depends libpng &&
+depends libxml2 &&
+depends libxslt &&
+depends giflib &&
depends JPEG &&
depends attica &&
depends shared-desktop-ontologies &&
-depends soprano &&
+depends -sub "REDLAND RAPTOR DBUS VIRTUOSO" soprano &&
depends redland &&
depends raptor &&
depends libdbusmenu-qt &&
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index 820dbe7..a997821 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,7 @@
+2011-09-14 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: added dependencies from KDE_DEPENDS
+ request soprano with REDLAND RAPTOR DBUS VIRTUOSO support (issue
#223)
+
2011-09-08 Bor Kraljič <pyrobor AT ver.si>
* CONFLICTS: conflict with yakuake and not yakuake4

diff --git a/kde4/kdenetwork4/DEPENDS b/kde4/kdenetwork4/DEPENDS
index cbe9a5f..9f9409f 100755
--- a/kde4/kdenetwork4/DEPENDS
+++ b/kde4/kdenetwork4/DEPENDS
@@ -2,13 +2,14 @@ source $SECTION_DIRECTORY/KDE_DEPENDS &&
depends kdepimlibs4 &&
depends libv4l &&
depends jasper &&
+depends qca2 &&
optional_depends gmp '' '' 'KGet Torrent support' &&
optional_depends ppp '' '' 'for dialup support' &&
optional_depends openslp '' '' 'to find available remote desktops' &&
optional_depends wireless_tools '' '' 'Wireless support' &&
optional_depends libidn '' '' 'International Domain Name Support' &&
#optional_depends decibel '' '' 'Decibel support' &&
-optional_depends qca2 '' '' 'needed to build kopete' &&
+#optional_depends qca2 '' '' 'needed to build kopete' &&
optional_depends ktorrent4 '' '' 'use system torrent library' &&
optional_depends alsa-lib '' '' 'sound support' &&
optional_depends xmms '' '' 'nowlistening plugin' &&
diff --git a/kde4/kdenetwork4/HISTORY b/kde4/kdenetwork4/HISTORY
index 2f475eb..1e6f692 100644
--- a/kde4/kdenetwork4/HISTORY
+++ b/kde4/kdenetwork4/HISTORY
@@ -1,3 +1,6 @@
+2011-09-14 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: qca2 is mandatory dependency (fixes #222)
+
2011-09-07 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.7.1

diff --git a/kde4/kdenetwork4/WIP b/kde4/kdenetwork4/WIP
deleted file mode 100644
index dc85f9c..0000000
--- a/kde4/kdenetwork4/WIP
+++ /dev/null
@@ -1,7 +0,0 @@
-2009-11-24
-
--- Building KGet torrent support with embedded torrent library (libbtcore)
(-DENABLE_EMBEDDED_TORRENT_SUPPORT=false to disable)
-CMake Error: File
/var/git/kdenetwork/kget/transfer-plugins/bittorrent/libbtcore/config-btcore.h.cmake
does not exist.
-CMake Error at kget/transfer-plugins/bittorrent/CMakeLists.txt:47
(configure_file):
- configure_file Problem configuring file
-



  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (e669c8e2936b5c674242c5b219e1221e29646b9b), Bor Kraljič, 09/14/2011

Archive powered by MHonArc 2.6.24.

Top of Page