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
commita651b6b6b29053c49422f1c45fe8b5f1d8b4ee34 (patch)
treef9816a3f4899746c038c6257d01c9992e0733cb2 /www-client/galeon
parentFix croscompilation per bug #267584. (diff)
downloadhistorical-a651b6b6b29053c49422f1c45fe8b5f1d8b4ee34.tar.gz
historical-a651b6b6b29053c49422f1c45fe8b5f1d8b4ee34.tar.bz2
historical-a651b6b6b29053c49422f1c45fe8b5f1d8b4ee34.zip
Fix bug 278917 -- build failure with xulrunner-1.9.1-r1
Package-Manager: portage-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/Manifest4
-rw-r--r--www-client/galeon/files/galeon-2.0.7-build-with-xulrunner-1.9.1.patch12
3 files changed, 19 insertions, 3 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/Manifest b/www-client/galeon/Manifest
index c1a801b77ec7..9027159b1c3b 100644
--- a/www-client/galeon/Manifest
+++ b/www-client/galeon/Manifest
@@ -1,10 +1,10 @@
AUX galeon-2.0.4-maketest.diff 592 RMD160 13162256efe1ad7a097ce5cd84332b86baf5311e SHA1 c43c170cb911e87e334dac62b58a55c5d46900ea SHA256 2b37df1396c8faa1e153c4ada242079729137ab3978eb8ad0a83cc75c3f37b29
-AUX galeon-2.0.7-build-with-xulrunner-1.9.1.patch 1545 RMD160 3343430bd05f66e1344ac00dae5a13e61a79a590 SHA1 0bb1151ba1f53599443bf329ec2e1055e37c628b SHA256 dc061ed2a9db3eae4a36cfdda383969c79faff9333cca175ff1b58db62669272
+AUX galeon-2.0.7-build-with-xulrunner-1.9.1.patch 1848 RMD160 543a3584d22dac260a7dedda5ec9692c468bc715 SHA1 8024056997277a9d56c503cacf8e59cb85605bce SHA256 f1df509f02196bed354665736305ba95c11b05f051713903c6bdd6d6d21fdbb5
DIST galeon-2.0.4.tar.bz2 3100793 RMD160 c52263ff9f8a49505f6b277da9e2db3745995828 SHA1 1e5cafec5a08191a5cf032332596863ee1cc1d29 SHA256 58565db5a213facd32aa940ef9d6b2486544629bdfa4b9c13a1dcaa3fc525731
DIST galeon-2.0.7-patches.tar.lzma 100072 RMD160 38c24fe18b93951c6805a2402648b9cdd778d6f8 SHA1 56fb068186cf8f5e247dd64333f9c19f89cbb049 SHA256 69b01ea3e80fb186635273f9b79737cb62c4d9169c234878279396a4ea22d3f7
DIST galeon-2.0.7.tar.bz2 3096337 RMD160 a443dfc11447a006d21d9e7852c616b41492a6f6 SHA1 14ccb53a7b3f398eb3ac3f7ca6aeb63348689a62 SHA256 c6fb0c9e7e2a4014ee7c785cec35380985138bd9aa2b33e9cb63de497ea68b3b
EBUILD galeon-2.0.4.ebuild 1494 RMD160 dcf30729cff7157a6bc8e4c2854fa9232135efdc SHA1 f6a34b92d875ca5ceb67d9eabea5754943ce7bac SHA256 22753cc08501bab2914542732809faa66d13f90c2ec301e2deea0cf073561702
EBUILD galeon-2.0.7-r1.ebuild 1326 RMD160 1814c43684f6fbae59e4c0a5a57c7121926b92ad SHA1 cbd80e2c024fe57c488b9ab24220ae3d17b69e62 SHA256 4346d41fd16321017c2eb5657ff96285d19aaeba8d7fcda21374a3eb86585eee
EBUILD galeon-2.0.7.ebuild 1239 RMD160 b480cf38e5b0966019f13e383f278009751689c0 SHA1 7e3b5af4787a6ce5416f65edad49170d6ec06db5 SHA256 3ceb510aba6d133dfeaba149c4b0aadde74d0f39f1dcf0c20bba2798c85e2d92
-MISC ChangeLog 21263 RMD160 401dcc555e2a85e6e342226b1fa66e5f946e60c3 SHA1 bfef2fed7cb6a0c222917587c3c94586b24bea7b SHA256 84097700c463bb258bcd6428ffbd88c09397044331ad214ace8f4af7c57df6ae
+MISC ChangeLog 21431 RMD160 4c471f356a4c0e7b6282c2378e23baffcba1f291 SHA1 ddf9743528213bf4eef21ce3f5e0dd0fc10e55e9 SHA256 b996fd200c77b27ce48be194626856e75bda28d64f69f7d57e422881e589ae77
MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
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 @@