From 3862af5edfa5fdba6b77680142ecb7e0fabd3d5b0781985790143812cd9bdd86 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 9 Nov 2007 00:27:41 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/epiphany?expand=0&rev=16 --- epiphany-2.20.0.tar.bz2 | 3 --- epiphany-2.20.1.tar.bz2 | 3 +++ epiphany-gcc4.3-fixes.patch | 27 +++++++++++++++++++++++++++ epiphany.changes | 6 ++++++ epiphany.spec | 11 ++++++++--- 5 files changed, 44 insertions(+), 6 deletions(-) delete mode 100644 epiphany-2.20.0.tar.bz2 create mode 100644 epiphany-2.20.1.tar.bz2 create mode 100644 epiphany-gcc4.3-fixes.patch diff --git a/epiphany-2.20.0.tar.bz2 b/epiphany-2.20.0.tar.bz2 deleted file mode 100644 index 4550737..0000000 --- a/epiphany-2.20.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea62002a9190e8207a0b3d09e4e414b2416b790ad011060b8be9d30d41f3135a -size 4874847 diff --git a/epiphany-2.20.1.tar.bz2 b/epiphany-2.20.1.tar.bz2 new file mode 100644 index 0000000..3f29ccc --- /dev/null +++ b/epiphany-2.20.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a1d9b9e928dd2cb7c3778d1990d5a42ae1b49b4d5e70d0bf86584a52d45bff1 +size 4878092 diff --git a/epiphany-gcc4.3-fixes.patch b/epiphany-gcc4.3-fixes.patch new file mode 100644 index 0000000..d1db86a --- /dev/null +++ b/epiphany-gcc4.3-fixes.patch @@ -0,0 +1,27 @@ +Index: epiphany-2.20.1/embed/mozilla/EphyBrowser.h +=================================================================== +--- epiphany-2.20.1.orig/embed/mozilla/EphyBrowser.h ++++ epiphany-2.20.1/embed/mozilla/EphyBrowser.h +@@ -187,7 +187,7 @@ public: + + nsresult LoadURI(const char *aURI, + PRUint32 aLoadFlags = nsIWebNavigation::LOAD_FLAGS_NONE, +- nsIURI *aURI = nsnull); ++ nsIURI *aReferrer = nsnull); + + EphyEmbedDocumentType GetDocumentType (); + +Index: epiphany-2.20.1/embed/mozilla/mozilla-x509-cert.h +=================================================================== +--- epiphany-2.20.1.orig/embed/mozilla/mozilla-x509-cert.h ++++ epiphany-2.20.1/embed/mozilla/mozilla-x509-cert.h +@@ -56,7 +56,8 @@ GType mozilla_x509_ce + + MozillaX509Cert *mozilla_x509_cert_new (nsIX509Cert *aMozCert); + +-nsresult mozilla_x509_cert_get_mozilla_cert (MozillaX509Cert *cert, nsIX509Cert **cert); ++nsresult mozilla_x509_cert_get_mozilla_cert (MozillaX509Cert *cert, ++ nsIX509Cert **aCert); + + G_END_DECLS + diff --git a/epiphany.changes b/epiphany.changes index c91f3d2..77ef08f 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 7 18:26:36 CET 2007 - maw@suse.de + +- Update to version 2.20.1 (another cosmetic version bump) +- Add epiphany-gcc4.3-fixes.patch. + ------------------------------------------------------------------- Thu Oct 11 17:05:49 CEST 2007 - sbrabec@suse.cz diff --git a/epiphany.spec b/epiphany.spec index b73b505..077e6f2 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -1,5 +1,5 @@ # -# spec file for package epiphany (Version 2.20.0) +# spec file for package epiphany (Version 2.20.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -28,8 +28,8 @@ BuildRequires: mozilla-devel Requires: mozilla = %{mozilla_ver} %endif %endif -Version: 2.20.0 -Release: 14 +Version: 2.20.1 +Release: 1 Requires: %{name}-lang = %{version} License: GPL v2 or later Group: Productivity/Networking/Web/Browsers @@ -43,6 +43,7 @@ Patch9: %{name}-desktop.patch Patch11: epiphany-no-root.patch Patch13: epiphany-browser-plugins.patch Patch14: default-bookmarks.patch +Patch15: epiphany-gcc4.3-fixes.patch Url: http://www.gnome.org/projects/epiphany/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: python-gtk python-gnome iso-codes gnome-icon-theme @@ -117,6 +118,7 @@ Authors: %patch11 %patch13 %patch14 -p1 +%patch15 -p1 %build #cp -i data/default-prefs-gecko-1-8.js data/default-prefs-xulrunner.js @@ -192,6 +194,9 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_datadir}/gtk-doc/html/epiphany %changelog +* Wed Nov 07 2007 - maw@suse.de +- Update to version 2.20.1 (another cosmetic version bump) +- Add epiphany-gcc4.3-fixes.patch. * Thu Oct 11 2007 - sbrabec@suse.cz - Removed bogus dependency on mDNSResponder. * Mon Sep 17 2007 - mauro@suse.de