Levente Polyak pushed to branch main at Arch Linux / Packaging / Packages /
wireshark
Commits:
bfef84cf by corubba at 2026-01-01T21:57:14+01:00
Execute tests
- - - - -
5cd48285 by corubba at 2026-01-01T21:57:14+01:00
Fix rpath for tests
The tests need the executables with the default present-but-empty rpath,
so they find/use the just-built shared libs. The rpath will be removed
from the executables by cmake during the install stage, so the final
package will (continue to) contain rpath-less executables.
- - - - -
89342147 by corubba at 2026-01-01T21:57:14+01:00
Fix qt package install source
The executables are build with a rpath now, which is only removed during
cmake's install stage. So any files, and especially executables, that
are put into the final package should come from the install/staging
directory where cmake put them. Files in the build directory should be
considered not their final form.
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -5,6 +5,8 @@ pkgbase = wireshark
url = https://www.wireshark.org/
arch = x86_64
license = GPL-2.0-only
+ checkdepends = python-pytest
+ checkdepends = python-pytest-xdist
makedepends = asciidoctor
makedepends = bcg729
makedepends = brotli
=====================================
PKGBUILD
=====================================
@@ -54,6 +54,10 @@ makedepends=(
zlib-ng
zstd
)
+checkdepends=(
+ python-pytest
+ python-pytest-xdist
+)
options=('!emptydirs')
source=(
"git+https://gitlab.com/wireshark/wireshark.git#tag=v${pkgver}";
@@ -73,13 +77,17 @@ build() {
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_INSTALL_RPATH= \
- -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_SKIP_INSTALL_RPATH=TRUE \
-DENABLE_LUA=ON \
-Wno-dev
ninja -C build -v
}
+check() {
+ cd ${pkgbase}
+ ninja -C build -v test
+}
+
package_wireshark-cli() {
pkgdesc+=' - CLI tools and data files'
depends=(
@@ -168,9 +176,10 @@ package_wireshark-qt() {
install -d "${srcdir}/staging"
DESTDIR="${srcdir}/staging" ninja -C build install
- install -Dm 755 build/run/wireshark -t "${pkgdir}"/usr/bin
- install -Dm 644 build/doc/man_pages/wireshark.1 -t
"${pkgdir}"/usr/share/man/man1
- install -Dm 644 build/doc/man_pages/wireshark.html -t
"${pkgdir}"/usr/share/doc/wireshark
+ cd "${srcdir}"/staging
+ install -Dm 755 usr/bin/wireshark -t "${pkgdir}"/usr/bin
+ install -Dm 644 usr/share/man/man1/wireshark.1 -t
"${pkgdir}"/usr/share/man/man1
+ install -Dm 644 usr/share/doc/wireshark/wireshark.html -t
"${pkgdir}"/usr/share/doc/wireshark
cd "${srcdir}"/staging/usr/share
install -Dm 644 applications/org.wireshark.Wireshark.desktop -t
"${pkgdir}"/usr/share/applications
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/wireshark/-/compare/f7b16127ad1b0f11c3063de7221aa6af6f53629d...89342147c3b708b4ef4abd9cfccc7fb284bdb7fb
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/wireshark/-/compare/f7b16127ad1b0f11c3063de7221aa6af6f53629d...89342147c3b708b4ef4abd9cfccc7fb284bdb7fb
You're receiving this email because of your account on gitlab.archlinux.org.
