Date: Thursday, October 15, 2015 @ 05:05:08
Author: anatolik
Revision: 144018
upgpkg: wireshark 1.12.8-1
Modified:
wireshark/trunk/PKGBUILD
Deleted:
wireshark/trunk/configure-pixmap-fix.diff
---------------------------+
PKGBUILD | 9 +++------
configure-pixmap-fix.diff | 14 --------------
2 files changed, 3 insertions(+), 20 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-10-15 02:41:44 UTC (rev 144017)
+++ PKGBUILD 2015-10-15 03:05:08 UTC (rev 144018)
@@ -4,7 +4,7 @@
# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
pkgname=('wireshark-cli' 'wireshark-gtk' 'wireshark-qt')
pkgbase=wireshark
-pkgver=1.12.7
+pkgver=1.12.8
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2')
@@ -11,15 +11,12 @@
makedepends=('qt4' 'gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
'lua52' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
url='http://www.wireshark.org/'
-source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
- configure-pixmap-fix.diff)
-sha1sums=('bed365bacfd0b5c653d8568ad25e52957659bd9f'
- 'c383bad83442d75f44afe1737848b9dee4f35b8f')
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
+sha1sums=('d8c23120525a2f3505e822b7684e7367bcd0ba70')
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() {
Deleted: configure-pixmap-fix.diff
===================================================================
--- configure-pixmap-fix.diff 2015-10-15 02:41:44 UTC (rev 144017)
+++ configure-pixmap-fix.diff 2015-10-15 03:05:08 UTC (rev 144018)
@@ -1,14 +0,0 @@
---- 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;
