From e4a51163e3ee4f45550e9bd229345f98fe27d6bb Mon Sep 17 00:00:00 2001 From: Spiwocoal Date: Sat, 8 Jul 2023 13:33:21 -0400 Subject: [PATCH 1/6] libinput-debug-gui: add update-check. --- srcpkgs/libinput-debug-gui/update | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 srcpkgs/libinput-debug-gui/update diff --git a/srcpkgs/libinput-debug-gui/update b/srcpkgs/libinput-debug-gui/update new file mode 100644 index 000000000000..bbb1210a852b --- /dev/null +++ b/srcpkgs/libinput-debug-gui/update @@ -0,0 +1,2 @@ +site="https://gitlab.freedesktop.org/libinput/libinput/-/tags" +pattern="libinput \K[\d.]+(?=)" From d6624ca1500a5eb07af969d06de709045b2cca8e Mon Sep 17 00:00:00 2001 From: Spiwocoal Date: Sat, 8 Jul 2023 13:33:51 -0400 Subject: [PATCH 2/6] libinput-debug-gui: update to 1.23.0. --- srcpkgs/libinput-debug-gui/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libinput-debug-gui/template b/srcpkgs/libinput-debug-gui/template index 9e16f5b891dc..a0cd52132445 100644 --- a/srcpkgs/libinput-debug-gui/template +++ b/srcpkgs/libinput-debug-gui/template @@ -2,7 +2,7 @@ # keep in sync with libinput # split to avoid cycle: gst-plugins-bad1 -> zbar -> qt5 -> libinput -> gtk4 -> gst-plugins-bad1 pkgname=libinput-debug-gui -version=1.21.0 +version=1.23.0 revision=1 build_style=meson configure_args="-Db_ndebug=false -Dtests=false -Ddebug-gui=true" @@ -14,7 +14,7 @@ maintainer="Michal Vasilek " license="MIT" homepage="https://www.freedesktop.org/wiki/Software/libinput" distfiles="https://gitlab.freedesktop.org/libinput/libinput/-/archive/${version}/libinput-${version}.tar.gz" -checksum=1b23c180f5b297303ed36f5a549910f5d320b0eb21052eac67a966d4eaa4e01d +checksum=7a7c90fbc59f1f65c781a51fa634e4f79e460bf6e16ad68afbe7965d25d09738 post_install() { mv ${DESTDIR}/usr/libexec/libinput/libinput-debug-gui ${DESTDIR}/libinput-debug-gui From a7fa901429afcb302be65850815641cb048c6371 Mon Sep 17 00:00:00 2001 From: Spiwocoal Date: Sat, 8 Jul 2023 13:34:16 -0400 Subject: [PATCH 3/6] libinput: add update-check. --- srcpkgs/libinput/update | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libinput/update b/srcpkgs/libinput/update index 9f6b7927aa79..bbb1210a852b 100644 --- a/srcpkgs/libinput/update +++ b/srcpkgs/libinput/update @@ -1 +1,2 @@ -ignore="*.99.* *.9[0-9][0-9]" +site="https://gitlab.freedesktop.org/libinput/libinput/-/tags" +pattern="libinput \K[\d.]+(?=)" From 79116f26b9bcf21e0c96a2a2ef245ebfd3fdbe73 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Sat, 8 Jul 2023 15:21:28 -0500 Subject: [PATCH 4/6] chroot-curl: Remove. --- srcpkgs/chroot-curl | 1 - srcpkgs/curl/template | 8 -------- 2 files changed, 9 deletions(-) delete mode 120000 srcpkgs/chroot-curl diff --git a/srcpkgs/chroot-curl b/srcpkgs/chroot-curl deleted file mode 120000 index 8b258ec33430..000000000000 --- a/srcpkgs/chroot-curl +++ /dev/null @@ -1 +0,0 @@ -curl \ No newline at end of file diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index df7d4ed01555..5711d0177ca4 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -85,11 +85,3 @@ libcurl-devel_package() { vmove usr/lib/pkgconfig } } - -chroot-curl_package() { - short_desc+=" - for build infra use" - repository=bootstrap - pkg_install() { - vbin $DESTDIR/usr/bin/curl chroot-curl - } -} From 4659e2625d472d8252412501abea52363c9e7835 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Sat, 8 Jul 2023 15:33:18 -0500 Subject: [PATCH 5/6] .github/workflows: update masterdirs to 20230708RC01. --- .github/workflows/build.yaml | 2 +- .github/workflows/cycles.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index eb4fb7c85be9..657712414657 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -40,7 +40,7 @@ jobs: if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')" container: - image: 'ghcr.io/void-linux/xbps-src-masterdir:20230425RC01-${{ matrix.config.bootstrap }}' + image: 'ghcr.io/void-linux/xbps-src-masterdir:20230708RC01-${{ matrix.config.bootstrap }}' env: PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin' ARCH: '${{ matrix.config.arch }}' diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml index aaf2a3d6685c..394a4ffe51a0 100644 --- a/.github/workflows/cycles.yml +++ b/.github/workflows/cycles.yml @@ -10,7 +10,7 @@ jobs: permissions: issues: write container: - image: 'ghcr.io/void-linux/xbps-src-masterdir:20230425RC01-x86_64-musl' + image: 'ghcr.io/void-linux/xbps-src-masterdir:20230708RC01-x86_64-musl' env: PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin' steps: From 4a7cde476bd4fa63c9d99919e5acc94f0b0dbcd5 Mon Sep 17 00:00:00 2001 From: Spiwocoal Date: Sat, 8 Jul 2023 22:14:21 -0400 Subject: [PATCH 6/6] libinput-debug-gui: Add testing dependencies. --- srcpkgs/libinput-debug-gui/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libinput-debug-gui/template b/srcpkgs/libinput-debug-gui/template index a0cd52132445..aae635045589 100644 --- a/srcpkgs/libinput-debug-gui/template +++ b/srcpkgs/libinput-debug-gui/template @@ -7,8 +7,8 @@ revision=1 build_style=meson configure_args="-Db_ndebug=false -Dtests=false -Ddebug-gui=true" hostmakedepends="pkg-config wayland-devel" -makedepends="libevdev-devel libwacom-devel mtdev-devel eudev-libudev-devel - gtk4-devel" +makedepends="libevdev-devel libwacom-devel mtdev-devel eudev-libudev-devel gtk4-devel" +checkdepends="valgrind check-devel python3-pytest" short_desc="Provides handling input devices in Wayland compositors and X" maintainer="Michal Vasilek " license="MIT"