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

[Timothy Redaelli]

    Date: Monday, March 10, 2014 @ 12:29:45
  Author: tredaelli
Revision: 106918

upgpkg: wireshark 1.10.6-1

Modified:
  wireshark/trunk/PKGBUILD
Deleted:
  wireshark/trunk/wireshark-1.10.3-gtk3.10-compile.patch

----------------------------------------+
 PKGBUILD                               |    9 +++------
 wireshark-1.10.3-gtk3.10-compile.patch |   12 ------------
 2 files changed, 3 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-10 10:56:29 UTC (rev 106917)
+++ PKGBUILD	2014-03-10 11:29:45 UTC (rev 106918)
@@ -4,8 +4,8 @@
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
-pkgver=1.10.5
-pkgrel=4
+pkgver=1.10.6
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
 makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
@@ -12,15 +12,12 @@
              '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.5-fix-flow-crash.patch)
-sha256sums=('a02190da9573dd381e7598277a31d0c63b05b2af9fe05ab6b7fc058bbea141f5'
-            '45274cca58f0abdd3a560beb79a6f0bc8f35736426a1855ed048c9ad8e94f3c0'
+sha256sums=('a9de3fd3002d4df0946cfea2f5a33557666e14c7014dbc42d1f78dfe113f6b5d'
             'de630c5dd1aa87749fd33c0f3f94a30215e122b1a7ffffeb9bed213fad0fe3ea')
 
 prepare() {
   cd ${pkgbase}-${pkgver}
-  patch -p1 -i "${srcdir}"/wireshark-1.10.3-gtk3.10-compile.patch
   patch -p1 -i "${srcdir}"/wireshark-1.10.5-fix-flow-crash.patch
 }
 

Deleted: wireshark-1.10.3-gtk3.10-compile.patch
===================================================================
--- wireshark-1.10.3-gtk3.10-compile.patch	2014-03-10 10:56:29 UTC (rev 106917)
+++ wireshark-1.10.3-gtk3.10-compile.patch	2014-03-10 11:29:45 UTC (rev 106918)
@@ -1,12 +0,0 @@
---- 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