diff options
| author | Carl Smedstad | 2024-02-20 19:52:17 +0100 |
|---|---|---|
| committer | Carl Smedstad | 2024-02-22 19:38:04 +0100 |
| commit | b58f40de4c0d5bb45d2a75c27079f8eb263f59d2 (patch) | |
| tree | b615eb233682843ed68f088be80c1c64aff9b8c4 | |
| parent | 525d4c24a7176fcd1420722a4bfce476d1a3731f (diff) | |
| download | aur-b58f40de4c0d5bb45d2a75c27079f8eb263f59d2.tar.gz | |
upgpkg: 2024.02.19.00-1
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | PKGBUILD | 10 |
3 files changed, 11 insertions, 10 deletions
@@ -1,6 +1,6 @@ pkgbase = watchman pkgdesc = Watches files and records, or triggers actions, when they change - pkgver = 2024.02.12.00 + pkgver = 2024.02.19.00 pkgrel = 1 url = https://github.com/facebook/watchman arch = x86_64 @@ -20,13 +20,13 @@ pkgbase = watchman depends = pcre2 depends = python backup = etc/watchman.json - source = watchman-2024.02.12.00.tar.gz::https://github.com/facebook/watchman/archive/refs/tags/v2024.02.12.00.tar.gz + source = watchman-2024.02.19.00.tar.gz::https://github.com/facebook/watchman/archive/refs/tags/v2024.02.19.00.tar.gz source = watchman-destdir.patch::https://src.fedoraproject.org/rpms/watchman/raw/a446ccc61c73d74053792656c3832f93bf0fe262/f/watchman-destdir.patch source = watchman.conf source = watchman.json source = watchman.service source = watchman.socket - sha256sums = 0ef064f8163a53cfacac714dd94dbd339a71f9f046b7c1954b000c88a650a82c + sha256sums = d0b98a50509ab8ee54535411104c8b00178fbe601186bbd85e8c28b6d493add3 sha256sums = d40feab6aa7dc6522c648660e88642fdf721ee1f9d80c23f6891a6381067a38b sha256sums = 3ebc93cb91ec9b9603969e222fd3ffd9baa4a1d07a7b3bd7aabf956ec2e177c8 sha256sums = ca3d163bab055381827226140568f3bef7eaac187cebd76878e0b63e9e442356 diff --git a/.gitignore b/.gitignore index 190b19231326..0c38e1247691 100644 --- a/.gitignore +++ b/.gitignore @@ -4,9 +4,6 @@ !.SRCINFO !PKGBUILD !watchman.conf -!watchman.install -!watchman.json.default +!watchman.json !watchman.service !watchman.socket -!watchman.tmpfiles -!0001-Fix-build-with-fmt-10.patch @@ -5,7 +5,7 @@ # Contributor: Michael Louis Thaler <michael.louis.thaler@gmail.com> pkgname=watchman -pkgver=2024.02.12.00 +pkgver=2024.02.19.00 pkgrel=1 pkgdesc="Watches files and records, or triggers actions, when they change" url="https://github.com/facebook/watchman" @@ -39,7 +39,7 @@ source=( "watchman.socket" ) sha256sums=( - '0ef064f8163a53cfacac714dd94dbd339a71f9f046b7c1954b000c88a650a82c' + 'd0b98a50509ab8ee54535411104c8b00178fbe601186bbd85e8c28b6d493add3' 'd40feab6aa7dc6522c648660e88642fdf721ee1f9d80c23f6891a6381067a38b' '3ebc93cb91ec9b9603969e222fd3ffd9baa4a1d07a7b3bd7aabf956ec2e177c8' 'ca3d163bab055381827226140568f3bef7eaac187cebd76878e0b63e9e442356' @@ -53,6 +53,11 @@ prepare() { cd "$_archive" patch --forward --strip=1 --ignore-whitespace --fuzz=3 --input="$srcdir/watchman-destdir.patch" + + # Use system CMake config instead of bundled module, incompatible with glog + # v0.7.0+ + sed -i 's/find_package(Glog REQUIRED)/find_package(Glog CONFIG REQUIRED)/' \ + CMakeLists.txt } build() { @@ -64,7 +69,6 @@ build() { -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ -Wno-dev \ - -DBUILD_TESTS=ON \ -DBUILD_SHARED_LIBS=ON \ -DWATCHMAN_STATE_DIR=/var/run/watchman \ -DUSE_SYS_PYTHON=ON \ |