Update to 1.3.12. This is a fairly big release considering it's only a micro

version rev.  Checkout http://galeon.sourceforge.net/news/index.php#68 for
a list of what's new.

6 files changed, 55 insertions, 85 deletions

diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index e3c9058fb402..3a0178dcfd98 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	galeon2
-PORTVERSION=	1.3.11a
-PORTREVISION=	1
+PORTVERSION=	1.3.12
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://osdn.dl.sourceforge.net/sourceforge/galeon/
@@ -20,7 +19,7 @@ COMMENT=	A GNOME 2 Web browser based on gecko (the Mozilla rendering engine)
 BUILD_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
 RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
 
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="trunk"
+MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.6"
 
 MOZILLA=	mozilla-gtk2
 HEADERS_SUFX=
diff --git a/www/galeon2/distinfo b/www/galeon2/distinfo
index 61cd5d0a3d19..d7a9609b1890 100644
--- a/www/galeon2/distinfo
+++ b/www/galeon2/distinfo
@@ -1 +1 @@
-MD5 (galeon-1.3.11a.tar.bz2) = 970ec350142d2e2d2c9b94bce7cf7ab7
+MD5 (galeon-1.3.12.tar.bz2) = dac3aac7df1169da9b065d053644a69c
diff --git a/www/galeon2/files/patch-bookmarks_bookmarks-add-dialog.c b/www/galeon2/files/patch-bookmarks_bookmarks-add-dialog.c
new file mode 100644
index 000000000000..8509c7aeffb2
--- /dev/null
+++ b/www/galeon2/files/patch-bookmarks_bookmarks-add-dialog.c
@@ -0,0 +1,16 @@
+--- bookmarks/bookmarks-add-dialog.c.orig	Fri Jan 23 01:53:29 2004
++++ bookmarks/bookmarks-add-dialog.c	Fri Jan 23 01:53:48 2004
+@@ -397,11 +397,12 @@
+ 				    gint int1, gint int2)
+ {
+ 	GbTreeView *treeview = gb_tree_view_new();
++	GtkWidget *widget;
+ 
+ 	g_signal_handlers_disconnect_matched(treeview, G_SIGNAL_MATCH_DATA,
+ 					     0, 0, NULL, NULL, treeview);
+ 
+-	GtkWidget *widget = GTK_WIDGET(treeview);
++	widget = GTK_WIDGET(treeview);
+ 	gtk_widget_show(widget);
+ 	return widget;
+ }
diff --git a/www/galeon2/files/patch-ui_Makefile.in b/www/galeon2/files/patch-ui_Makefile.in
index 375c1bf916a1..9e87b8029a20 100644
--- a/www/galeon2/files/patch-ui_Makefile.in
+++ b/www/galeon2/files/patch-ui_Makefile.in
@@ -1,10 +1,12 @@
---- ui/Makefile.in.orig	Sun Nov 17 00:56:49 2002
-+++ ui/Makefile.in	Sun Nov 17 00:56:52 2002
-@@ -182,7 +182,6 @@
+--- ui/Makefile.in.orig	Fri Jan 23 01:48:25 2004
++++ ui/Makefile.in	Fri Jan 23 01:48:55 2004
+@@ -265,8 +265,7 @@
+ uidir = $(pkgdatadir)
  
  uixmldir = $(datadir)/gnome-2.0/ui
- uixml_in_files = galeon-bookmarks-editor-ui.xml.in 	\
--                 nautilus-galeon-view-ui.xml.in 	\
- 		 galeon-ui.xml.in
+-uixml_in_files = galeon-bookmarks-editor-ui.xml.in 	\
+-                 nautilus-galeon-view-ui.xml.in
++uixml_in_files = galeon-bookmarks-editor-ui.xml.in
  
  
+ uixml_DATA = $(uixml_in_files:.xml.in=.xml)
diff --git a/www/galeon2/files/patch-utils_gul-toolbar-bonobo-view.c b/www/galeon2/files/patch-utils_gul-toolbar-bonobo-view.c
deleted file mode 100644
index ffa0128c0f14..000000000000
--- a/www/galeon2/files/patch-utils_gul-toolbar-bonobo-view.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- utils/gul-toolbar-bonobo-view.c.orig	Sun Jun 15 02:34:00 2003
-+++ utils/gul-toolbar-bonobo-view.c	Sun Jun 15 02:34:36 2003
-@@ -20,6 +20,7 @@
- #include "config.h"
- #endif
- 
-+#include <sys/types.h>
- #include <libgnome/gnome-i18n.h>
- #include "gul-gobject-misc.h"
- #include "galeon-marshal.h"
diff --git a/www/galeon2/pkg-plist b/www/galeon2/pkg-plist
index d9a9a1b53a5e..ac4412e8fd47 100644
--- a/www/galeon2/pkg-plist
+++ b/www/galeon2/pkg-plist
@@ -6,7 +6,6 @@ etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Filtering/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Network/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Persistent/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Security/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Bookmarks/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Bookmarks/Editor/%gconf.xml
@@ -31,7 +30,6 @@ etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Filtering/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Network/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Persistent/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Security/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Bookmarks/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Bookmarks/Editor/%gconf.xml
@@ -75,6 +73,8 @@ share/gnome/galeon/galeon-bookmark-alias-mark.png
 share/gnome/galeon/galeon-bookmark.png
 share/gnome/galeon/galeon-default-open.png
 share/gnome/galeon/galeon-default.png
+share/gnome/galeon/galeon-egg-ui-toolbar.xml
+share/gnome/galeon/galeon-egg-ui.xml
 share/gnome/galeon/galeon-folder-open.png
 share/gnome/galeon/galeon-folder.png
 share/gnome/galeon/galeon-fullscreen.png
@@ -94,6 +94,7 @@ share/gnome/galeon/galeon-send-link.png
 share/gnome/galeon/galeon-separator.png
 share/gnome/galeon/galeon-tab-loading.gif
 share/gnome/galeon/galeon-viewsource.png
+share/gnome/galeon/galeon-zoom.png
 share/gnome/galeon/galeon.glade
 share/gnome/galeon/galeon.png
 share/gnome/galeon/gnu.png
@@ -117,78 +118,45 @@ share/gnome/galeon/rpm.png
 share/gnome/galeon/slack.png
 share/gnome/galeon/smart-bm-fold.png
 share/gnome/galeon/smart-bm-unfold.png
-share/gnome/galeon/spinners/crashcut/001.png
-share/gnome/galeon/spinners/crashcut/002.png
-share/gnome/galeon/spinners/crashcut/003.png
-share/gnome/galeon/spinners/crashcut/004.png
-share/gnome/galeon/spinners/crashcut/005.png
-share/gnome/galeon/spinners/crashcut/006.png
-share/gnome/galeon/spinners/crashcut/007.png
-share/gnome/galeon/spinners/crashcut/008.png
-share/gnome/galeon/spinners/crashcut/009.png
-share/gnome/galeon/spinners/crashcut/010.png
-share/gnome/galeon/spinners/crashcut/011.png
-share/gnome/galeon/spinners/crashcut/012.png
-share/gnome/galeon/spinners/crashcut/rest.png
-share/gnome/galeon/spinners/galeon/001.png
-share/gnome/galeon/spinners/galeon/002.png
-share/gnome/galeon/spinners/galeon/003.png
-share/gnome/galeon/spinners/galeon/004.png
-share/gnome/galeon/spinners/galeon/005.png
-share/gnome/galeon/spinners/galeon/006.png
-share/gnome/galeon/spinners/galeon/007.png
-share/gnome/galeon/spinners/galeon/008.png
-share/gnome/galeon/spinners/galeon/009.png
-share/gnome/galeon/spinners/galeon/010.png
-share/gnome/galeon/spinners/galeon/011.png
-share/gnome/galeon/spinners/galeon/012.png
-share/gnome/galeon/spinners/galeon/013.png
-share/gnome/galeon/spinners/galeon/014.png
-share/gnome/galeon/spinners/galeon/015.png
-share/gnome/galeon/spinners/galeon/016.png
-share/gnome/galeon/spinners/galeon/017.png
-share/gnome/galeon/spinners/galeon/018.png
-share/gnome/galeon/spinners/galeon/019.png
-share/gnome/galeon/spinners/galeon/020.png
-share/gnome/galeon/spinners/galeon/021.png
-share/gnome/galeon/spinners/galeon/022.png
-share/gnome/galeon/spinners/galeon/023.png
-share/gnome/galeon/spinners/galeon/024.png
-share/gnome/galeon/spinners/galeon/025.png
-share/gnome/galeon/spinners/galeon/026.png
-share/gnome/galeon/spinners/galeon/027.png
-share/gnome/galeon/spinners/galeon/rest.png
-share/gnome/galeon/spinners/pipeon/001.png
-share/gnome/galeon/spinners/pipeon/002.png
-share/gnome/galeon/spinners/pipeon/003.png
-share/gnome/galeon/spinners/pipeon/004.png
-share/gnome/galeon/spinners/pipeon/005.png
-share/gnome/galeon/spinners/pipeon/006.png
-share/gnome/galeon/spinners/pipeon/007.png
-share/gnome/galeon/spinners/pipeon/008.png
-share/gnome/galeon/spinners/pipeon/009.png
-share/gnome/galeon/spinners/pipeon/010.png
-share/gnome/galeon/spinners/pipeon/011.png
-share/gnome/galeon/spinners/pipeon/012.png
-share/gnome/galeon/spinners/pipeon/013.png
-share/gnome/galeon/spinners/pipeon/014.png
-share/gnome/galeon/spinners/pipeon/rest.png
 share/gnome/galeon/stocks.png
 share/gnome/galeon/toolbar-editor.glade
 share/gnome/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml
-share/gnome/gnome-2.0/ui/galeon-ui.xml
 share/gnome/help/galeon/C/apx-authors.xml
 share/gnome/help/galeon/C/apx-bugs.xml
 share/gnome/help/galeon/C/apx-command-line.xml
 share/gnome/help/galeon/C/apx-compiling.xml
+share/gnome/help/galeon/C/apx-keyboard-shortcuts.xml
+share/gnome/help/galeon/C/apx-mouse-gestures.xml
 share/gnome/help/galeon/C/apx-troubleshooting.xml
 share/gnome/help/galeon/C/bookmarks.xml
 share/gnome/help/galeon/C/browser-window.xml
 share/gnome/help/galeon/C/figures/bookmarks-editor.png
 share/gnome/help/galeon/C/figures/browser-window.png
 share/gnome/help/galeon/C/figures/find-dialog.png
+share/gnome/help/galeon/C/figures/gesture-back.png
+share/gnome/help/galeon/C/figures/gesture-clone-tab.png
+share/gnome/help/galeon/C/figures/gesture-clone-window.png
+share/gnome/help/galeon/C/figures/gesture-close-2.png
+share/gnome/help/galeon/C/figures/gesture-close.png
+share/gnome/help/galeon/C/figures/gesture-contents.png
+share/gnome/help/galeon/C/figures/gesture-forward.png
+share/gnome/help/galeon/C/figures/gesture-fullscreen.png
+share/gnome/help/galeon/C/figures/gesture-homepage.png
+share/gnome/help/galeon/C/figures/gesture-new-tab.png
+share/gnome/help/galeon/C/figures/gesture-new-window.png
+share/gnome/help/galeon/C/figures/gesture-next-link.png
+share/gnome/help/galeon/C/figures/gesture-next-tab.png
+share/gnome/help/galeon/C/figures/gesture-prev-link.png
+share/gnome/help/galeon/C/figures/gesture-prev-tab.png
+share/gnome/help/galeon/C/figures/gesture-reload-bypass.png
+share/gnome/help/galeon/C/figures/gesture-reload.png
+share/gnome/help/galeon/C/figures/gesture-stop.png
+share/gnome/help/galeon/C/figures/gesture-up.png
+share/gnome/help/galeon/C/figures/gesture-view-source.png
 share/gnome/help/galeon/C/figures/othertools-history.png
 share/gnome/help/galeon/C/figures/othertools-pdm.png
+share/gnome/help/galeon/C/figures/othertools-toolbar-editor.png
+share/gnome/help/galeon/C/figures/statusbar.png
 share/gnome/help/galeon/C/figures/tabbed-browsing.png
 share/gnome/help/galeon/C/figures/toolbars-bookmarks.png
 share/gnome/help/galeon/C/figures/toolbars-main.png
@@ -240,6 +208,7 @@ share/locale/ro/LC_MESSAGES/galeon-2.0.mo
 share/locale/ru/LC_MESSAGES/galeon-2.0.mo
 share/locale/sk/LC_MESSAGES/galeon-2.0.mo
 share/locale/sl/LC_MESSAGES/galeon-2.0.mo
+share/locale/sq/LC_MESSAGES/galeon-2.0.mo
 share/locale/sr/LC_MESSAGES/galeon-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/galeon-2.0.mo
 share/locale/sv/LC_MESSAGES/galeon-2.0.mo
@@ -255,10 +224,6 @@ share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
 @dirrm share/gnome/help/galeon/C/figures
 @dirrm share/gnome/help/galeon/C
 @dirrm share/gnome/help/galeon
-@dirrm share/gnome/galeon/spinners/pipeon
-@dirrm share/gnome/galeon/spinners/galeon
-@dirrm share/gnome/galeon/spinners/crashcut
-@dirrm share/gnome/galeon/spinners
 @dirrm share/gnome/galeon
 @dirrm lib/galeon/components
 @dirrm lib/galeon
@@ -281,7 +246,6 @@ share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Bookmarks/Editor
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Bookmarks
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Security
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Persistent
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Network
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Filtering
@@ -306,7 +270,6 @@ share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Bookmarks/Editor
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Bookmarks
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Security
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Persistent
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Network
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Filtering