Added a patch to configure, and configure.in to correct the includes for the GlobalHistory tests - see bug #74972

4 files changed, 41 insertions, 4 deletions

diff --git a/net-www/epiphany/ChangeLog b/net-www/epiphany/ChangeLog
index 8effdd2bfcfd..feedcd8ad601 100644
--- a/net-www/epiphany/ChangeLog
+++ b/net-www/epiphany/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/epiphany
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/ChangeLog,v 1.82 2004/12/19 06:23:48 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/ChangeLog,v 1.83 2004/12/20 08:34:26 obz Exp $
+
+  20 Dec 2004; Mike Gardiner <obz@gentoo.org>
+  +files/epiphany-1.4.6-moz-nsiurip.patch, epiphany-1.4.6.ebuild:
+  Added a patch to configure, and configure.in to correct the includes for the
+  GlobalHistory tests - see bug #74972
 
   19 Dec 2004; Mike Gardiner <obz@gentoo.org> epiphany-1.4.6.ebuild:
   Keyworded x86 and ppc for GNOME 2.8.1
diff --git a/net-www/epiphany/Manifest b/net-www/epiphany/Manifest
index c0c37b314d57..3526b22f3623 100644
--- a/net-www/epiphany/Manifest
+++ b/net-www/epiphany/Manifest
@@ -1,11 +1,12 @@
 MD5 71abaf1357baf25a58119f151b6cfd96 epiphany-1.2.10.ebuild 1328
 MD5 9dbacb408083855f29a9d7e2cd564952 epiphany-1.4.4.ebuild 1370
-MD5 c091fd2d4e61d03914eb9391422d231e epiphany-1.4.6.ebuild 1333
+MD5 402d7e67fc8151b377d0a0927a6597bd epiphany-1.4.6.ebuild 1464
 MD5 c0c9a502eef6ab123b58eaaa83c46a78 epiphany-1.2.9-r1.ebuild 1464
-MD5 e0e4002fb99a39bbdd6ef08c4821fc4d ChangeLog 10697
+MD5 cc63021ff3d389f1ee60f3ac4c6b8a57 ChangeLog 10928
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 0348530d161fe6234cc49c1536f6f522 epiphany-1.4.5.ebuild 1368
 MD5 f06f6e1c83f9668cfe31e9da7129ba4a files/epiphany-1.3.4-fix_includes.patch 720
+MD5 5dd8a008a5612c492c8d0b648f5b0954 files/epiphany-1.4.6-moz-nsiurip.patch 1071
 MD5 687a46caa636617d50fcf56d46f4c9f2 files/epiphany-1.2.9-mozilla-1.7.3.patch 972
 MD5 86259cda058c165aeb287a2b885b1b7a files/digest-epiphany-1.2.9-r1 68
 MD5 124caf61eb374940967a1d4c561270ca files/epiphany-1.4.6-fix_includes.patch 869
diff --git a/net-www/epiphany/epiphany-1.4.6.ebuild b/net-www/epiphany/epiphany-1.4.6.ebuild
index 79e02cb9c235..239c26b04378 100644
--- a/net-www/epiphany/epiphany-1.4.6.ebuild
+++ b/net-www/epiphany/epiphany-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.4.6.ebuild,v 1.2 2004/12/19 06:23:48 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.4.6.ebuild,v 1.3 2004/12/20 08:34:26 obz Exp $
 
 inherit eutils gnome2
 
@@ -52,5 +52,8 @@ src_unpack() {
 
 	# Fix include paths for our mozilla
 	epatch ${FILESDIR}/${P}-fix_includes.patch
+	# Fix compilation/API breakage with mozilla 1.7.5.
+	# See bug #74972 ,<obz@gentoo.org>
+	epatch ${FILESDIR}/${P}-moz-nsiurip.patch
 
 }
diff --git a/net-www/epiphany/files/epiphany-1.4.6-moz-nsiurip.patch b/net-www/epiphany/files/epiphany-1.4.6-moz-nsiurip.patch
new file mode 100644
index 000000000000..04fde3148e42
--- /dev/null
+++ b/net-www/epiphany/files/epiphany-1.4.6-moz-nsiurip.patch
@@ -0,0 +1,28 @@
+diff -ur epiphany-1.4.6/configure epiphany-1.4.6-patched/configure
+--- epiphany-1.4.6/configure	2004-11-29 03:54:24.000000000 +0800
++++ epiphany-1.4.6-patched/configure	2004-12-20 16:15:06.608361048 +0800
+@@ -23030,8 +23030,8 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <nsIURI.h>
+-		  #include <nsIGlobalHistory.h>
++#include <necko/nsIURI.h>
++#include <docshell/nsIGlobalHistory.h>
+ 		  #include <docshell/nsIGlobalHistory2.h>
+ 		  #include <history/nsIBrowserHistory.h>
+ int
+diff -ur epiphany-1.4.6/configure.in epiphany-1.4.6-patched/configure.in
+--- epiphany-1.4.6/configure.in	2004-11-25 05:14:25.000000000 +0800
++++ epiphany-1.4.6-patched/configure.in	2004-12-20 16:14:43.770832880 +0800
+@@ -259,8 +259,8 @@
+ 
+ AC_COMPILE_IFELSE(
+ 	[AC_LANG_PROGRAM(
+-		[[#include <nsIURI.h>
+-		  #include <nsIGlobalHistory.h>
++		[[#include <necko/nsIURI.h>
++		  #include <docshell/nsIGlobalHistory.h>
+ 		  #include <docshell/nsIGlobalHistory2.h>
+ 		  #include <history/nsIBrowserHistory.h>]],
+ 		[[nsIBrowserHistory* p;