Add patch from Fedora to fix building with developmental glib/wxGTK

GSocket conflict. No revision bump as this is only a build fix.
Thanks to insanity5902@gmail.com for tracking down this patch in bug
#278778.
Package-Manager: portage-2.2_rc35/cvs/Linux x86_64

4 files changed, 29 insertions, 7 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index 97a9c3bad7b4..cae1bb554a8f 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/audacity
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.127 2009/07/25 15:08:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.128 2009/08/06 05:09:38 dirtyepic Exp $
+
+  06 Aug 2009; Ryan Hill <dirtyepic@gentoo.org> audacity-1.3.8.ebuild,
+  +files/audacity-1.3.8-gsocket-conflict.patch:
+  Add patch from Fedora to fix building with developmental glib/wxGTK
+  GSocket conflict. No revision bump as this is only a build fix.
+  Thanks to insanity5902@gmail.com for tracking down this patch in bug
+  #278778.
 
   25 Jul 2009; Alexis Ballier <aballier@gentoo.org> -audacity-1.3.6.ebuild,
   -files/audacity-1.3.6-novorbis.patch, -files/audacity-1.3.6-vamp2.patch:
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 6be25a535e7f..6727147e02b8 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -5,16 +5,17 @@ AUX audacity-1.3.4-automagic.patch 2625 RMD160 63f28b895aa94c2458cc3f16ed52f3a44
 AUX audacity-1.3.5-libtool22.patch 621 RMD160 9c8b46928a8dd2d1750163570fa9a36abb44212a SHA1 c1fb708d251331670a881bb3196baf21bfc5bee7 SHA256 c8f25696de80da8f41224be44c630c288e7a94290bb0d86fef6709e0d1923f67
 AUX audacity-1.3.7-cflags.patch 1099 RMD160 db05c38ce8ae3d91f7ec928f8096a089368d7414 SHA1 d6b5a69c28eb16fb9dcacebc2e461d53f7951106 SHA256 eab7268b3b7b3c2ac2eb07ede639c16f3babccc528f018af17a532082b478ca9
 AUX audacity-1.3.8-automagic.patch 2625 RMD160 af4edacf4d9d331b7daa56d20ee55da5ae7759dc SHA1 4e91de0cecde8a75f14830e9446d6fbb0fc3036a SHA256 a7cc0fd0566877d50d5c8d0568a26dc163f2db1b74314791ff0b4060dafdae81
+AUX audacity-1.3.8-gsocket-conflict.patch 410 RMD160 c5e2716c4a7e9df8d4ebf05a3f226c719c1715e0 SHA1 fe9a1c08399bad5d34839c78c023bd9fea9228fd SHA256 2b77e18c378696392d04e5e1e14285433ee9e904bc95bdd1ec245edfd31efb20
 DIST audacity-minsrc-1.3.7.tar.bz2 5386329 RMD160 b160789b97109e306e6fde19f3cf97453a747925 SHA1 ba4a696bb950800c690ec80138aa84801e04f35a SHA256 e0044916ffe0d6d8f9227fc1e3d973e11b37edd89005a110ebff482ef301d4d5
 DIST audacity-minsrc-1.3.8.tar.bz2 6734200 RMD160 3ae7ed409520b62f40e4c9fcd49ea5a25827b8a3 SHA1 8b8e5dbbf38546c08eb77005f77648d28836dfd4 SHA256 50132fead4de4382e603fa14f0a7ffe87c4db86ddcfda1a472b8fa0dc7fb41cf
 EBUILD audacity-1.3.7.ebuild 2674 RMD160 9d91ea24417c4a99923d799b723a1f996b66fa37 SHA1 5bf38720a92536a033be30885ffb83b9a7c6fb39 SHA256 231a444980ab817bc4cd87ae39f3c30e609f2b5be2b5966a7600022b2e6dd0af
-EBUILD audacity-1.3.8.ebuild 2599 RMD160 027b396c60675e3d9be3bcec20b07ce630c2f230 SHA1 247a03b22ef00045ccb5df522e4ab9735876e896 SHA256 d7cb7512ac51ea1040af93156e1e6a41b10add8e43171397fd6b36574543e437
-MISC ChangeLog 21236 RMD160 bacd89053fa0b670ea1c749b84f18b4ff69c0986 SHA1 6084177427d6d9a58d8c1d22fbd8ec5c1335cec8 SHA256 a3c65daef95642d46d7cd3e50f6312ed6a9be060760a0f1a572c9b90909f0650
+EBUILD audacity-1.3.8.ebuild 2657 RMD160 a6947960b72a4193c958601c98fe6a9a2fc6920d SHA1 d12d3a7ceeabf611ef54324509e0a1289ec91c19 SHA256 2b77f25db317866caa38aa2d288827677c20cc6462307bbe457595855fcebbe4
+MISC ChangeLog 21575 RMD160 162bf2be8e959749ab977813b7f98ebef6ac5048 SHA1 bff2d32ce91a3bfb459b822c69abcca65c0f769d SHA256 64cea2b54afd60c917d3b828dfc0f04d6e8caaf87549900316671397acb57116
 MISC metadata.xml 540 RMD160 af87bf45a5fe6c0b9e0622ca574374e63f0f54bc SHA1 0b9aae054070ae3e941b2ddbae5af137de16fdfa SHA256 5dfbf5b22fd3e3fd53714334381588f02e5776b98e07abc1fdbd7ad14fc07486
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkprIDwACgkQvFcC4BYPU0qB+ACgjRfPnB8+R7h/VRcmtjyD8W9V
-CKYAniIe6z3GDS8Lw+UUkE5T99X1ket8
-=wDfv
+iEYEARECAAYFAkp6ZbMACgkQiqiDRvmkBmLtrQCgyOb0MGnzi6YI/rvHpWm0xzbI
+MucAn0wX7xsF8QrgA3KLpDvSJ3v12zTH
+=/XDj
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacity/audacity-1.3.8.ebuild b/media-sound/audacity/audacity-1.3.8.ebuild
index 646dff78760e..715db0fe8b70 100644
--- a/media-sound/audacity/audacity-1.3.8.ebuild
+++ b/media-sound/audacity/audacity-1.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.8.ebuild,v 1.1 2009/07/22 11:38:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.8.ebuild,v 1.2 2009/08/06 05:09:38 dirtyepic Exp $
 
 EAPI=2
 
@@ -49,6 +49,7 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.3.8-automagic.patch"
+	epatch "${FILESDIR}/${PN}-1.3.8-gsocket-conflict.patch"
 	AT_M4DIR="${S}/m4" eautoreconf
 }
 
diff --git a/media-sound/audacity/files/audacity-1.3.8-gsocket-conflict.patch b/media-sound/audacity/files/audacity-1.3.8-gsocket-conflict.patch
new file mode 100644
index 000000000000..45415e76ab6d
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.8-gsocket-conflict.patch
@@ -0,0 +1,13 @@
+--- audacity-src-1.3.8-orig/src/AudacityApp.cpp
++++ audacity-src-1.3.8/src/AudacityApp.cpp
+@@ -331,7 +331,9 @@
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+ #include <dlfcn.h>
+-#include <gtk/gtk.h>
++/*#include <gtk/gtk.h>*/
++#include <glib/gtypes.h>
++#include <glib-object.h>
+ 
+ typedef struct _GnomeProgram GnomeProgram;
+ typedef struct _GnomeModuleInfo GnomeModuleInfo;