upgpkg: auracle-git r366.8739929-4

4 files changed, 103 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 756f2cb3d9e5..3c721c7a5b83 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = auracle-git
 	pkgdesc = A flexible client for the AUR
 	pkgver = r366.8739929
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/falconindy/auracle.git
 	arch = x86_64
 	arch = i686
@@ -19,10 +19,10 @@ pkgbase = auracle-git
 	provides = auracle
 	conflicts = auracle
 	source = git+https://github.com/falconindy/auracle.git
-	source = abseil-fix.patch::https://github.com/inglor/auracle/commit/587880dce84f47b9a01e3d53ccaeee11ba580d64.patch
-	source = static-fmt.patch::https://github.com/inglor/auracle/commit/18ab2549a8a656a670bdc17233abd5a7708c50ee.patch
+	source = 0001-Update-abseil-cpp-to-LTS-20211102.0-version.patch
+	source = 0002-Force-fmt-dependency-to-static.patch
 	b2sums = SKIP
-	b2sums = 060a16cb5e3f8c244cfb12203ae0b356596fe255e0a56aee2fc6a140ac6ba7a28ed4da5e16fa43eb248ecedd577c29ab19b9455b657c3a039cbdd276c78aaec9
-	b2sums = f735c89485d8682b9dee25c1b96152d44005b8bf78f683015c65dd93cc3802177fbf8a4fa94587958157ec175260417da101a1436f7e1c4106bc2e4c21974a70
+	b2sums = b3b08d114328e09dc1a045733bfea7dcc2235eb4f18fe930d572ebb28a436cdea738acca3cc5d22b71ca47a74437b57f4790a8fc3fea7574fccfb2ccc7a594ed
+	b2sums = 9972eecdded08cb18b402c9ff8fa483a401ee13d1760de3094d9f8494d829f6ed6f75b66393b22c51e3dc98290d863b49d9c52dab17699d88d6a26b02e55fac5
 
 pkgname = auracle-git
diff --git a/0001-Update-abseil-cpp-to-LTS-20211102.0-version.patch b/0001-Update-abseil-cpp-to-LTS-20211102.0-version.patch
new file mode 100644
index 000000000000..36688d8a5ab1
--- /dev/null
+++ b/0001-Update-abseil-cpp-to-LTS-20211102.0-version.patch
@@ -0,0 +1,64 @@
+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
+
+Fixes: #85 #94
+
+Signed-off-by: Leonidas Spyropoulos <artafinde@gmail.com>
+---
+ meson.build                 |  1 +
+ subprojects/abseil-cpp.wrap | 28 ++++++++++++++++++++--------
+ 2 files changed, 21 insertions(+), 8 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index cefe4d5..402a4e1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -44,6 +44,7 @@ abseil_proj = subproject(
+   'abseil-cpp',
+   default_options : [
+     '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
+--- 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
+ 
+-source_url = https://github.com/abseil/abseil-cpp/archive/20200225.2.zip
+-source_filename = abseil-cpp-20200225.2.zip
+-source_hash = f342aac71a62861ac784cadb8127d5a42c6c61ab1cd07f00aef05f2cc4988c42
++[provide]
++absl_base = absl_base_dep
++absl_container = absl_container_dep
++absl_debugging = absl_debugging_dep
++absl_flags = absl_flags_dep
++absl_hash = absl_hash_dep
++absl_numeric = absl_numeric_dep
++absl_random = absl_random_dep
++absl_status = absl_status_dep
++absl_strings = absl_strings_dep
++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
+
diff --git a/0002-Force-fmt-dependency-to-static.patch b/0002-Force-fmt-dependency-to-static.patch
new file mode 100644
index 000000000000..b787fe806183
--- /dev/null
+++ b/0002-Force-fmt-dependency-to-static.patch
@@ -0,0 +1,27 @@
+From 18ab2549a8a656a670bdc17233abd5a7708c50ee Mon Sep 17 00:00:00 2001
+From: Leonidas Spyropoulos <artafinde@gmail.com>
+Date: Sun, 18 Jul 2021 10:37:00 +0100
+Subject: [PATCH] Force fmt dependency to static
+
+Signed-off-by: Leonidas Spyropoulos <artafinde@gmail.com>
+---
+ meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index cefe4d5..c98065f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -29,7 +29,8 @@ libalpm = dependency('libalpm')
+ libcurl = dependency('libcurl')
+ libfmt = dependency('fmt',
+                     version : '>=6.0.0',
+-                    fallback : ['fmt', 'fmt_dep'])
++                    fallback : ['fmt', 'fmt_dep'],
++                    static: 'true')
+ libsystemd = dependency('libsystemd')
+ gtest = dependency('gtest',
+                    version : '>=1.10.0',
+-- 
+2.35.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 683fd0180d5b..3b40ebd4e9e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=auracle-git
 _pkgname="${pkgname%-git}"
 pkgver=r366.8739929
-pkgrel=3
+pkgrel=4
 pkgdesc='A flexible client for the AUR'
 arch=('x86_64' 'i686')
 url="https://github.com/falconindy/auracle.git"
@@ -14,11 +14,11 @@ checkdepends=('python' 'fakechroot' 'gtest')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
 source=("git+https://github.com/falconindy/auracle.git"
-        "abseil-fix.patch::https://github.com/inglor/auracle/commit/587880dce84f47b9a01e3d53ccaeee11ba580d64.patch"
-        "static-fmt.patch::https://github.com/inglor/auracle/commit/18ab2549a8a656a670bdc17233abd5a7708c50ee.patch")
+        "0001-Update-abseil-cpp-to-LTS-20211102.0-version.patch"
+        "0002-Force-fmt-dependency-to-static.patch")
 b2sums=('SKIP'
-        '060a16cb5e3f8c244cfb12203ae0b356596fe255e0a56aee2fc6a140ac6ba7a28ed4da5e16fa43eb248ecedd577c29ab19b9455b657c3a039cbdd276c78aaec9'
-        'f735c89485d8682b9dee25c1b96152d44005b8bf78f683015c65dd93cc3802177fbf8a4fa94587958157ec175260417da101a1436f7e1c4106bc2e4c21974a70')
+        'b3b08d114328e09dc1a045733bfea7dcc2235eb4f18fe930d572ebb28a436cdea738acca3cc5d22b71ca47a74437b57f4790a8fc3fea7574fccfb2ccc7a594ed'
+        '9972eecdded08cb18b402c9ff8fa483a401ee13d1760de3094d9f8494d829f6ed6f75b66393b22c51e3dc98290d863b49d9c52dab17699d88d6a26b02e55fac5')
 
 pkgver() {
   cd "$_pkgname"
@@ -29,8 +29,8 @@ pkgver() {
 prepare() {
   cd "$_pkgname"
 
-  patch -Np1 < "$srcdir/abseil-fix.patch"
-  patch -Np1 < "$srcdir/static-fmt.patch"
+  patch -Np1 < "${srcdir}/0001-Update-abseil-cpp-to-LTS-20211102.0-version.patch"
+  patch -Np1 < "${srcdir}/0002-Force-fmt-dependency-to-static.patch"
 }
 
 build() {