Accepting request 133103 from GNOME:Next

Repush ... comments fixed

OBS-URL: https://build.opensuse.org/request/show/133103
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=150
This commit is contained in:
Vincent Untz 2012-09-07 15:24:51 +00:00 committed by Git OBS Bridge
parent 4b6179d34e
commit 7a1e02c3ad
5 changed files with 153 additions and 284 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3233fb9e9e8a056c3ef494e85cf5e27068abf51df5fc7f5203ab7afda480f395
size 5029412

3
epiphany-3.5.91.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0c04c4e0b532b8721b7d28900e0ed593d6380145df971225c59a5be22797f81a
size 2555184

View File

@ -1,245 +0,0 @@
From 9954541fdc25579033d396554717b4e4c30c8cfb Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <cgarcia@igalia.com>
Date: Thu, 14 Jun 2012 17:35:58 +0000
Subject: Fix memory leak
---
Index: epiphany-3.4.2/src/window-commands.c
===================================================================
--- epiphany-3.4.2.orig/src/window-commands.c
+++ epiphany-3.4.2/src/window-commands.c
@@ -370,14 +370,15 @@ download_status_changed_cb (WebKitDownlo
EphyApplicationDialogData *data)
{
WebKitDownloadStatus status = webkit_download_get_status (download);
- const char *destination;
+ char *filename;
switch (status)
{
case WEBKIT_DOWNLOAD_STATUS_FINISHED:
- destination = g_filename_from_uri (webkit_download_get_destination_uri (download),
+ filename = g_filename_from_uri (webkit_download_get_destination_uri (download),
NULL, NULL);
- gtk_image_set_from_file (GTK_IMAGE (data->image), destination);
+ gtk_image_set_from_file (GTK_IMAGE (data->image), filename);
+ g_free (filename);
break;
case WEBKIT_DOWNLOAD_STATUS_ERROR:
case WEBKIT_DOWNLOAD_STATUS_CANCELLED:
Index: epiphany-3.4.2/embed/ephy-download.c
===================================================================
--- epiphany-3.4.2.orig/embed/ephy-download.c
+++ epiphany-3.4.2/embed/ephy-download.c
@@ -184,47 +184,34 @@ ephy_download_get_content_type (EphyDown
return content_type;
}
+
+/* Helper function to decide what EphyDownloadActionType should be the
+ * default for the download. This implies that you want something to
+ * happen, this function will never return EPHY_DOWNLOAD_ACTION_NONE.
+ */
static EphyDownloadActionType
decide_action_from_mime (EphyDownload *ephy_download)
{
- WebKitNetworkResponse *response;
- SoupMessage *message;
- char *mime_description = NULL;
+ char *content_type;
GAppInfo *helper_app = NULL;
EphyDownloadActionType action;
- WebKitDownload *download;
-
- download = ephy_download_get_webkit_download (ephy_download);
-
- response = webkit_download_get_network_response (download);
- message = webkit_network_response_get_message (response);
-
- if (message) {
- char *content_type = ephy_download_get_content_type (ephy_download);
- if (content_type) {
- mime_description = g_content_type_get_description (content_type);
- helper_app = g_app_info_get_default_for_type (content_type, FALSE);
+ content_type = ephy_download_get_content_type (ephy_download);
+ if (content_type) {
+ helper_app = g_app_info_get_default_for_type (content_type, FALSE);
+ if (helper_app)
+ action = EPHY_DOWNLOAD_ACTION_OPEN;
- if (helper_app)
- action = EPHY_DOWNLOAD_ACTION_OPEN;
-
- g_free (content_type);
- }
- }
-
- if (mime_description == NULL) {
- mime_description = g_strdup (C_("file type", "Unknown"));
- action = EPHY_DOWNLOAD_ACTION_BROWSE_TO;
+ g_free (content_type);
}
- /* Sometimes downloads can have a mime_description but a NULL helper_app
- * in that case action is never changed so DOWNLOAD_ACTION_DOWNLOAD remains
- * as action value. This is the same response value as Save as...
- * button, which is wrong for the Download button.
+ /* Downloads that have no content_type, or no helper_app, are
+ * considered unsafe/unable to open. Default them to BROWSE_TO.
*/
if (helper_app == NULL)
action = EPHY_DOWNLOAD_ACTION_BROWSE_TO;
+ else
+ g_object_unref (helper_app);
return action;
}
Index: epiphany-3.4.2/lib/widgets/ephy-download-widget.c
===================================================================
--- epiphany-3.4.2.orig/lib/widgets/ephy-download-widget.c
+++ epiphany-3.4.2/lib/widgets/ephy-download-widget.c
@@ -135,6 +135,17 @@ download_clicked_cb (GtkButton *button,
}
static void
+update_download_icon (EphyDownloadWidget *widget)
+{
+ GIcon *new_icon;
+
+ new_icon = get_gicon_from_download (widget->priv->download);
+ gtk_image_set_from_gicon (GTK_IMAGE (widget->priv->icon), new_icon,
+ GTK_ICON_SIZE_LARGE_TOOLBAR);
+ g_object_unref (new_icon);
+}
+
+static void
widget_progress_cb (GObject *object,
GParamSpec *pspec,
EphyDownloadWidget *widget)
@@ -152,9 +163,7 @@ widget_progress_cb (GObject *object,
progress = webkit_download_get_progress (download) * 100;
if (progress % 10 == 0)
- gtk_image_set_from_gicon (GTK_IMAGE (widget->priv->icon),
- get_gicon_from_download (widget->priv->download),
- GTK_ICON_SIZE_LARGE_TOOLBAR);
+ update_download_icon (widget);
time = get_remaining_time (download);
@@ -434,6 +443,7 @@ ephy_download_widget_new (EphyDownload *
char *dest, *basename;
WebKitDownload *download;
+ GIcon *gicon;
g_return_val_if_fail (EPHY_IS_DOWNLOAD (ephy_download), NULL);
@@ -449,8 +459,10 @@ ephy_download_widget_new (EphyDownload *
button = totem_glow_button_new ();
menu = gtk_button_new ();
- icon = gtk_image_new_from_gicon (get_gicon_from_download (ephy_download),
- GTK_ICON_SIZE_LARGE_TOOLBAR);
+ gicon = get_gicon_from_download (ephy_download);
+ icon = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_LARGE_TOOLBAR);
+ g_object_unref (gicon);
+
text = gtk_label_new (dest);
gtk_misc_set_alignment (GTK_MISC (text), 0, 0.5);
gtk_label_set_ellipsize (GTK_LABEL (text), PANGO_ELLIPSIZE_END);
Index: epiphany-3.4.2/src/ephy-session.c
===================================================================
--- epiphany-3.4.2.orig/src/ephy-session.c
+++ epiphany-3.4.2/src/ephy-session.c
@@ -1109,6 +1109,7 @@ write_tab (xmlTextWriterPtr writer,
EphyEmbed *embed)
{
const char *address, *title;
+ char *new_address = NULL;
int ret;
ret = xmlTextWriterStartElement (writer, (xmlChar *) "embed");
@@ -1119,10 +1120,11 @@ write_tab (xmlTextWriterPtr writer,
* loading. */
if (g_str_has_prefix (address, EPHY_ABOUT_SCHEME))
{
- address = g_strconcat ("about", address + EPHY_ABOUT_SCHEME_LEN, NULL);
+ new_address = g_strconcat ("about", address + EPHY_ABOUT_SCHEME_LEN, NULL);
}
ret = xmlTextWriterWriteAttribute (writer, (xmlChar *) "url",
- (const xmlChar *) address);
+ (const xmlChar *) (new_address ? new_address : address));
+ g_free (new_address);
if (ret < 0) return ret;
title = ephy_web_view_get_title (ephy_embed_get_web_view (embed));
Index: epiphany-3.4.2/src/bookmarks/ephy-bookmarks-editor.c
===================================================================
--- epiphany-3.4.2.orig/src/bookmarks/ephy-bookmarks-editor.c
+++ epiphany-3.4.2/src/bookmarks/ephy-bookmarks-editor.c
@@ -1139,9 +1139,8 @@ ephy_bookmarks_editor_update_menu (EphyB
key_normal = (priority == EPHY_NODE_NORMAL_PRIORITY);
EPHY_TOPIC_ACTION_NAME_PRINTF (name, node);
-
- g_list_free (selected);
}
+ g_list_free (selected);
selected = ephy_node_view_get_selection (EPHY_NODE_VIEW (editor->priv->bm_view));
if (bmk_focus && selected)
@@ -1154,9 +1153,8 @@ ephy_bookmarks_editor_update_menu (EphyB
mutable = !ephy_node_get_property_boolean (node, EPHY_NODE_BMK_PROP_IMMUTABLE);
EPHY_BOOKMARK_ACTION_NAME_PRINTF (name, node);
-
- g_list_free (selected);
}
+ g_list_free (selected);
open_in_window_label = ngettext ("Open in New _Window",
"Open in New _Windows",
@@ -1460,6 +1458,19 @@ node_dropped_cb (EphyNodeView *view,
}
}
+static gboolean
+webkit_favicon_database_has_favicon (WebKitFaviconDatabase *database, const char *page_uri)
+{
+ gboolean result;
+ char *uri;
+
+ uri = webkit_favicon_database_get_favicon_uri (database, page_uri);
+ result = (uri != NULL);
+ g_free (uri);
+
+ return result;
+}
+
static void
icon_loaded_cb (WebKitFaviconDatabase *database, GAsyncResult *result, GValue *value)
{
@@ -1489,7 +1500,7 @@ provide_favicon (EphyNode *node, GValue
favicon = webkit_favicon_database_try_get_favicon_pixbuf (database, page_location,
FAVICON_SIZE, FAVICON_SIZE);
- if (!favicon && webkit_favicon_database_get_favicon_uri (database, page_location))
+ if (!favicon && webkit_favicon_database_has_favicon (database, page_location))
webkit_favicon_database_get_favicon_pixbuf (database, page_location,
FAVICON_SIZE, FAVICON_SIZE, NULL,
(GAsyncReadyCallback) icon_loaded_cb, value);
Index: epiphany-3.4.2/src/ephy-completion-model.c
===================================================================
--- epiphany-3.4.2.orig/src/ephy-completion-model.c
+++ epiphany-3.4.2/src/ephy-completion-model.c
@@ -416,7 +416,7 @@ query_completed_cb (EphyHistoryService *
g_free (user_data->search_string);
g_slice_free (FindURLsData, user_data);
-
+ g_list_free_full (urls, (GDestroyNotify)ephy_history_url_free);
g_slist_free_full (list, (GDestroyNotify)free_potential_row);
}

View File

@ -1,3 +1,128 @@
-------------------------------------------------------------------
Wed Sep 5 12:44:14 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.91.1:
+ Fix the epiphany-extensions build
- Changes from version 3.5.91:
+ New overview with most visited pages as starting page
(bgo#455173)
+ Avoid using 'Blank page' as title for pages without title
(bgo#682354)
+ Do not restore tool windows on startup (bgo#682966)
+ Port preferred language preferences to WK2 (bgo#679685)
+ Add code coverage reports (--enable-code-coverage) (bgo#683297)
+ Several fixes and updates to the test suite.
+ Many fixes and improvements in the profile migrator.
+ Many other code fixes and cleanups.
- Add pkgconfig(gnome-desktop-3.0) BuildRequires: new dependency.
-------------------------------------------------------------------
Thu Aug 23 21:20:40 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.90:
+ Improved url entry autosearch (bgo#681022)
+ Show information about TLS certificates and SSL errors when
clicking the lock icon (bgo#681506)
+ Store http disk cache with temporary profiles for improved privacy
(bgo#681147)
+ Do not add error pages to back forward list.
+ Do not add error pages to history (bgo#655619)
+ WebKit2: Show information about web and plugins processes in
about:memory (bgo#679764)
+ Port saving to WebKit2 (bgo#679368)
+ Update to recent WebKit2 API changes.
+ Dependencies cleanup.
+ Many code cleanups and bug fixes.
- Drop ca-certificates BuildRequires: the build system no longer
knows --with-ca-file and as such no longer needs it.
- Completely rework BuildRequires:
+ Removed: gnome-doc-utils-devel, gobject-introspection-devel,
iso-codes-devel, libavahi-gobject-devel,
libgnome-keyring-devel, libnotify-devel, libsoup-devel,
libtool, libwebkitgtk3-devel, libxslt-devel, mozilla-nss-devel,
pkgconfig(ice), pkgconfig(sm)
+ Added: pkgconfig()-style: avahi-client, avahi-gobject, gcr-3,
gio-unix-2.0, glib-2.0, gmodule-2.0, gnome-keyring-1,
gobject-introspection-1.0, gsettings-desktop-schemas,
gthread-2.0, gtk+-unix-print-3.0, iso-codes, libnotify,
libsoup-gnome-2.4, libxml-2.0, libxslt, nss, webkitgtk-3.0.
- No longer pass --disable-scrollkeeper, --enable-zeroconf and
--enable-network-manager to configure: the parameters are no
longer known by the build system.
-------------------------------------------------------------------
Sun Aug 12 09:27:16 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.5:
+ Rewrite EphyEncoding(s) so that it does not use EphyNode
anymore. (bgo#680735)
+ Remove Seed support for extensions
+ Make the browser recover from broken session state files
(bgo#680590)
+ Stop setting 'persist-key' in our filechooser (bgo#655508)
+ Do not copy history from parent tab when doing Ctrl+T
(bgo#651918)
+ Suggest the right name in 'Save As' more often, using the
information available in the Content-Disposition headers.
(bgo#674291)
+ Add a 'enable-webaudio' setting, false by default
+ Port disk cache, inspector and spell-checking to WebKit2
+ Many other bugfixes and cleanups.
- Drop libseed-gtk3-devel BuildRequires and stop passing
--enable-seed to configure, following upstream dropping seed.
-------------------------------------------------------------------
Sat Aug 11 18:29:10 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.4:
+ Make the security level indicator work in WebKit2.
+ Make site-specific quirks work in WebKit2.
+ Make cookies work in WebKit2.
+ Fix the page title not being updated properly in WebKit2.
+ Make the fullscreen popup work in WebKit2.
+ Make find work in WebKit2.
+ Make downloads work in WebKit2.
+ Make resource tracking work in WebKit2.
+ Code cleanups and refactorings (ie, moving EphyFileMonitor out
of EphyWebView).
-------------------------------------------------------------------
Fri Aug 10 17:42:35 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.3:
+ Initial WebKit2 support
+ Improve fullscreen UI, and add support for HTML5 fullscreen
(bgo#676905)
+ Add support for 'Do Not Track', http://donottrack.us/
+ Migrate profile directory to the XDG config directory
(~/.gnome2/epiphany -> ~/.config/epiphany) (bgo#522810)
+ Add new unit tests for EphyShell, EphySession,
EphyProfileMigrator, EphyWebAppUtils, ...
+ Lots and lots of cleanups and other minor fixes.
- Drop epiphany-fix-memory-leaks.patch: fixed upstream.
-------------------------------------------------------------------
Thu Aug 9 23:16:35 UTC 2012 - dimstar@opensuse.org
- Update to version 3.5.1:
+ Use the linked style class for the download bar (bgo#672712)
+ Use glib resources for the UI and CSS files
+ Default to always restoring the last session on startup,
regardless of how epiphany was closed (bgo#673453, bgo#673122)
+ Use intltool 0.50 (bgo#672932)
+ Improvements in the url entry layout (bgo#672927)
+ Fix stop/reload button misalignment when using custom font size
(bgo#668135)
+ New org.gnome.Epiphany.ui.tabs-visibility-policy setting. It's
now possible to always hide tabs.
+ Consider email-type entries when doing login/password
autocomplete (bgo#666326)
+ Prioritize smart bookmarks URIs over normal URIs when exporting
bookmarks (bgo#534565)
+ Restore right-click/long press menus in back/forward buttons
(bgo#671609)
+ Remove completely outdated help (bgo#674047)
-------------------------------------------------------------------
Wed Aug 8 12:26:37 UTC 2012 - dimstar@opensuse.org

View File

@ -17,40 +17,41 @@
Name: epiphany
Version: 3.4.3
Version: 3.5.91.1
Release: 0
Summary: GNOME Web Browser
License: GPL-2.0+
Group: Productivity/Networking/Web/Browsers
Url: http://www.gnome.org/projects/epiphany/
Source: http://download.gnome.org/sources/epiphany/3.4/%{name}-%{version}.tar.xz
Source: http://download.gnome.org/sources/epiphany/3.5/%{name}-%{version}.tar.xz
# PATCH-FEATURE-OPENSUSE epiphany-safe-one-click-install.patch bnc330070 vuntz@novell.com -- Make one-click install work with one-click
Patch6: epiphany-safe-one-click-install.patch
# PATCH-FIX-UPSTREAM epiphany-fix-memory-leaks.patch bnc#771568 bgo#677720 bgo#676484 badshah400@gmail.com -- Fix several memory leaks; patches taken from upstream git commits and rebased for 3.4.2
Patch7: epiphany-fix-memory-leaks.patch
BuildRequires: ca-certificates
BuildRequires: fdupes
BuildRequires: gnome-doc-utils-devel
BuildRequires: gnome-icon-theme
BuildRequires: gobject-introspection-devel
BuildRequires: intltool
BuildRequires: iso-codes-devel
BuildRequires: libavahi-gobject-devel
BuildRequires: libgnome-keyring-devel
BuildRequires: libnotify-devel >= 0.5.1
BuildRequires: libseed-gtk3-devel
BuildRequires: libsoup-devel >= 2.37.1
BuildRequires: libtool
BuildRequires: libwebkitgtk3-devel >= 1.8.2
BuildRequires: libxslt-devel
BuildRequires: mozilla-nss-devel
BuildRequires: intltool >= 0.50
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(gsettings-desktop-schemas)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.14
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(avahi-client) >= 0.6.22
BuildRequires: pkgconfig(avahi-gobject) >= 0.6.22
BuildRequires: pkgconfig(gcr-3) >= 3.5.5
BuildRequires: pkgconfig(gio-unix-2.0) >= 2.31.2
BuildRequires: pkgconfig(glib-2.0) >= 2.31.2
BuildRequires: pkgconfig(gmodule-2.0)
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 2.91.7
BuildRequires: pkgconfig(gnome-keyring-1) >= 2.26.0
BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.5
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 0.0.1
BuildRequires: pkgconfig(gthread-2.0)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.5.2
BuildRequires: pkgconfig(gtk+-unix-print-3.0) >= 3.5.2
BuildRequires: pkgconfig(iso-codes) >= 0.35
BuildRequires: pkgconfig(libnotify) >= 0.5.1
BuildRequires: pkgconfig(libsoup-gnome-2.4) >= 2.39.6
BuildRequires: pkgconfig(libxml-2.0) >= 2.6.12
BuildRequires: pkgconfig(libxslt) >= 1.1.7
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(webkitgtk-3.0) >= 1.9.6
BuildRequires: pkgconfig(x11)
Requires: %{name}-branding = %{version}
Requires: NetworkManager
@ -107,21 +108,16 @@ string.
%setup -q
translation-update-upstream
%patch6 -p1
%patch7 -p1
%build
%configure \
--disable-scrollkeeper \
--disable-maintainer-mode \
--enable-introspection \
--enable-zeroconf \
--enable-network-manager \
--enable-seed \
--with-distributor-name="SUSE"
make %{?_smp_mflags} V=1
%install
%makeinstall
%make_install
# In case make install did not create the extensions directory; note that we
# determine this directory with the pkg-config file that got installed.
extensionsdir=`pkg-config --variable extensionsdir %{buildroot}%{_libdir}/pkgconfig/epiphany-*.pc`
@ -154,13 +150,6 @@ done
%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%dir %{_datadir}/gnome/
%dir %{_datadir}/gnome/help/
%dir %{_datadir}/gnome/help/%{name}/
%doc %{_datadir}/gnome/help/%{name}/C/
%dir %{_datadir}/omf/
%dir %{_datadir}/omf/%{name}/
%doc %{_datadir}/omf/%{name}/%{name}-C.omf
%{_bindir}/ephy-profile-migrator
%{_bindir}/epiphany
%{_datadir}/applications/epiphany.desktop
@ -172,7 +161,7 @@ done
%{_datadir}/glib-2.0/schemas/org.gnome.epiphany.gschema.xml
%{_datadir}/icons/hicolor/*/apps/*.png
%{_libdir}/epiphany
%{_libdir}/girepository-1.0/Epiphany-3.4.typelib
%{_libdir}/girepository-1.0/Epiphany-3.5.typelib
%doc %{_mandir}/man1/epiphany.1.gz
%files lang -f %{name}.lang