commit 562f3955925269c4ad5cae81ea0765af07609792
Author: Elan Ruusamäe <[email protected]>
Date: Wed Feb 20 20:45:53 2013 +0200
up to 0.6.7, keep XUL min version at 17.0 (current icedove version)t sh
mozilla-addon-gnome-keyring-no-nsnull.patch | 48 -----------------------------
mozilla-addon-gnome-keyring-stdint.patch | 22 -------------
mozilla-addon-gnome-keyring.spec | 17 ++++------
3 files changed, 6 insertions(+), 81 deletions(-)
---
diff --git a/mozilla-addon-gnome-keyring.spec b/mozilla-addon-gnome-keyring.spec
index c8fc139..8793460 100644
--- a/mozilla-addon-gnome-keyring.spec
+++ b/mozilla-addon-gnome-keyring.spec
@@ -1,14 +1,12 @@
%define extension gnome-keyring
Summary: Extension that enables Gnome Keyring integration
Name: mozilla-addon-%{extension}
-Version: 0.6.5
-Release: 4
+Version: 0.6.7
+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: 38dd3bd872d5b446b2fe8c1f899a810e
-Patch0: %{name}-no-nsnull.patch
-Patch1: %{name}-stdint.patch
+Source0:
https://github.com/infinity0/mozilla-gnome-keyring/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: c69d2816e0543baec478ab9d57a38e43
URL: https://github.com/infinity0/mozilla-gnome-keyring/
BuildRequires: libgnome-keyring-devel >= 3.4.0
BuildRequires: libstdc++-devel
@@ -16,7 +14,6 @@ BuildRequires: pkg-config
BuildRequires: xulrunner-devel
BuildRequires: zip
Requires: libgnome-keyring >= 3.4.0
-%requires_eq_to xulrunner-libs xulrunner-devel
ExclusiveArch: %{x8664} %{ix86}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,10 +39,7 @@ This allows for safe storage of passwords without prompting
for
password after Firefox or Thunderbird has been started.
%prep
-%setup -qc
-mv *-gnome-keyring-*/* .
-%patch0 -p1
-%patch1 -p1
+%setup -qn mozilla-gnome-keyring-%{version}
%{__sed} -i -e '/^CXXFLAGS/ s/$/ $(OPTFLAGS)/' Makefile
@@ -54,6 +48,7 @@ mv *-gnome-keyring-*/* .
%{__make} build-xpi \
PLATFORM=%{platform} \
VERSION=%{version} \
+ XUL_VER_MIN=17.0 \
CXX="%{__cxx}" \
LDFLAGS="%{rpmldflags}" \
OPTFLAGS="%{rpmcxxflags} -fpermissive"
diff --git a/mozilla-addon-gnome-keyring-no-nsnull.patch
b/mozilla-addon-gnome-keyring-no-nsnull.patch
deleted file mode 100644
index d30b574..0000000
--- a/mozilla-addon-gnome-keyring-no-nsnull.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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));
---- 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;
- }
diff --git a/mozilla-addon-gnome-keyring-stdint.patch
b/mozilla-addon-gnome-keyring-stdint.patch
deleted file mode 100644
index 69c6718..0000000
--- a/mozilla-addon-gnome-keyring-stdint.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur mozilla-addon-gnome-keyring-0.6.5/GnomeKeyring.cpp
mozilla-addon-gnome-keyring-0.6.5.new/GnomeKeyring.cpp
---- mozilla-addon-gnome-keyring-0.6.5/GnomeKeyring.cpp 2013-01-11
13:41:54.065028226 +0100
-+++ mozilla-addon-gnome-keyring-0.6.5.new/GnomeKeyring.cpp 2013-01-11
13:41:09.427955750 +0100
-@@ -36,6 +36,8 @@
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-+#define __STDC_LIMIT_MACROS
-+#include <stdint.h>
-
- #include "GnomeKeyring.h"
- #include "nsMemory.h"
-diff -ur mozilla-addon-gnome-keyring-0.6.5/xpcom_abi.cpp
mozilla-addon-gnome-keyring-0.6.5.new/xpcom_abi.cpp
---- mozilla-addon-gnome-keyring-0.6.5/xpcom_abi.cpp 2013-01-11
13:41:54.065028226 +0100
-+++ mozilla-addon-gnome-keyring-0.6.5.new/xpcom_abi.cpp 2013-01-11
13:39:37.553786774 +0100
-@@ -1,4 +1,6 @@
- #include <stdio.h>
-+#define __STDC_LIMIT_MACROS
-+#include <stdint.h>
-
- #include "nsIXULRuntime.h"
- #include "nsServiceManagerUtils.h"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mozilla-addon-gnome-keyring.git/commitdiff/5edc5411136df2f84479564d7ded1f9e101f7154
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
