jer 14/10/24 21:30:54 Added: wireshark-1.99.0-qt5.patch Log: Add USE=qt5 (bug #488640). (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.1 net-analyzer/wireshark/files/wireshark-1.99.0-qt5.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.99.0-qt5.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.99.0-qt5.patch?rev=1.1&content-type=text/plain Index: wireshark-1.99.0-qt5.patch =================================================================== --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2043,21 +2043,23 @@ # Try the Qt 5 version first. # (And be prepared to add Qt6 at some point....) # - for modprefix in Qt5 Qt - do - pkg_config_module="${modprefix}$1" - AC_MSG_CHECKING(for $pkg_config_module - version >= $min_qt_version) - if $PKG_CONFIG --atleast-version $min_qt_version $pkg_config_module; then - mod_version=`$PKG_CONFIG --modversion $pkg_config_module` - AC_MSG_RESULT(yes (version $mod_version)) - Qt_CFLAGS="$Qt_CFLAGS `$PKG_CONFIG --cflags $pkg_config_module`" - Qt_LIBS="$Qt_LIBS `$PKG_CONFIG --libs $pkg_config_module`" - found_$1=yes - break - else - AC_MSG_RESULT(no) - fi - done + if test "$with_qt5" = yes; then + modprefix=Qt5 + else + modprefix=Qt + fi + pkg_config_module="${modprefix}$1" + AC_MSG_CHECKING(for $pkg_config_module - version >= $min_qt_version) + if $PKG_CONFIG --atleast-version $min_qt_version $pkg_config_module; then + mod_version=`$PKG_CONFIG --modversion $pkg_config_module` + AC_MSG_RESULT(yes (version $mod_version)) + Qt_CFLAGS="$Qt_CFLAGS `$PKG_CONFIG --cflags $pkg_config_module`" + Qt_LIBS="$Qt_LIBS `$PKG_CONFIG --libs $pkg_config_module`" + found_$1=yes + break + else + AC_MSG_RESULT(no) + fi if test "x$found_$1" = "xyes"; then # Run Action-If-Found --- a/configure.ac +++ b/configure.ac @@ -456,10 +456,15 @@ # # GUI toolkit options # -AC_ARG_WITH([qt], - AC_HELP_STRING( [--with-qt=@<:@yes/no@:>@], +AC_ARG_WITH([qt4], + AC_HELP_STRING( [--with-qt4=@<:@yes/no@:>@], + [use Qt @<:@default=yes@:>@]), + with_qt4="$withval", with_qt4="unspecified") + +AC_ARG_WITH([qt5], + AC_HELP_STRING( [--with-qt5=@<:@yes/no@:>@], [use Qt @<:@default=yes@:>@]), - with_qt="$withval", with_qt="unspecified") + with_qt5="$withval", with_qt5="unspecified") AC_ARG_WITH([gtk2], AC_HELP_STRING( [--with-gtk2=@<:@yes/no@:>@], @@ -1373,7 +1378,6 @@ AC_SUBST(GTK2_MIN_VERSION) GTK3_MIN_VERSION=3.0.0 AC_SUBST(GTK3_MIN_VERSION) -QT_MIN_VERSION=4.6.0 AC_SUBST(QT_MIN_VERSION) # GTK+ and Qt checks; we require GTK+ $GTK2_MIN_VERSION or later or # GTK3_MIN_VERSION or later or Qt $QT_MIN_VERSION or later. @@ -1417,14 +1421,15 @@ if test "x$enable_wireshark" = "xyes"; then if test "x$with_gtk2" = "xunspecified" -a \ "x$with_gtk3" = "xunspecified" -a \ - "x$with_qt" = "xunspecified"; then + "x$with_qt4" = "xunspecified" -a \ + "x$with_qt5" = "xunspecified"; then # # No GUI toolkit was explicitly specified; pick Qt and GTK+ 3. # with_qt=yes with_gtk3=yes fi - if test "x$with_qt" = "xyes"; then + if test "x$with_qt" = "xyes" || test "x$with_qt4" = "xyes" || test "x$with_qt5" = "xyes"; then # # Qt was specified; Make sure we have a C++ compiler. #
