[arch-commits] Commit in epiphany/trunk (PKGBUILD ephy-download-mime.patch)

[Jan de Groot]

    Date: Wednesday, August 18, 2010 @ 04:53:47
  Author: jgc
Revision: 87759

upgpkg: epiphany 2.30.3-1
Update to 2.30.3

Modified:
  epiphany/trunk/PKGBUILD
Deleted:
  epiphany/trunk/ephy-download-mime.patch

--------------------------+
 PKGBUILD                 |   14 +++++-----
 ephy-download-mime.patch |   62 ---------------------------------------------
 2 files changed, 7 insertions(+), 69 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-18 08:16:26 UTC (rev 87758)
+++ PKGBUILD	2010-08-18 08:53:47 UTC (rev 87759)
@@ -2,30 +2,30 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=epiphany
-pkgver=2.30.2
+pkgver=2.30.3
 pkgrel=1
 install=epiphany.install
 pkgdesc="A GNOME2 web browser based on the WebKit rendering engine."
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libwebkit>=1.2.0' 'iso-codes>=3.10.1' 'desktop-file-utils' 'libxslt>=1.1.24' 'libnotify>=0.4.5' 'avahi>=0.6.25' 'libsoup-gnome>=2.30.0' 'nss>=3.12.6' 'ca-certificates' 'seed>=2.30.0')
+depends=('libwebkit>=1.2.3' 'iso-codes>=3.10.1' 'desktop-file-utils' 'libxslt>=1.1.24' 'libnotify>=0.4.5' 'avahi>=0.6.25' 'libsoup-gnome>=2.30.2' 'nss>=3.12.7' 'ca-certificates' 'seed>=2.30.0')
 makedepends=('gnome-doc-utils>=0.20' 'pkgconfig' 'networkmanager' 'intltool' 'startup-notification' 'gir-repository')
 options=('!libtool' '!emptydirs')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('cd0124e71e72142593cfeb442d58d97e99ba94ace6e31d94717fe977c0bfb98a')
+sha256sums=('5c3825c31c5bd01bccb9404c59c13e74fb7bc490a79fc3da56d06e1817f7bd2e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var \
       --disable-scrollkeeper \
-      --enable-network-manager --enable-seed || return 1
-  make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
+      --enable-network-manager --enable-seed
+  make
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain epiphany ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain epiphany ${pkgdir}/etc/gconf/schemas/*.schemas
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }

Deleted: ephy-download-mime.patch
===================================================================
--- ephy-download-mime.patch	2010-08-18 08:16:26 UTC (rev 87758)
+++ ephy-download-mime.patch	2010-08-18 08:53:47 UTC (rev 87759)
@@ -1,62 +0,0 @@
-diff -ruN epiphany-2.28.1/embed/ephy-embed.c epiphany-2.28.1.new/embed/ephy-embed.c
---- epiphany-2.28.1/embed/ephy-embed.c	2009-10-17 23:11:58.000000000 +0200
-+++ epiphany-2.28.1.new/embed/ephy-embed.c	2009-11-02 12:08:12.000000000 +0100
-@@ -645,27 +645,38 @@
-   GAppInfo *helper_app;
-   const char *suggested_filename;
-   int default_response;
-+  WebKitNetworkResponse *response;
-+  SoupMessage *message;
- 
-   parent_window = gtk_widget_get_toplevel (GTK_WIDGET(web_view));
-   if (!GTK_WIDGET_TOPLEVEL (parent_window))
-     parent_window = NULL;
- 
--  /* FIXME: we still have no way of getting the content type from
--   * webkit yet; we need to have a proper WebKitNetworkRequest
--   * implementation to do this here; see
--   * https://bugs.webkit.org/show_bug.cgi?id=18608
--   */
-   helper_app = NULL;
-   mime_description = NULL;
-   mime_permission = EPHY_MIME_PERMISSION_SAFE;
-+
-+  response = webkit_download_get_network_response (download);
-+  message = webkit_network_response_get_message (response);
-+
-+  if (message) {
-+    const char *content_type = soup_message_headers_get_content_type (message->response_headers, NULL);
-+
-+    if (content_type) {
-+      mime_description = g_content_type_get_description (content_type);
-+      helper_app = g_app_info_get_default_for_type (content_type, FALSE);
-+
-+      if (helper_app) {
-+        action = DOWNLOAD_ACTION_OPEN;
-+      }
-+    }
-+  }
-+
-   if (mime_description == NULL) {
-     mime_description = g_strdup (C_("file type", "Unknown"));
-     action = DOWNLOAD_ACTION_OPEN_LOCATION;
-   }
- 
--  /* OPEN will never happen here, for now; see comment about
--   * WebKitNetworkRequest above!
--   */
-   action_label = (action == DOWNLOAD_ACTION_OPEN) ? GTK_STOCK_OPEN : STOCK_DOWNLOAD;
-   suggested_filename = webkit_download_get_suggested_filename (download);
- 
-@@ -757,11 +768,6 @@
-     return;
-   }
- 
--  /* FIXME: when we are able to obtain the MIME information from
--   * WebKit, we will want to decide earlier whether we want to open or
--   * open the location to where the file was downloaded. See
--   * perform_auto_download, too.
--   */
-   g_object_ref (download); /* balanced in confirm_action_response_cb */
-   confirm_action_from_mime (web_view, download, DOWNLOAD_ACTION_DOWNLOAD);
- }