[packages/mozilla-addon-gnome-keyring] - fix building with firefox 33 - rel 3

baggins baggins at pld-linux.org
Sun Oct 19 09:11:38 CEST 2014


commit 5b2bcb78251ebe312ad70bd6824c3cb5e73b3340
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Oct 19 09:11:25 2014 +0200

    - fix building with firefox 33
    - rel 3

 firefox-33.patch                 | 10 ++++++++++
 mozilla-addon-gnome-keyring.spec |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/mozilla-addon-gnome-keyring.spec b/mozilla-addon-gnome-keyring.spec
index 9c40660..92b281a 100644
--- a/mozilla-addon-gnome-keyring.spec
+++ b/mozilla-addon-gnome-keyring.spec
@@ -2,12 +2,13 @@
 Summary:	Extension that enables Gnome Keyring integration
 Name:		mozilla-addon-%{extension}
 Version:	0.6.11
-Release:	2
+Release:	3
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	https://github.com/infinity0/mozilla-gnome-keyring/archive/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	f6abf2e5bc5de7ad3472998bfd68a763
 Patch0:		firefox-32.patch
+Patch1:		firefox-33.patch
 URL:		https://github.com/infinity0/mozilla-gnome-keyring/
 BuildRequires:	libgnome-keyring-devel >= 3.4.0
 BuildRequires:	libstdc++-devel
@@ -42,6 +43,7 @@ password after Firefox or Thunderbird has been started.
 %prep
 %setup -qn mozilla-gnome-keyring-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -i -e '/^CXXFLAGS/ s/$/ $(OPTFLAGS)/' Makefile
 
diff --git a/firefox-33.patch b/firefox-33.patch
new file mode 100644
index 0000000..b5b7256
--- /dev/null
+++ b/firefox-33.patch
@@ -0,0 +1,10 @@
+--- mozilla-gnome-keyring-0.6.11/GnomeKeyring.h~	2014-10-18 22:19:04.000000000 +0200
++++ mozilla-gnome-keyring-0.6.11/GnomeKeyring.h	2014-10-18 22:23:16.478743383 +0200
+@@ -84,6 +84,7 @@
+   GnomeKeyringResult
+   findHostItemsAll(GList** found);
+ 
++  ~GnomeKeyring() {}
+ public:
+   NS_DECL_ISUPPORTS
+   NS_DECL_NSILOGINMANAGERSTORAGE
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mozilla-addon-gnome-keyring.git/commitdiff/5b2bcb78251ebe312ad70bd6824c3cb5e73b3340



More information about the pld-cvs-commit mailing list