mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-21 19:42:24 +01:00
network/wireshark: Force to use Qt4.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
parent
bd3bd2e2e2
commit
31a3d2deb9
2 changed files with 8 additions and 9 deletions
|
@ -22,9 +22,3 @@ You will need to remove any already-installed wireshark package before
|
||||||
building this one or else the new one will not work (the new build will
|
building this one or else the new one will not work (the new build will
|
||||||
link libraries present in the old package, which will then be removed
|
link libraries present in the old package, which will then be removed
|
||||||
when upgrading).
|
when upgrading).
|
||||||
|
|
||||||
WARNING: Wireshark will not compile currently on a sysytem that has QT4 AND
|
|
||||||
QT5 installed. The easiest way to fix this is to either 1) Build in a clean
|
|
||||||
enviroment or 2) Remove QT5 temporarily while building Wirehark so it links
|
|
||||||
properly against Slackware's own QT4.
|
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,8 @@
|
||||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
# Modified by Mario Preksavec <mario@slackware.hr>
|
||||||
|
|
||||||
PRGNAM=wireshark
|
PRGNAM=wireshark
|
||||||
VERSION=${VERSION:-1.12.2}
|
VERSION=${VERSION:-1.12.2}
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-1}
|
||||||
|
@ -64,15 +66,18 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
|
||||||
cd $PRGNAM-$VERSION
|
cd $PRGNAM-$VERSION
|
||||||
chown -R root:root .
|
chown -R root:root .
|
||||||
find -L . \
|
find -L . \
|
||||||
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
|
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
|
||||||
-exec chmod 755 {} \; -o \
|
-o -perm 511 \) -exec chmod 755 {} \; -o \
|
||||||
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
||||||
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
||||||
|
|
||||||
# Ammend hardcoded paths to /usr/lib/ which will give a problem when compiling on
|
# Ammend hardcoded paths to /usr/lib/ which will give a problem when compiling on
|
||||||
# systems with 32bit compat libs install. Thanks to Heinz Wiesinger.
|
# systems with 32bit compat libs install. Thanks to Heinz Wiesinger.
|
||||||
sed -i "s|/lib)|/lib$LIBDIRSUFFIX)|g" configure.ac
|
sed -i "s|/lib)|/lib$LIBDIRSUFFIX)|g" configure.ac
|
||||||
|
|
||||||
|
# Force use of qt4 libs
|
||||||
|
sed -i 's/for modprefix in Qt5 Qt/for modprefix in Qt/' acinclude.m4
|
||||||
|
|
||||||
# run autoreconf so it'll use the correct automake version.
|
# run autoreconf so it'll use the correct automake version.
|
||||||
autoreconf -f -i
|
autoreconf -f -i
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue