summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2009-08-21 08:28:03 +0000
committerNirbheek Chauhan <nirbheek@gentoo.org>2009-08-21 08:28:03 +0000
commit048ec5b3fbed34e504c0d1c183e2e3b91f459aec (patch)
tree5b44ca265e4993eb5287c1239fc6ca2a6c821a80 /www-client/galeon
parentstable x86, bug 280946 (diff)
downloadgentoo-2-048ec5b3fbed34e504c0d1c183e2e3b91f459aec.tar.gz
gentoo-2-048ec5b3fbed34e504c0d1c183e2e3b91f459aec.tar.bz2
gentoo-2-048ec5b3fbed34e504c0d1c183e2e3b91f459aec.zip
Fix bug 278917 -- build failure with xulrunner-1.9.1-r1
(Portage version: 2.2_rc38/cvs/Linux i686)
Diffstat (limited to 'www-client/galeon')
-rw-r--r--www-client/galeon/ChangeLog6
-rw-r--r--www-client/galeon/files/galeon-2.0.7-build-with-xulrunner-1.9.1.patch12
2 files changed, 17 insertions, 1 deletions
diff --git a/www-client/galeon/ChangeLog b/www-client/galeon/ChangeLog
index faa317eae5cb..18f1b9cf4b0f 100644
--- a/www-client/galeon/ChangeLog
+++ b/www-client/galeon/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/galeon
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/ChangeLog,v 1.49 2009/07/21 15:38:52 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/ChangeLog,v 1.50 2009/08/21 08:28:03 nirbheek Exp $
+
+ 21 Aug 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+ files/galeon-2.0.7-build-with-xulrunner-1.9.1.patch:
+ Fix bug 278917 -- build failure with xulrunner-1.9.1-r1
*galeon-2.0.7-r1 (21 Jul 2009)
diff --git a/www-client/galeon/files/galeon-2.0.7-build-with-xulrunner-1.9.1.patch b/www-client/galeon/files/galeon-2.0.7-build-with-xulrunner-1.9.1.patch
index 8cf368b23f3b..4ef4da4b9aca 100644
--- a/www-client/galeon/files/galeon-2.0.7-build-with-xulrunner-1.9.1.patch
+++ b/www-client/galeon/files/galeon-2.0.7-build-with-xulrunner-1.9.1.patch
@@ -2,7 +2,19 @@ Fix building with xulrunner-1.9.1, bug 275252
Patch taken from http://cvs.fedoraproject.org/viewvc/devel/galeon/galeon-2.0.7-moz191.patch?view=log
+Addendum from bug 278917 -- patch adapted from bug 263990 by Michael Mauch
+
--
+--- a/mozilla/MozRegisterComponents.cpp
++++ b/mozilla/MozRegisterComponents.cpp
+@@ -44,6 +44,7 @@
+
+ #ifdef HAVE_NSIXULAPPINFO_H
+ #include <nsXULAppAPI.h>
++#include <nsXPCOMCIDInternal.h>
+ #include "EphyXULAppInfo.h"
+ #endif
+
--- a/mozilla/EventContext.cpp
+++ b/mozilla/EventContext.cpp
@@ -35,6 +35,7 @@