Update to 1.2.8.

5 files changed, 18 insertions, 92 deletions

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index a19926f9317c..348250a244f2 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	galeon
-PORTVERSION=	1.2.7
-PORTREVISION=	1
+PORTVERSION=	1.2.8
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -33,7 +32,7 @@ MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.0"
 .if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-embedded-devel"
 MOZILLA=	${WITH_MOZILLA}
 HEADERS_SUFX=	-devel
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="trunk"
+MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.3b"
 .else
 .if ${WITH_MOZILLA}=="mozilla-embedded"
 MOZILLA=	mozilla-embedded
diff --git a/www/galeon/distinfo b/www/galeon/distinfo
index 8383151f457b..a7e12e0048e9 100644
--- a/www/galeon/distinfo
+++ b/www/galeon/distinfo
@@ -1 +1 @@
-MD5 (galeon-1.2.7.tar.gz) = 2408b7e6b1a2a2655f6720b41a391f4b
+MD5 (galeon-1.2.8.tar.gz) = 3996982329273db71c84ccd86a5c3856
diff --git a/www/galeon/files/patch-hairy b/www/galeon/files/patch-hairy
index ed3c8f980573..b8513add52c2 100644
--- a/www/galeon/files/patch-hairy
+++ b/www/galeon/files/patch-hairy
@@ -715,9 +715,9 @@ $FreeBSD$
 +END_GNOME_DECLS
 +
 +#endif /* NAUTILUS_VIEW_H */
---- src/Makefile.in.orig	Sun Apr 21 18:18:11 2002
-+++ src/Makefile.in	Sun Apr 21 18:21:12 2002
-@@ -184,7 +184,8 @@
+--- src/Makefile.in.orig	Sun Feb 16 17:01:18 2003
++++ src/Makefile.in	Sun Feb 16 17:03:10 2003
+@@ -250,7 +250,8 @@
  NAUTILUS_VIEW_SRC = \
  	galeon-nautilus-view.c \
  	galeon-nautilus-view.h \
@@ -726,25 +726,14 @@ $FreeBSD$
 +	nautstub.c
  
  
- @ENABLE_NAUTILUS_VIEW_TRUE@NAUTILUS_VIEW_SRC_TO_COMPILE = @ENABLE_NAUTILUS_VIEW_TRUE@$(NAUTILUS_VIEW_SRC)
-@@ -399,7 +400,8 @@
- @ENABLE_NAUTILUS_VIEW_TRUE@window.$(OBJEXT) window_callbacks.$(OBJEXT) \
- @ENABLE_NAUTILUS_VIEW_TRUE@window_notifiers.$(OBJEXT) xbel.$(OBJEXT) \
- @ENABLE_NAUTILUS_VIEW_TRUE@xlink.$(OBJEXT) \
--@ENABLE_NAUTILUS_VIEW_TRUE@galeon-nautilus-view.$(OBJEXT)
-+@ENABLE_NAUTILUS_VIEW_TRUE@galeon-nautilus-view.$(OBJEXT) \
-+@ENABLE_NAUTILUS_VIEW_TRUE@nautstub.$(OBJEXT)
- @ENABLE_NAUTILUS_VIEW_FALSE@galeon_bin_OBJECTS =  \
- @ENABLE_NAUTILUS_VIEW_FALSE@GaleonAutomation-common.$(OBJEXT) \
- @ENABLE_NAUTILUS_VIEW_FALSE@Galeon-impl.$(OBJEXT) \
---- configure.orig	Wed Mar 13 19:23:43 2002
-+++ configure	Wed Mar 13 19:29:40 2002
-@@ -7030,7 +7030,7 @@
- #define ENABLE_NAUTILUS_VIEW 1
- EOF
- 
--  _gnome_modules="$_gnome_modules bonobox nautilus"
-+  _gnome_modules="$_gnome_modules bonobox"
- fi
- echo "$ac_t""$enable_nautilus_view" 1>&6
- 
+ @ENABLE_NAUTILUS_VIEW_TRUE@NAUTILUS_VIEW_SRC_TO_COMPILE = $(NAUTILUS_VIEW_SRC)
+@@ -442,7 +443,8 @@
+ 	toolbar_editor_callbacks.c window.c window.h window_callbacks.c \
+ 	window_notifiers.c window_notifiers.h xbel.c xlink.c xlink.h \
+ 	galeon-nautilus-view.c galeon-nautilus-view.h eel-gtk-macros.h
+-am__objects_1 = galeon-nautilus-view.$(OBJEXT)
++am__objects_1 = galeon-nautilus-view.$(OBJEXT) \
++		nautstub.$(OBJEXT)
+ @ENABLE_NAUTILUS_VIEW_TRUE@am__objects_2 = $(am__objects_1)
+ am_galeon_bin_OBJECTS = GaleonAutomation-common.$(OBJEXT) \
+ 	Galeon-impl.$(OBJEXT) GaleonAutomation-stubs.$(OBJEXT) \
diff --git a/www/galeon/files/patch-src_mozilla_GaleonWrapper.cpp b/www/galeon/files/patch-src_mozilla_GaleonWrapper.cpp
deleted file mode 100644
index b0f7fba45285..000000000000
--- a/www/galeon/files/patch-src_mozilla_GaleonWrapper.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
---- src/mozilla/GaleonWrapper.cpp.orig	Fri Oct 25 20:52:28 2002
-+++ src/mozilla/GaleonWrapper.cpp	Thu Feb  6 15:36:06 2003
-@@ -80,8 +80,10 @@
- #include "caps/nsIPrincipal.h"
- #include "nsIDeviceContext.h"
- #include "nsIPresContext.h"
-+#if MOZILLA_SNAPSHOT > 2
- #include "nsITypeAheadFind.h"
- #include "nsSupportsPrimitives.h"
-+#endif
- 
- GaleonWrapper::GaleonWrapper ()
- {
-@@ -584,6 +586,7 @@
- 			      PRBool search_in_frames,
- 			      PRBool *didFind)
- {
-+#if MOZILLA_SNAPSHOT > 2
- 	if (!interactive)
- 	{
- 		nsresult rv;
-@@ -610,6 +613,7 @@
- 			}
- 		}
- 	}
-+#endif
- 
- 	nsCOMPtr<nsIWebBrowserFind> finder (do_GetInterface(mWebBrowser));
- 
-@@ -984,7 +988,6 @@
- 					       nsIStyleSheet **return_sheet)
- {
- 	nsresult result;
--	PRBool completed;
- 
- 	/* catch necessary stuff */
- 	nsCOMPtr<nsIDocShell> DocShell;
-@@ -1014,7 +1017,12 @@
- 	if (NS_FAILED(result)) return NS_ERROR_FAILURE;
- 
- 	nsICSSStyleSheet *sheet;
-+#if MOZILLA_SNAPSHOT > 3
-+	result = loader->LoadAgentSheet(uri, &sheet);
-+#else
-+	PRBool completed;
- 	result = loader->LoadAgentSheet(uri, sheet, completed, nsnull);
-+#endif
- 	if (NS_FAILED(result)) return NS_ERROR_FAILURE;
- 
- 	/* catch stylesheet stuff and apply by appending it as a override
diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist
index 2caf115e6491..94963aeb151a 100644
--- a/www/galeon/pkg-plist
+++ b/www/galeon/pkg-plist
@@ -273,7 +273,6 @@ share/gnome/galeon/themes/Remembrance/empty.png
 share/gnome/galeon/toc.css
 share/gnome/galeon/toolbars.png
 share/gnome/galeon/windows.png
-share/gnome/help/galeon-manual/C/LEGALNOTICE.html
 share/gnome/help/galeon-manual/C/aboutbook.html
 share/gnome/help/galeon-manual/C/apx-authors.sgml
 share/gnome/help/galeon-manual/C/apx-bugs.sgml
@@ -333,6 +332,7 @@ share/gnome/help/galeon-manual/C/getting-started.sgml
 share/gnome/help/galeon-manual/C/history.html
 share/gnome/help/galeon-manual/C/index.html
 share/gnome/help/galeon-manual/C/introduction.html
+share/gnome/help/galeon-manual/C/ln26.html
 share/gnome/help/galeon-manual/C/menubar.html
 share/gnome/help/galeon-manual/C/mouse-gestures.html
 share/gnome/help/galeon-manual/C/other-tools.html
@@ -348,18 +348,6 @@ share/gnome/help/galeon-manual/C/prefs-handlers.html
 share/gnome/help/galeon-manual/C/prefs-rendering.html
 share/gnome/help/galeon-manual/C/prefs-user-interface.html
 share/gnome/help/galeon-manual/C/statusbar.html
-share/gnome/help/galeon-manual/C/stylesheet-images/caution.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/home.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/important.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/next.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/note.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/prev.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/tip.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/toc-blank.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/toc-minus.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/toc-plus.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/up.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/warning.gif
 share/gnome/help/galeon-manual/C/tabbed-browsing.html
 share/gnome/help/galeon-manual/C/toolbar.html
 share/gnome/oaf/GNOME_Galeon_Automation.oaf