Bump version, fix builds with gcc 9

3 files changed, 71 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4fca7aa8adb2..fc32942f6dd4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rocksdb-static
 	pkgdesc = Embedded key-value store for fast storage (static library)
-	pkgver = 6.0.2
+	pkgver = 6.2.2
 	pkgrel = 1
 	url = http://rocksdb.org
 	arch = i686
@@ -13,8 +13,10 @@ pkgbase = rocksdb-static
 	depends = lz4
 	depends = snappy
 	depends = gcc-libs
-	source = https://github.com/facebook/rocksdb/archive/v6.0.2.tar.gz
-	sha256sums = 89e0832f1fb00ac240a9438d4bbdae37dd3e52f7c15c3f646dc26887da16f342
+	source = https://github.com/facebook/rocksdb/archive/v6.2.2.tar.gz
+	source = fix-compile-warnings-treated-as-errors-for-gcc9.patch
+	sha256sums = 3e7365cb2a35982e95e5e5dd0b3352dc78573193dafca02788572318c38483fb
+	sha256sums = 775b1099346843f0598168aff8d6621857012155234a2d50f87ed4bcad363c2d
 
 pkgname = rocksdb-static
 
diff --git a/PKGBUILD b/PKGBUILD
index c4a5d7e7146a..50ff68d9a3a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Tony <tony@criticalstack.com>
 
 pkgname=rocksdb-static
-pkgver=6.0.2
+pkgver=6.2.2
 pkgrel=1
 pkgdesc='Embedded key-value store for fast storage (static library)'
 arch=(i686 x86_64)
@@ -9,8 +9,10 @@ url='http://rocksdb.org'
 license=('Apache')
 depends=('gperftools' 'zlib' 'bzip2' 'lz4' 'snappy' 'gcc-libs')
 checkdepends=('python2')
-source=("https://github.com/facebook/rocksdb/archive/v${pkgver}.tar.gz")
-sha256sums=('89e0832f1fb00ac240a9438d4bbdae37dd3e52f7c15c3f646dc26887da16f342')
+source=("https://github.com/facebook/rocksdb/archive/v${pkgver}.tar.gz"
+		"fix-compile-warnings-treated-as-errors-for-gcc9.patch")
+sha256sums=('3e7365cb2a35982e95e5e5dd0b3352dc78573193dafca02788572318c38483fb'
+            '775b1099346843f0598168aff8d6621857012155234a2d50f87ed4bcad363c2d')
 
 prepare() {
   cd "${srcdir}/rocksdb-${pkgver}"
@@ -19,6 +21,8 @@ prepare() {
   if [ "$CARCH"  == "armv6h" ]; then
     sed -e 's/-momit-leaf-frame-pointer//' -i Makefile
   fi
+
+  patch -F3 -p1 -i "${srcdir}/fix-compile-warnings-treated-as-errors-for-gcc9.patch"
 }
 
 build() {
diff --git a/fix-compile-warnings-treated-as-errors-for-gcc9.patch b/fix-compile-warnings-treated-as-errors-for-gcc9.patch
new file mode 100644
index 000000000000..2bdbcd4a6bed
--- /dev/null
+++ b/fix-compile-warnings-treated-as-errors-for-gcc9.patch
@@ -0,0 +1,59 @@
+diff --git a/db/internal_stats.h b/db/internal_stats.h
+index 20fb07f485..ebe90d574d 100644
+--- a/db/internal_stats.h
++++ b/db/internal_stats.h
+@@ -237,6 +237,28 @@ class InternalStats {
+       }
+     }
+ 
++    CompactionStats& operator=(const CompactionStats& c) {
++      micros = c.micros;
++      cpu_micros = c.cpu_micros;
++      bytes_read_non_output_levels = c.bytes_read_non_output_levels;
++      bytes_read_output_level = c.bytes_read_output_level;
++      bytes_written = c.bytes_written;
++      bytes_moved = c.bytes_moved;
++      num_input_files_in_non_output_levels =
++          c.num_input_files_in_non_output_levels;
++      num_input_files_in_output_level = c.num_input_files_in_output_level;
++      num_output_files = c.num_output_files;
++      num_input_records = c.num_input_records;
++      num_dropped_records = c.num_dropped_records;
++      count = c.count;
++
++      int num_of_reasons = static_cast<int>(CompactionReason::kNumOfReasons);
++      for (int i = 0; i < num_of_reasons; i++) {
++        counts[i] = c.counts[i];
++      }
++      return *this;
++    }
++
+     void Clear() {
+       this->micros = 0;
+       this->cpu_micros = 0;
+diff --git a/db/version_edit.h b/db/version_edit.h
+index e1857b37fc..4a93db34e1 100644
+--- a/db/version_edit.h
++++ b/db/version_edit.h
+@@ -52,6 +52,8 @@ struct FileDescriptor {
+         smallest_seqno(_smallest_seqno),
+         largest_seqno(_largest_seqno) {}
+ 
++  FileDescriptor(const FileDescriptor& fd) { *this=fd; }
++
+   FileDescriptor& operator=(const FileDescriptor& fd) {
+     table_reader = fd.table_reader;
+     packed_number_and_path_id = fd.packed_number_and_path_id;
+diff --git a/utilities/persistent_cache/persistent_cache_util.h b/utilities/persistent_cache/persistent_cache_util.h
+index 214bb5875d..254c038f98 100644
+--- a/utilities/persistent_cache/persistent_cache_util.h
++++ b/utilities/persistent_cache/persistent_cache_util.h
+@@ -48,7 +48,7 @@ class BoundedQueue {
+     T t = std::move(q_.front());
+     size_ -= t.Size();
+     q_.pop_front();
+-    return std::move(t);
++    return t;
+   }
+ 
+   size_t Size() const {