Skip to Content.
Sympa Menu

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

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č (6cc47deaf5e2dddd700567a72ce799de6584e89c)
  • Date: Mon, 13 Sep 2010 13:02:29 -0500

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

http/arora/DEPENDS | 2 +-
http/arora/HISTORY | 3 +++
x11-toolkits/qt4/HISTORY | 4 ++++
x11-toolkits/qt4/PRE_SUB_DEPENDS | 1 +
x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS | 19 +++++++++++++++++++
x11-toolkits/qt4/SUB_DEPENDS | 5 +++++
6 files changed, 33 insertions(+), 1 deletion(-)

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

qt4: added option EXCEPT to *SUB_DEPENDS

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

arora: depend on qt4 with exceptions (fixes bug #15551)

diff --git a/http/arora/DEPENDS b/http/arora/DEPENDS
index c294d28..e2bcced 100755
--- a/http/arora/DEPENDS
+++ b/http/arora/DEPENDS
@@ -1 +1 @@
-depends -sub WEBKIT qt4
+depends -sub "WEBKIT EXCEPT" qt4
diff --git a/http/arora/HISTORY b/http/arora/HISTORY
index fe08439..5ead92b 100644
--- a/http/arora/HISTORY
+++ b/http/arora/HISTORY
@@ -1,3 +1,6 @@
+2010-09-13 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: depend on qt4 with exceptions (fixes bug #15551)
+
2009-12-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.10.2

diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 2ccc287..7037131 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,7 @@
+2010-09-13 Bor Kraljič <pyrobor AT ver.si>
+ * {,PRE_,REPAIR^all^PRE_}SUB_DEPENDS: added option EXCEPT
+ needed to fix bug #15551
+
2010-07-12 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: Remove -ffast-math from CFLAGS, fixes bug #15634

diff --git a/x11-toolkits/qt4/PRE_SUB_DEPENDS
b/x11-toolkits/qt4/PRE_SUB_DEPENDS
index 47abc86..639e358 100755
--- a/x11-toolkits/qt4/PRE_SUB_DEPENDS
+++ b/x11-toolkits/qt4/PRE_SUB_DEPENDS
@@ -13,6 +13,7 @@ case $THIS_SUB_DEPENDS in
WEBKIT) [[ $QT_WEBKIT == "-webkit" ]] && return 0;;
MEDIA) [[ $QT_MEDIA == "-multimedia" ]] && return 0;;
GTK ) [[ $QT_GTK == "-gtkstyle" ]] && return 0;;
+ EXCEPT) [[ $QT_EXCEPT == "-exceptions" ]] && return 0;;
*) echo "Eek, unknown subdependency requested!"; return 1;;
esac
return 1
diff --git a/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
b/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..639e358
--- /dev/null
+++ b/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,19 @@
+case $THIS_SUB_DEPENDS in
+ ACCESS) [[ $QT_ACCESS == "-accessibility" ]] && return 0;;
+ DBUS) is_depends_enabled $SPELL dbus && return 0;;
+ OPENGL) is_depends_enabled $SPELL $(get_spell_provider $SPELL OPENGL) &&
return 0;;
+ FIREBIRD) is_depends_enabled $SPELL firebird && return 0;;
+ MYSQL) is_depends_enabled $SPELL mysql && return 0;;
+ POSTGRESQL) is_depends_enabled $SPELL postgresql && return 0;;
+ SQLITE) is_depends_enabled $SPELL sqlite && return 0;;
+ SSL) is_depends_enabled $SPELL openssl && return 0;;
+ TOOLS) [[ $QT_TOOLS == "-make" ]] && return 0;;
+ STL) [[ $QT_STL == "-stl" ]] && return 0;;
+ QT3) [[ $QT_QT3 == "-qt3support" ]] && return 0;;
+ WEBKIT) [[ $QT_WEBKIT == "-webkit" ]] && return 0;;
+ MEDIA) [[ $QT_MEDIA == "-multimedia" ]] && return 0;;
+ GTK ) [[ $QT_GTK == "-gtkstyle" ]] && return 0;;
+ EXCEPT) [[ $QT_EXCEPT == "-exceptions" ]] && 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 fec1ea3..f36d044 100755
--- a/x11-toolkits/qt4/SUB_DEPENDS
+++ b/x11-toolkits/qt4/SUB_DEPENDS
@@ -63,6 +63,11 @@ ACCESS) if [[ $QT_ACCESS == "-no-accessibility" ]]; then
QT_ACCESS="-accessibility"
fi
;;
+EXCEPT) if [[ $QT_EXCEPT == "-no-exceptions" ]]; then
+ echo "Exception checking requested, forcing build."
+ QT_EXCEPT="-exceptions"
+ fi
+ ;;

*) echo unknown sub-depends!!! ; return 1 ;;
esac



  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (6cc47deaf5e2dddd700567a72ce799de6584e89c), Bor Kraljič, 09/13/2010

Archive powered by MHonArc 2.6.24.

Top of Page