upgpkg: auracle-git r366.8739929-5

5 files changed, 101 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c721c7a5b83..e7e1bdcc60d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = auracle-git
 	pkgdesc = A flexible client for the AUR
 	pkgver = r366.8739929
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/falconindy/auracle.git
 	arch = x86_64
 	arch = i686
@@ -19,10 +19,12 @@ pkgbase = auracle-git
 	provides = auracle
 	conflicts = auracle
 	source = git+https://github.com/falconindy/auracle.git
-	source = 0001-Update-abseil-cpp-to-LTS-20211102.0-version.patch
-	source = 0002-Force-fmt-dependency-to-static.patch
+	source = 0001-Force-fmt-dependency-to-static.patch
+	source = 0002-Update-abseil-cpp-to-LTS-20220623.0.patch
+	source = 0003-Use-non-deprecated-meson-command.patch
 	b2sums = SKIP
-	b2sums = b3b08d114328e09dc1a045733bfea7dcc2235eb4f18fe930d572ebb28a436cdea738acca3cc5d22b71ca47a74437b57f4790a8fc3fea7574fccfb2ccc7a594ed
-	b2sums = 9972eecdded08cb18b402c9ff8fa483a401ee13d1760de3094d9f8494d829f6ed6f75b66393b22c51e3dc98290d863b49d9c52dab17699d88d6a26b02e55fac5
+	b2sums = 36c8b35b06a9f2d09669110e6ec5686bcb755ae384dbcd985691e5f635a733b9c87b31371de5fa5f743a256b2140cd6dd9c86aebb2ea4a5395377ce273fd080b
+	b2sums = df877c951a2054deca1a390cc4e3b458193a0f084e850dbf155f8cac5068753c868215f749034c2e9df914c252517d3017bff542e947477e67b426b5fd554b9c
+	b2sums = d743c7cf9a38b0088f356869800d72728672c6dea876d436405f48e4e5b83ff6c7b9f4ce4d3d4002ed25fb7630cacebb6281085cfc8e77eaa7a1730666dd8d01
 
 pkgname = auracle-git
diff --git a/0002-Force-fmt-dependency-to-static.patch b/0001-Force-fmt-dependency-to-static.patch
index b787fe806183..72fcfe0fcbca 100644
--- a/0002-Force-fmt-dependency-to-static.patch
+++ b/0001-Force-fmt-dependency-to-static.patch
@@ -23,5 +23,5 @@ index cefe4d5..c98065f 100644
  gtest = dependency('gtest',
                     version : '>=1.10.0',
 -- 
-2.35.0
+2.37.0
 
diff --git a/0001-Update-abseil-cpp-to-LTS-20211102.0-version.patch b/0002-Update-abseil-cpp-to-LTS-20220623.0.patch
index 36688d8a5ab1..185e80cf754b 100644
--- a/0001-Update-abseil-cpp-to-LTS-20211102.0-version.patch
+++ b/0002-Update-abseil-cpp-to-LTS-20220623.0.patch
@@ -1,46 +1,54 @@
-From 587880dce84f47b9a01e3d53ccaeee11ba580d64 Mon Sep 17 00:00:00 2001
-From: Leonidas Spyropoulos <artafinde@gmail.com>
-Date: Tue, 25 May 2021 11:59:46 +0100
-Subject: [PATCH] Update abseil-cpp to LTS 20211102.0 version
+From efce7f4c556047f2c00bdafd869076c02825e260 Mon Sep 17 00:00:00 2001
+From: Leonidas Spyropoulos <artafinde@archlinux.org>
+Date: Mon, 4 Jul 2022 23:56:49 +0100
+Subject: [PATCH] Update abseil-cpp to LTS 20220623.0
 
-Fixes: #85 #94
+Fixes: falconindy#85 falconindy#94
 
-Signed-off-by: Leonidas Spyropoulos <artafinde@gmail.com>
+Signed-off-by: Leonidas Spyropoulos <artafinde@archlinux.org>
 ---
- meson.build                 |  1 +
- subprojects/abseil-cpp.wrap | 28 ++++++++++++++++++++--------
- 2 files changed, 21 insertions(+), 8 deletions(-)
+ meson.build                 |  2 ++
+ subprojects/abseil-cpp.wrap | 30 +++++++++++++++++++++---------
+ 2 files changed, 23 insertions(+), 9 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index cefe4d5..402a4e1 100644
+index cefe4d5..5c87002 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -44,6 +44,7 @@ abseil_proj = subproject(
+@@ -43,7 +43,9 @@ gmock = dependency('gmock',
+ abseil_proj = subproject(
    'abseil-cpp',
    default_options : [
++    'cpp_std=c++17',
      'default_library=static',
 +    'warning_level=0',
    ])
  abseil = declare_dependency(
    dependencies : [
 diff --git a/subprojects/abseil-cpp.wrap b/subprojects/abseil-cpp.wrap
-index 5d53afd..6a5fd91 100644
+index 5d53afd..8eebf94 100644
 --- a/subprojects/abseil-cpp.wrap
 +++ b/subprojects/abseil-cpp.wrap
 @@ -1,11 +1,23 @@
  [wrap-file]
 -directory = abseil-cpp-20200225.2
-+directory = abseil-cpp-20211102.0
-+source_url = https://github.com/abseil/abseil-cpp/archive/20211102.0.tar.gz
-+source_filename = abseil-cpp-20211102.0.tar.gz
-+source_hash = dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4
-+patch_filename = abseil-cpp_20211102.0-1_patch.zip
-+patch_url = https://wrapdb.mesonbuild.com/v2/abseil-cpp_20211102.0-1/get_patch
-+patch_hash = 722c5c15b43bee57995c33a9e0d512e6e4e7f77353aff5e5ce2cd11f7b8e0626
++directory = abseil-cpp-20220623.0
++source_url = https://github.com/abseil/abseil-cpp/archive/20220623.0.tar.gz
++source_filename = abseil-cpp-20220623.0.tar.gz
++source_hash = 4208129b49006089ba1d6710845a45e31c59b0ab6bff9e5788a87f55c5abd602
++patch_filename = abseil-cpp_20220623.0-1_patch.zip
++patch_url = https://wrapdb.mesonbuild.com/v2/abseil-cpp_20220623.0-1/get_patch
++patch_hash = 327b853c2e42679717db4eeef23a2b302984d756ccb03847efad90fbf70d5e83
++wrapdb_version = 20220623.0-1
  
 -source_url = https://github.com/abseil/abseil-cpp/archive/20200225.2.zip
 -source_filename = abseil-cpp-20200225.2.zip
 -source_hash = f342aac71a62861ac784cadb8127d5a42c6c61ab1cd07f00aef05f2cc4988c42
+-
+-
+-patch_url = https://github.com/mesonbuild/abseil-cpp/releases/download/20200225.2-2/abseil-cpp.zip
+-patch_filename = abseil-cpp-20200225.2-2-wrap.zip
+-patch_hash = cc2bc7caab91de737637ec7f8438455836a02b444d306b447d59573991717088
 +[provide]
 +absl_base = absl_base_dep
 +absl_container = absl_container_dep
@@ -54,11 +62,6 @@ index 5d53afd..6a5fd91 100644
 +absl_synchronization = absl_synchronization_dep
 +absl_time = absl_time_dep
 +absl_types = absl_types_dep
- 
--
--patch_url = https://github.com/mesonbuild/abseil-cpp/releases/download/20200225.2-2/abseil-cpp.zip
--patch_filename = abseil-cpp-20200225.2-2-wrap.zip
--patch_hash = cc2bc7caab91de737637ec7f8438455836a02b444d306b447d59573991717088
 -- 
-2.35.0
+2.37.0
 
diff --git a/0003-Use-non-deprecated-meson-command.patch b/0003-Use-non-deprecated-meson-command.patch
new file mode 100644
index 000000000000..e9a055adadb5
--- /dev/null
+++ b/0003-Use-non-deprecated-meson-command.patch
@@ -0,0 +1,51 @@
+From d1f31671319e1a384cd0d099e72b18b80af7b298 Mon Sep 17 00:00:00 2001
+From: Leonidas Spyropoulos <artafinde@archlinux.org>
+Date: Mon, 4 Jul 2022 23:59:28 +0100
+Subject: [PATCH] Use non-deprecated meson command
+
+Signed-off-by: Leonidas Spyropoulos <artafinde@archlinux.org>
+---
+ meson.build | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index cefe4d5..179dd35 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,7 +1,7 @@
+ project('auracle', 'cpp',
+         version : '0',
+         license : 'MIT',
+-        meson_version : '>=0.55',
++        meson_version : '>=0.56',
+         default_options : [
+           'cpp_std=c++17',
+           'warning_level=2',
+@@ -128,13 +128,13 @@ install_data(
+ run_target(
+   'fmt',
+   command : [
+-    join_paths(meson.source_root(), 'build-aux/source-format')
++    join_paths(meson.project_source_root(), 'build-aux/source-format')
+   ])
+ 
+ run_target(
+   'tidy',
+   command : [
+-    join_paths(meson.source_root(), 'build-aux/clang-tidy')
++    join_paths(meson.project_source_root(), 'build-aux/clang-tidy')
+   ])
+ 
+ # unit tests
+@@ -191,7 +191,7 @@ if py3.found() and py3.language_version().version_compare(python_requirement)
+       suite : 'auracle',
+       args : [
+         '-W', 'all',
+-        join_paths(meson.source_root(), input)
++        join_paths(meson.project_source_root(), input)
+       ],
+       env : ['PYTHONDONTWRITEBYTECODE=1'])
+   endforeach
+-- 
+2.37.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 3b40ebd4e9e0..131b2beadef5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=auracle-git
 _pkgname="${pkgname%-git}"
 pkgver=r366.8739929
-pkgrel=4
+pkgrel=5
 pkgdesc='A flexible client for the AUR'
 arch=('x86_64' 'i686')
 url="https://github.com/falconindy/auracle.git"
@@ -14,11 +14,13 @@ checkdepends=('python' 'fakechroot' 'gtest')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
 source=("git+https://github.com/falconindy/auracle.git"
-        "0001-Update-abseil-cpp-to-LTS-20211102.0-version.patch"
-        "0002-Force-fmt-dependency-to-static.patch")
+        "0001-Force-fmt-dependency-to-static.patch"
+        "0002-Update-abseil-cpp-to-LTS-20220623.0.patch"
+        "0003-Use-non-deprecated-meson-command.patch")
 b2sums=('SKIP'
-        'b3b08d114328e09dc1a045733bfea7dcc2235eb4f18fe930d572ebb28a436cdea738acca3cc5d22b71ca47a74437b57f4790a8fc3fea7574fccfb2ccc7a594ed'
-        '9972eecdded08cb18b402c9ff8fa483a401ee13d1760de3094d9f8494d829f6ed6f75b66393b22c51e3dc98290d863b49d9c52dab17699d88d6a26b02e55fac5')
+        '36c8b35b06a9f2d09669110e6ec5686bcb755ae384dbcd985691e5f635a733b9c87b31371de5fa5f743a256b2140cd6dd9c86aebb2ea4a5395377ce273fd080b'
+        'df877c951a2054deca1a390cc4e3b458193a0f084e850dbf155f8cac5068753c868215f749034c2e9df914c252517d3017bff542e947477e67b426b5fd554b9c'
+        'd743c7cf9a38b0088f356869800d72728672c6dea876d436405f48e4e5b83ff6c7b9f4ce4d3d4002ed25fb7630cacebb6281085cfc8e77eaa7a1730666dd8d01')
 
 pkgver() {
   cd "$_pkgname"
@@ -29,8 +31,13 @@ pkgver() {
 prepare() {
   cd "$_pkgname"
 
-  patch -Np1 < "${srcdir}/0001-Update-abseil-cpp-to-LTS-20211102.0-version.patch"
-  patch -Np1 < "${srcdir}/0002-Force-fmt-dependency-to-static.patch"
+  local filename
+  for filename in "${source[@]}"; do
+    if [[ "$filename" =~ \.patch$ ]]; then
+      msg2 "Applying patch ${filename##*/}"
+      patch -p1 -N -i "$srcdir/${filename##*/}"
+    fi
+  done
 }
 
 build() {