diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-analyzer/wireshark/files/wireshark-1.99.0-qt5.patch | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-analyzer/wireshark/files/wireshark-1.99.0-qt5.patch')
| -rw-r--r-- | net-analyzer/wireshark/files/wireshark-1.99.0-qt5.patch | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/net-analyzer/wireshark/files/wireshark-1.99.0-qt5.patch b/net-analyzer/wireshark/files/wireshark-1.99.0-qt5.patch new file mode 100644 index 000000000000..be1343d45045 --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-1.99.0-qt5.patch @@ -0,0 +1,88 @@ +--- 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. + # |