Bump to v0.12.2.0

3 files changed, 7 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b4acb8d72bc1..2bc4e0806d39 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat May 26 02:13:52 UTC 2018
+# Tue Jun  5 06:15:06 UTC 2018
 pkgbase = monero
 	pkgdesc = Monero: the secure, private, untraceable currency - release version (includes daemon, wallet and miner)
-	pkgver = 0.12.1.0
+	pkgver = 0.12.2.0
 	pkgrel = 1
 	url = https://getmonero.org/
 	arch = x86_64
@@ -20,17 +20,16 @@ pkgbase = monero
 	depends = openssl
 	depends = readline
 	depends = zeromq
+	depends = pcsclite
 	provides = monero
 	provides = libmonero-wallet
 	conflicts = bitmonero-git
 	conflicts = libmonero-wallet-git
-	source = monero::git+https://github.com/monero-project/monero#tag=v0.12.1.0
+	source = monero::git+https://github.com/monero-project/monero#tag=v0.12.2.0
 	source = 0001-account-fix-build-with-GCC-8.1.0.patch
-	source = 0001-Ignore-GCC-8-warnings.patch
 	source = 0001-cmake-do-not-install-into-the-system.patch
 	sha256sums = SKIP
 	sha256sums = 3802e9a6eb21309c6d08d7da4a1979c369fc6a0d74789f34beaaf60a89e82af2
-	sha256sums = 1881c02eccb500c4ee28bf4bc1f59259fc1216013139f1e77f4255ffca2715fe
 	sha256sums = 653853f9c0fed231a2cec476703f09198e6a87af12bb0a3bfe98b32e48e7a1c5
 
 pkgname = monero
diff --git a/0001-Ignore-GCC-8-warnings.patch b/0001-Ignore-GCC-8-warnings.patch
deleted file mode 100644
index 7b4d13e336db..000000000000
--- a/0001-Ignore-GCC-8-warnings.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 4685997fbd6687158879f2db0456ce2eb1ff0567 Mon Sep 17 00:00:00 2001
-From: Romain Geissler <romain.geissler@amadeus.com>
-Date: Mon, 19 Feb 2018 12:52:16 +0100
-Subject: [PATCH] Ignore GCC 8 warnings.
-
-(cherry picked from commit 54dab1eebb0dea32d9ea49dad4fa9c98816c21ed)
----
- external/rapidjson/document.h | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/external/rapidjson/document.h b/external/rapidjson/document.h
-index 19f5a6a5f..0cde80780 100644
---- a/external/rapidjson/document.h
-+++ b/external/rapidjson/document.h
-@@ -1936,7 +1936,12 @@ private:
-         if (count) {
-             GenericValue* e = static_cast<GenericValue*>(allocator.Malloc(count * sizeof(GenericValue)));
-             SetElementsPointer(e);
-+RAPIDJSON_DIAG_PUSH
-+#if defined(__GNUC__) && __GNUC__ >= 8
-+RAPIDJSON_DIAG_OFF(class-memaccess) // ignore complains from gcc that no trivial copy constructor exists.
-+#endif
-             std::memcpy(e, values, count * sizeof(GenericValue));
-+RAPIDJSON_DIAG_POP
-         }
-         else
-             SetElementsPointer(0);
-@@ -1949,7 +1954,12 @@ private:
-         if (count) {
-             Member* m = static_cast<Member*>(allocator.Malloc(count * sizeof(Member)));
-             SetMembersPointer(m);
-+RAPIDJSON_DIAG_PUSH
-+#if defined(__GNUC__) && __GNUC__ >= 8
-+RAPIDJSON_DIAG_OFF(class-memaccess) // ignore complains from gcc that no trivial copy constructor exists.
-+#endif
-             std::memcpy(m, members, count * sizeof(Member));
-+RAPIDJSON_DIAG_POP
-         }
-         else
-             SetMembersPointer(0);
--- 
-2.17.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 774c00963745..09f76c225e42 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,25 +4,23 @@
 
 pkgbase=('monero')
 pkgname=('monero' 'libmonero-wallet')
-pkgver=0.12.1.0
+pkgver=0.12.2.0
 pkgrel=1
 pkgdesc="Monero: the secure, private, untraceable currency - release version (includes daemon, wallet and miner)"
 license=('custom:Cryptonote')
 arch=('x86_64' 'i686' 'armv7h' 'aarch64')
 url="https://getmonero.org/"
-depends=('boost-libs' 'libunwind' 'openssl' 'readline' 'zeromq')
+depends=('boost-libs' 'libunwind' 'openssl' 'readline' 'zeromq' 'pcsclite')
 makedepends=('git' 'cmake' 'boost' 'gtest' 'qt5-tools')
 provides=('monero' 'libmonero-wallet')
 conflicts=('bitmonero-git' 'libmonero-wallet-git')
 
-source=("${pkgname}"::'git+https://github.com/monero-project/monero#tag=v0.12.1.0'
+source=("${pkgname}"::'git+https://github.com/monero-project/monero#tag=v0.12.2.0'
         "0001-account-fix-build-with-GCC-8.1.0.patch"
-        "0001-Ignore-GCC-8-warnings.patch"
         "0001-cmake-do-not-install-into-the-system.patch")
 
 sha256sums+=('SKIP'
              '3802e9a6eb21309c6d08d7da4a1979c369fc6a0d74789f34beaaf60a89e82af2'
-             '1881c02eccb500c4ee28bf4bc1f59259fc1216013139f1e77f4255ffca2715fe'
              '653853f9c0fed231a2cec476703f09198e6a87af12bb0a3bfe98b32e48e7a1c5')
 
 _monero="${pkgbase}"
@@ -34,7 +32,6 @@ prepare()
 
   cd "${srcdir}/${_monero}"
   patch -Np1 -i "${srcdir}/0001-account-fix-build-with-GCC-8.1.0.patch"
-  patch -Np1 -i "${srcdir}/0001-Ignore-GCC-8-warnings.patch"
   patch -Np1 -i "${srcdir}/0001-cmake-do-not-install-into-the-system.patch" -d "${srcdir}/monero/external/miniupnp"
 }