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

[Timothy Redaelli]

    Date: Wednesday, March 5, 2014 @ 16:19:32
  Author: tredaelli
Revision: 106521

upgpkg: wireshark 1.10.5-4

FS#39042

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

---------------------------------------+
 PKGBUILD                              |   13 ++++---
 wireshark-1.10.5-fix-flow-crash.patch |   55 ++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-05 14:38:37 UTC (rev 106520)
+++ PKGBUILD	2014-03-05 15:19:32 UTC (rev 106521)
@@ -5,7 +5,7 @@
 pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
 pkgver=1.10.5
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('GPL2')
 makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
@@ -12,13 +12,16 @@
              'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
 url='http://www.wireshark.org/'
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
-        wireshark-1.10.3-gtk3.10-compile.patch)
+        wireshark-1.10.3-gtk3.10-compile.patch
+        wireshark-1.10.5-fix-flow-crash.patch)
 sha256sums=('a02190da9573dd381e7598277a31d0c63b05b2af9fe05ab6b7fc058bbea141f5'
-            '45274cca58f0abdd3a560beb79a6f0bc8f35736426a1855ed048c9ad8e94f3c0')
+            '45274cca58f0abdd3a560beb79a6f0bc8f35736426a1855ed048c9ad8e94f3c0'
+            'de630c5dd1aa87749fd33c0f3f94a30215e122b1a7ffffeb9bed213fad0fe3ea')
 
 prepare() {
   cd ${pkgbase}-${pkgver}
-  patch -p1 -i ${srcdir}/wireshark-1.10.3-gtk3.10-compile.patch
+  patch -p1 -i "${srcdir}"/wireshark-1.10.3-gtk3.10-compile.patch
+  patch -p1 -i "${srcdir}"/wireshark-1.10.5-fix-flow-crash.patch
 }
 
 build() {
@@ -39,7 +42,7 @@
 
 package_wireshark-cli() {
   pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
-  depends=('krb5' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua' 'portaudio')
+  depends=('krb5' 'libgcrypt' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua' 'portaudio')
   install=wireshark.install
   conflicts=(wireshark)
 

Added: wireshark-1.10.5-fix-flow-crash.patch
===================================================================
--- wireshark-1.10.5-fix-flow-crash.patch	                        (rev 0)
+++ wireshark-1.10.5-fix-flow-crash.patch	2014-03-05 15:19:32 UTC (rev 106521)
@@ -0,0 +1,55 @@
+--- 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) ) {