[arch-commits] Commit in wireshark/trunk (PKGBUILD configure-pixmap-fix.diff)

[Timothy Redaelli]

    Date: Monday, March 16, 2015 @ 12:51:26
  Author: tredaelli
Revision: 129357

upgpkg: wireshark 1.12.4-2

FS#44169 (not reproducible here)

Added:
  wireshark/trunk/configure-pixmap-fix.diff
Modified:
  wireshark/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |    9 ++++++---
 configure-pixmap-fix.diff |   14 ++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-16 11:51:19 UTC (rev 129356)
+++ PKGBUILD	2015-03-16 11:51:26 UTC (rev 129357)
@@ -5,18 +5,21 @@
 pkgname=('wireshark-cli' 'wireshark-gtk' 'wireshark-qt')
 pkgbase=wireshark
 pkgver=1.12.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL2')
 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)
-sha1sums=('dbbd4090c02fe170f35b26fa26d8aba0b399c659')
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
+        configure-pixmap-fix.diff)
+sha1sums=('dbbd4090c02fe170f35b26fa26d8aba0b399c659'
+          'c383bad83442d75f44afe1737848b9dee4f35b8f')
 
 prepare() {
   cd ${pkgbase}-${pkgver}
   sed -i 's/$(AM_V_RCC)rcc/&-qt4/p' ui/qt/Makefile.am
+  patch -uNp0 -i ../configure-pixmap-fix.diff
 }
 
 build() {

Added: configure-pixmap-fix.diff
===================================================================
--- configure-pixmap-fix.diff	                        (rev 0)
+++ configure-pixmap-fix.diff	2015-03-16 11:51:26 UTC (rev 129357)
@@ -0,0 +1,14 @@
+--- configure.ac	2015-03-14 10:52:22.187482157 -0500
++++ configure.ac	2015-03-14 10:53:01.040495936 -0500
+@@ -1531,7 +1531,10 @@
+ if test "$have_gtk" = "yes" ; then
+ 	# If we have GTK then add flags for it.
+ 
+-	CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS"
++	# 2015-03-04 - disabled to fix SegFault, see
++	# https://trac.macports.org/ticket/46850
++	# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195980#c45
++	#CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS"
+ 	CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
+ 	if test \( $gtk_config_major_version -eq 3 -a $gtk_config_minor_version -ge 10 \) ; then
+ 		## Allow use of deprecated & disable deprecated warnings if Gtk >= 3.10;