Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (b012e7e41d2d90e5c683bc57c3b02cdf31bd879b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (b012e7e41d2d90e5c683bc57c3b02cdf31bd879b)
  • Date: Fri, 16 Nov 2007 08:02:20 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

libs/soprano/DEPENDS | 2 +-
libs/soprano/HISTORY | 3 +++
x11-toolkits/qt4/BUILD | 8 ++++----
x11-toolkits/qt4/CONFIGURE | 16 ++++++++--------
x11-toolkits/qt4/HISTORY | 5 +++++
x11-toolkits/qt4/PRE_SUB_DEPENDS | 2 ++
x11-toolkits/qt4/SUB_DEPENDS | 5 +++++
7 files changed, 28 insertions(+), 13 deletions(-)

New commits:
commit b012e7e41d2d90e5c683bc57c3b02cdf31bd879b
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

soprano: needs qt4 tools

commit 2a0052046769babf2bbd7f7052f6be5448e85143
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

qt4;
can't pass strings with spaces in it with
config_query_option, was making qt secretly forget the saved answer

SUB_DEPENDS, PRE_SUB_DEPENDS: added TOOLS for soprano

diff --git a/libs/soprano/DEPENDS b/libs/soprano/DEPENDS
index e98f41b..651f6bd 100755
--- a/libs/soprano/DEPENDS
+++ b/libs/soprano/DEPENDS
@@ -1,4 +1,4 @@
-depends qt4 &&
+depends -sub TOOLS qt4 &&
depends cmake &&
depends redland &&
optional_depends clucene '' '' 'full-text search index'
diff --git a/libs/soprano/HISTORY b/libs/soprano/HISTORY
index 9e911c8..5f98037 100644
--- a/libs/soprano/HISTORY
+++ b/libs/soprano/HISTORY
@@ -1,3 +1,6 @@
+2007-11-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: needs qt4 with tools (qttest)
+
2007-11-07 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add optional clucene

diff --git a/x11-toolkits/qt4/BUILD b/x11-toolkits/qt4/BUILD
index 674a5cb..dc1b5f8 100755
--- a/x11-toolkits/qt4/BUILD
+++ b/x11-toolkits/qt4/BUILD
@@ -8,10 +8,10 @@ OPTS="$QT_DEBUG \
$QT_EXCEPT \
$QT_PCH \
$QT_QT3 \
- $QT_DEMO \
- $QT_EXAMPLE \
- $QT_TOOLS \
- $QT_TRANS \
+ $QT_DEMO demos \
+ $QT_EXAMPLE examples \
+ $QT_TOOLS tools \
+ $QT_TRANS translations \
$OPTS" &&
if [[ x${QT_DEBUG} == "x" ]];then
OPTS="-no-separate-debug-info ${OPTS}"
diff --git a/x11-toolkits/qt4/CONFIGURE b/x11-toolkits/qt4/CONFIGURE
index 3b70348..f2a0915 100755
--- a/x11-toolkits/qt4/CONFIGURE
+++ b/x11-toolkits/qt4/CONFIGURE
@@ -1,20 +1,20 @@
config_query QT_DOC 'install documents(very big)?' n &&

config_query_option QT_DEMO 'install demos?' n \
- '-make demos' \
- '-nomake demos' &&
+ '-make' \
+ '-nomake' &&

config_query_option QT_EXAMPLE 'install examples?' n \
- '-make examples' \
- '-nomake examples' &&
+ '-make' \
+ '-nomake' &&

config_query_option QT_TOOLS 'install tools?' y \
- '-make tools' \
- '-nomake tools' &&
+ '-make' \
+ '-nomake' &&

config_query_option QT_TRANS 'install translations?' n \
- '-make translations' \
- '-nomake translations' &&
+ '-make' \
+ '-nomake' &&

config_query_option QT_QT3 'build qt3 support?' y \
'-qt3support' \
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 34fcc8f..5539f16 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,8 @@
+2007-11-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * BUILD, CONFIGURE: can't pass strings with spaces in it with
+ config_query_option, was making qt secretly forget the saved answer
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: added TOOLS for soprano
+
2007-11-07 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS, PRE_SUB_DEPENDS, SUB_DEPENDS: add OPENGL

diff --git a/x11-toolkits/qt4/PRE_SUB_DEPENDS
b/x11-toolkits/qt4/PRE_SUB_DEPENDS
index 1141c3c..6753b23 100755
--- a/x11-toolkits/qt4/PRE_SUB_DEPENDS
+++ b/x11-toolkits/qt4/PRE_SUB_DEPENDS
@@ -3,5 +3,7 @@ case $THIS_SUB_DEPENDS in
# GIF) is_depends_enabled $SPELL LIBGIF && return 0;;
OPENGL) is_depends_enabled $SPELL OPENGL && return 0;;
SSL) is_depends_enabled $SPELL openssl && return 0;;
+ TOOLS) [[ $QT_TOOLS == "-make" ]] && return 0;;
+ *) echo "Eek, unknown subdependency requested!"; return 1;;
esac
return 1
diff --git a/x11-toolkits/qt4/SUB_DEPENDS b/x11-toolkits/qt4/SUB_DEPENDS
index a7fc453..99404b6 100755
--- a/x11-toolkits/qt4/SUB_DEPENDS
+++ b/x11-toolkits/qt4/SUB_DEPENDS
@@ -10,6 +10,11 @@ OPENGL) echo "OPENGL support requested, forcing OPENGL
dependency." &&
;;
SSL) echo "SSL support requested, forcing openssl dependency." &&
depends openssl
+ ;;
+TOOLS) if [[ $QT_TOOLS == "-nomake" ]]; then
+ echo "Tools requested, forcing build." &&
+ QT_TOOLS="-make"
+ fi
;;
*) echo unknown sub-depends!!! ; return 1 ;;
esac



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (b012e7e41d2d90e5c683bc57c3b02cdf31bd879b), Jaka Kranjc, 11/16/2007

Archive powered by MHonArc 2.6.24.

Top of Page