Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (5bf6b40ddb2eab7af305506ee4d27f770672df9a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (5bf6b40ddb2eab7af305506ee4d27f770672df9a)
  • Date: Thu, 20 Oct 2011 19:26:47 -0500

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

gnome2-apps/gnome-disk-utility/DEPENDS | 4 +-
gnome2-apps/gnome-disk-utility/HISTORY | 4 ++
utils/avahi/BUILD | 3 ++
utils/avahi/HISTORY | 4 ++
utils/avahi/PRE_SUB_DEPENDS | 2 +
utils/avahi/REPAIR^0219b41c8d42a21a6d61fb3e7b5f23c0^PRE_SUB_DEPENDS | 15
++++++++++
utils/avahi/SUB_DEPENDS | 3 ++
7 files changed, 33 insertions(+), 2 deletions(-)

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

avahi: Disable QT3 support (won't work with qt4's implementation)

avahi tries to build QT3 support unless you specifically disable it.

grep QT3 /etc/sorcery/local/depends/qt4.p
QT_QT3="-qt3support"

...
checking for QT3... no
configure: error: Package requirements ( qt-mt >= 3.0.0 ) were not met:

No package 'qt-mt' found

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

gnome-disk-utility: Requires avahi built with gtk+3 support for Avahi UI
Depends on gtk+3, not gtk+2

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

avahi: Allow requiring gtk+3 optional dependency

diff --git a/gnome2-apps/gnome-disk-utility/DEPENDS
b/gnome2-apps/gnome-disk-utility/DEPENDS
index 9943a37..d819279 100755
--- a/gnome2-apps/gnome-disk-utility/DEPENDS
+++ b/gnome2-apps/gnome-disk-utility/DEPENDS
@@ -1,7 +1,7 @@
depends glib2 &&
-depends gtk+2 &&
+depends gtk+3 &&
depends udisks &&
-depends avahi &&
+depends -sub GTK3 avahi &&
depends libnotify &&
depends unique &&

diff --git a/gnome2-apps/gnome-disk-utility/HISTORY
b/gnome2-apps/gnome-disk-utility/HISTORY
index c43c253..1f18cf2 100644
--- a/gnome2-apps/gnome-disk-utility/HISTORY
+++ b/gnome2-apps/gnome-disk-utility/HISTORY
@@ -1,3 +1,7 @@
+2011-10-20 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Requires avahi built with gtk+3 support for Avahi UI
+ Depends on gtk+3, not gtk+2
+
2011-07-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.0.2

diff --git a/utils/avahi/BUILD b/utils/avahi/BUILD
index bb5575e..ddb918a 100755
--- a/utils/avahi/BUILD
+++ b/utils/avahi/BUILD
@@ -21,4 +21,7 @@ if [[ "$AVAHI_COMPAT_HOWL" == 'y' ]]; then
OPTS="$OPTS --enable-compat-howl"
fi &&

+OPTS="--disable-qt3 $OPTS" &&
+
+
default_build
diff --git a/utils/avahi/HISTORY b/utils/avahi/HISTORY
index ff72ba1..cb85c10 100644
--- a/utils/avahi/HISTORY
+++ b/utils/avahi/HISTORY
@@ -1,3 +1,7 @@
+2011-10-20 Eric Sandall <sandalle AT sourcemage.org>
+ * *SUB_DEPENDS: Allow requiring gtk+3 optional dependency
+ * BUILD: Disable QT3 support (won't work with qt4's implementation)
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: removed some redundant checking for qt-x11

diff --git a/utils/avahi/PRE_SUB_DEPENDS b/utils/avahi/PRE_SUB_DEPENDS
index c8790c5..623730e 100755
--- a/utils/avahi/PRE_SUB_DEPENDS
+++ b/utils/avahi/PRE_SUB_DEPENDS
@@ -5,6 +5,8 @@ case $THIS_SUB_DEPENDS in
if is_depends_enabled $SPELL qt4; then return 0; fi;;
GTK2)
if is_depends_enabled $SPELL gtk+2; then return 0; fi;;
+ GTK3)
+ if is_depends_enabled $SPELL gtk+3; then return 0; fi;;
COMPAT_LIBDNS_SD)
if [[ "$AVAHI_COMPAT_LIBDNS_SD" == y ]]; then return 0; fi;;
COMPAT_HOWL)
diff --git
a/utils/avahi/REPAIR^0219b41c8d42a21a6d61fb3e7b5f23c0^PRE_SUB_DEPENDS
b/utils/avahi/REPAIR^0219b41c8d42a21a6d61fb3e7b5f23c0^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..623730e
--- /dev/null
+++ b/utils/avahi/REPAIR^0219b41c8d42a21a6d61fb3e7b5f23c0^PRE_SUB_DEPENDS
@@ -0,0 +1,15 @@
+case $THIS_SUB_DEPENDS in
+ MONO)
+ if is_depends_enabled $SPELL mono; then return 0; fi;;
+ QT4)
+ if is_depends_enabled $SPELL qt4; then return 0; fi;;
+ GTK2)
+ if is_depends_enabled $SPELL gtk+2; then return 0; fi;;
+ GTK3)
+ if is_depends_enabled $SPELL gtk+3; then return 0; fi;;
+ COMPAT_LIBDNS_SD)
+ if [[ "$AVAHI_COMPAT_LIBDNS_SD" == y ]]; then return 0; fi;;
+ COMPAT_HOWL)
+ if [[ "$AVAHI_COMPAT_HOWL" == y ]]; then return 0; fi;;
+esac &&
+return 1
diff --git a/utils/avahi/SUB_DEPENDS b/utils/avahi/SUB_DEPENDS
index a7ba6fc..b11282b 100755
--- a/utils/avahi/SUB_DEPENDS
+++ b/utils/avahi/SUB_DEPENDS
@@ -8,6 +8,9 @@ QT4) echo "qt4 bindings requested, forcing them." &&
GTK2) echo "gtk+2 bindings requested, forcing them." &&
depends gtk+2 '--enable-gtk'
;;
+GTK3) echo "gtk+3 bindings requested, forcing them." &&
+ depends gtk+3 '--enable-gtk3'
+ ;;
COMPAT_LIBDNS_SD) echo "libdns_sd compatibility layer requested, forcing
it." &&
AVAHI_COMPAT_LIBDNS_SD=y
;;



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (5bf6b40ddb2eab7af305506ee4d27f770672df9a), Eric Sandall, 10/20/2011

Archive powered by MHonArc 2.6.24.

Top of Page