commit dfe4d3645a313727dfdb3d76a069448209133b77
Author: Jan Rękorajski <[email protected]>
Date: Fri Jan 11 13:43:48 2013 +0100
- fix building with xulrunner 18.0
mozilla-addon-gnome-keyring-stdint.patch | 22 ++++++++++++++++++++++
mozilla-addon-gnome-keyring.spec | 6 ++++--
2 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/mozilla-addon-gnome-keyring.spec b/mozilla-addon-gnome-keyring.spec
index 84d709b..4b6f97f 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.5
-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/tarball/%{version}/%{name}-%{version}.tgz
# Source0-md5: 38dd3bd872d5b446b2fe8c1f899a810e
Patch0: %{name}-no-nsnull.patch
+Patch1: %{name}-stdint.patch
URL: https://github.com/infinity0/mozilla-gnome-keyring/
BuildRequires: libgnome-keyring-devel >= 3.4.0
BuildRequires: libstdc++-devel
@@ -44,6 +45,7 @@ password after Firefox or Thunderbird has been started.
%setup -qc
mv *-gnome-keyring-*/* .
%patch0 -p1
+%patch1 -p1
%{__sed} -i -e '/^CXXFLAGS/ s/$/ $(OPTFLAGS)/' Makefile
@@ -54,7 +56,7 @@ mv *-gnome-keyring-*/* .
VERSION=%{version} \
CXX="%{__cxx}" \
LDFLAGS="%{rpmldflags}" \
- OPTFLAGS="%{rpmcxxflags}"
+ OPTFLAGS="%{rpmcxxflags} -fpermissive"
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/mozilla-addon-gnome-keyring-stdint.patch
b/mozilla-addon-gnome-keyring-stdint.patch
new file mode 100644
index 0000000..69c6718
--- /dev/null
+++ b/mozilla-addon-gnome-keyring-stdint.patch
@@ -0,0 +1,22 @@
+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/dfe4d3645a313727dfdb3d76a069448209133b77
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
