sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Eric Sandall (b3ed764234da32f4018aa374f457834cd604f4de)

From: Eric Sandall <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (b3ed764234da32f4018aa374f457834cd604f4de)
Date: Thu, 19 Jan 2012 20:01:41 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

gnome2-apps/vinagre/DEPENDS | 2 -
gnome2-apps/vinagre/HISTORY | 3 ++
x11/gtk-vnc/DEPENDS | 2 -
x11/gtk-vnc/HISTORY | 7
+++++-
x11/gtk-vnc/PRE_SUB_DEPENDS | 6
+++--
x11/gtk-vnc/REPAIR^fa4f2fa4289ffc42c28cf63eb48ec61a^PRE_SUB_DEPENDS | 8
+++++++
x11/gtk-vnc/SUB_DEPENDS | 11
++++++++--
7 files changed, 31 insertions(+), 8 deletions(-)

New commits:
commit b3ed764234da32f4018aa374f457834cd604f4de
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

vinagre: Requires gtk-vnc built with gtk+3 bindings

commit 16c59ecbbda74f05ca93bfa7f27f3aeb4ba61aa5
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gtk-vnc: Cleanup formatting

commit 8586480f19f46304df48a47945ee3ef9259c3edb
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gtk-vnc: Allow choice between gtk+2 (default) and gtk+3
Some apps require pythong bindings (e.g. virt-manager) which
do not build with gtk+3 selected.

diff --git a/gnome2-apps/vinagre/DEPENDS b/gnome2-apps/vinagre/DEPENDS
index 3982ae9..3bc90e7 100755
--- a/gnome2-apps/vinagre/DEPENDS
+++ b/gnome2-apps/vinagre/DEPENDS
@@ -1,7 +1,7 @@
depends libxml2 &&
depends vala &&
depends gtk+3 &&
-depends gtk-vnc &&
+depends -sub 'GTK3' gtk-vnc &&
depends glib2 &&
depends gconf2 &&
depends gnome-doc-utils &&
diff --git a/gnome2-apps/vinagre/HISTORY b/gnome2-apps/vinagre/HISTORY
index 3a48e3a..49593fb 100644
--- a/gnome2-apps/vinagre/HISTORY
+++ b/gnome2-apps/vinagre/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Requires gtk-vnc built with gtk+3 bindings
+
2011-11-26 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 3.2.2
* DEPENDS: gtk+2 -> gtk+3
diff --git a/x11/gtk-vnc/DEPENDS b/x11/gtk-vnc/DEPENDS
index 694ea2e..0285a90 100755
--- a/x11/gtk-vnc/DEPENDS
+++ b/x11/gtk-vnc/DEPENDS
@@ -1,5 +1,3 @@
-depends gtk+3 "--with-gtk=3.0" &&
-
depends gnutls &&
depends -sub VAPIGEN vala &&

diff --git a/x11/gtk-vnc/HISTORY b/x11/gtk-vnc/HISTORY
index 7fcdbcf..316a523 100644
--- a/x11/gtk-vnc/HISTORY
+++ b/x11/gtk-vnc/HISTORY
@@ -1,10 +1,15 @@
+2012-01-19 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS, SUB_DEPENDS: Allow choice between gtk+2 (default) and gtk+3
+ Some apps require pythong bindings (e.g. virt-manager) which
+ do not build with gtk+3 selected.
+
2011-11-20 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: bz2 => xz

2011-11-11 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 0.4.4
bz2 => xz
- * DEPENDS: added depends vala with VAPIGEN
+ * DEPENDS: added depends vala with VAPIGEN

2011-07-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.4.3
diff --git a/x11/gtk-vnc/PRE_SUB_DEPENDS b/x11/gtk-vnc/PRE_SUB_DEPENDS
index 6d312e2..241941f 100755
--- a/x11/gtk-vnc/PRE_SUB_DEPENDS
+++ b/x11/gtk-vnc/PRE_SUB_DEPENDS
@@ -1,6 +1,8 @@
case $THIS_SUB_DEPENDS in
- PYTHON) is_depends_enabled $SPELL python && return 0
- ;;
+ PYTHON) is_depends_enabled $SPELL python &&
+ is_depends_enabled $SPELL gtk+2 && return 0 ;;
+ GTK2) is_depends_enabled $SPELL gtk+2 && return 0 ;;
+ GTK3) is_depends_enabled $SPELL gtk+3 && return 0 ;;
esac

return 1
diff --git
a/x11/gtk-vnc/REPAIR^fa4f2fa4289ffc42c28cf63eb48ec61a^PRE_SUB_DEPENDS
b/x11/gtk-vnc/REPAIR^fa4f2fa4289ffc42c28cf63eb48ec61a^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..241941f
--- /dev/null
+++ b/x11/gtk-vnc/REPAIR^fa4f2fa4289ffc42c28cf63eb48ec61a^PRE_SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+ PYTHON) is_depends_enabled $SPELL python &&
+ is_depends_enabled $SPELL gtk+2 && return 0 ;;
+ GTK2) is_depends_enabled $SPELL gtk+2 && return 0 ;;
+ GTK3) is_depends_enabled $SPELL gtk+3 && return 0 ;;
+esac
+
+return 1
diff --git a/x11/gtk-vnc/SUB_DEPENDS b/x11/gtk-vnc/SUB_DEPENDS
index 474d208..e9d41db 100755
--- a/x11/gtk-vnc/SUB_DEPENDS
+++ b/x11/gtk-vnc/SUB_DEPENDS
@@ -1,6 +1,13 @@
case $THIS_SUB_DEPENDS in
- PYTHON) echo "python bindings requested, forcing them."
- depends python '--with-python'
+ PYTHON) echo "python bindings requested, forcing them." &&
+ depends python '--with-python' &&
+ depends gtk+2 '--with-gtk=2.0'
+ ;;
+ GTK2) echo "gtk+2 bindings requested, forcing them." &&
+ depends gtk+2 '--with-gtk=2.0'
+ ;;
+ GTK3) echo "gtk+3 bindings requested, forcing them." &&
+ depends gtk+3 '--with-gtk=3.0'
;;
*) echo "unknown sub-depends!"
return 1

[SM-Commit] GIT changes to master grimoire by Eric Sandall (b3ed764234da32f4018aa374f457834cd604f4de), Eric Sandall, 01/19/2012