Fix building with USE="gtk -pcap" by Andreas Schürch (bug #411175).

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 47 insertions, 8 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 57d316ff6ea7..4c0ce914f2f4 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.330 2012/04/07 15:27:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.331 2012/04/10 16:28:05 jer Exp $
+
+  10 Apr 2012; Jeroen Roovers <jer@gentoo.org> wireshark-1.6.6.ebuild,
+  +files/wireshark-1.6.6-gtk-pcap.patch:
+  Fix building with USE="gtk -pcap" by Andreas Schürch (bug #411175).
 
   07 Apr 2012; Jeroen Roovers <jer@gentoo.org> wireshark-1.6.6.ebuild:
   Stable for HPPA (bug #410871).
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 9e581a7ace14..e90fecb361c9 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX wireshark-1.6.4-build.patch 396 RMD160 fa909e374c80f0c637a459750d305cd636e7e18a SHA1 825cb721d7d30cfdec5f53e0b38fa7ee8891ec20 SHA256 8648c0eda8fd4393d4b0513c4d6673d0568b7341f920e55e7ebe7391d1e3b430
 AUX wireshark-1.6.4-doc-build.patch 501 RMD160 65ea45bc7014c5f0bb556b3c964c45d2b0d2f582 SHA1 ea7c00ed98613581791c7c9e53f009efee5e6c08 SHA256 2ae9ad7ce2ceb1b7a2430ae71d04cdb4f9173d74e0d67667965226d8f43d1945
+AUX wireshark-1.6.6-gtk-pcap.patch 841 RMD160 a1b003dcf1deee02fe2c15b96cbfda50c094d64d SHA1 0d8ea55014b696c04d91e73780af2109b86cddaa SHA256 862c301f450fcb775e3bd907e5a6ca667b5a11b819768b66a7c848c2c3c90d8a
 DIST wireshark-1.4.9.tar.bz2 20604645 RMD160 e8f6d68b5b49607fa337ef05ff6bd6c5acdb2e60 SHA1 242e8faf76ec219ddc28688517865ce19c611cd6 SHA256 e554f855cba4091779feb3d9d452716a8f87a549d8c27a4e2c700b0cb12dc984
 DIST wireshark-1.6.2.tar.bz2 21408664 RMD160 e343d9bb5600b236dea708bb68ecad805a9ee20a SHA1 a18d4e8eaf56fe0214b19d7fde0eb91a06817a49 SHA256 5343f514ce98c28498ec4734e40e34e2bbf779a6c57d958837e3f70234471e7f
 DIST wireshark-1.6.4.tar.bz2 21464517 RMD160 9437c416a5963aee1c049c0275bdfd3edd7488e8 SHA1 8abd7681e8c05841b7cf31d5dc83c1092c54e79f SHA256 7f98191f53d375f020312a99a9747ff3b846ac4029af4027fc883f685fabef5d
@@ -10,13 +11,13 @@ DIST wireshark-1.6.6.tar.bz2 21527655 RMD160 27a3d7fa7f78350dabb00d3ee382c335f7e
 EBUILD wireshark-1.4.9.ebuild 6308 RMD160 1cc754917fc9fa2b67dcde05296c031c5b3dbc58 SHA1 40233e735c52457737c555fe196ac92a9b5780de SHA256 d968bdf0343ff49a3809dfc995233ce612662bc0903afa641b3e4fb9bf18d1f5
 EBUILD wireshark-1.6.2.ebuild 6315 RMD160 7bd88e4d7009dee6cc65d2e2a0ccb7411804f49e SHA1 c24b9b04671fb26c508185997ff11ca2a10ac4b4 SHA256 1eee0327c11708795aaac2af165f31bb0ee8039a1698b58ecf07f421f6551a1d
 EBUILD wireshark-1.6.4.ebuild 6496 RMD160 2e2def4d88b4dcad721b993387ce50ecc5238131 SHA1 a6fc4c1254b67b56f780b6eec6362f6dea759308 SHA256 24d1b1569cccfe1eb74accf9000c6ad4e29c67273f04c4b2d8eae305359ddffe
-EBUILD wireshark-1.6.6.ebuild 6400 RMD160 d38959fb676ae9f06f6766098bab0242a175c521 SHA1 5d2161d0745501d4d42b07fa099e2defcc812e88 SHA256 5d53b55262dba53b1aa088733fef1f8a93a0b8152c62e62664dfb131026b0357
-MISC ChangeLog 48070 RMD160 358183e0e2c54057b54b3158abc15c067bfc692f SHA1 19ea3935e52fc7c16265da4aed53c5bf0082adaa SHA256 eb10f852e22ba0b64bb3381416d958122a9d6da00bc6e89b99328f5b236ce2a7
+EBUILD wireshark-1.6.6.ebuild 6461 RMD160 d48e897148c981872772ff667c31e0180cd03bf6 SHA1 57064665a656602a90d2610259dbb391675ac688 SHA256 b5d74d65e61dca7cc480714dfb4ac9d890b0d208e367818e42a8d672d8bd2d6d
+MISC ChangeLog 48254 RMD160 2de788eb2f8b085a3f027b7356a6b64686f3c161 SHA1 58e81a9a68403a9f109e08391cf563c33d7f7580 SHA256 cb03f8c7d72699d1f76001f57434937710f0be289fede2f8299bb98a060846da
 MISC metadata.xml 2242 RMD160 66dbbb758acc194df17217183b60a56f61fced38 SHA1 4498ea4c0f0f04213fd1cba2fd3de44565058f7d SHA256 2dfaef45c385c37c7ae8af96f5d8c58d9bff8f6186d55be8f2d034ebd0c60869
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+AXOAACgkQVWmRsqeSphOEYwCfRzkPrJsHcJWjdMWIswkWISio
-90YAniwuGbN8Ux5g0bhXEmvHzD76iLES
-=Ket1
+iEYEARECAAYFAk+EX5oACgkQVWmRsqeSphPwOACeLUdtag4oICOfFz1h2mZ1IIlL
+p+4An3cel639w/4KQ71Okcr5VYUA1vxa
+=HX98
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/wireshark-1.6.6-gtk-pcap.patch b/net-analyzer/wireshark/files/wireshark-1.6.6-gtk-pcap.patch
new file mode 100644
index 000000000000..0727aa2f8ebe
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.6.6-gtk-pcap.patch
@@ -0,0 +1,30 @@
+--- a/gtk/main.c
++++ b/gtk/main.c
+@@ -2834,7 +2834,9 @@
+ 
+   color_filters_init();
+   decode_as_init();
++#ifdef HAVE_LIBPCAP
+   capture_filter_init();
++#endif
+ 
+   /* the window can be sized only, if it's not already shown, so do it now! */
+   main_load_window_geometry(top_level);--- a/gtk/capture_dlg.c
++++ b/gtk/capture_dlg.c
+@@ -371,6 +371,7 @@
+ 
+ /** Initialize background capture filter syntax checking
+  */
++#ifdef HAVE_LIBPCAP                                                                                                                 
+ void capture_filter_init(void) {
+   cfc_data.filter_text = NULL;
+   cfc_data.filter_te = NULL;
+@@ -383,6 +384,7 @@
+   g_thread_create(check_capture_filter_syntax, NULL, FALSE, NULL);
+ #endif
+ }
++#endif
+ 
+ static void
+ capture_filter_check_syntax_cb(GtkWidget *w _U_, gpointer user_data _U_)
+
diff --git a/net-analyzer/wireshark/wireshark-1.6.6.ebuild b/net-analyzer/wireshark/wireshark-1.6.6.ebuild
index af78ebef5b84..388db0fd6e0d 100644
--- a/net-analyzer/wireshark/wireshark-1.6.6.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.6.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.6.ebuild,v 1.3 2012/04/07 15:27:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.6.ebuild,v 1.4 2012/04/10 16:28:05 jer Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
-inherit libtool flag-o-matic eutils toolchain-funcs python
+inherit eutils flag-o-matic libtool python toolchain-funcs
 
 [[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
@@ -102,6 +102,10 @@ pkg_setup() {
 	enewgroup wireshark
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gtk-pcap.patch
+}
+
 src_configure() {
 	local myconf