diff options
Diffstat (limited to 'net/wireshark')
| -rw-r--r-- | net/wireshark/Makefile | 1 | ||||
| -rw-r--r-- | net/wireshark/files/extrapatch-configure-qt5 | 37 |
2 files changed, 38 insertions, 0 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index a161ac651055..e825dc8a689a 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -116,6 +116,7 @@ ANDROIDDUMP_CONFIGURE_OFF=--enable-androiddump=no LUA_CPPFLAGS= -I${LUA_INCDIR} QT5_CONFIGURE_ENV= PATH="${PATH}:${QT_BINDIR}" +QT5_EXTRA_PATCHES= ${FILESDIR}/extrapatch-configure-qt5 QT5_MAKE_ENV= PATH="${PATH}:${QT_BINDIR}" QT5_VARS= PKGNAMESUFFIX=-qt5 QT5_PLIST_SUB= GUI_GTK="@comment " diff --git a/net/wireshark/files/extrapatch-configure-qt5 b/net/wireshark/files/extrapatch-configure-qt5 new file mode 100644 index 000000000000..cfe84de16313 --- /dev/null +++ b/net/wireshark/files/extrapatch-configure-qt5 @@ -0,0 +1,37 @@ +Work around the buggy detection of the Qt tools via qtchooser, which adds the -qt=foo +flag even though the found tool is not qtchooser. + +--- configure.orig 2017-02-09 18:02:53 UTC ++++ configure +@@ -47562,7 +47562,6 @@ fi + # + # Add the -qt={version} argument to it. + # +- UIC="$UIC -qt=$qt_version" + else + # + # Annoyingly, on some Linux distros (e.g. Debian) +@@ -47740,7 +47739,6 @@ fi + # + # Add the -qt={version} argument to it. + # +- MOC="$MOC -qt=$qt_version" + else + # + # Annoyingly, on some Linux distros (e.g. Debian) +@@ -47918,7 +47916,6 @@ fi + # + # Add the -qt={version} argument to it. + # +- RCC="$RCC -qt=$qt_version" + else + # + # Annoyingly, on some Linux distros (e.g. Debian) +@@ -48097,7 +48094,6 @@ fi + # + # Add the -qt={version} argument to it. + # +- LRELEASE="$LRELEASE -qt=$qt_version" + else + # + # Annoyingly, on some Linux distros (e.g. Debian) |