From 517846e0c33d97669079b66a28881a8fae177af0 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 10 Dec 2017 21:08:47 +0000
Subject: [PATCH] community/ceph: v7 fix

---
 community/ceph/0001-no-neon.patch | 6 +++---
 community/ceph/PKGBUILD           | 4 +++-
 extra/meson/PKGBUILD              | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/community/ceph/0001-no-neon.patch b/community/ceph/0001-no-neon.patch
index 527864fcc..dbc80dd05 100644
--- a/community/ceph/0001-no-neon.patch
+++ b/community/ceph/0001-no-neon.patch
@@ -1,7 +1,7 @@
-From 649bae1e1e80fd2a7a4a0e7ad45b981749d5a2cc Mon Sep 17 00:00:00 2001
+From abed0c91771f3349120505a28e3fe32de951f459 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sat, 9 Dec 2017 10:20:06 -0700
-Subject: [PATCH] no neon
+Subject: [PATCH 1/2] no neon
 
 ---
  cmake/modules/SIMDExt.cmake | 5 +----
@@ -24,5 +24,5 @@ index 5330835aa1..0708867de5 100644
  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64")
    set(HAVE_INTEL 1)
 -- 
-2.14.1
+2.15.1
 
diff --git a/community/ceph/PKGBUILD b/community/ceph/PKGBUILD
index 68ccca8b8..06f34cd5b 100644
--- a/community/ceph/PKGBUILD
+++ b/community/ceph/PKGBUILD
@@ -29,13 +29,15 @@ options=('emptydirs')
 source=("https://download.ceph.com/tarballs/${pkgbase}-${pkgver}.tar.gz"
         'ceph.sysusers'
         '0001-no-neon.patch'
+        '0002-librbd-Conditionally-import-TrimRequest.cc.patch'
         'fix-ceph_disk-python-interpreter.patch'
         'fix-or-disable-broken-tests.patch'
         'fix-python2-paths.patch'
         'remove-distro-version-detection.patch')
 sha512sums=('89b166dc4b58e0110ebe0147eef9f47e1090ccee01702b3f72cfbdca856d02bf03b2663de9e88c84b21a2a61f8f92211e217a05b8bdcf7d5de3158adbe49db88'
             '4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049'
-            '603a360657b8f095fc1de995df19794d9ea7094560480a16f7199bac0cd372313216ad93c6c67a42dd4083240829fd6561545b89891966c7cb27f2f6c15e8a61'
+            'e389a0034d1310d9a2d15c9f8b1d489fa65d2222668566747f1da2e83564f7b78507f3ad2d71887a2b6d56751eebd8d7b3ce43e435e404afb765e4b3ded6821e'
+            '6c410d26a7e510d126dd361e389b470dd6448fcbbb255b1b31b2a1c9a437397e46cd18ba0e17405c47b91cc9c55dcc8d1fc1029527b6d90e6ac990a1b0ac2bc9'
             '7abd94a333fb0d6c9f7156d69ed6d4bf123f0f3030407f4347209d677b282e5023664d43e74a21a27b7856d3493ae469a17ea8a810331c7266018cc34eee4841'
             '40446e298ab6b735b149d26ac26d273d6e159c319bb79f112614f1d4933a5a2684007fc9a1d660c5d4a17075d8bac59019c6cc7e66d64d4e240a1a61454800ef'
             'd5d9e8123833212f6cf0ecef209a5dd9b9a8ec70d780b5140884dc9f87690ec305fb2569c5d1da2b28deb05bd03caecc534acc9dc5ce7ec75e2580df4b5b2063'
diff --git a/extra/meson/PKGBUILD b/extra/meson/PKGBUILD
index 621d279d3..966ff5699 100644
--- a/extra/meson/PKGBUILD
+++ b/extra/meson/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=meson
 pkgver=0.44.0
-pkgrel=1.1
+pkgrel=1
 pkgdesc='High productivity build system'
 url='http://mesonbuild.com/'
 arch=('any')