[arch-commits] Commit in wireshark/trunk (5 files)
Timothy Redaelli
tredaelli at archlinux.org
Thu Nov 19 18:21:54 UTC 2015
Date: Thursday, November 19, 2015 @ 19:21:54
Author: tredaelli
Revision: 147163
upgpkg: wireshark 2.0.0-1
Wireshark is now the Qt version, wireshark-gtk is the old interface.
Added:
wireshark/trunk/wireshark-common.install
wireshark/trunk/wireshark-gui.install
Modified:
wireshark/trunk/PKGBUILD
Deleted:
wireshark/trunk/wireshark-gtk.install
wireshark/trunk/wireshark-qt.install
--------------------------+
PKGBUILD | 58 +++++++++++++++++++++------------------------
wireshark-common.install | 12 +++++++++
wireshark-gtk.install | 12 ---------
wireshark-gui.install | 11 ++++++++
wireshark-qt.install | 11 --------
5 files changed, 51 insertions(+), 53 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-11-19 17:01:28 UTC (rev 147162)
+++ PKGBUILD 2015-11-19 18:21:54 UTC (rev 147163)
@@ -2,23 +2,19 @@
# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
# Contributor: Guillaume ALAUX <guillaume at archlinux.org>
# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
-pkgname=('wireshark-cli' 'wireshark-gtk' 'wireshark-qt')
+pkgname=('wireshark-cli' 'wireshark-common' 'wireshark-gtk' 'wireshark-qt')
pkgbase=wireshark
-pkgver=1.12.8
+pkgver=2.0.0
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2')
-makedepends=('qt4' 'gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
+makedepends=('qt5-base' 'gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
'lua52' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
+options=(!emptydirs)
url='http://www.wireshark.org/'
source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-sha1sums=('d8c23120525a2f3505e822b7684e7367bcd0ba70')
+sha1sums=('f8b226b40e36e4c431b4f70bc3f523b6dd53a501')
-prepare() {
- cd ${pkgbase}-${pkgver}
- sed -i 's/$(AM_V_RCC)rcc/&-qt4/p' ui/qt/Makefile.am
-}
-
build() {
cd ${pkgbase}-${pkgver}
@@ -25,7 +21,7 @@
./autogen.sh
./configure \
--prefix=/usr \
- --with-qt \
+ --with-qt=5 \
--with-gtk3=yes \
--with-pcap \
--with-zlib \
@@ -38,7 +34,7 @@
package_wireshark-cli() {
pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
- depends=('krb5' 'libgcrypt' 'libcap' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua52')
+ depends=('krb5' 'libgcrypt' 'libcap' 'libpcap' 'gnutls' 'glib2' 'lua52')
install=wireshark.install
conflicts=(wireshark)
@@ -45,11 +41,12 @@
cd ${pkgbase}-${pkgver}
make DESTDIR="${pkgdir}" install
+ make DESTDIR="${pkgdir}" uninstall-local
#wireshark uid group is 150
chgrp 150 "${pkgdir}/usr/bin/dumpcap"
chmod 754 "${pkgdir}/usr/bin/dumpcap"
- rm "${pkgdir}/usr/bin/wireshark" "${pkgdir}/usr/bin/wireshark-qt"
+ rm "${pkgdir}/usr/bin/wireshark" "${pkgdir}/usr/bin/wireshark-gtk"
# Headers
install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes,wmem},wiretap,wsutil}
@@ -60,36 +57,37 @@
done
}
+package_wireshark-common() {
+ pkgdesc='Common files used by wireshark-gtk and wireshark-qt'
+ depends=('hicolor-icon-theme' 'shared-mime-info' 'xdg-utils')
+ install=wireshark-common.install
+
+ cd ${pkgbase}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install-data-local
+ rm "${pkgdir}"/usr/share/applications/wireshark{,-gtk}.desktop
+}
+
package_wireshark-gtk() {
pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend'
- depends=('gtk3' 'portaudio' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme')
- install=wireshark-gtk.install
+ depends=('desktop-file-utils' 'gtk3' 'portaudio' 'wireshark-cli' 'wireshark-common')
replaces=(wireshark)
conflicts=(wireshark)
+ install=wireshark-gui.install
cd ${pkgbase}-${pkgver}
- install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
- for d in 16 32 48; do
- install -Dm644 image/hi${d}-app-wireshark.png \
- "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png"
- done
-
- for d in 16 24 32 48 64 128 256 ; do
- install -Dm644 image/WiresharkDoc-${d}.png \
- "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png"
- done
- install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
+ install -Dm755 .libs/wireshark-gtk "${pkgdir}/usr/bin/wireshark-gtk"
+ install -Dm644 wireshark-gtk.desktop "${pkgdir}/usr/share/applications/wireshark-gtk.desktop"
}
package_wireshark-qt() {
pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - Qt frontend'
- depends=('qt4' 'wireshark-cli')
- install=wireshark-qt.install
+ depends=('desktop-file-utils' 'qt5-base' 'wireshark-cli' 'wireshark-common')
+ install=wireshark-gui.install
cd ${pkgbase}-${pkgver}
- install -Dm755 .libs/wireshark-qt "${pkgdir}/usr/bin/wireshark-qt"
- install -d "${pkgdir}/usr/share/applications"
- sed -e 's/^Name.*=Wireshark/& (QT)/g' -e '/Exec=/s/wireshark/&-qt/g' wireshark.desktop > "${pkgdir}/usr/share/applications/wireshark-qt.desktop"
+ install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
+ install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
}
Added: wireshark-common.install
===================================================================
--- wireshark-common.install (rev 0)
+++ wireshark-common.install 2015-11-19 18:21:54 UTC (rev 147163)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-mime-database usr/share/mime &>/dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: wireshark-gtk.install
===================================================================
--- wireshark-gtk.install 2015-11-19 17:01:28 UTC (rev 147162)
+++ wireshark-gtk.install 2015-11-19 18:21:54 UTC (rev 147163)
@@ -1,12 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Added: wireshark-gui.install
===================================================================
--- wireshark-gui.install (rev 0)
+++ wireshark-gui.install 2015-11-19 18:21:54 UTC (rev 147163)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: wireshark-qt.install
===================================================================
--- wireshark-qt.install 2015-11-19 17:01:28 UTC (rev 147162)
+++ wireshark-qt.install 2015-11-19 18:21:54 UTC (rev 147163)
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
More information about the arch-commits
mailing list