summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex2021-01-28 12:19:57 +0100
committerAlex2021-01-28 12:19:57 +0100
commit5d2c2e666e6254668e12eadac4d5a39d8913bc36 (patch)
tree7fceff3b5f5689097ee49c87015514458da66741
parent616744cd75e9468f996999c0ab75859b8c6ed878 (diff)
downloadaur-5d2c2e666e6254668e12eadac4d5a39d8913bc36.tar.gz
fix: remove build patch
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD7
-rw-r--r--meson.build.patch13
3 files changed, 2 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 96e23757fbc..4a7104213cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -28,9 +28,7 @@ pkgbase = waybar-git
provides = waybar
conflicts = waybar
source = waybar-git::git://github.com/Alexays/Waybar
- source = meson.build.patch
sha1sums = SKIP
- sha1sums = c82d390a9334537eeac260bfb6e09ecff1c6830c
pkgname = waybar-git
diff --git a/PKGBUILD b/PKGBUILD
index e713d6cb554..85879ec5606 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -36,11 +36,9 @@ optdepends=(
'otf-font-awesome: Icons in the default configuration'
)
-source=("${pkgname}::git://github.com/Alexays/Waybar"
- 'meson.build.patch')
+source=("${pkgname}::git://github.com/Alexays/Waybar")
-sha1sums=('SKIP'
- 'c82d390a9334537eeac260bfb6e09ecff1c6830c')
+sha1sums=('SKIP')
pkgver() {
cd "${srcdir}/${pkgname}"
@@ -49,7 +47,6 @@ pkgver() {
prepare() {
cd "${srcdir}/${pkgname}"
- patch meson.build "${srcdir}/meson.build.patch"
}
build() {
diff --git a/meson.build.patch b/meson.build.patch
deleted file mode 100644
index 21d9e590129..00000000000
--- a/meson.build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- meson.build 2020-06-30 09:04:50.000000000 +0200
-+++ meson.build.new 2020-06-30 09:04:45.000000000 +0200
-@@ -78,8 +78,8 @@
- is_openbsd = host_machine.system() == 'openbsd'
-
- thread_dep = dependency('threads')
--fmt = dependency('fmt', version : ['>=5.3.0'], fallback : ['fmt', 'fmt_dep'])
--spdlog = dependency('spdlog', version : ['>=1.8.0'], fallback : ['spdlog', 'spdlog_dep'])
-+fmt = subproject('fmt').get_variable('fmt_dep')
-+spdlog = subproject('spdlog').get_variable('spdlog_dep')
- wayland_client = dependency('wayland-client')
- wayland_cursor = dependency('wayland-cursor')
- wayland_protos = dependency('wayland-protocols')