OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/epiphany?expand=0&rev=4

59950.diff

@@ -1,7 +1,8 @@
-diff -pruN epiphany-1.5.4-old/embed/ephy-embed.c epiphany-1.5.4/embed/ephy-embed.c
---- epiphany-1.5.4-old/embed/ephy-embed.c	Thu Jan  6 19:14:41 2005
-+++ epiphany-1.5.4/embed/ephy-embed.c	Fri Jan 14 12:37:01 2005
-@@ -28,6 +28,8 @@
+Index: epiphany-2.18.0/embed/ephy-embed.c
+===================================================================
+--- epiphany-2.18.0.orig/embed/ephy-embed.c
++++ epiphany-2.18.0/embed/ephy-embed.c
+@@ -27,6 +27,8 @@
  #include "mozilla-embed-single.h"
  #include "mozilla-embed.h"
  
@@ -10,19 +11,22 @@ diff -pruN epiphany-1.5.4-old/embed/ephy-embed.c epiphany-1.5.4/embed/ephy-embed
  static void ephy_embed_base_init (gpointer g_class);
  
  GType
-@@ -329,8 +331,15 @@ void
- ephy_embed_load_url (EphyEmbed *embed,
+@@ -441,8 +443,16 @@ ephy_embed_load_url (EphyEmbed *embed,
  		     const char *url)
  {
+ 	/* Remove that crap patch please */
+-	EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed);
+-	iface->load_url (embed, url);
++    /* Sorry, I don't feel like removing this crap patch.  */
 +	char *protocol;
 +	protocol=malloc(strlen(url)+1);
 +	strcpy(protocol,url);
 +	protocol=strtok(protocol,":");
 +	if(strcasecmp(protocol,"gopher")!=0)
 +	{
- 	EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed);
- 	iface->load_url (embed, url);
-+	}
++        EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed);
++        iface->load_url (embed, url);
++    }
  }
  
  /**

epiphany-2.16.1.tar.bz2

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

epiphany-2.18.0.tar.bz2

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

epiphany.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr  2 14:51:30 CDT 2007 - maw@suse.de
+
+- Update to version 2.18.0
+- b.g.o 416994, 348331, 404514
+- Fix several .desktop files to remove invalid Category entries.
+
 -------------------------------------------------------------------
 Mon Mar 12 18:03:30 CET 2007 - jhargadon@suse.de
 

epiphany.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package epiphany (Version 2.16.1)
+# spec file for package epiphany (Version 2.18.0)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -30,9 +30,9 @@ Requires:       mozilla = %{mozilla_ver}
 %endif
 License:        GNU General Public License (GPL)
 Group:          Productivity/Networking/Web/Browsers
-Version:        2.16.1
-Release:        45
-%define interface_version 2.16
+Version:        2.18.0
+Release:        1
+%define interface_version 2.18
 Summary:        GNOME Web Browser Based on the Mozilla Rendering Engine
 Source:         %{name}-%{version}.tar.bz2
 Patch1:         %{name}-schema.dif
@@ -42,6 +42,7 @@ Patch9:         %{name}-desktop.patch
 Patch11:        epiphany-no-root.patch
 Patch12:        epiphany-flash-crash.patch
 Patch13:        epiphany-browser-plugins.patch
+# FIXME: make this reapply, if necessary
 Patch14:        epiphany-dbus-connection-close-fix-thoenig-01.patch
 URL:            http://www.gnome.org/projects/epiphany/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -117,7 +118,7 @@ Authors:
 %patch11
 %patch12
 cat %{P:13} | sed s/@LIB@/%{_lib}/g | patch -p0
-%patch14 -p0
+# %patch14 -p0
 
 %build
 #cp -i data/default-prefs-gecko-1-8.js data/default-prefs-xulrunner.js
@@ -191,6 +192,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/epiphany
 
 %changelog
+* Mon Apr 02 2007 - maw@suse.de
+- Update to version 2.18.0
+- b.g.o 416994, 348331, 404514
+- Fix several .desktop files to remove invalid Category entries.
 * Mon Mar 12 2007 - jhargadon@suse.de
 - added gtk-doc to the BuildRequires
 * Wed Jan 10 2007 - sbrabec@suse.cz