upgpkg: auracle-git r370.6fdcc4d-1

Switched to maintainer's fork

5 files changed, 9 insertions, 166 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e7e1bdcc60d3..d946399ec02f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = auracle-git
 	pkgdesc = A flexible client for the AUR
-	pkgver = r366.8739929
-	pkgrel = 5
-	url = https://github.com/falconindy/auracle.git
+	pkgver = r370.6fdcc4d
+	pkgrel = 1
+	url = https://github.com/inglor/auracle
 	arch = x86_64
 	arch = i686
 	license = MIT
@@ -18,13 +18,7 @@ pkgbase = auracle-git
 	depends = libsystemd
 	provides = auracle
 	conflicts = auracle
-	source = git+https://github.com/falconindy/auracle.git
-	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
+	source = git+https://github.com/inglor/auracle
 	b2sums = SKIP
-	b2sums = 36c8b35b06a9f2d09669110e6ec5686bcb755ae384dbcd985691e5f635a733b9c87b31371de5fa5f743a256b2140cd6dd9c86aebb2ea4a5395377ce273fd080b
-	b2sums = df877c951a2054deca1a390cc4e3b458193a0f084e850dbf155f8cac5068753c868215f749034c2e9df914c252517d3017bff542e947477e67b426b5fd554b9c
-	b2sums = d743c7cf9a38b0088f356869800d72728672c6dea876d436405f48e4e5b83ff6c7b9f4ce4d3d4002ed25fb7630cacebb6281085cfc8e77eaa7a1730666dd8d01
 
 pkgname = auracle-git
diff --git a/0001-Force-fmt-dependency-to-static.patch b/0001-Force-fmt-dependency-to-static.patch
deleted file mode 100644
index 72fcfe0fcbca..000000000000
--- a/0001-Force-fmt-dependency-to-static.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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.37.0
-
diff --git a/0002-Update-abseil-cpp-to-LTS-20220623.0.patch b/0002-Update-abseil-cpp-to-LTS-20220623.0.patch
deleted file mode 100644
index 185e80cf754b..000000000000
--- a/0002-Update-abseil-cpp-to-LTS-20220623.0.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-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: falconindy#85 falconindy#94
-
-Signed-off-by: Leonidas Spyropoulos <artafinde@archlinux.org>
----
- 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..5c87002 100644
---- a/meson.build
-+++ b/meson.build
-@@ -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..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-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
-+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
--- 
-2.37.0
-
diff --git a/0003-Use-non-deprecated-meson-command.patch b/0003-Use-non-deprecated-meson-command.patch
deleted file mode 100644
index e9a055adadb5..000000000000
--- a/0003-Use-non-deprecated-meson-command.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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 131b2beadef5..37fe24ed49c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,25 +2,19 @@
 
 pkgname=auracle-git
 _pkgname="${pkgname%-git}"
-pkgver=r366.8739929
-pkgrel=5
+pkgver=r370.6fdcc4d
+pkgrel=1
 pkgdesc='A flexible client for the AUR'
 arch=('x86_64' 'i686')
-url="https://github.com/falconindy/auracle.git"
+url="https://github.com/inglor/auracle"
 license=('MIT')
 depends=('pacman' 'libcurl.so' 'libsystemd')
 makedepends=('meson' 'git' 'perl' 'systemd')
 checkdepends=('python' 'fakechroot' 'gtest')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-source=("git+https://github.com/falconindy/auracle.git"
-        "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'
-        '36c8b35b06a9f2d09669110e6ec5686bcb755ae384dbcd985691e5f635a733b9c87b31371de5fa5f743a256b2140cd6dd9c86aebb2ea4a5395377ce273fd080b'
-        'df877c951a2054deca1a390cc4e3b458193a0f084e850dbf155f8cac5068753c868215f749034c2e9df914c252517d3017bff542e947477e67b426b5fd554b9c'
-        'd743c7cf9a38b0088f356869800d72728672c6dea876d436405f48e4e5b83ff6c7b9f4ce4d3d4002ed25fb7630cacebb6281085cfc8e77eaa7a1730666dd8d01')
+source=("git+https://github.com/inglor/auracle")
+b2sums=('SKIP')
 
 pkgver() {
   cd "$_pkgname"