Add patch from upstream to allow building without alsa, bug #360163

Package-Manager: portage-2.1.10.11/cvs/Linux ia64

4 files changed, 194 insertions, 19 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index 2b53d20104b3..5e8cdd849b0e 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.429 2011/08/23 19:26:43 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.430 2011/08/28 11:24:42 armin76 Exp $
+
+  28 Aug 2011; Raúl Porcel <armin76@gentoo.org> xulrunner-2.0.1-r1.ebuild,
+  +files/bug-626229.patch:
+  Add patch from upstream to allow building without alsa, bug #360163
 
   23 Aug 2011; Lars Wendler <polynomial-c@gentoo.org>
   xulrunner-1.9.2.17.ebuild, xulrunner-1.9.2.18.ebuild,
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 01d20107ab80..f085690ad1fd 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX arm-bug-644136.patch 472 RMD160 bda46fa7a4ca306ebfa3455d90c6e54a3f0d97e1 SHA1 f2eb5ab3ce793fc7d8c30d9f9db6be3a714f5c16 SHA256 3152f9c5b3f9cd75caf522e71d4105be8fbcc4def3e2f4162663799d78e03511
 AUX bug-606109.patch 1243 RMD160 ec262eed0480d8a13c914c4781329e3ea1c23b0f SHA1 0c0cc40ee0a663422b107cc3ae5d1412b8c45ac7 SHA256 266d9c7218cc04c3badadc54f8f31b1238326b9c3052aed057ffce40c69541dc
+AUX bug-626229.patch 4172 RMD160 d7ae0bc768b6951c249d640d7f0c079cd46f3adb SHA1 bd5d649948e0cb3a662bfa35f9ce6f1f60653067 SHA256 c61d16a56bcc7e333e8f47662d1ad9bc8468806bbf9d76c500d666bf645c1ddc
 AUX fix-animated-gifs.patch 7789 RMD160 a8889110a2daea27e07f92a70df6cb1e39e05546 SHA1 05b335feeefff4f06004a20182f821d998b44879 SHA256 6d85d3c103b0dcdbb073302a4041a37bea97c715384d04d299c1fb49a5da7443
 AUX libnotify-0.7.patch 1777 RMD160 1669210dd704fd4cb84be3fbb8ced8bd10133abb SHA1 981a0cf66608e1b441c21db73a7203711de56fe0 SHA256 153d129004e63baca57182ce2ec381a9103feef9e5fbdf631339bce25cde9489
 AUX mozilla-2.0_arm_respect_cflags.patch 3333 RMD160 d5f8b428a5a9cb0938e99666ac66d2abf3156b9b SHA1 17a5807b5f26a54ba80be7d0b64fbeb6d050364b SHA256 fb92269bcd700b257133875d5ecba063e99f33235282b251d4bb0eb37a73ba8f
@@ -21,23 +22,13 @@ EBUILD xulrunner-1.9.2.12.ebuild 8544 RMD160 b9237eaa83d73bfeae84245453dd5c120f3
 EBUILD xulrunner-1.9.2.17.ebuild 8534 RMD160 284f9838c86f79d886deda76c1f1b99064ccd59f SHA1 86264c2cefb9ed751b995d5454321b9afa44f8dd SHA256 ae38269d6a2f674b9fd5fc52210ab8c08b33c6f6c6760b609817553bce165f5c
 EBUILD xulrunner-1.9.2.18.ebuild 8542 RMD160 3c9e0340adecb60a1bc03a0f5330c98796ff08ac SHA1 e7fbb2b12c5191fca7c046da67077fb5e37865b8 SHA256 f84b9e4e1d750fdb5c9e9f4c9fd43acf79271a1222e62ef9137cb83ec9a9a13f
 EBUILD xulrunner-1.9.2.20.ebuild 8542 RMD160 5c91cf267780fdcc0d395cfb3c7b29ad14a19605 SHA1 b49d25b2e2073767abaa894cb4f74ff1e6554c6a SHA256 64ba711e8b4f8f676e2426cd42ecce610596e0d7b732de640e413afb9b6867e6
-EBUILD xulrunner-2.0.1-r1.ebuild 6453 RMD160 57a44145197a861f5b561246096e22b61c9f227e SHA1 6a324fa88790c6be0ec45c1b2a4aa2ba9f4b7a3b SHA256 8438736203e989330ac0eeb9af05d03b02cbb91d727a191e5cdf184dba74558a
-MISC ChangeLog 60061 RMD160 2fdfc113ed2bd48af5bf1192f3af5eec67a19724 SHA1 0db6520a05c92ad91a8e0a4afd99577c0408c8b8 SHA256 0a19d9ffd5a95e0dfb7188fe0f31386cdeaec193d9e78c1b724d6fbe591c9b87
+EBUILD xulrunner-2.0.1-r1.ebuild 6545 RMD160 3b53547acccb037d549fcefa24fc6bbccfc8e965 SHA1 ec98c46634c32920083914cb641e5b48d2d141a7 SHA256 315159f8a6128afbf748114f3d43523f8e57d4a7b0f62527fd5a7ddf83aab035
+MISC ChangeLog 60230 RMD160 16630369f03742ceab2e84fcab45e4320d217581 SHA1 11843dc99c713345df4ae73b3dd068c88bff5ed0 SHA256 b825537f46253de5c537d651f47c7ba307170d0c3cd404eb53806716f84ace35
 MISC metadata.xml 737 RMD160 ee298932f419af0c12657a8df62b797e1ae7720b SHA1 8b9e4d04ae106f928b374568a5d3e2ff0eddcc88 SHA256 400effb40ec15054f2a51ce3d9ea5c27359a4a4456c18459c014c58773491be0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOU/77AAoJEPiazRVxLXTF+5YQAI6Y9vhdxOvW121MMlLvzehi
-1phhhf5EhDGYU7gi0SVpHznpiXLcPOfjawVQ+xXMXXjDhbqq7VaSZaHoxsYN4hQv
-Z3LOhbuQICbUdGbFeQHqo+oTMD381l+03mE6oJ9g0mkhYKYtZ73fx8969AEe2EPU
-OGhkKHAsTF2FcEPKGrd4kbIH1E+UisLFcNe2l9kur9EUEfs7CFEmCIdAKiKxPay7
-7LOcfj0d+0nb6eRC/mkNtnOjHWzjYfdADHEqhIXzVCYzpejEYyByQH5nf5KLBMpX
-WGOgdsLIhwrIn9sib+RZ4jyi2474eKoCJWiJAstgsmA0QnjIVQ6peKolf70GFaPx
-el7OFTkdalpt+yrKqg2RUnmM2QgcPV7EPcRUh9N3MDegJwxzDAi/KbmVu/IiJ+Gv
-/s3FV8QE0w8+Vqqxp9iISb3MXoaJU2ttszrF623zfdA9lQQP7qQnaRUdpZw0Xnth
-gFcJFA2jIsAuk35eqf/c2BceZWDieqzDvLNM/cLBI0bw+iXZNoV2tKwzSk9KDLbM
-4GreMSUWHWC4AzF2m5fHM3eUv/PGCWUyQf5c+MzPfWkMAwmdXF1YQj49IPwzAV0j
-EJ/BWlvgCHTsx2AipqnMDj4Q9Qljk8Clk8a2mI7jUnYNqyU9kdEjvX32roSrapz6
-XEXdjztILz2BxvxUKFIk
-=kL0e
+iEYEARECAAYFAk5aJYEACgkQuQc30/atMkCqbgCfVkRLmK7s7bggxux9enUcnes0
+by4AoL6nzc8ibsBJyy0Mryg8FKYHw96d
+=EN99
 -----END PGP SIGNATURE-----
diff --git a/net-libs/xulrunner/files/bug-626229.patch b/net-libs/xulrunner/files/bug-626229.patch
new file mode 100644
index 000000000000..27ee4175c3e6
--- /dev/null
+++ b/net-libs/xulrunner/files/bug-626229.patch
@@ -0,0 +1,177 @@
+diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
+--- a/dom/ipc/ContentChild.cpp
++++ b/dom/ipc/ContentChild.cpp
+@@ -43,27 +43,31 @@
+ 
+ #ifdef MOZ_WIDGET_QT
+ #include "nsQAppInstance.h"
+ #endif
+ 
+ #include "ContentChild.h"
+ #include "CrashReporterChild.h"
+ #include "TabChild.h"
++#if defined(MOZ_SYDNEYAUDIO)
+ #include "AudioChild.h"
++#endif
+ 
+ #include "mozilla/ipc/TestShellChild.h"
+ #include "mozilla/net/NeckoChild.h"
+ #include "mozilla/ipc/XPCShellEnvironment.h"
+ #include "mozilla/jsipc/PContextWrapperChild.h"
+ #include "mozilla/dom/ExternalHelperAppChild.h"
+ #include "mozilla/dom/StorageChild.h"
+ #include "mozilla/dom/PCrashReporterChild.h"
+ 
++#if defined(MOZ_SYDNEYAUDIO)
+ #include "nsAudioStream.h"
++#endif
+ #include "nsIMemoryReporter.h"
+ #include "nsIObserverService.h"
+ #include "nsTObserverArray.h"
+ #include "nsIObserver.h"
+ #include "nsIPrefService.h"
+ #include "nsServiceManagerUtils.h"
+ #include "nsXULAppAPI.h"
+ #include "nsWeakReference.h"
+@@ -379,26 +383,32 @@ ContentChild::RecvPTestShellConstructor(
+     return true;
+ }
+ 
+ PAudioChild*
+ ContentChild::AllocPAudio(const PRInt32& numChannels,
+                           const PRInt32& rate,
+                           const PRInt32& format)
+ {
++#if defined(MOZ_SYDNEYAUDIO)
+     AudioChild *child = new AudioChild();
+     NS_ADDREF(child);
+     return child;
++#else
++    return nsnull;
++#endif
+ }
+ 
+ bool
+ ContentChild::DeallocPAudio(PAudioChild* doomed)
+ {
++#if defined(MOZ_SYDNEYAUDIO)
+     AudioChild *child = static_cast<AudioChild*>(doomed);
+     NS_RELEASE(child);
++#endif
+     return true;
+ }
+ 
+ PNeckoChild* 
+ ContentChild::AllocPNecko()
+ {
+     return new NeckoChild();
+ }
+diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
+--- a/dom/ipc/ContentParent.cpp
++++ b/dom/ipc/ContentParent.cpp
+@@ -63,17 +63,19 @@
+ #include "nsCExternalHandlerService.h"
+ #include "nsFrameMessageManager.h"
+ #include "nsIAlertsService.h"
+ #include "nsToolkitCompsCID.h"
+ #include "nsIDOMGeoGeolocation.h"
+ #include "nsIConsoleService.h"
+ #include "nsIScriptError.h"
+ #include "nsConsoleMessage.h"
++#if defined(MOZ_SYDNEYAUDIO)
+ #include "AudioParent.h"
++#endif
+ 
+ #if defined(ANDROID) || defined(LINUX)
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #endif
+ 
+ #ifdef MOZ_PERMISSIONS
+ #include "nsPermissionManager.h"
+@@ -682,26 +684,32 @@ ContentParent::DeallocPTestShell(PTestSh
+   return true;
+ }
+  
+ PAudioParent*
+ ContentParent::AllocPAudio(const PRInt32& numChannels,
+                            const PRInt32& rate,
+                            const PRInt32& format)
+ {
++#if defined(MOZ_SYDNEYAUDIO)
+     AudioParent *parent = new AudioParent(numChannels, rate, format);
+     NS_ADDREF(parent);
+     return parent;
++#else
++    return nsnull;
++#endif
+ }
+ 
+ bool
+ ContentParent::DeallocPAudio(PAudioParent* doomed)
+ {
++#if defined(MOZ_SYDNEYAUDIO)
+     AudioParent *parent = static_cast<AudioParent*>(doomed);
+     NS_RELEASE(parent);
++#endif
+     return true;
+ }
+ 
+ PNeckoParent* 
+ ContentParent::AllocPNecko()
+ {
+     return new NeckoParent();
+ }
+diff --git a/dom/ipc/Makefile.in b/dom/ipc/Makefile.in
+--- a/dom/ipc/Makefile.in
++++ b/dom/ipc/Makefile.in
+@@ -51,38 +51,45 @@ DIRS = tests
+ DIRS = tests
+ endif
+ 
+ EXPORTS = TabMessageUtils.h PCOMContentPermissionRequestChild.h
+ 
+ EXPORTS_NAMESPACES = mozilla/dom
+ 
+ EXPORTS_mozilla/dom = \
+-  AudioChild.h \
+-  AudioParent.h \
+   ContentChild.h \
+   ContentParent.h \
+   ContentProcess.h \
+   CrashReporterChild.h \
+   CrashReporterParent.h \
+   TabParent.h \
+   TabChild.h \
+   $(NULL)
+ 
+ CPPSRCS = \
+-  AudioChild.cpp \
+-  AudioParent.cpp \
+   ContentProcess.cpp \
+   ContentParent.cpp \
+   ContentChild.cpp \
+   CrashReporterParent.cpp \
+   TabParent.cpp \
+   TabChild.cpp \
+   TabMessageUtils.cpp \
+   $(NULL)
++
++ifdef MOZ_SYDNEYAUDIO
++EXPORTS_mozilla/dom += \
++  AudioChild.h \
++  AudioParent.h \
++  $(NULL)
++CPPSRCS += \
++  AudioChild.cpp \
++  AudioParent.cpp \
++  $(NULL)
++endif
+ 
+ include $(topsrcdir)/config/config.mk
+ include $(topsrcdir)/ipc/chromium/chromium-config.mk
+ include $(topsrcdir)/config/rules.mk
+ 
+ LOCAL_INCLUDES += \
+ 		-I$(srcdir)/../../content/base/src \
+ 		-I$(srcdir)/../../content/events/src \
diff --git a/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild b/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild
index 28b025589301..8dcd019e60c9 100644
--- a/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild
+++ b/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild,v 1.7 2011/08/13 17:20:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild,v 1.8 2011/08/28 11:24:42 armin76 Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -77,6 +77,9 @@ src_prepare() {
 	epatch "${FILESDIR}/arm-bug-644136.patch"
 	epatch "${FILESDIR}/mozilla-2.0_arm_respect_cflags.patch"
 
+	# Allow to build without alsa USE-flag,bug #360163
+	epatch "${FILESDIR}/bug-626229.patch"
+
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user