diff options
| author | Eric Sandall | 2012-01-19 17:20:06 -0800 |
|---|---|---|
| committer | Eric Sandall | 2012-01-19 17:20:06 -0800 |
| commit | 8586480f19f46304df48a47945ee3ef9259c3edb (patch) | |
| tree | 9bf08e36602926a9b8d942e526d008e6c6f50369 | |
| parent | e1ab319715de4e38fe58f4e3074ad843fea70db9 (diff) | |
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.
| -rwxr-xr-x | x11/gtk-vnc/DEPENDS | 2 | ||||
| -rw-r--r-- | x11/gtk-vnc/HISTORY | 5 | ||||
| -rwxr-xr-x | x11/gtk-vnc/PRE_SUB_DEPENDS | 6 | ||||
| -rwxr-xr-x | x11/gtk-vnc/REPAIR^fa4f2fa4289ffc42c28cf63eb48ec61a^PRE_SUB_DEPENDS | 8 | ||||
| -rwxr-xr-x | x11/gtk-vnc/SUB_DEPENDS | 11 |
5 files changed, 26 insertions, 6 deletions
diff --git a/x11/gtk-vnc/DEPENDS b/x11/gtk-vnc/DEPENDS index 694ea2ef53..0285a90d85 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 7fcdbcff59..55e407c56d 100644 --- a/x11/gtk-vnc/HISTORY +++ b/x11/gtk-vnc/HISTORY @@ -1,3 +1,8 @@ +2012-01-19 Eric Sandall <sandalle@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@sourcemage.org> * DETAILS: bz2 => xz diff --git a/x11/gtk-vnc/PRE_SUB_DEPENDS b/x11/gtk-vnc/PRE_SUB_DEPENDS index 6d312e2eb2..241941fd42 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 0000000000..241941fd42 --- /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 474d20839e..e9d41db01e 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 |