summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2016-01-20 07:04:33 +0100
committerJeroen Roovers <jer@gentoo.org>2016-01-20 07:06:10 +0100
commitc18666624deb29b36aab08897e7201e5bfd0bd98 (patch)
treebaf6accc813a84e1abf5d8196c862a8b6b956c90 /net-analyzer/wireshark/files
parentnet-misc/youtube-dl: Version bump. (diff)
downloadgentoo-c18666624deb29b36aab08897e7201e5bfd0bd98.tar.gz
gentoo-c18666624deb29b36aab08897e7201e5bfd0bd98.tar.bz2
gentoo-c18666624deb29b36aab08897e7201e5bfd0bd98.zip
net-analyzer/wireshark: Old.
Package-Manager: portage-2.2.27
Diffstat (limited to 'net-analyzer/wireshark/files')
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.12.5-cross-compile.patch51
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.12.6-rcc.patch52
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.12.8-gtk-deprecated-warnings.patch28
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.99.0-qt5.patch88
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.99.0.1975-sse4_2.patch20
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.99.1-sbc.patch18
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.99.7-qt-pie.patch11
7 files changed, 0 insertions, 268 deletions
diff --git a/net-analyzer/wireshark/files/wireshark-1.12.5-cross-compile.patch b/net-analyzer/wireshark/files/wireshark-1.12.5-cross-compile.patch
deleted file mode 100644
index 3118178d696..00000000000
--- a/net-analyzer/wireshark/files/wireshark-1.12.5-cross-compile.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://code.wireshark.org/review/8481
-
-From edefd74591d8f7010024a31576c2cb51eb1526ad Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Sat, 16 May 2015 05:08:53 -0400
-Subject: [PATCH] switch to AC_PATH_TOOL
-
-The TOOL variant will automatically search for host prefixed scripts
-(e.g. armv7a-unknown-linux-gnueabi-pcap-config) before falling back
-to the default (i.e. pcap-config). This makes cross-compiling a bit
-simpler.
-
-Change-Id: Ia450839693b5550f798634a7e8b82c2a661b088c
----
- acinclude.m4 | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index ffb1cac..c79c427 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -380,7 +380,7 @@ AC_DEFUN([AC_WIRESHARK_PCAP_CHECK],
- # The user didn't specify a directory in which libpcap resides.
- # First, look for a pcap-config script.
- #
-- AC_PATH_PROG(PCAP_CONFIG, pcap-config)
-+ AC_PATH_TOOL(PCAP_CONFIG, pcap-config)
-
- if test -n "$PCAP_CONFIG" ; then
- #
-@@ -1217,7 +1217,7 @@ AC_DEFUN([AC_WIRESHARK_KRB5_CHECK],
- AC_DEFINE(HAVE_MIT_KERBEROS, 1, [Define to use MIT kerberos])
- fi
- else
-- AC_PATH_PROG(KRB5_CONFIG, krb5-config)
-+ AC_PATH_TOOL(KRB5_CONFIG, krb5-config)
- if test -x "$KRB5_CONFIG"
- then
- KRB5_FLAGS=`"$KRB5_CONFIG" --cflags`
-@@ -2033,7 +2033,7 @@ AC_DEFUN([AC_WIRESHARK_QT_CHECK],
- [
- no_qt=""
-
-- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+ AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
-
- if test x$PKG_CONFIG != xno ; then
- if pkg-config --atleast-pkgconfig-version 0.7 ; then
---
-2.4.0
-
diff --git a/net-analyzer/wireshark/files/wireshark-1.12.6-rcc.patch b/net-analyzer/wireshark/files/wireshark-1.12.6-rcc.patch
deleted file mode 100644
index b8290d00c96..00000000000
--- a/net-analyzer/wireshark/files/wireshark-1.12.6-rcc.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1609,11 +1609,37 @@
- # we don't know whether they'll be doing that,
- # so this is the best we can do.
- #
-- MIC=moc
-+ MOC=moc
- fi
- fi
- fi
- AC_SUBST(MOC)
-+AC_PATH_PROG(RCC, rcc)
-+if test "x$RCC" = x
-+then
-+ AC_PATH_PROG(RCC, rcc-qt4)
-+ if test "x$RCC" = x
-+ then
-+ if test "x$have_qt" = "xyes"; then
-+ #
-+ # If you want to build with Qt, you'd better
-+ # have rcc.
-+ #
-+ AC_MSG_ERROR(I couldn't find moc or rcc-qt4; make sure it's installed and in your path)
-+ else
-+ #
-+ # We shouldn't fail here, as the user's not
-+ # building with Qt, and we shouldn't force them
-+ # to have Qt installed if they're not doing so.
-+ # "make dist" will fail if they do that, but
-+ # we don't know whether they'll be doing that,
-+ # so this is the best we can do.
-+ #
-+ RCC=rcc
-+ fi
-+ fi
-+fi
-+AC_SUBST(RCC)
-
- # Error out if a glib header other than a "top level" header
- # (glib.h, glib-object.h, gio.h) or certain other headers( e.g.,gmodule.h)
---- a/ui/qt/Makefile.am
-+++ b/ui/qt/Makefile.am
-@@ -116,7 +116,7 @@
-
- .qrc.rcc.cpp:
- $(MKDIR_P) $(@D)
-- $(AM_V_RCC)rcc -name `basename $< .qrc` -o $@ $<
-+ $(AM_V_RCC)$(RCC) -name `basename $< .qrc` -o $@ $<
-
- ui_%.h: %.ui
- $(AM_V_UIC)$(UIC) $< -o $@
diff --git a/net-analyzer/wireshark/files/wireshark-1.12.8-gtk-deprecated-warnings.patch b/net-analyzer/wireshark/files/wireshark-1.12.8-gtk-deprecated-warnings.patch
deleted file mode 100644
index 24ecf9fc449..00000000000
--- a/net-analyzer/wireshark/files/wireshark-1.12.8-gtk-deprecated-warnings.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1536,25 +1536,6 @@
- wireshark_man=""
- fi
-
--if test "$have_gtk" = "yes" ; then
-- # If we have GTK then add flags for it.
--
-- CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
-- if test \( $gtk_config_major_version -eq 3 -a $gtk_config_minor_version -ge 10 \) ; then
-- ## Allow use of deprecated & disable deprecated warnings if Gtk >= 3.10;
-- ## The deprecations in Gtk 3.10 will not be fixed ...
-- CPPFLAGS="-DGDK_DISABLE_DEPRECATION_WARNINGS $CPPFLAGS"
-- else
-- CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
-- fi
-- CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
-- if test ! \( $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -lt 20 \) ; then
-- # Enable GSEAL when building with GTK > 2.20
-- # (Versions prior to 2.22 lacked some necessary accessors.)
-- CPPFLAGS="-DGSEAL_ENABLE $CPPFLAGS"
-- fi
--fi
--
- # XXX - Is this really necessary? When we build with both Gtk+ and Qt it works...
- if test "$use_glib_cflags" = "true"; then
- # Use GLIB_CFLAGS
diff --git a/net-analyzer/wireshark/files/wireshark-1.99.0-qt5.patch b/net-analyzer/wireshark/files/wireshark-1.99.0-qt5.patch
deleted file mode 100644
index be1343d4504..00000000000
--- a/net-analyzer/wireshark/files/wireshark-1.99.0-qt5.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- 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.
- #
diff --git a/net-analyzer/wireshark/files/wireshark-1.99.0.1975-sse4_2.patch b/net-analyzer/wireshark/files/wireshark-1.99.0.1975-sse4_2.patch
deleted file mode 100644
index ba61de64535..00000000000
--- a/net-analyzer/wireshark/files/wireshark-1.99.0.1975-sse4_2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -985,6 +985,7 @@
- AC_SUBST(PIE_CFLAGS)
- AC_SUBST(PIE_LDFLAGS)
-
-+AC_ARG_ENABLE(sse4_2,[ --enable-sse4_2 Support SSE4.2 (Streaming SIMD Extensions 4.2) instructions],[
- CFLAGS_before_simd="$CFLAGS"
- AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C)
- if test "x$CFLAGS" != "x$CFLAGS_before_simd"
-@@ -1011,6 +1012,9 @@
- else
- have_sse42=no
- fi
-+],[
-+AC_MSG_RESULT(no)
-+])
- dnl build libwsutil_sse42 only if there is SSE4.2
- AM_CONDITIONAL(SSE42_SUPPORTED, test "x$have_sse42" = "xyes")
- AC_SUBST(CFLAGS_SSE42)
diff --git a/net-analyzer/wireshark/files/wireshark-1.99.1-sbc.patch b/net-analyzer/wireshark/files/wireshark-1.99.1-sbc.patch
deleted file mode 100644
index adda8fe8561..00000000000
--- a/net-analyzer/wireshark/files/wireshark-1.99.1-sbc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -2731,7 +2731,14 @@
-
- # Check Bluetooth SBC codec for RTP Player
- # git://git.kernel.org/pub/scm/bluetooth/sbc.git
--PKG_CHECK_MODULES(SBC, sbc >= 1.0, [have_sbc=yes], [have_sbc=no])
-+AC_ARG_WITH(sbc,
-+ AC_HELP_STRING( [--with-sbc],
-+ [add support for playing SBC]),
-+ [if test "x$withval" = "xyes"; then
-+ PKG_CHECK_MODULES(SBC, sbc >= 1.0, [have_sbc=yes], [have_sbc=no])
-+ else
-+ have_sbc=no
-+ fi])
- if (test "${have_sbc}" = "yes"); then
- AC_DEFINE(HAVE_SBC, 1, [Define to support playing SBC by standalone BlueZ SBC library])
- CFLAGS="$CFLAGS $(pkg-config sbc --cflags)"
diff --git a/net-analyzer/wireshark/files/wireshark-1.99.7-qt-pie.patch b/net-analyzer/wireshark/files/wireshark-1.99.7-qt-pie.patch
deleted file mode 100644
index 445fe102722..00000000000
--- a/net-analyzer/wireshark/files/wireshark-1.99.7-qt-pie.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ui/qt/Makefile.am
-+++ b/ui/qt/Makefile.am
-@@ -84,7 +84,7 @@
-
- # Common headers
- AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) \
-- $(LIBGNUTLS_CFLAGS) $(PIE_CFLAGS)
-+ $(LIBGNUTLS_CFLAGS)
-
- AM_CXXFLAGS = $(AM_CLEAN_CFLAGS)
-