Date: Monday, November 4, 2013 @ 12:49:23 Author: tredaelli Revision: 100435
upgpkg: wireshark 1.10.3-1 Add patch to make it compile with GTK 3.10 Added: wireshark/trunk/wireshark-1.10.3-gtk3.10-compile.patch Modified: wireshark/trunk/PKGBUILD ----------------------------------------+ PKGBUILD | 16 ++++++++++++---- wireshark-1.10.3-gtk3.10-compile.patch | 12 ++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-11-04 11:03:19 UTC (rev 100434) +++ PKGBUILD 2013-11-04 11:49:23 UTC (rev 100435) @@ -1,9 +1,10 @@ # $Id$ -# Maintainer: Guillaume ALAUX <[email protected]> +# Maintainer: Timothy Redaelli <[email protected]> +# Contributor: Guillaume ALAUX <[email protected]> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark -pkgver=1.10.2 +pkgver=1.10.3 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') @@ -10,9 +11,16 @@ makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme') url='http://www.wireshark.org/' -source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('b7a83314424e13639c591de924aa240bc5f3d9cae01dde69bf858fa04b22a33d') +source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 + wireshark-1.10.3-gtk3.10-compile.patch) +sha256sums=('c1641b36aeb0ca2c1a95fb01d2c647888b65e00a215c9a6464b5fc61e0fd498c' + '45274cca58f0abdd3a560beb79a6f0bc8f35736426a1855ed048c9ad8e94f3c0') +prepare() { + cd ${pkgbase}-${pkgver} + patch -p1 -i ${srcdir}/wireshark-1.10.3-gtk3.10-compile.patch +} + build() { cd ${pkgbase}-${pkgver} Added: wireshark-1.10.3-gtk3.10-compile.patch =================================================================== --- wireshark-1.10.3-gtk3.10-compile.patch (rev 0) +++ wireshark-1.10.3-gtk3.10-compile.patch 2013-11-04 11:49:23 UTC (rev 100435) @@ -0,0 +1,12 @@ +--- wireshark-1.10.3/configure.ac.orig 2013-11-04 10:39:14.101045626 +0000 ++++ wireshark-1.10.3/configure.ac 2013-11-04 10:39:26.884300664 +0000 +@@ -1388,9 +1388,6 @@ + # Don't use GLIB_CFLAGS + AM_PATH_GLIB_2_0($GLIB_MIN_VERSION, , AC_MSG_ERROR(GLib $GLIB_MIN_VERSION or later distribution not found.), gthread gmodule) + +- CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS" +- CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS" +- CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS" + CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS" + if test ! \( $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -lt 20 \) ; then + # Enable GSEAL when building with GTK > 2.20
