summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2003-04-20 12:03:39 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2003-04-20 12:03:39 +0800
commit5ceb3a3593ce6134a68ccedc9269c24618ac15fd (patch)
tree1aa657d4b57ff610d03071723df044d15ba87003
parent90f823ae51454b5426ff322c5fbefc10b40379dd (diff)
downloadmarcuscom-ports-5ceb3a3593ce6134a68ccedc9269c24618ac15fd.tar
marcuscom-ports-5ceb3a3593ce6134a68ccedc9269c24618ac15fd.tar.gz
marcuscom-ports-5ceb3a3593ce6134a68ccedc9269c24618ac15fd.tar.bz2
marcuscom-ports-5ceb3a3593ce6134a68ccedc9269c24618ac15fd.tar.lz
marcuscom-ports-5ceb3a3593ce6134a68ccedc9269c24618ac15fd.tar.xz
marcuscom-ports-5ceb3a3593ce6134a68ccedc9269c24618ac15fd.tar.zst
marcuscom-ports-5ceb3a3593ce6134a68ccedc9269c24618ac15fd.zip
Remove galeon now that these changes have been merged into the FreeBSD
tree. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@677 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--www/galeon2/Makefile96
-rw-r--r--www/galeon2/distinfo1
-rw-r--r--www/galeon2/files/patch-ab52
-rw-r--r--www/galeon2/files/patch-bookmarks_bookmarks-import-druid-konqueror.c10
-rw-r--r--www/galeon2/files/patch-configure21
-rw-r--r--www/galeon2/files/patch-mozilla_GaleonWrapper.cpp41
-rw-r--r--www/galeon2/files/patch-mozilla_GaleonWrapper.h11
-rw-r--r--www/galeon2/files/patch-mozilla_Makefile.in11
-rw-r--r--www/galeon2/files/patch-mozilla_TOCProtocolHandler.cpp40
-rw-r--r--www/galeon2/files/patch-mozilla_TOCProtocolHandler.h11
-rw-r--r--www/galeon2/files/patch-mozilla_mozilla-embed-shell.cpp235
-rw-r--r--www/galeon2/files/patch-mozilla_nsMailtoUrl.h14
-rw-r--r--www/galeon2/files/patch-ui_Makefile.in10
-rw-r--r--www/galeon2/pkg-descr4
-rw-r--r--www/galeon2/pkg-plist303
15 files changed, 0 insertions, 860 deletions
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
deleted file mode 100644
index 3c1bd6774..000000000
--- a/www/galeon2/Makefile
+++ /dev/null
@@ -1,96 +0,0 @@
-# Ports collection Makefile for: galeon2
-# Date created: 16 November 2002
-# Whom: Maxime Romano <verbophobe@jewcrew.org>
-#
-# $FreeBSD: ports/www/galeon2/Makefile,v 1.103 2003/04/07 22:54:59 marcus Exp $
-#
-
-PORTNAME= galeon2
-PORTVERSION= 1.3.3
-PORTREVISION= 1
-CATEGORIES= www gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/2$//}
-DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= A GNOME 2 Web browser based on gecko (the Mozilla rendering engine)
-
-BUILD_DEPENDS= ${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers${HEADERS_SUFX} \
- ${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="1.3"
-
-MOZILLA= mozilla-gtk2
-HEADERS_SUFX=
-
-.if !defined(WITH_MOZILLA)
-MOZILLA= mozilla-gtk2
-HEADERS_SUFX=
-.else
-.if ${WITH_MOZILLA}=="mozilla-devel-gtk2"
-MOZILLA= ${WITH_MOZILLA}
-HEADERS_SUFX= -devel
-MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.4a"
-.else
-MOZILLA= mozilla
-HEADERS_SUFX=
-.endif
-.endif
-
-USE_X_PREFIX= yes
-USE_GNOME= gnomeprefix gnomehack libgnomeui
-USE_LIBTOOL= yes
-USE_GMAKE= yes
-USE_REINPLACE= yes
-CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \
- --with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \
- --enable-nautilus-view=no \
- ${MOZ_CONFIGURE_ARGS}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -D_REENTRANT ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-
-MAN1= galeon.1
-
-FLASHPLAYER= ${LOCALBASE}/lib/libflashplayer.so.1
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 500000
-# Galeon does not build correctly in -CURRENT if -Werror is passed
-# to the compiler.
-NO_WERROR= yes
-.endif
-# allow build with more warnings enabled
-.if defined(NO_WERROR)
-CONFIGURE_ARGS+= --disable-werror
-.endif
-
-pre-everything::
- @${ECHO_MSG} ""
- @${ECHO_MSG} " By default the port uses www/mozilla-gtk2 for html rendering, but you can"
- @${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
- @${ECHO_MSG}
- @${ECHO_MSG} " mozilla-devel-gtk2 "
- @${ECHO_MSG} ""
-
-post-patch:
- @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
- s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
- @${FIND} ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
- 's|-lpthread|${PTHREAD_LIBS}|g'
- @${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|malloc\.h|stdlib.h|g'
-
-post-configure:
- @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
- s|%%LOCALBASE%%|${LOCALBASE}|g ; \
- s|%%X11BASE%%|${X11BASE}|g ; \
- s|%%MOZILLA%%|${MOZILLA}|g ; \
- s|%%FLASHPLAYER%%|${FLASHPLAYER}|g' ${WRKSRC}/src/galeon
-
-pre-install:
- @-${X11BASE}/bin/gconftool --shutdown
-
-.include <bsd.port.post.mk>
diff --git a/www/galeon2/distinfo b/www/galeon2/distinfo
deleted file mode 100644
index 9f2f14fc1..000000000
--- a/www/galeon2/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (galeon-1.3.3.tar.gz) = e08a66e4c263d24532aacdd695bc75e5
diff --git a/www/galeon2/files/patch-ab b/www/galeon2/files/patch-ab
deleted file mode 100644
index b81cef0f4..000000000
--- a/www/galeon2/files/patch-ab
+++ /dev/null
@@ -1,52 +0,0 @@
---- src/galeon.in.orig Thu Dec 27 19:13:42 2001
-+++ src/galeon.in Mon Mar 10 11:20:39 2003
-@@ -4,18 +4,14 @@
-
- if test -n "$MOZILLA_FIVE_HOME"; then
- MOZILLA_HOME=$MOZILLA_FIVE_HOME
--elif [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then
-+elif [ -f @MOZILLA_HOME@/libgtkembedmoz.so ]; then
- MOZILLA_HOME=@MOZILLA_HOME@
--elif [ -f /usr/local/mozilla/chrome/comm.jar ]; then
-- MOZILLA_HOME=/usr/local/mozilla
--elif [ -f /usr/lib/mozilla/chrome/comm.jar ]; then
-- MOZILLA_HOME=/usr/lib/mozilla
--elif [ -f /opt/mozilla/chrome/comm.jar ]; then
-- MOZILLA_HOME=/opt/mozilla
--elif [ -f /usr/lib/mozilla-0.9.7/chrome/comm.jar ]; then
-- MOZILLA_HOME=/usr/lib/mozilla-0.9.7/
--elif [ -f /opt/gnome/lib/mozilla/chrome/comm.jar ]; then
-- MOZILLA_HOME=/opt/gnome/lib/mozilla/
-+elif [ -f %%LOCALBASE%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then
-+ MOZILLA_HOME=%%LOCALBASE%%/lib/%%MOZILLA%%
-+elif [ -f %%X11BASE%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then
-+ MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%%
-+elif [ -f %%PREFIX%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then
-+ MOZILLA_HOME=%%PREFIX%%/lib/%%MOZILLA%%
- else
- echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
- exit
-@@ -27,16 +23,17 @@
- MOZILLA_FIVE_HOME=$MOZILLA_HOME
- export MOZILLA_FIVE_HOME
-
--# for some reason this lets Galeon start properly on Red Hat 7.1 systems
--if [ -f /etc/redhat-release ]; then
-- if [ "`cat /etc/redhat-release`" = "Red Hat Linux release 7.1 (Seawolf)" ]; then
-- export LD_ASSUME_KERNEL=2.2.5
-- fi
-+MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins
-+export MOZ_PLUGIN_PATH
-+
-+if [ -f %%FLASHPLAYER%% ]; then
-+ LD_PRELOAD=%%FLASHPLAYER%%
-+ export LD_PRELOAD
- fi
-
- if [ -f ./galeon-bin ]; then
- exec ./galeon-bin "$@"
- else
--exec $dist_bin/galeon-bin "$@"
-+exec %%PREFIX%%/bin/galeon-bin "$@"
- fi
-
diff --git a/www/galeon2/files/patch-bookmarks_bookmarks-import-druid-konqueror.c b/www/galeon2/files/patch-bookmarks_bookmarks-import-druid-konqueror.c
deleted file mode 100644
index 6a54adc32..000000000
--- a/www/galeon2/files/patch-bookmarks_bookmarks-import-druid-konqueror.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- bookmarks/bookmarks-import-druid-konqueror.c.orig Sun Feb 16 18:36:14 2003
-+++ bookmarks/bookmarks-import-druid-konqueror.c Sun Feb 16 18:36:40 2003
-@@ -20,6 +20,7 @@
- #include "config.h"
- #endif
-
-+#include <sys/types.h>
- #include <libgnome/gnome-i18n.h>
- #include "bookmarks-import-druid-konqueror.h"
- #include "gul-gobject-misc.h"
diff --git a/www/galeon2/files/patch-configure b/www/galeon2/files/patch-configure
deleted file mode 100644
index 20a6e1b02..000000000
--- a/www/galeon2/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig Sun Mar 9 08:30:25 2003
-+++ configure Mon Apr 7 21:57:40 2003
-@@ -7838,6 +7838,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10305,8 +10306,8 @@
- 1.3a) MOZILLA_SNAPSHOT=4 ;;
- 1.3b) MOZILLA_SNAPSHOT=5 ;;
- 1.3) MOZILLA_SNAPSHOT=6 ;;
-- 1.4a) MOZILLA_SNAPSHOT=6 ;;
--trunk) MOZILLA_SNAPSHOT=6 ;;
-+ 1.4a) MOZILLA_SNAPSHOT=7 ;;
-+trunk) MOZILLA_SNAPSHOT=7 ;;
- *) { { echo "$as_me:$LINENO: error:
- *****************************************************************************
- Galeon can be built using mozilla 1.3a, 1.3b or trunk snapshot, but the version
diff --git a/www/galeon2/files/patch-mozilla_GaleonWrapper.cpp b/www/galeon2/files/patch-mozilla_GaleonWrapper.cpp
deleted file mode 100644
index 48c3c0939..000000000
--- a/www/galeon2/files/patch-mozilla_GaleonWrapper.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
---- mozilla/GaleonWrapper.cpp.orig Mon Apr 7 18:45:26 2003
-+++ mozilla/GaleonWrapper.cpp Mon Apr 7 18:45:35 2003
-@@ -666,10 +666,16 @@
- nsCOMPtr<nsIDocument> doc = do_QueryInterface(DOMDocument);
- if(!doc) return NS_ERROR_FAILURE;
-
-+#if MOZILLA_SNAPSHOT > 6
-+ nsAutoString t;
-+ doc->GetDocumentTitle(t);
-+ *title = g_strdup (NS_ConvertUCS2toUTF8(t).get());
-+#else
- const nsString* t;
- t = doc->GetDocumentTitle();
-
- *title = g_strdup (NS_ConvertUCS2toUTF8(*t).get());
-+#endif
-
- return NS_OK;
- }
-@@ -735,7 +741,7 @@
- return NS_OK;
- }
-
--nsresult GaleonWrapper::ForceCharacterSet (char *charset)
-+nsresult GaleonWrapper::ForceCharacterSet (const char *charset)
- {
- nsresult result;
-
-@@ -839,12 +845,7 @@
- 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/galeon2/files/patch-mozilla_GaleonWrapper.h b/www/galeon2/files/patch-mozilla_GaleonWrapper.h
deleted file mode 100644
index 77b723b32..000000000
--- a/www/galeon2/files/patch-mozilla_GaleonWrapper.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/GaleonWrapper.h.orig Mon Apr 7 18:48:36 2003
-+++ mozilla/GaleonWrapper.h Mon Apr 7 18:48:49 2003
-@@ -91,7 +91,7 @@
-
- nsresult GoToHistoryIndex (PRInt16 index);
-
-- nsresult ForceCharacterSet (char *charset);
-+ nsresult ForceCharacterSet (const char *charset);
-
- nsresult CanCutSelection(PRBool *result);
-
diff --git a/www/galeon2/files/patch-mozilla_Makefile.in b/www/galeon2/files/patch-mozilla_Makefile.in
deleted file mode 100644
index 6db4987ef..000000000
--- a/www/galeon2/files/patch-mozilla_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/Makefile.in.orig Mon Apr 7 18:09:47 2003
-+++ mozilla/Makefile.in Mon Apr 7 18:10:08 2003
-@@ -246,7 +246,7 @@
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGNOME_DISABLE_DEPRECATED \
- -DSHARE_DIR=\"$(pkgdatadir)\" \
-- -DNEW_H=\<new\>
-+ -include $(MOZILLA_INCLUDE_ROOT)/mozilla-config.h
-
-
- libgaleon_xpcom_la_LIBADD = \
diff --git a/www/galeon2/files/patch-mozilla_TOCProtocolHandler.cpp b/www/galeon2/files/patch-mozilla_TOCProtocolHandler.cpp
deleted file mode 100644
index cdb7d9860..000000000
--- a/www/galeon2/files/patch-mozilla_TOCProtocolHandler.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
---- mozilla/TOCProtocolHandler.cpp.orig Wed Sep 4 20:41:48 2002
-+++ mozilla/TOCProtocolHandler.cpp Thu Feb 13 16:15:50 2003
-@@ -83,8 +83,8 @@
- oStream->Write (str.c_str(), str.size(), &bytesWriten);
-
- void ParseEnvPath(const nsCString &path, list<string> &dirs);
--int gHelpSelect (const struct dirent *dirEntry);
--int gnomeHelpSelect (const struct dirent *dirEntry);
-+int gHelpSelect (struct dirent *dirEntry);
-+int gnomeHelpSelect (struct dirent *dirEntry);
-
- /* Implementation file */
- NS_IMPL_ISUPPORTS1 (GTOCProtocolHandler, nsIProtocolHandler)
-@@ -401,7 +408,7 @@
- }
-
- NS_METHOD GTOCProtocolHandler::CreateHelpPage (const char *type,
-- int (*select)(const struct dirent *))
-+ int (*select)(struct dirent *))
- {
- nsresult rv;
-
-@@ -496,7 +503,7 @@
- }
- }
-
--int gHelpSelect (const struct dirent *dirEntry)
-+int gHelpSelect (struct dirent *dirEntry)
- {
- #ifdef NOT_PORTED
- char *helpPath = gnome_help_file_find_file (
-@@ -512,7 +519,7 @@
- #endif
- }
-
--int gnomeHelpSelect (const struct dirent *dirEntry)
-+int gnomeHelpSelect (struct dirent *dirEntry)
- {
- #ifdef NOT_PORTED
- nsCString fileName = dirEntry->d_name;
diff --git a/www/galeon2/files/patch-mozilla_TOCProtocolHandler.h b/www/galeon2/files/patch-mozilla_TOCProtocolHandler.h
deleted file mode 100644
index e942b83c8..000000000
--- a/www/galeon2/files/patch-mozilla_TOCProtocolHandler.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/TOCProtocolHandler.h.orig Wed Nov 20 15:25:05 2002
-+++ mozilla/TOCProtocolHandler.h Wed Nov 20 15:25:10 2002
-@@ -55,7 +55,7 @@
- NS_METHOD CreateInfoPage (void);
- NS_METHOD CreateManPage (void);
- NS_METHOD CreateHelpPage (const char *type,
-- int (*select)(const struct dirent *));
-+ int (*select)(struct dirent *));
- nsCOMPtr<nsIURI> mURI;
- nsCOMPtr<nsIChannel> mChannel;
- nsCOMPtr<nsIStorageStream> mStream;
diff --git a/www/galeon2/files/patch-mozilla_mozilla-embed-shell.cpp b/www/galeon2/files/patch-mozilla_mozilla-embed-shell.cpp
deleted file mode 100644
index 5a71f547d..000000000
--- a/www/galeon2/files/patch-mozilla_mozilla-embed-shell.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
---- mozilla/mozilla-embed-shell.cpp.orig Mon Apr 7 18:39:50 2003
-+++ mozilla/mozilla-embed-shell.cpp Mon Apr 7 18:39:59 2003
-@@ -42,6 +42,7 @@
- #include <nsICacheService.h>
- #include <nsCOMPtr.h>
- #include <nsNetCID.h>
-+#include <nsNetUtil.h>
- #include <nsIServiceManager.h>
- #include <nsIIOService.h>
- #include <nsIProtocolProxyService.h>
-@@ -848,17 +849,26 @@
- }
-
- static gresult
--impl_set_permission (GaleonEmbedShell *shell,
-- const char *url,
-- PermissionType type,
-- gboolean allow)
-+impl_set_permission(GaleonEmbedShell *shell,
-+ const char *url,
-+ PermissionType type,
-+ gboolean allow)
- {
- nsresult rv;
- nsCOMPtr<nsIPermissionManager> permissionManager =
-- do_CreateInstance (NS_PERMISSIONMANAGER_CONTRACTID);
-+ do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
-
-- rv = permissionManager->Add (nsDependentCString(url),
-- allow ? PR_TRUE : PR_FALSE, type);
-+#if MOZILLA_SNAPSHOT > 6
-+ nsCOMPtr<nsIURI> uri;
-+ rv = NS_NewURI(getter_AddRefs(uri), url);
-+ if (NS_FAILED(rv) || !uri) return G_FAILED;
-+ rv = permissionManager->Add(uri, type,
-+ allow ? (PRUint32)nsIPermissionManager::ALLOW_ACTION
-+ : (PRUint32)nsIPermissionManager::DENY_ACTION);
-+#else
-+ rv = permissionManager->Add(nsDependentCString(url),
-+ allow ? PR_TRUE : PR_FALSE, type);
-+#endif
- if (NS_FAILED(rv)) return G_FAILED;
-
- return G_OK;
-@@ -874,9 +884,9 @@
- *permissions = NULL;
-
- nsCOMPtr<nsIPermissionManager> permissionManager =
-- do_CreateInstance (NS_PERMISSIONMANAGER_CONTRACTID);
-+ do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
- nsCOMPtr<nsISimpleEnumerator> permissionEnumerator;
-- result = permissionManager->GetEnumerator (getter_AddRefs(permissionEnumerator));
-+ result = permissionManager->GetEnumerator(getter_AddRefs(permissionEnumerator));
- if (NS_FAILED(result)) return G_FAILED;
-
- PRBool enumResult;
-@@ -885,47 +895,68 @@
- permissionEnumerator->HasMoreElements(&enumResult))
- {
- nsCOMPtr<nsIPermission> nsPermission;
-- result = permissionEnumerator->GetNext (getter_AddRefs(nsPermission));
-+ result = permissionEnumerator->GetNext(getter_AddRefs(nsPermission));
- if (NS_FAILED(result)) return G_FAILED;
-
-+#if MOZILLA_SNAPSHOT > 6
-+ PRUint32 cType;
-+#else
- PRInt32 cType;
-- nsPermission->GetType (&cType);
-- if (cType == type)
-+#endif
-+ nsPermission->GetType(&cType);
-+ if ((PRUint32)cType == (PRUint32)type)
- {
-- PermissionInfo *b = g_new0 (PermissionInfo, 1);
-- gchar *tmp = NULL;
--
-- nsPermission->GetHost (&tmp);
-- b->domain = g_strdup (tmp);
-- nsMemory::Free (tmp);
-+ PermissionInfo *b = g_new0(PermissionInfo, 1);
-+#if MOZILLA_SNAPSHOT > 6
-+ nsCString host;
-+ nsPermission->GetHost(host);
-+ b->domain = g_strdup(host.get());
-+
-+ PRUint32 cap;
-+ nsPermission->GetCapability(&cap);
-+ switch (cap)
-+ {
-+ case nsIPermissionManager::ALLOW_ACTION :
-+ b->status = TRUE;
-+ break;
-+ case nsIPermissionManager::DENY_ACTION :
-+ b->status = FALSE;
-+ break;
-+ default :
-+ b->status = FALSE;
-+ }
-+#else
-+ nsXPIDLCString host;
-+ nsPermission->GetHost(getter_Copies(host));
-+ b->domain = g_strdup(host.get());
-
- PRBool cap;
-- nsPermission->GetCapability (&cap);
-+ nsPermission->GetCapability(&cap);
- b->status = cap;
--
-- *permissions = g_list_prepend (*permissions, b);
-+#endif
-+ *permissions = g_list_prepend(*permissions, b);
- }
- }
-
-- *permissions = g_list_reverse (*permissions);
-+ *permissions = g_list_reverse(*permissions);
-
- return G_OK;
- }
-
- static gresult
--impl_remove_permissions (GaleonEmbedShell *shell,
-- PermissionType type,
-- GList *permissions)
-+impl_remove_permissions(GaleonEmbedShell *shell,
-+ PermissionType type,
-+ GList *permissions)
- {
- nsresult result;
- nsCOMPtr<nsIPermissionManager> permissionManager =
-- do_CreateInstance (NS_PERMISSIONMANAGER_CONTRACTID);
-+ do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
-
- for (GList *l = permissions; l != NULL; l = l->next)
- {
- PermissionInfo *b = (PermissionInfo *)l->data;
-- result = permissionManager->Remove (nsDependentCString(b->domain),
-- type);
-+ result = permissionManager->Remove(nsDependentCString(b->domain),
-+ type);
- if (NS_FAILED(result)) return G_FAILED;
- };
-
-@@ -937,28 +968,27 @@
- GList **cookies)
- {
- nsresult result;
--
- nsCOMPtr<nsICookieManager> cookieManager =
-- do_CreateInstance (NS_COOKIEMANAGER_CONTRACTID);
-+ do_GetService(NS_COOKIEMANAGER_CONTRACTID);
- nsCOMPtr<nsISimpleEnumerator> cookieEnumerator;
- result =
-- cookieManager->GetEnumerator (getter_AddRefs(cookieEnumerator));
-+ cookieManager->GetEnumerator(getter_AddRefs(cookieEnumerator));
- if (NS_FAILED(result)) return G_FAILED;
--
-+
- PRBool enumResult;
- for (cookieEnumerator->HasMoreElements(&enumResult) ;
- enumResult == PR_TRUE ;
- cookieEnumerator->HasMoreElements(&enumResult))
- {
- nsCOMPtr<nsICookie> nsCookie;
-- result = cookieEnumerator->GetNext (getter_AddRefs(nsCookie));
-+ result = cookieEnumerator->GetNext(getter_AddRefs(nsCookie));
- if (NS_FAILED(result)) return G_FAILED;
-
-- CookieInfo *c = mozilla_cookie_to_info (nsCookie);
-- *cookies = g_list_prepend (*cookies, c);
-+ CookieInfo *c = mozilla_cookie_to_info(nsCookie);
-+ *cookies = g_list_prepend(*cookies, c);
- }
-
-- *cookies = g_list_reverse (*cookies);
-+ *cookies = g_list_reverse(*cookies);
-
- return G_OK;
- }
-@@ -969,15 +999,15 @@
- {
- nsresult result;
- nsCOMPtr<nsICookieManager> cookieManager =
-- do_CreateInstance (NS_COOKIEMANAGER_CONTRACTID);
-+ do_GetService(NS_COOKIEMANAGER_CONTRACTID);
-
- for (GList *l = cookies; l != NULL; l = l->next)
- {
- CookieInfo *c = (CookieInfo *)l->data;
-
-- result = cookieManager->Remove (NS_LITERAL_CSTRING(c->domain),
-- NS_LITERAL_CSTRING(c->name),
-- NS_LITERAL_CSTRING(c->path),
-+ result = cookieManager->Remove (nsDependentCString(c->domain),
-+ nsDependentCString(c->name),
-+ nsDependentCString(c->path),
- PR_FALSE);
- if (NS_FAILED(result)) return G_FAILED;
- };
-@@ -993,7 +1023,7 @@
- nsresult result = NS_ERROR_FAILURE;
-
- nsCOMPtr<nsIPasswordManager> passwordManager =
-- do_CreateInstance (NS_PASSWORDMANAGER_CONTRACTID);
-+ do_GetService(NS_PASSWORDMANAGER_CONTRACTID);
- nsCOMPtr<nsISimpleEnumerator> passwordEnumerator;
- if (type == PASSWORD_PASSWORD)
- result = passwordManager->GetEnumerator
-@@ -1041,14 +1071,14 @@
- {
- nsresult result = NS_ERROR_FAILURE;
- nsCOMPtr<nsIPasswordManager> passwordManager =
-- do_CreateInstance (NS_PASSWORDMANAGER_CONTRACTID);
-+ do_GetService(NS_PASSWORDMANAGER_CONTRACTID);
-
- for (GList *l = passwords; l != NULL; l = l->next)
- {
- PasswordInfo *p = (PasswordInfo *)l->data;
- if (type == PASSWORD_PASSWORD)
- {
-- result = passwordManager->RemoveUser (NS_LITERAL_CSTRING(p->host),
-+ result = passwordManager->RemoveUser (nsDependentCString(p->host),
- NS_ConvertUTF8toUCS2(nsDependentCString(p->username)));
- }
- else if (type == PASSWORD_REJECT)
-@@ -1129,8 +1159,6 @@
- }
- else
- {
-- if (*ret_fullpath)
-- g_free (*ret_fullpath);
- nsCOMPtr<nsILocalFile> file;
- filePicker->GetFile (getter_AddRefs(file));
- nsCAutoString tempFullPathStr;
diff --git a/www/galeon2/files/patch-mozilla_nsMailtoUrl.h b/www/galeon2/files/patch-mozilla_nsMailtoUrl.h
deleted file mode 100644
index fdaa127c2..000000000
--- a/www/galeon2/files/patch-mozilla_nsMailtoUrl.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- mozilla/nsMailtoUrl.h.orig Mon Apr 7 18:13:50 2003
-+++ mozilla/nsMailtoUrl.h Mon Apr 7 18:14:24 2003
-@@ -43,8 +43,10 @@
-
- #include "nsIMailtoUrl.h"
- #include "nsIURI.h"
--#include "nsIFileSpec.h"
-+#include "nsCRT.h"
- #include "nsCOMPtr.h"
-+#include "nsString.h"
-+#include "nsIComponentManager.h"
- #include "nsIPrompt.h"
- #include "nsIAuthPrompt.h"
- #include "nsIInterfaceRequestor.h"
diff --git a/www/galeon2/files/patch-ui_Makefile.in b/www/galeon2/files/patch-ui_Makefile.in
deleted file mode 100644
index 375c1bf91..000000000
--- a/www/galeon2/files/patch-ui_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 @@
-
- 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
-
-
diff --git a/www/galeon2/pkg-descr b/www/galeon2/pkg-descr
deleted file mode 100644
index 9a4205386..000000000
--- a/www/galeon2/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Galeon is a GNOME 2 Web browser based on Gecko (the mozilla rendering engine).
-It's fast, it has a light interface, and it is fully standards-compliant.
-
-WWW: http://galeon.sourceforge.net/
diff --git a/www/galeon2/pkg-plist b/www/galeon2/pkg-plist
deleted file mode 100644
index 88b3e4270..000000000
--- a/www/galeon2/pkg-plist
+++ /dev/null
@@ -1,303 +0,0 @@
-bin/galeon
-bin/galeon-bin
-bin/galeon-config-tool
-etc/gconf/gconf.xml.defaults/apps/galeon/%gconf.xml
-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/Find/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/General/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Downloading/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Programs/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Print/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/FontsColors/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/Language/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/State/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/State/bookmarks_editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/State/page_info/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/UI/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/UI/Mouse/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/UI/Tabs/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/UI/Toolbar/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/UI/Windows/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/%gconf.xml
-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/Find/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/General/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Downloading/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Programs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Print/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/FontsColors/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/Language/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/bookmarks_editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/page_info/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Mouse/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Tabs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Toolbar/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Windows/%gconf.xml
-etc/gconf/schemas/galeon.schemas
-etc/sound/events/galeon.soundlist
-lib/galeon/components/libgaleon-xpcom.so
-libdata/bonobo/servers/GNOME_Galeon_Automation.server
-libdata/bonobo/servers/GNOME_Galeon_NautilusView.server
-share/gnome/applications/galeon.desktop
-share/gnome/galeon/FAQ.html
-share/gnome/galeon/Insecure.png
-share/gnome/galeon/Secure.png
-share/gnome/galeon/about_logo.png
-share/gnome/galeon/autoscroll.xpm
-share/gnome/galeon/bookmarks-editor.glade
-share/gnome/galeon/bookmarks.glade
-share/gnome/galeon/bug.png
-share/gnome/galeon/debian.png
-share/gnome/galeon/default-bookmarks.xbel
-share/gnome/galeon/fetch_favicon.xpm
-share/gnome/galeon/fonts.png
-share/gnome/galeon/freshmeat.png
-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-folder-open.png
-share/gnome/galeon/galeon-folder.png
-share/gnome/galeon/galeon-history.png
-share/gnome/galeon/galeon-send-link.png
-share/gnome/galeon/galeon-separator.png
-share/gnome/galeon/galeon-viewsource.png
-share/gnome/galeon/galeon.glade
-share/gnome/galeon/galeon.png
-share/gnome/galeon/general.png
-share/gnome/galeon/gnu.png
-share/gnome/galeon/google.png
-share/gnome/galeon/google_groups.png
-share/gnome/galeon/google_images.png
-share/gnome/galeon/imdb_movies.png
-share/gnome/galeon/logo.png
-share/gnome/galeon/myportal.css
-share/gnome/galeon/network.png
-share/gnome/galeon/new_alias.xpm
-share/gnome/galeon/new_alias_small.xpm
-share/gnome/galeon/new_folder.xpm
-share/gnome/galeon/new_folder_small.xpm
-share/gnome/galeon/new_item.xpm
-share/gnome/galeon/new_item_small.xpm
-share/gnome/galeon/new_separator.xpm
-share/gnome/galeon/new_separator_small.xpm
-share/gnome/galeon/prefs-dialog.glade
-share/gnome/galeon/print.glade
-share/gnome/galeon/prompts.glade
-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/stop.png
-share/gnome/galeon/tabs.png
-share/gnome/galeon/toc.css
-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-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/othertools-history.png
-share/gnome/help/galeon/C/figures/othertools-pdm.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
-share/gnome/help/galeon/C/galeon.xml
-share/gnome/help/galeon/C/getting-started.xml
-share/gnome/help/galeon/C/other-tools.xml
-share/gnome/help/galeon/C/plugins.xml
-share/gnome/help/galeon/C/preface.xml
-share/gnome/help/galeon/C/preferences.xml
-share/gnome/omf/galeon/galeon-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/galeon/galeon-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/pixmaps/galeon.png
-share/gnome/sounds/galeon/clicked.wav
-share/locale/am/LC_MESSAGES/galeon-2.0.mo
-share/locale/az/LC_MESSAGES/galeon-2.0.mo
-share/locale/bg/LC_MESSAGES/galeon-2.0.mo
-share/locale/ca/LC_MESSAGES/galeon-2.0.mo
-share/locale/cs/LC_MESSAGES/galeon-2.0.mo
-share/locale/da/LC_MESSAGES/galeon-2.0.mo
-share/locale/de/LC_MESSAGES/galeon-2.0.mo
-share/locale/el/LC_MESSAGES/galeon-2.0.mo
-share/locale/es/LC_MESSAGES/galeon-2.0.mo
-share/locale/et/LC_MESSAGES/galeon-2.0.mo
-share/locale/eu/LC_MESSAGES/galeon-2.0.mo
-share/locale/fi/LC_MESSAGES/galeon-2.0.mo
-share/locale/fr/LC_MESSAGES/galeon-2.0.mo
-share/locale/gl/LC_MESSAGES/galeon-2.0.mo
-share/locale/hr/LC_MESSAGES/galeon-2.0.mo
-share/locale/hu/LC_MESSAGES/galeon-2.0.mo
-share/locale/it/LC_MESSAGES/galeon-2.0.mo
-share/locale/ja/LC_MESSAGES/galeon-2.0.mo
-share/locale/ko/LC_MESSAGES/galeon-2.0.mo
-share/locale/lt/LC_MESSAGES/galeon-2.0.mo
-share/locale/lv/LC_MESSAGES/galeon-2.0.mo
-share/locale/ms/LC_MESSAGES/galeon-2.0.mo
-share/locale/nl/LC_MESSAGES/galeon-2.0.mo
-share/locale/nn/LC_MESSAGES/galeon-2.0.mo
-share/locale/no/LC_MESSAGES/galeon-2.0.mo
-share/locale/pl/LC_MESSAGES/galeon-2.0.mo
-share/locale/pt/LC_MESSAGES/galeon-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/galeon-2.0.mo
-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/sv/LC_MESSAGES/galeon-2.0.mo
-share/locale/ta/LC_MESSAGES/galeon-2.0.mo
-share/locale/tr/LC_MESSAGES/galeon-2.0.mo
-share/locale/vi/LC_MESSAGES/galeon-2.0.mo
-share/locale/uk/LC_MESSAGES/galeon-2.0.mo
-share/locale/wa/LC_MESSAGES/galeon-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/galeon-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
-@dirrm share/gnome/sounds/galeon
-@dirrm share/gnome/omf/galeon
-@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
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Windows
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Toolbar
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Tabs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Mouse
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/page_info
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/bookmarks_editor
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/Language
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/FontsColors
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Print
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Programs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Downloading
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/General
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Find
-@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
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Windows
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Toolbar
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Tabs
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Mouse
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/page_info
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/bookmarks_editor
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/Language
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/FontsColors
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Rendering
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Print
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Programs
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Downloading
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/General
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Find
-@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
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/galeon/galeon-C.omf 2>/dev/null || /usr/bin/true