[packages/mozilla-addon-gnome-keyring] - up to 0.6.5. verified works in icedove

[glen]

commit 9f30ad5632e58b440adb4a21498350446b842533
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Dec 19 23:21:37 2012 +0200

    - up to 0.6.5. verified works in icedove

 mozilla-addon-gnome-keyring-no-nsnull.patch | 19 +++++++++++++++++++
 mozilla-addon-gnome-keyring.spec            | 12 ++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)
---
diff --git a/mozilla-addon-gnome-keyring.spec b/mozilla-addon-gnome-keyring.spec
index a97c3cd..7e7dd70 100644
--- a/mozilla-addon-gnome-keyring.spec
+++ b/mozilla-addon-gnome-keyring.spec
@@ -1,12 +1,12 @@
 %define		extension gnome-keyring
 Summary:	Extension that enables Gnome Keyring integration
 Name:		mozilla-addon-%{extension}
-Version:	0.6.1
-Release:	11
+Version:	0.6.5
+Release:	1
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	https://github.com/infinity0/mozilla-gnome-keyring/tarball/%{version}/%{name}-%{version}.tgz
-# Source0-md5:	078ad1df972de74d8a60f4feead0c053
+# Source0-md5:	38dd3bd872d5b446b2fe8c1f899a810e
 Patch0:		%{name}-no-nsnull.patch
 URL:		https://github.com/infinity0/mozilla-gnome-keyring/
 BuildRequires:	libgnome-keyring-devel >= 3.4.0
@@ -47,15 +47,13 @@ mv *-gnome-keyring-*/* .
 
 %{__sed} -i -e '/^CXXFLAGS/ s/$/ $(OPTFLAGS)/' Makefile
 
-# keep minversion
-%{__sed} -i -e 's/XUL_VER_MIN=$(XUL_VERSION)/XUL_VER_MIN=/' Makefile
-
 %build
 # build ext for current arch only
 %{__make} build-xpi \
 	PLATFORM=%{platform} \
 	VERSION=%{version} \
 	CXX="%{__cxx}" \
+	LDFLAGS="%{rpmldflags}" \
 	OPTFLAGS="%{rpmcxxflags}"
 
 %install
@@ -70,7 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %dir %{extensionsdir}/%{extension_id}
+%{extensionsdir}/%{extension_id}/chrome
 %{extensionsdir}/%{extension_id}/chrome.manifest
+%{extensionsdir}/%{extension_id}/defaults
 %{extensionsdir}/%{extension_id}/install.rdf
 %dir %{extensionsdir}/%{extension_id}/platform
 %dir %{extensionsdir}/%{extension_id}/platform/%{platform}
diff --git a/mozilla-addon-gnome-keyring-no-nsnull.patch b/mozilla-addon-gnome-keyring-no-nsnull.patch
index 3068a36..d30b574 100644
--- a/mozilla-addon-gnome-keyring-no-nsnull.patch
+++ b/mozilla-addon-gnome-keyring-no-nsnull.patch
@@ -27,3 +27,22 @@
    if (ret != NS_OK) { return ret; }
  
    ret = prefService->GetBranch(kPrefsBranch, getter_AddRefs(pref));
+--- mozilla-addon-gnome-keyring-0.6.5/xpcom_abi.cpp~	2012-10-20 12:07:33.000000000 +0300
++++ mozilla-addon-gnome-keyring-0.6.5/xpcom_abi.cpp	2012-12-19 23:17:19.705244425 +0200
+@@ -21,7 +21,7 @@
+ 	nsresult rv;
+ 
+ 	nsCOMPtr<nsIServiceManager> servMan;
+-	rv = NS_InitXPCOM2(getter_AddRefs(servMan), nsnull, nsnull);
++	rv = NS_InitXPCOM2(getter_AddRefs(servMan), NULL, NULL);
+ 	if (!NS_SUCCEEDED(rv)) return rv;
+ 
+ 	nsCOMPtr<nsIXULRuntime> xulrun = do_GetService(XULAPPINFO_SERVICE_CONTRACTID, &rv);
+@@ -35,6 +35,6 @@
+ 	if (!NS_SUCCEEDED(rv)) return rv;
+ 	printf("%s_%s\n", xpcomOs.get(), xpcomAbi.get());
+ 
+-	rv = NS_ShutdownXPCOM(nsnull);
++	rv = NS_ShutdownXPCOM(NULL);
+ 	return 0;
+ }
================================================================

---- gitweb:

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