From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] libinput: split libinput-debug-gui to avoid a cycle
Date: Sun, 10 Jul 2022 20:58:18 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37985@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1395 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages libinput-split-debug-gui
https://github.com/void-linux/void-packages/pull/37985
libinput: split libinput-debug-gui to avoid a cycle
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
gst-plugins-bad1 -> zbar -> qt5 -> libinput -> gtk4 -> gst-plugins-bad1
Closes #37948
Closes #37971
@sgn
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37985.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libinput-split-debug-gui-37985.patch --]
[-- Type: text/x-diff, Size: 3386 bytes --]
From 95696ebaf18330260a120bc134261a5cbd261385 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <michal@vasilek.cz>"
+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 <michal@vasilek.cz>"
@@ -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
- }
-}
next reply other threads:[~2022-07-10 18:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-10 18:58 paper42 [this message]
2022-07-10 19:03 ` [PR PATCH] [Updated] " paper42
2022-07-10 20:16 ` CameronNemo
2022-07-10 21:40 ` paper42
2022-07-10 22:20 ` CameronNemo
2022-07-11 19:33 ` paper42
2022-07-11 21:20 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37985@inbox.vuxu.org \
--to=paper42@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).