From 95696ebaf18330260a120bc134261a5cbd261385 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 10 Jul 2022 20:17:37 +0200 Subject: [PATCH] libinput: split libinput-debug-gui to avoid a cycle gst-plugins-bad1 -> zbar -> qt5 -> libinput -> gtk4 -> gst-plugins-bad1 --- srcpkgs/libinput-debug-gui | 1 - srcpkgs/libinput-debug-gui/template | 28 ++++++++++++++++++++++++++++ srcpkgs/libinput/template | 15 +++------------ 3 files changed, 31 insertions(+), 13 deletions(-) delete mode 120000 srcpkgs/libinput-debug-gui create mode 100644 srcpkgs/libinput-debug-gui/template diff --git a/srcpkgs/libinput-debug-gui b/srcpkgs/libinput-debug-gui deleted file mode 120000 index b8bfebd1511c..000000000000 --- a/srcpkgs/libinput-debug-gui +++ /dev/null @@ -1 +0,0 @@ -libinput \ No newline at end of file diff --git a/srcpkgs/libinput-debug-gui/template b/srcpkgs/libinput-debug-gui/template new file mode 100644 index 000000000000..350ff194772f --- /dev/null +++ b/srcpkgs/libinput-debug-gui/template @@ -0,0 +1,28 @@ +# Template file for 'libinput-debug-gui' +# 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 +revision=1 +build_style=meson +wrksrc="libinput-${version}" +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" +short_desc="Provides handling input devices in Wayland compositors and X" +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 + +post_install() { + mv ${DESTDIR}/usr/libexec/libinput/libinput-debug-gui ${DESTDIR}/libinput-debug-gui + mv ${DESTDIR}/usr/share/man/man1/libinput-debug-gui.1 ${DESTDIR}/libinput-debug-gui.1 + rm -r ${DESTDIR}/usr + vmkdir usr/libexec/libinput + mv ${DESTDIR}/libinput-debug-gui ${DESTDIR}/usr/libexec/libinput/libinput-debug-gui + vmkdir usr/share/man/man1 + mv ${DESTDIR}/libinput-debug-gui.1 ${DESTDIR}/usr/share/man/man1/libinput-debug-gui.1 +} diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template index 55f6847caa57..df6b4a4198b5 100644 --- a/srcpkgs/libinput/template +++ b/srcpkgs/libinput/template @@ -3,10 +3,9 @@ pkgname=libinput version=1.21.0 revision=1 build_style=meson -configure_args="-Db_ndebug=false" -hostmakedepends="pkg-config wayland-devel" -makedepends="libevdev-devel libwacom-devel mtdev-devel eudev-libudev-devel - gtk4-devel" +configure_args="-Db_ndebug=false -Ddebug-gui=false" +hostmakedepends="pkg-config" +makedepends="libevdev-devel libwacom-devel mtdev-devel eudev-libudev-devel" checkdepends="valgrind check-devel" short_desc="Provides handling input devices in Wayland compositors and X" maintainer="Michal Vasilek " @@ -34,11 +33,3 @@ libinput-devel_package() { vmove usr/lib/pkgconfig } } - -libinput-debug-gui_package() { - short_desc+=" - debug GUI" - pkg_install() { - vmove usr/libexec/libinput/libinput-debug-gui - vmove usr/share/man/man1/libinput-debug-gui.1 - } -}