haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

wireshark: packaging fixes

Browse Source 
- The main executable is Wireshark, not WireShark.
- Split the main executable in a separate _gui package, so it is
  possible to install and use the command line tools without instlaling
  Qt
- Move the command line tools back to bin/ so they are reachable from
  the command line.
This commit is contained in:
Adrien Destugues
2019-02-27 21:38:25 +01:00
parent 361e827856
commit ce9f78281d
1 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
net-analyzer/wireshark/wireshark-2.6.5.recipe
View File

@@ -13,7 +13,7 @@ from the capture."
HOMEPAGE="https://www.wireshark.org"
COPYRIGHT="1998-2018 Gerald Combs"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="3"
SOURCE_URI="https://github.com/wireshark/wireshark/archive/wireshark-$portVersion.tar.gz"
CHECKSUM_SHA256="47e15281b767f6fd09b72d8ddb9c392c1a56ca601b1b3483d9c9b6e479c7b997"
SOURCE_DIR="wireshark-wireshark-$portVersion"
@@ -24,20 +24,18 @@ SECONDARY_ARCHITECTURES="x86"
PROVIDES="
wireshark$secondaryArchSuffix = $portVersion
app:WireShark$secondaryArchSuffix
cmd:capinfos$secondaryArchSuffix
cmd:captype$secondaryArchSuffix
cmd:dftest$secondaryArchSuffix
cmd:dumpcap$secondaryArchSuffix
cmd:editcap$secondaryArchSuffix
cmd:idl2wrs$secondaryArchSuffix
cmd:mergecap$secondaryArchSuffix
cmd:randpkt$secondaryArchSuffix
cmd:rawshark$secondaryArchSuffix
cmd:reordercap$secondaryArchSuffix
cmd:sharkd$secondaryArchSuffix
cmd:text2pcap$secondaryArchSuffix
cmd:tshark$secondaryArchSuffix
cmd:capinfos
cmd:captype
cmd:dumpcap
cmd:editcap
cmd:idl2wrs
cmd:mergecap
cmd:randpkt
cmd:rawshark
cmd:reordercap
cmd:sharkd
cmd:text2pcap
cmd:tshark
devel:libwireshark$secondaryArchSuffix = 10.1.2 compat >= 10
devel:libwiretap$secondaryArchSuffix = 8.0.2 compat >= 8
devel:libwscodecs$secondaryArchSuffix = 2.1.0 compat >= 2
@@ -56,13 +54,26 @@ REQUIRES="
lib:libgthread_2.0$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
lib:libpcap$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
PROVIDES_gui="
wireshark${secondaryArchSuffix}_gui = $portVersion
app:Wireshark$secondaryArchSuffix
"
REQUIRES_gui="
haiku$secondaryArchSuffix
wireshark${secondaryArchSuffix} == $portVersion base
lib:libgmodule_2.0$secondaryArchSuffix
lib:libpcap$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
lib:libQt5Gui$secondaryArchSuffix
lib:libQt5Multimedia$secondaryArchSuffix
lib:libQt5PrintSupport$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
@@ -96,7 +107,7 @@ BUILD()
{
autoreconf -fi
LIBS=-lnetwork CPPFLAGS="-D_BSD_SOURCE -fPIC" \
runConfigure ./configure --without-gtk3 --bindir=$appsDir\WireShark
runConfigure ./configure --without-gtk3 --bindir=$prefix/bin
make $jobArgs
}
@@ -111,10 +122,13 @@ INSTALL()
prepareInstalledDevelLibs libwireshark libwiretap libwscodecs libwsutil
fixPkgconfig
mv $appsDir/wireshark $appsDir/WireShark
mkdir -p $appsDir
mv $prefix/bin/wireshark $appsDir/Wireshark
addResourcesToBinaries $portDir/additional-files/wireshark.rdef \
$appsDir/WireShark
$appsDir/Wireshark
addAppDeskbarSymlink $appsDir/WireShark
addAppDeskbarSymlink $appsDir/Wireshark
packageEntries gui $appsDir $dataDir/deskbar
}