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

[Levente Polyak]

    Date: Saturday, May 23, 2020 @ 21:33:25
  Author: anthraxx
Revision: 632602

upgpkg: wireshark 3.2.4-1

Modified:
  wireshark/trunk/PKGBUILD

----------+
 PKGBUILD |   46 ++++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-23 21:32:53 UTC (rev 632601)
+++ PKGBUILD	2020-05-23 21:33:25 UTC (rev 632602)
@@ -6,22 +6,25 @@
 
 pkgbase=wireshark
 pkgname=('wireshark-cli' 'wireshark-qt')
-pkgver=3.2.3
+pkgver=3.2.4
 pkgrel=1
 pkgdesc='Network traffic and protocol analyzer/sniffer'
 url='https://www.wireshark.org/'
 arch=('x86_64')
 license=('GPL2')
-makedepends=('cmake' 'ninja' 'c-ares' 'libmaxminddb' 'qt5-tools' 'qt5-svg'
+makedepends=('glibc' 'cmake' 'ninja' 'c-ares' 'libmaxminddb' 'qt5-tools' 'qt5-svg'
              'qt5-multimedia' 'krb5' 'libpcap' 'libssh' 'libxml2' 'libnghttp2'
-             'snappy' 'lz4' 'spandsp' 'gnutls' 'lua52' 'python' 'libcap'
-             'glib2' 'libgcrypt' 'sbc' 'bcg729' 'desktop-file-utils'
-             'hicolor-icon-theme')
+             'snappy' 'lz4' 'spandsp' 'gnutls' 'lua52' 'python' 'libcap' 'libnl'
+             'glib2' 'libgcrypt' 'sbc' 'bcg729' 'desktop-file-utils' 'libxslt'
+             'hicolor-icon-theme' 'zstd' 'zlib' 'gcc-libs' 'brotli' 'asciidoctor'
+             'doxygen' 'minizip' 'speexdsp')
 options=('!emptydirs')
 source=(https://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.xz
         wireshark.sysusers)
-sha512sums=('6e13f5aba9c3f531fab94c9f19e85856278ff534d02e406143c0c134c9b37a76d372105b43f51e95f319e31d742fc17c2812defe377886bd8f7ed03f743f9e9a'
+sha512sums=('67d20a248c0f4e63a58fd3a4191ede75542e9cfd09b0baa5c0016f72a435527d8f95d34f2d35ef1957c1a9c66844d530162379bfcf9e51b64d0d220b381cb097'
             '3956c1226e64f0ce4df463f80b55b15eed06ecd9b8703b3e8309d4236a6e1ca84e43007336f3987bc862d8a5e7cfcaaf6653125d2a34999a0f1357c52e7c4990')
+b2sums=('c40c19fde09726192119efe358892157d17e28ab87afa9a5b91203e11d3079b718d8e200522294886613d63d19283198de1256561eaf83436742db3898019e89'
+        '3cebcc993f51eaf0e09673c77e0436598593ef5eff306d880415ccc8eecb32fee93c9a6986f1a7bb0835ab7f9732369d7c5a07e6c053d6293e73a1ea84c58a5c')
 
 prepare() {
   cd ${pkgbase}-${pkgver}
@@ -30,26 +33,29 @@
 
 build() {
   cd ${pkgbase}-${pkgver}
-  cmake . -GNinja \
-    -DCMAKE_BUILD_TYPE=Release \
+  cmake \
+    -B build \
+    -G Ninja \
+    -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_INSTALL_RPATH= \
-    -DCMAKE_SKIP_RPATH=ON
-  ninja
+    -DCMAKE_SKIP_RPATH=ON \
+    -Wno-dev
+  ninja -C build -v
 }
 
 package_wireshark-cli() {
   pkgdesc+=' - CLI tools and data files'
-  depends=('c-ares' 'libmaxminddb' 'krb5' 'libgcrypt' 'libcap' 'libpcap'
+  depends=('glibc' 'c-ares' 'libmaxminddb' 'krb5' 'libgcrypt' 'libcap' 'libpcap'
            'gnutls' 'glib2' 'lua52' 'libssh' 'libxml2' 'libnghttp2' 'snappy'
-           'lz4' 'spandsp' 'sbc' 'bcg729')
+           'lz4' 'spandsp' 'sbc' 'bcg729' 'zstd' 'zlib' 'brotli' 'speexdsp')
   install=wireshark.install
   conflicts=(wireshark)
   provides=(libwireshark.so libwiretap.so libwsutil.so)
 
   cd ${pkgbase}-${pkgver}
-  DESTDIR="${pkgdir}" ninja install
+  DESTDIR="${pkgdir}" ninja -C build install
 
   # wireshark uid group is 150
   install -Dm 644 "${srcdir}/wireshark.sysusers" "${pkgdir}/usr/lib/sysusers.d/wireshark.conf"
@@ -60,6 +66,7 @@
   rm -r usr/share/mime \
     usr/share/icons \
     usr/share/man/man1/wireshark.1 \
+    usr/share/doc/wireshark/wireshark.html \
     usr/bin/wireshark \
     usr/share/applications/wireshark.desktop \
     usr/share/appdata/wireshark.appdata.xml
@@ -67,18 +74,21 @@
 
 package_wireshark-qt() {
   pkgdesc+=' - Qt GUI'
-  depends=('desktop-file-utils' 'qt5-multimedia' 'qt5-svg' 'wireshark-cli'
-           'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils')
+  depends=('glibc' 'desktop-file-utils' 'qt5-multimedia' 'qt5-svg'
+           'wireshark-cli' 'libwireshark.so' 'libwiretap.so' 'libwsutil.so'
+           'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gcc-libs'
+           'zlib' 'libpcap' 'libgcrypt' 'libnl' 'minizip')
   replaces=(wireshark wireshark-gtk wireshark-common)
   conflicts=(wireshark wireshark-gtk wireshark-common)
 
   cd ${pkgbase}-${pkgver}
   install -d "${srcdir}/staging"
-  DESTDIR="${srcdir}/staging" ninja install
+  DESTDIR="${srcdir}/staging" ninja -C build install
 
-  install -Dm 755 run/wireshark -t "${pkgdir}/usr/bin"
+  install -Dm 755 build/run/wireshark -t "${pkgdir}/usr/bin"
+  install -Dm 644 build/doc/wireshark.1 -t "${pkgdir}/usr/share/man/man1"
+  install -Dm 644 build/doc/wireshark.html -t "${pkgdir}/usr/share/doc/wireshark"
   install -Dm 644 wireshark.desktop -t "${pkgdir}/usr/share/applications"
-  install -Dm 644 doc/wireshark.1 -t "${pkgdir}/usr/share/man/man1"
   install -Dm 644 wireshark.appdata.xml -t "${pkgdir}/usr/share/appdata"
   install -Dm 644 wireshark-mime-package.xml "${pkgdir}/usr/share/mime/packages/wireshark.xml"
   mv "${srcdir}/staging/usr/share/icons" "${pkgdir}/usr/share/icons"