commit 1088fe5e3705cbc581ff2f0e3e010ee97acd0d9d
Author: Jan Rękorajski <[email protected]>
Date: Tue Nov 27 11:34:30 2012 +0100
- fix missing nsnull type
- rel 10
mozilla-addon-gnome-keyring-no-nsnull.patch | 29 +++++++++++++++++++++++++++++
mozilla-addon-gnome-keyring.spec | 4 +++-
2 files changed, 32 insertions(+), 1 deletion(-)
---
diff --git a/mozilla-addon-gnome-keyring.spec b/mozilla-addon-gnome-keyring.spec
index 33c7985..f811d05 100644
--- a/mozilla-addon-gnome-keyring.spec
+++ b/mozilla-addon-gnome-keyring.spec
@@ -2,11 +2,12 @@
Summary: Extension that enables Gnome Keyring integration
Name: mozilla-addon-%{extension}
Version: 0.6.1
-Release: 9
+Release: 10
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
+Patch0: %{name}-no-nsnull.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 -qc
mv *-gnome-keyring-*/* .
+%patch0 -p1
%{__sed} -i -e '/^CXXFLAGS/ s/$/ $(OPTFLAGS)/' Makefile
diff --git a/mozilla-addon-gnome-keyring-no-nsnull.patch
b/mozilla-addon-gnome-keyring-no-nsnull.patch
new file mode 100644
index 0000000..3068a36
--- /dev/null
+++ b/mozilla-addon-gnome-keyring-no-nsnull.patch
@@ -0,0 +1,29 @@
+--- mozilla-addon-gnome-keyring-0.6.1/GnomeKeyring.cpp~ 2012-02-14
00:15:56.000000000 +0100
++++ mozilla-addon-gnome-keyring-0.6.1/GnomeKeyring.cpp 2012-11-27
11:32:56.351868118 +0100
+@@ -139,7 +139,7 @@
+ template<class T, void F(T *)>
+ class AutoPtr {
+ public:
+- AutoPtr() : mPtr(nsnull) { }
++ AutoPtr() : mPtr(NULL) { }
+
+ operator T*() {
+ return mPtr;
+@@ -449,7 +449,7 @@
+ {
+ nsCOMPtr<nsILoginInfo> loginInfo =
do_CreateInstance(NS_LOGININFO_CONTRACTID);
+ if (!loginInfo)
+- return nsnull;
++ return NULL;
+
+ loginInfo->SetPassword(NS_ConvertUTF8toUTF16(found->secret));
+
+@@ -587,7 +587,7 @@
+ getter_AddRefs(prefService));
+ if (ret != NS_OK) { return ret; }
+
+- ret = prefService->ReadUserPrefs(nsnull);
++ ret = prefService->ReadUserPrefs(NULL);
+ if (ret != NS_OK) { return ret; }
+
+ ret = prefService->GetBranch(kPrefsBranch, getter_AddRefs(pref));
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mozilla-addon-gnome-keyring.git/commitdiff/1088fe5e3705cbc581ff2f0e3e010ee97acd0d9d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
