Source Mage code commit list

[Ladislav Hagara <scm AT sourcemage.org>]

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

 security/wireshark/BUILD   |    2 +-
 security/wireshark/DEPENDS |   12 +++++++++---
 security/wireshark/DETAILS |    4 ++--
 security/wireshark/HISTORY |    5 +++++
 4 files changed, 17 insertions(+), 6 deletions(-)

New commits:
commit b84b65faa8f71189c5b81cf9452b41210f97022e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    wireshark 1.12.0

diff --git a/security/wireshark/BUILD b/security/wireshark/BUILD
index ef8bf7b..efea309 100755
--- a/security/wireshark/BUILD
+++ b/security/wireshark/BUILD
@@ -1,3 +1,3 @@
-OPTS="$WIRESHARK_OPTS $OPTS" &&
+OPTS="--with-qt=no $WIRESHARK_OPTS $OPTS" &&
 
 default_build
diff --git a/security/wireshark/DEPENDS b/security/wireshark/DEPENDS
index b4272d1..93a01e1 100755
--- a/security/wireshark/DEPENDS
+++ b/security/wireshark/DEPENDS
@@ -2,9 +2,15 @@ depends glibc &&
 depends glib2 &&
 depends libpcap &&
 
-optional_depends gtk+2 \
-                 "--enable-wireshark" "--disable-wireshark" \
-                 "for GTK+2 GUI support" &&
+optional_depends gtk+3 \
+                 "--with-gtk3=yes" "--with-gtk3=no" \
+                 "for GTK+3 GUI support" &&
+
+if ! is_depends_enabled $SPELL gtk+3; then
+  optional_depends gtk+2 \
+                 "--with-gtk2=yes" "--with-gtk2=no" \
+                 "for GTK+2 GUI support"
+fi &&
 
 optional_depends zlib \
                  "--with-zlib" "--without-zlib" \
diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index ce0bfbe..ebbf0c8 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
            SPELL=wireshark
-         VERSION=1.10.7
+         VERSION=1.12.0
   SECURITY_PATCH=48
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
    SOURCE_URL[1]=http://www.wireshark.org/download/src/$SOURCE
-     
SOURCE_HASH=sha512:2bc96e59a8fb2515ff557384f67a93dc0695bd9868b4b5ac340633dd0cae4970711f2eacf5f1fc63f47691b54d830059650c68680bd31478e29c83c7ebed8bc3
+     
SOURCE_HASH=sha512:03c55106e2b4d5690d0b5fe74b2f4723f07ea9f9a6ca0f54b006045ec4bda47cb31dd3aa8c1879375844f6e6b49f1ffd4a6bb2e34564d43d6e0a25a08302b902
         WEB_SITE=http://www.wireshark.org/
          ENTERED=20020116
       LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index 7efc21c..258158e 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,8 @@
+2014-08-01 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 1.12.0
+       * DEPENDS: gtk+3 added, gtk+2 options fixed
+       * BUILD: added --with-qt=no temporarily
+
 2014-04-23 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.10.7, SECURITY_PATCH=48