[arch-commits] Commit in wireshark/trunk (2 files)

[Timothy Redaelli]

    Date: Tuesday, August 5, 2014 @ 09:50:30
  Author: tredaelli
Revision: 116883

upgpkg: wireshark 1.12.0-2

Modified:
  wireshark/trunk/PKGBUILD
Deleted:
  wireshark/trunk/wireshark-1.10.5-fix-flow-crash.patch

---------------------------------------+
 PKGBUILD                              |   25 +++++++++++---
 wireshark-1.10.5-fix-flow-crash.patch |   55 --------------------------------
 2 files changed, 19 insertions(+), 61 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-05 07:29:20 UTC (rev 116882)
+++ PKGBUILD	2014-08-05 07:50:30 UTC (rev 116883)
@@ -2,19 +2,23 @@
 # Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
 # Contributor: Guillaume ALAUX <guillaume at archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
-pkgname=('wireshark-cli' 'wireshark-gtk')
+pkgname=('wireshark-cli' 'wireshark-gtk' 'wireshark-qt')
 pkgbase=wireshark
-pkgver=1.10.8
+pkgver=1.12.0
 pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL2')
-makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
+makedepends=('qt4' 'gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
              'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
 url='http://www.wireshark.org/'
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-# https://www.wireshark.org/download/SIGNATURES-1.10.8.txt
-sha1sums=('aa6067ce91637506504c8b954caf75ac98742152')
+sha256sums=('0f59fea1c5b35de90af681067e49113fee0dd7a901750a97fa25f4256dbf13c7')
 
+prepare() {
+  cd ${pkgbase}-${pkgver}
+  sed -i 's/$(AM_V_RCC)rcc/&-qt4/p' ui/qt/Makefile.am
+}
+
 build() {
   cd ${pkgbase}-${pkgver}
 
@@ -21,6 +25,7 @@
   ./autogen.sh
   ./configure \
       --prefix=/usr \
+      --with-qt \
       --with-gtk3=yes \
       --with-pcap \
       --with-zlib \
@@ -44,7 +49,7 @@
   #wireshark uid group is 150
   chgrp 150 "${pkgdir}/usr/bin/dumpcap"
   chmod 754 "${pkgdir}/usr/bin/dumpcap"
-  rm "${pkgdir}/usr/bin/wireshark"
+  rm "${pkgdir}/usr/bin/wireshark" "${pkgdir}/usr/bin/wireshark-qt"
 
   # Headers
   install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
@@ -76,3 +81,11 @@
   done
   install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
 }
+
+package_wireshark-qt() {
+  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - Qt frontend'
+  depends=('qt4' 'wireshark-cli')
+
+  cd ${pkgbase}-${pkgver}
+  install -Dm755 .libs/wireshark-qt "${pkgdir}/usr/bin/wireshark-qt"
+}

Deleted: wireshark-1.10.5-fix-flow-crash.patch
===================================================================
--- wireshark-1.10.5-fix-flow-crash.patch	2014-08-05 07:29:20 UTC (rev 116882)
+++ wireshark-1.10.5-fix-flow-crash.patch	2014-08-05 07:50:30 UTC (rev 116883)
@@ -1,55 +0,0 @@
---- a/ui/gtk/graph_analysis.c
-+++ b/ui/gtk/graph_analysis.c
-@@ -504,28 +504,34 @@ static void dialog_graph_draw(graph_analysis_data_t *user_data)
- 
- #if GTK_CHECK_VERSION(2,22,0)
- 	/* Paint time title background */
--	cr = cairo_create (user_data->dlg.surface_time);
--	gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
--	cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
--	cairo_rectangle (cr, 0, 0, draw_area_time_alloc.width, top_y_border);
--	cairo_fill (cr);
--	cairo_destroy (cr);
-+	if ( user_data->dlg.surface_time ) {
-+		cr = cairo_create (user_data->dlg.surface_time);
-+		gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
-+		cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
-+		cairo_rectangle (cr, 0, 0, draw_area_time_alloc.width, top_y_border);
-+		cairo_fill (cr);
-+		cairo_destroy (cr);
-+	}
- 
- 	/* Paint main title background */
--	cr = cairo_create (user_data->dlg.surface_main);
--	gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
--	cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
--	cairo_rectangle (cr, 0, 0, draw_area_alloc.width, top_y_border);
--	cairo_fill (cr);
--	cairo_destroy (cr);
-+	if ( user_data->dlg.surface_main ) {
-+		cr = cairo_create (user_data->dlg.surface_main);
-+		gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
-+		cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
-+		cairo_rectangle (cr, 0, 0, draw_area_alloc.width, top_y_border);
-+		cairo_fill (cr);
-+		cairo_destroy (cr);
-+	}
- 
- 	/* Paint main comment background */
--	cr = cairo_create (user_data->dlg.surface_comments);
--	gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
--	cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
--	cairo_rectangle (cr, 0, 0, draw_area_comments_alloc.width, top_y_border);
--	cairo_fill (cr);
--	cairo_destroy (cr);
-+	if ( user_data->dlg.surface_comments ) {
-+		cr = cairo_create (user_data->dlg.surface_comments);
-+		gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0);
-+		cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
-+		cairo_rectangle (cr, 0, 0, draw_area_comments_alloc.width, top_y_border);
-+		cairo_fill (cr);
-+		cairo_destroy (cr);
-+	}
- #else
- 	/* Paint time title background */
- 	if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_time) ) {