From e1498e426f584f0908fb3fdc9c46d2f5011ede56 Mon Sep 17 00:00:00 2001 From: marcus Date: Thu, 11 Dec 2003 00:43:10 +0000 Subject: Update to 1.1.1. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1456 df743ca5-7f9a-e211-a948-0013205c9059 --- www/epiphany/Makefile | 4 +- www/epiphany/distinfo | 2 +- www/epiphany/files/patch-configure | 10 --- .../patch-embed_mozilla_EphyEventListener.cpp | 29 ------- .../files/patch-embed_mozilla_EphyWrapper.cpp | 94 ---------------------- .../files/patch-embed_mozilla_EventContext.cpp | 40 --------- www/epiphany/files/patch-src_ephy-nautilus-view.c | 51 ------------ www/epiphany/pkg-plist | 38 ++++++--- 8 files changed, 32 insertions(+), 236 deletions(-) delete mode 100644 www/epiphany/files/patch-configure delete mode 100644 www/epiphany/files/patch-embed_mozilla_EphyEventListener.cpp delete mode 100644 www/epiphany/files/patch-embed_mozilla_EphyWrapper.cpp delete mode 100644 www/epiphany/files/patch-embed_mozilla_EventContext.cpp delete mode 100644 www/epiphany/files/patch-src_ephy-nautilus-view.c (limited to 'www/epiphany') diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index b59bac3c4..d0ff4a0bd 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -6,7 +6,7 @@ # PORTNAME= epiphany -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.1 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1 @@ -40,7 +40,7 @@ HEADERS_SUFX= USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack libgnomeui +USE_GNOME= gnomeprefix gnomehack intlhack lthack libgnomeui WANT_GNOME= yes USE_LIBTOOL= yes USE_GMAKE= yes diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo index cabe847c7..a0e695622 100644 --- a/www/epiphany/distinfo +++ b/www/epiphany/distinfo @@ -1 +1 @@ -MD5 (gnome2/epiphany-1.1.0.tar.bz2) = a47728c84c3d3906756beb3c359de481 +MD5 (gnome2/epiphany-1.1.1.tar.bz2) = f57314feb050037e8e5c79a8ecafa151 diff --git a/www/epiphany/files/patch-configure b/www/epiphany/files/patch-configure deleted file mode 100644 index 0f5ae010c..000000000 --- a/www/epiphany/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Tue Jul 15 14:31:11 2003 -+++ configure Tue Jul 15 14:31:11 2003 -@@ -18205,6 +18205,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' diff --git a/www/epiphany/files/patch-embed_mozilla_EphyEventListener.cpp b/www/epiphany/files/patch-embed_mozilla_EphyEventListener.cpp deleted file mode 100644 index 48f6e973a..000000000 --- a/www/epiphany/files/patch-embed_mozilla_EphyEventListener.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- embed/mozilla/EphyEventListener.cpp.orig Sat Nov 1 22:39:59 2003 -+++ embed/mozilla/EphyEventListener.cpp Sat Nov 1 22:41:44 2003 -@@ -16,6 +16,10 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #include - - #include "EphyEventListener.h" -@@ -80,9 +84,15 @@ - nsCOMPtr doc = do_QueryInterface (domDoc); - if(!doc) return NS_ERROR_FAILURE; - -+#if MOZILLA_SNAPSHOT > 11 -+ nsIURI *uri; -+ uri = doc->GetDocumentURL (); -+ if (uri == NULL) return NS_ERROR_FAILURE; -+#else - nsCOMPtr uri; - result = doc->GetDocumentURL(getter_AddRefs(uri)); - if (NS_FAILED (result)) return NS_ERROR_FAILURE; -+#endif - - const nsACString &link = NS_ConvertUCS2toUTF8(value); - nsCAutoString favicon_url; diff --git a/www/epiphany/files/patch-embed_mozilla_EphyWrapper.cpp b/www/epiphany/files/patch-embed_mozilla_EphyWrapper.cpp deleted file mode 100644 index a1d510768..000000000 --- a/www/epiphany/files/patch-embed_mozilla_EphyWrapper.cpp +++ /dev/null @@ -1,94 +0,0 @@ ---- embed/mozilla/EphyWrapper.cpp.orig Fri Oct 17 18:57:27 2003 -+++ embed/mozilla/EphyWrapper.cpp Sun Nov 30 18:57:18 2003 -@@ -74,6 +74,7 @@ - #include "nsIPresContext.h" - #include "nsIAtom.h" - #include "nsIDocumentCharsetInfo.h" -+#include "nsPromiseFlatString.h" - #include "ContentHandler.h" - #include "EphyEventListener.h" - -@@ -590,8 +591,13 @@ - nsCOMPtr doc = do_QueryInterface(DOMDocument); - if(!doc) return NS_ERROR_FAILURE; - -+#if MOZILLA_SNAPSHOT > 11 -+ nsIURI *uri; -+ uri = doc->GetDocumentURL (); -+#else - nsCOMPtr uri; - doc->GetDocumentURL(getter_AddRefs(uri)); -+#endif - - return uri->GetSpec (url); - } -@@ -608,8 +614,13 @@ - nsCOMPtr doc = do_QueryInterface(DOMDocument); - if(!doc) return NS_ERROR_FAILURE; - -+#if MOZILLA_SNAPSHOT > 11 -+ nsIURI *uri; -+ uri = doc->GetDocumentURL (); -+#else - nsCOMPtr uri; - doc->GetDocumentURL(getter_AddRefs(uri)); -+#endif - - uri->GetSpec (url); - -@@ -773,23 +784,13 @@ - info = g_new0 (EphyEncodingInfo, 1); - *infoptr = info; - --#if MOZILLA_SNAPSHOT >= 10 -- nsCAutoString enc; -- result = doc->GetDocumentCharacterSet (enc); -- if (NS_FAILED (result)) return NS_ERROR_FAILURE; -- -- info->encoding = g_strdup (enc.get()); --#else -- nsAutoString enc; -- result = doc->GetDocumentCharacterSet (enc); -- if (NS_FAILED (result)) return NS_ERROR_FAILURE; -- -- info->encoding = g_strdup (NS_ConvertUCS2toUTF8(enc).get()); --#endif -- - PRInt32 source; -+#if MOZILLA_SNAPSHOT > 11 -+ source = doc->GetDocumentCharacterSetSource (); -+#else - result = doc->GetDocumentCharacterSetSource (&source); - if (NS_FAILED (result)) return NS_ERROR_FAILURE; -+#endif - info->encoding_source = (EphyEncodingSource) source; - - nsCOMPtr ds; -@@ -831,7 +832,27 @@ - &result); - if (NS_FAILED(result) || !mdv) return NS_ERROR_FAILURE; - -+#if MOZILLA_SNAPSHOT > 11 -+ const nsACString& charsetEnc = doc->GetDocumentCharacterSet (); -+ if (charsetEnc.IsEmpty()) return NS_ERROR_FAILURE; -+ -+ info->encoding = g_strdup (PromiseFlatCString(charsetEnc).get()); -+#elif MOZILLA_SNAPSHOT >= 10 -+ nsCAutoString charsetEnc; -+ result = doc->GetDocumentCharacterSet (charsetEnc); -+ if (NS_FAILED (result)) return NS_ERROR_FAILURE; -+ -+ info->encoding = g_strdup (charsetEnc.get()); -+#else -+ nsAutoString charsetEnc; -+ result = doc->GetDocumentCharacterSet (charsetEnc); -+ if (NS_FAILED (result)) return NS_ERROR_FAILURE; -+ -+ info->encoding = g_strdup (NS_ConvertUCS2toUTF8(charsetEnc).get()); -+#endif -+ - #if MOZILLA_SNAPSHOT >= 10 -+ nsCAutoString enc; - result = mdv->GetDefaultCharacterSet (enc); - if (NS_FAILED (result)) return NS_ERROR_FAILURE; - info->default_encoding = g_strdup (enc.get()); diff --git a/www/epiphany/files/patch-embed_mozilla_EventContext.cpp b/www/epiphany/files/patch-embed_mozilla_EventContext.cpp deleted file mode 100644 index f40825763..000000000 --- a/www/epiphany/files/patch-embed_mozilla_EventContext.cpp +++ /dev/null @@ -1,40 +0,0 @@ ---- embed/mozilla/EventContext.cpp.orig Thu Oct 16 19:08:54 2003 -+++ embed/mozilla/EventContext.cpp Thu Nov 13 19:05:29 2003 -@@ -145,13 +145,19 @@ - nsresult EventContext::ResolveBaseURL (nsIDocument *doc, const nsAString &relurl, nsACString &url) - { - nsresult rv; -+#if MOZILLA_SNAPSHOT > 11 -+ nsIURI *base; -+ base = doc->GetBaseURL (); -+ if (base == NULL) return NS_ERROR_FAILURE; -+#elif MOZILLA_SNAPSHOT > 9 - nsCOMPtr base; --#if MOZILLA_SNAPSHOT > 9 - rv = doc->GetBaseURL (getter_AddRefs(base)); -+ if (NS_FAILED(rv)) return rv; - #else -+ nsCOMPtr base; - rv = doc->GetBaseURL (*getter_AddRefs(base)); --#endif - if (NS_FAILED(rv)) return rv; -+#endif - - return base->Resolve (NS_ConvertUCS2toUTF8(relurl), url); - } -@@ -159,9 +165,15 @@ - nsresult EventContext::ResolveDocumentURL (nsIDocument *doc, const nsAString &relurl, nsACString &url) - { - nsresult rv; -+#if MOZILLA_SNAPSHOT > 11 -+ nsIURI *uri; -+ uri = doc->GetDocumentURL (); -+ if (uri == NULL) return NS_ERROR_FAILURE; -+#else - nsCOMPtr uri; - rv = doc->GetDocumentURL(getter_AddRefs(uri)); - if (NS_FAILED(rv)) return rv; -+#endif - - return uri->Resolve (NS_ConvertUCS2toUTF8(relurl), url); - } diff --git a/www/epiphany/files/patch-src_ephy-nautilus-view.c b/www/epiphany/files/patch-src_ephy-nautilus-view.c deleted file mode 100644 index b9864eefb..000000000 --- a/www/epiphany/files/patch-src_ephy-nautilus-view.c +++ /dev/null @@ -1,51 +0,0 @@ ---- src/ephy-nautilus-view.c.orig Sat Oct 18 00:41:25 2003 -+++ src/ephy-nautilus-view.c Sat Nov 29 14:36:38 2003 -@@ -312,8 +312,8 @@ - - g_return_val_if_fail (url, FALSE); - -- nautilus_view_open_location_force_new_window (NAUTILUS_VIEW (view), -- url, NULL); -+ nautilus_view_open_location (NAUTILUS_VIEW (view), url, -+ Nautilus_ViewFrame_OPEN_IN_NAVIGATION, 0, NULL); - } - - return FALSE; -@@ -461,8 +461,8 @@ - - ephy_embed_event_get_property (info, "link", &value); - -- nautilus_view_open_location_force_new_window (NAUTILUS_VIEW (view), -- g_value_get_string (value), NULL); -+ nautilus_view_open_location (NAUTILUS_VIEW (view), g_value_get_string (value), -+ Nautilus_ViewFrame_OPEN_IN_NAVIGATION, 0, NULL); - } - - static void -@@ -480,8 +480,10 @@ - - ephy_embed_event_get_property (info, "image", &value); - -- nautilus_view_open_location_force_new_window (NAUTILUS_VIEW (view), -- g_value_get_string (value), NULL); -+ nautilus_view_open_location (NAUTILUS_VIEW (view), -+ g_value_get_string (value), -+ Nautilus_ViewFrame_OPEN_IN_NAVIGATION, -+ 0, NULL); - } - - static void -@@ -499,8 +501,11 @@ - - ephy_embed_get_location (view->priv->embed, FALSE, &location); - -- nautilus_view_open_location_force_new_window (NAUTILUS_VIEW (view), -- location, NULL); -+ nautilus_view_open_location (NAUTILUS_VIEW (view), -+ location, -+ Nautilus_ViewFrame_OPEN_IN_NAVIGATION, -+ 0, NULL); -+ - g_free (location); - } - diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist index b26d30479..7b1b48df2 100644 --- a/www/epiphany/pkg-plist +++ b/www/epiphany/pkg-plist @@ -4,51 +4,66 @@ etc/gconf/gconf.xml.defaults/apps/epiphany/%gconf.xml etc/gconf/gconf.xml.defaults/apps/epiphany/dialogs/%gconf.xml etc/gconf/gconf.xml.defaults/apps/epiphany/directories/%gconf.xml etc/gconf/gconf.xml.defaults/apps/epiphany/general/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/epiphany/lockdown/%gconf.xml etc/gconf/gconf.xml.defaults/apps/epiphany/web/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/dialogs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/directories/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/general/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/lockdown/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/web/%gconf.xml +etc/gconf/schemas/epiphany-lockdown.schemas etc/gconf/schemas/epiphany.schemas include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-bookmarks.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-command-manager.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-cookie-manager.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-dialog.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-event.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-persist.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-prefs.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-shell.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-single.h -include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-types.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-encodings.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-extension.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-history.h -include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-langs.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-node-db.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-node.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-notebook.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-password-manager.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-permission-manager.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-session.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-shell.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-tab.h -include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-types.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-window.h -include/epiphany-%%EPHY_VERSION%%/epiphany/session.h libdata/bonobo/servers/GNOME_Epiphany_Automation.server libdata/bonobo/servers/GNOME_Epiphany_NautilusView.server libdata/pkgconfig/epiphany-1.0.pc +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/epiphany-ephy-cookie-manager.html +%%DOCSDIR%%/epiphany-ephy-embed-factory.html +%%DOCSDIR%%/epiphany-ephy-embed-single.html +%%DOCSDIR%%/epiphany-ephy-password-manager.html +%%DOCSDIR%%/epiphany-ephy-permission-manager.html +%%DOCSDIR%%/epiphany-ephy-session.html +%%DOCSDIR%%/epiphany-ephy-shell.html +%%DOCSDIR%%/epiphany.devhelp +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/right.png +%%DOCSDIR%%/up.png share/gnome/application-registry/epiphany.applications share/gnome/applications/bme.desktop share/gnome/applications/epiphany.desktop -share/gnome/epiphany/art/epiphany-bookmark-page.png share/gnome/epiphany/art/epiphany-bookmarks.png share/gnome/epiphany/art/epiphany-download.png share/gnome/epiphany/art/epiphany-entry.png -share/gnome/epiphany/art/epiphany-fullscreen.png share/gnome/epiphany/art/epiphany-history.png -share/gnome/epiphany/art/epiphany-new-tab.png share/gnome/epiphany/art/epiphany-secure.png -share/gnome/epiphany/art/epiphany-send-link.png share/gnome/epiphany/art/epiphany-tab-loading.gif share/gnome/epiphany/art/epiphany-unsecure.png -share/gnome/epiphany/art/epiphany-viewsource.png share/gnome/epiphany/art/hand-open.png share/gnome/epiphany/conspiracy.xhtml share/gnome/epiphany/default-prefs.js @@ -58,9 +73,11 @@ share/gnome/epiphany/epiphany-history-window-ui.xml share/gnome/epiphany/epiphany-toolbar.xml share/gnome/epiphany/epiphany-ui.xml share/gnome/epiphany/epiphany.xhtml +share/gnome/epiphany/glade/certificate-dialogs.glade share/gnome/epiphany/glade/epiphany.glade share/gnome/epiphany/glade/prefs-dialog.glade share/gnome/epiphany/glade/print.glade +share/gnome/epiphany/mime-types-permissions.xml share/gnome/epiphany/nautilus-epiphany-view.xml share/gnome/help/epiphany/C/epiphany.xml share/gnome/help/epiphany/C/figures/ephy-history-window-screenshot.png @@ -129,12 +146,15 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo @dirrm share/gnome/epiphany/glade @dirrm share/gnome/epiphany/art @dirrm share/gnome/epiphany +@dirrm %%DOCSDIR%% @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/web +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/lockdown @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/general @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/directories @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/dialogs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany @dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/web +@dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/lockdown @dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/general @dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/directories @dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/dialogs -- cgit v1.2.3