* [PR PATCH] Qtile wayland
@ 2023-08-07 7:49 sgn
2023-08-07 7:51 ` [PR REVIEW] " classabbyamp
` (10 more replies)
0 siblings, 11 replies; 12+ messages in thread
From: sgn @ 2023-08-07 7:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1272 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages qtile-wayland
https://github.com/void-linux/void-packages/pull/45467
Qtile wayland
<!-- Uncomment relevant sections and delete options which are not applicable -->
Close #45429
Close #45430
Close #45431
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/45467.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qtile-wayland-45467.patch --]
[-- Type: text/x-diff, Size: 5822 bytes --]
From 07164cd9ceb04d74ba5338431bbe8f927622430c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 3 Aug 2023 13:58:39 +0700
Subject: [PATCH 1/4] New package: python3-pywayland-0.4.16
Close: #45430
---
srcpkgs/python3-pywayland/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/python3-pywayland/template
diff --git a/srcpkgs/python3-pywayland/template b/srcpkgs/python3-pywayland/template
new file mode 100644
index 0000000000000..103360eaf37ff
--- /dev/null
+++ b/srcpkgs/python3-pywayland/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-pywayland'
+pkgname=python3-pywayland
+version=0.4.16
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools wayland-protocols pkg-config
+ python3-wheel python3-cffi wayland-devel"
+makedepends="python3-devel wayland-devel"
+depends="python3-cffi"
+short_desc="Python bindings for the libwayland library"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/flacjacket/pywayland"
+distfiles="${PYPI_SITE}/p/pywayland/pywayland-${version}.tar.gz"
+checksum=aaa70c870b0ab365215f8e71505f73683c4ed15b1f3638433b1dc7344fe5b5dd
+make_check=no
From fa2f7fda01c4c5ffd42b7ed14d4f6027ece8ce0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 3 Aug 2023 14:09:35 +0700
Subject: [PATCH 2/4] New package: python3-xkbcommon-0.8
Close #45431
---
srcpkgs/python3-xkbcommon/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-xkbcommon/template
diff --git a/srcpkgs/python3-xkbcommon/template b/srcpkgs/python3-xkbcommon/template
new file mode 100644
index 0000000000000..fa0f294c72fed
--- /dev/null
+++ b/srcpkgs/python3-xkbcommon/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-xkbcommon'
+pkgname=python3-xkbcommon
+version=0.8
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-cffi python3-setuptools python3-wheel"
+makedepends="libxkbcommon-devel python3-devel"
+depends="python3 python3-cffi"
+short_desc="Python bindings for libxkbcommon using cffi"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="MIT"
+homepage="https://github.com/sde1000/python-xkbcommon"
+distfiles="${PYPI_SITE}/x/xkbcommon/xkbcommon-${version}.tar.gz"
+checksum=5be5973bf5b7525687a4df6c84789b421590d7f7cf92ae56f2aab177b795d516
+
+post_install() {
+ vlicense LICENSE
+}
From aa15b2ec6bb01a46da19ea8f7370900a8184e832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 3 Aug 2023 14:11:37 +0700
Subject: [PATCH 3/4] New package: python3-pywlroots-0.15-0.15.24
Close #45429
---
srcpkgs/python3-pywlroots-0.15/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/python3-pywlroots-0.15/template
diff --git a/srcpkgs/python3-pywlroots-0.15/template b/srcpkgs/python3-pywlroots-0.15/template
new file mode 100644
index 0000000000000..5cd6b160045f3
--- /dev/null
+++ b/srcpkgs/python3-pywlroots-0.15/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-pywlroots-0.15'
+pkgname=python3-pywlroots-0.15
+version=0.15.24
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-cffi python3-pywayland python3-xkbcommon
+ python3-wheel"
+makedepends="python3-devel wlroots${pkgname##*-}-devel"
+depends="python3-pywayland python3-xkbcommon python3-cffi"
+short_desc="Python binding to the wlroots ${pkgname##*-} using cffi"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="MIT"
+homepage="https://github.com/flacjacket/pywlroots"
+distfiles="${PYPI_SITE}/p/pywlroots/pywlroots-${version}.tar.gz"
+checksum=4ef621c6201b2be9a970413dcbbf561fde9dcde0e7bc8d313da53149842ac871
From e417de51066ad2556298f906ff247b99ac5a6fa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 7 Aug 2023 14:33:53 +0700
Subject: [PATCH 4/4] qtile: add subpkg for wayland dependencies
---
srcpkgs/qtile-wayland | 1 +
srcpkgs/qtile/template | 16 +++++++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/qtile-wayland
diff --git a/srcpkgs/qtile-wayland b/srcpkgs/qtile-wayland
new file mode 120000
index 0000000000000..37d4345d5336d
--- /dev/null
+++ b/srcpkgs/qtile-wayland
@@ -0,0 +1 @@
+qtile
\ No newline at end of file
diff --git a/srcpkgs/qtile/template b/srcpkgs/qtile/template
index 3f16eada0cda7..7b466061079e4 100644
--- a/srcpkgs/qtile/template
+++ b/srcpkgs/qtile/template
@@ -1,10 +1,12 @@
# Template file for 'qtile'
pkgname=qtile
version=0.22.0
-revision=2
+revision=3
build_style=python3-pep517
-hostmakedepends="python3-setuptools_scm python3-cairocffi python3-xcffib python3-wheel pkg-config"
-makedepends="python3-devel libffi-devel pulseaudio-devel"
+_wlroots=0.15
+hostmakedepends="python3-setuptools_scm python3-cairocffi python3-xcffib python3-wheel
+ pkg-config python3-pywlroots-${_wlroots} python3-pywayland python3-xkbcommon"
+makedepends="python3-devel libffi-devel pulseaudio-devel wlroots${_wlroots}-devel"
depends="python3-cairocffi python3-xcffib pango gdk-pixbuf"
short_desc="Full-featured tiling window manager written and configured in Python"
maintainer="Kai Stian Olstad <void@olstad.com>"
@@ -18,3 +20,11 @@ post_install() {
vinstall resources/qtile.desktop 644 usr/share/xsessions
vlicense LICENSE
}
+
+qtile-wayland_package() {
+ depends="${sourcepkg}>=${version}_${revision}
+ python3-pywlroots-${_wlroots} python3-pywayland python3-xkbcommon"
+ pkg_install() {
+ vmove ${py3_sitelib}/libqtile/backend/wayland
+ }
+}
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] Qtile wayland
2023-08-07 7:49 [PR PATCH] Qtile wayland sgn
@ 2023-08-07 7:51 ` classabbyamp
2023-08-07 8:01 ` [PR PATCH] [Updated] " sgn
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: classabbyamp @ 2023-08-07 7:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 245 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/45467#discussion_r1285509441
Comment:
are pywaland and xkbcommon necessary to list here? they're already dependencies of pywlroots
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] Qtile wayland
2023-08-07 7:49 [PR PATCH] Qtile wayland sgn
2023-08-07 7:51 ` [PR REVIEW] " classabbyamp
@ 2023-08-07 8:01 ` sgn
2023-08-07 8:38 ` [PR REVIEW] " mhmdanas
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2023-08-07 8:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1277 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages qtile-wayland
https://github.com/void-linux/void-packages/pull/45467
Qtile wayland
<!-- Uncomment relevant sections and delete options which are not applicable -->
Close #45429
Close #45430
Close #45431
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/45467.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qtile-wayland-45467.patch --]
[-- Type: text/x-diff, Size: 10463 bytes --]
From 07164cd9ceb04d74ba5338431bbe8f927622430c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 3 Aug 2023 13:58:39 +0700
Subject: [PATCH 1/5] New package: python3-pywayland-0.4.16
Close: #45430
---
srcpkgs/python3-pywayland/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/python3-pywayland/template
diff --git a/srcpkgs/python3-pywayland/template b/srcpkgs/python3-pywayland/template
new file mode 100644
index 0000000000000..103360eaf37ff
--- /dev/null
+++ b/srcpkgs/python3-pywayland/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-pywayland'
+pkgname=python3-pywayland
+version=0.4.16
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools wayland-protocols pkg-config
+ python3-wheel python3-cffi wayland-devel"
+makedepends="python3-devel wayland-devel"
+depends="python3-cffi"
+short_desc="Python bindings for the libwayland library"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/flacjacket/pywayland"
+distfiles="${PYPI_SITE}/p/pywayland/pywayland-${version}.tar.gz"
+checksum=aaa70c870b0ab365215f8e71505f73683c4ed15b1f3638433b1dc7344fe5b5dd
+make_check=no
From fa2f7fda01c4c5ffd42b7ed14d4f6027ece8ce0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 3 Aug 2023 14:09:35 +0700
Subject: [PATCH 2/5] New package: python3-xkbcommon-0.8
Close #45431
---
srcpkgs/python3-xkbcommon/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-xkbcommon/template
diff --git a/srcpkgs/python3-xkbcommon/template b/srcpkgs/python3-xkbcommon/template
new file mode 100644
index 0000000000000..fa0f294c72fed
--- /dev/null
+++ b/srcpkgs/python3-xkbcommon/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-xkbcommon'
+pkgname=python3-xkbcommon
+version=0.8
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-cffi python3-setuptools python3-wheel"
+makedepends="libxkbcommon-devel python3-devel"
+depends="python3 python3-cffi"
+short_desc="Python bindings for libxkbcommon using cffi"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="MIT"
+homepage="https://github.com/sde1000/python-xkbcommon"
+distfiles="${PYPI_SITE}/x/xkbcommon/xkbcommon-${version}.tar.gz"
+checksum=5be5973bf5b7525687a4df6c84789b421590d7f7cf92ae56f2aab177b795d516
+
+post_install() {
+ vlicense LICENSE
+}
From aa15b2ec6bb01a46da19ea8f7370900a8184e832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 3 Aug 2023 14:11:37 +0700
Subject: [PATCH 3/5] New package: python3-pywlroots-0.15-0.15.24
Close #45429
---
srcpkgs/python3-pywlroots-0.15/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/python3-pywlroots-0.15/template
diff --git a/srcpkgs/python3-pywlroots-0.15/template b/srcpkgs/python3-pywlroots-0.15/template
new file mode 100644
index 0000000000000..5cd6b160045f3
--- /dev/null
+++ b/srcpkgs/python3-pywlroots-0.15/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-pywlroots-0.15'
+pkgname=python3-pywlroots-0.15
+version=0.15.24
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-cffi python3-pywayland python3-xkbcommon
+ python3-wheel"
+makedepends="python3-devel wlroots${pkgname##*-}-devel"
+depends="python3-pywayland python3-xkbcommon python3-cffi"
+short_desc="Python binding to the wlroots ${pkgname##*-} using cffi"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="MIT"
+homepage="https://github.com/flacjacket/pywlroots"
+distfiles="${PYPI_SITE}/p/pywlroots/pywlroots-${version}.tar.gz"
+checksum=4ef621c6201b2be9a970413dcbbf561fde9dcde0e7bc8d313da53149842ac871
From e417de51066ad2556298f906ff247b99ac5a6fa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 7 Aug 2023 14:33:53 +0700
Subject: [PATCH 4/5] qtile: add subpkg for wayland dependencies
---
srcpkgs/qtile-wayland | 1 +
srcpkgs/qtile/template | 16 +++++++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/qtile-wayland
diff --git a/srcpkgs/qtile-wayland b/srcpkgs/qtile-wayland
new file mode 120000
index 0000000000000..37d4345d5336d
--- /dev/null
+++ b/srcpkgs/qtile-wayland
@@ -0,0 +1 @@
+qtile
\ No newline at end of file
diff --git a/srcpkgs/qtile/template b/srcpkgs/qtile/template
index 3f16eada0cda7..7b466061079e4 100644
--- a/srcpkgs/qtile/template
+++ b/srcpkgs/qtile/template
@@ -1,10 +1,12 @@
# Template file for 'qtile'
pkgname=qtile
version=0.22.0
-revision=2
+revision=3
build_style=python3-pep517
-hostmakedepends="python3-setuptools_scm python3-cairocffi python3-xcffib python3-wheel pkg-config"
-makedepends="python3-devel libffi-devel pulseaudio-devel"
+_wlroots=0.15
+hostmakedepends="python3-setuptools_scm python3-cairocffi python3-xcffib python3-wheel
+ pkg-config python3-pywlroots-${_wlroots} python3-pywayland python3-xkbcommon"
+makedepends="python3-devel libffi-devel pulseaudio-devel wlroots${_wlroots}-devel"
depends="python3-cairocffi python3-xcffib pango gdk-pixbuf"
short_desc="Full-featured tiling window manager written and configured in Python"
maintainer="Kai Stian Olstad <void@olstad.com>"
@@ -18,3 +20,11 @@ post_install() {
vinstall resources/qtile.desktop 644 usr/share/xsessions
vlicense LICENSE
}
+
+qtile-wayland_package() {
+ depends="${sourcepkg}>=${version}_${revision}
+ python3-pywlroots-${_wlroots} python3-pywayland python3-xkbcommon"
+ pkg_install() {
+ vmove ${py3_sitelib}/libqtile/backend/wayland
+ }
+}
From 76cc7cd9051ea9b298df3c5f5ee5fb3e07eb0678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 7 Aug 2023 15:00:06 +0700
Subject: [PATCH 5/5] wlroots: change to meta version package
Each compositor choose a different version, use this scheme for ease of
packaging other rev-deps.
---
srcpkgs/wlroots/template | 40 +++++++++---------------------------
srcpkgs/wlroots0.16-devel | 1 +
srcpkgs/wlroots0.16/template | 38 ++++++++++++++++++++++++++++++++++
3 files changed, 49 insertions(+), 30 deletions(-)
create mode 120000 srcpkgs/wlroots0.16-devel
create mode 100644 srcpkgs/wlroots0.16/template
diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index c015f8529fc2e..1f7e668303eaf 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -1,38 +1,18 @@
# Template file for 'wlroots'
+#
+# On next bump, remove the .99 part
pkgname=wlroots
-version=0.16.2
+version=0.16.99
revision=1
-build_style=meson
-# Follow upstream packaging recommendations:
-# https://gitlab.freedesktop.org/wlroots/wlroots/-/wikis/Packaging-recommendations
-configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false
- -Db_ndebug=false"
-hostmakedepends="pkg-config wayland-devel glslang hwids"
-_devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel
- libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel
- wayland-protocols vulkan-loader Vulkan-Headers xcb-util-errors-devel
- xcb-util-wm-devel xcb-util-renderutil-devel "
-makedepends="${_devel_depends}
- libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel
- xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland"
+build_style=meta
+depends="wlroots${version%.99}"
short_desc="Modular Wayland compositor library"
-maintainer="Isaac Freund <mail@isaacfreund.com>"
-license="MIT"
-homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
-distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
-checksum=83e9a11605f23d4bf781ab1947089483d9ec3f7e9ba65398e0609593b77d44aa
-
-post_install() {
- vlicense LICENSE
-}
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="BSD-2-Clause" # no vlicense
+homepage="https://github.com/swaywm/wlroots"
wlroots-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}"
- conflicts="wlroots0.15-devel"
+ depends="wlroots${version%.99}-devel"
+ build_style=meta
short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
}
diff --git a/srcpkgs/wlroots0.16-devel b/srcpkgs/wlroots0.16-devel
new file mode 120000
index 0000000000000..8fe7760ebc0f0
--- /dev/null
+++ b/srcpkgs/wlroots0.16-devel
@@ -0,0 +1 @@
+wlroots0.16
\ No newline at end of file
diff --git a/srcpkgs/wlroots0.16/template b/srcpkgs/wlroots0.16/template
new file mode 100644
index 0000000000000..ad4e17072172b
--- /dev/null
+++ b/srcpkgs/wlroots0.16/template
@@ -0,0 +1,38 @@
+# Template file for 'wlroots0.16'
+pkgname=wlroots0.16
+version=0.16.2
+revision=1
+build_style=meson
+# Follow upstream packaging recommendations:
+# https://gitlab.freedesktop.org/wlroots/wlroots/-/wikis/Packaging-recommendations
+configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false
+ -Db_ndebug=false"
+hostmakedepends="pkg-config wayland-devel glslang hwids"
+_devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel
+ libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel
+ wayland-protocols vulkan-loader Vulkan-Headers xcb-util-errors-devel
+ xcb-util-wm-devel xcb-util-renderutil-devel "
+makedepends="${_devel_depends}
+ libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel
+ xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland"
+short_desc="Modular Wayland compositor library ${pkgname#wlroots}"
+maintainer="Isaac Freund <mail@isaacfreund.com>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
+checksum=83e9a11605f23d4bf781ab1947089483d9ec3f7e9ba65398e0609593b77d44aa
+
+post_install() {
+ vlicense LICENSE
+}
+
+wlroots0.16-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}"
+ conflicts="wlroots0.15-devel wlroots0.14-devel"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] Qtile wayland
2023-08-07 7:49 [PR PATCH] Qtile wayland sgn
` (2 preceding siblings ...)
2023-08-07 8:38 ` [PR REVIEW] " mhmdanas
@ 2023-08-07 8:38 ` mhmdanas
2023-08-07 8:57 ` sgn
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: mhmdanas @ 2023-08-07 8:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
New review comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/45467#discussion_r1285558489
Comment:
```suggestion
short_desc="Python bindings to wlroots ${pkgname##*-} using cffi"
```
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] Qtile wayland
2023-08-07 7:49 [PR PATCH] Qtile wayland sgn
2023-08-07 7:51 ` [PR REVIEW] " classabbyamp
2023-08-07 8:01 ` [PR PATCH] [Updated] " sgn
@ 2023-08-07 8:38 ` mhmdanas
2023-08-07 8:38 ` mhmdanas
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: mhmdanas @ 2023-08-07 8:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 259 bytes --]
New review comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/45467#discussion_r1285557993
Comment:
I'd name it `python3-pywlroots0.15` instead, as it's more in line with how other versioned packages are named.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] Qtile wayland
2023-08-07 7:49 [PR PATCH] Qtile wayland sgn
` (3 preceding siblings ...)
2023-08-07 8:38 ` mhmdanas
@ 2023-08-07 8:57 ` sgn
2023-08-07 9:00 ` sgn
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2023-08-07 8:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 185 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/45467#discussion_r1285580694
Comment:
See https://pypi.org/project/pywlroots/
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] Qtile wayland
2023-08-07 7:49 [PR PATCH] Qtile wayland sgn
` (4 preceding siblings ...)
2023-08-07 8:57 ` sgn
@ 2023-08-07 9:00 ` sgn
2023-08-07 9:01 ` sgn
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2023-08-07 9:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 435 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/45467#discussion_r1285583621
Comment:
For `pywayland`:
https://github.com/qtile/qtile/blob/07c37413a749a295572294ba46583b14b49736aa/libqtile/backend/wayland/core.py#L29-L30
For xkbcommon:
https://github.com/qtile/qtile/blob/07c37413a749a295572294ba46583b14b49736aa/libqtile/backend/wayland/core.py#L75
So, imo, yes.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] Qtile wayland
2023-08-07 7:49 [PR PATCH] Qtile wayland sgn
` (5 preceding siblings ...)
2023-08-07 9:00 ` sgn
@ 2023-08-07 9:01 ` sgn
2023-08-07 15:05 ` [PR PATCH] [Updated] " sgn
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2023-08-07 9:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/45467#discussion_r1285584521
Comment:
This naming schema is easier to manipulate, though.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] Qtile wayland
2023-08-07 7:49 [PR PATCH] Qtile wayland sgn
` (6 preceding siblings ...)
2023-08-07 9:01 ` sgn
@ 2023-08-07 15:05 ` sgn
2023-08-07 15:07 ` sgn
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2023-08-07 15:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1277 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages qtile-wayland
https://github.com/void-linux/void-packages/pull/45467
Qtile wayland
<!-- Uncomment relevant sections and delete options which are not applicable -->
Close #45429
Close #45430
Close #45431
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/45467.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qtile-wayland-45467.patch --]
[-- Type: text/x-diff, Size: 10888 bytes --]
From 07164cd9ceb04d74ba5338431bbe8f927622430c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 3 Aug 2023 13:58:39 +0700
Subject: [PATCH 1/5] New package: python3-pywayland-0.4.16
Close: #45430
---
srcpkgs/python3-pywayland/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/python3-pywayland/template
diff --git a/srcpkgs/python3-pywayland/template b/srcpkgs/python3-pywayland/template
new file mode 100644
index 0000000000000..103360eaf37ff
--- /dev/null
+++ b/srcpkgs/python3-pywayland/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-pywayland'
+pkgname=python3-pywayland
+version=0.4.16
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools wayland-protocols pkg-config
+ python3-wheel python3-cffi wayland-devel"
+makedepends="python3-devel wayland-devel"
+depends="python3-cffi"
+short_desc="Python bindings for the libwayland library"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/flacjacket/pywayland"
+distfiles="${PYPI_SITE}/p/pywayland/pywayland-${version}.tar.gz"
+checksum=aaa70c870b0ab365215f8e71505f73683c4ed15b1f3638433b1dc7344fe5b5dd
+make_check=no
From fa2f7fda01c4c5ffd42b7ed14d4f6027ece8ce0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 3 Aug 2023 14:09:35 +0700
Subject: [PATCH 2/5] New package: python3-xkbcommon-0.8
Close #45431
---
srcpkgs/python3-xkbcommon/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-xkbcommon/template
diff --git a/srcpkgs/python3-xkbcommon/template b/srcpkgs/python3-xkbcommon/template
new file mode 100644
index 0000000000000..fa0f294c72fed
--- /dev/null
+++ b/srcpkgs/python3-xkbcommon/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-xkbcommon'
+pkgname=python3-xkbcommon
+version=0.8
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-cffi python3-setuptools python3-wheel"
+makedepends="libxkbcommon-devel python3-devel"
+depends="python3 python3-cffi"
+short_desc="Python bindings for libxkbcommon using cffi"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="MIT"
+homepage="https://github.com/sde1000/python-xkbcommon"
+distfiles="${PYPI_SITE}/x/xkbcommon/xkbcommon-${version}.tar.gz"
+checksum=5be5973bf5b7525687a4df6c84789b421590d7f7cf92ae56f2aab177b795d516
+
+post_install() {
+ vlicense LICENSE
+}
From 135587da7d2d0017e1108d57d2fa55737382ce3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 3 Aug 2023 14:11:37 +0700
Subject: [PATCH 3/5] New package: python3-pywlroots-0.15-0.15.24
Close #45429
---
srcpkgs/python3-pywlroots-0.15/template | 32 +++++++++++++++++++++++++
1 file changed, 32 insertions(+)
create mode 100644 srcpkgs/python3-pywlroots-0.15/template
diff --git a/srcpkgs/python3-pywlroots-0.15/template b/srcpkgs/python3-pywlroots-0.15/template
new file mode 100644
index 0000000000000..efbd97613a30c
--- /dev/null
+++ b/srcpkgs/python3-pywlroots-0.15/template
@@ -0,0 +1,32 @@
+# Template file for 'python3-pywlroots-0.15'
+pkgname=python3-pywlroots-0.15
+version=0.15.24
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-cffi python3-pywayland python3-xkbcommon
+ python3-wheel python3-devel wlroots${pkgname##*-}-devel"
+makedepends="python3-devel python3-cffi wlroots${pkgname##*-}-devel"
+depends="python3-pywayland python3-xkbcommon python3-cffi"
+short_desc="Python binding to the wlroots ${pkgname##*-} using cffi"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="MIT"
+homepage="https://github.com/flacjacket/pywlroots"
+distfiles="${PYPI_SITE}/p/pywlroots/pywlroots-${version}.tar.gz"
+checksum=4ef621c6201b2be9a970413dcbbf561fde9dcde0e7bc8d313da53149842ac871
+
+pre_build() {
+ [ "$CROSS_BUILD" ] || return 0
+ (
+ rm -rf wlroots/__pycache__
+ CC="$BUILD_CC"
+ CFLAGS="$BUILD_CFLAGS"
+ LDFLAGS="$BUILD_LDFLAGS"
+ unset LDSHARED
+ unset PYTHON_CONFIG
+ unset PYTHONPATH
+ unset PYPREFIX
+ unset _PYTHON_SYSCONFIGDATA_NAME
+ python3 wlroots/ffi_build.py
+ rm -f wlroots/_ffi.o wlroots/_ffi.cpython.*.so
+ )
+}
From 14ba515f35d7f39c8065bd76114b6c27894a39c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 7 Aug 2023 14:33:53 +0700
Subject: [PATCH 4/5] qtile: add subpkg for wayland dependencies
---
srcpkgs/qtile-wayland | 1 +
srcpkgs/qtile/template | 16 +++++++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/qtile-wayland
diff --git a/srcpkgs/qtile-wayland b/srcpkgs/qtile-wayland
new file mode 120000
index 0000000000000..37d4345d5336d
--- /dev/null
+++ b/srcpkgs/qtile-wayland
@@ -0,0 +1 @@
+qtile
\ No newline at end of file
diff --git a/srcpkgs/qtile/template b/srcpkgs/qtile/template
index 3f16eada0cda7..7b466061079e4 100644
--- a/srcpkgs/qtile/template
+++ b/srcpkgs/qtile/template
@@ -1,10 +1,12 @@
# Template file for 'qtile'
pkgname=qtile
version=0.22.0
-revision=2
+revision=3
build_style=python3-pep517
-hostmakedepends="python3-setuptools_scm python3-cairocffi python3-xcffib python3-wheel pkg-config"
-makedepends="python3-devel libffi-devel pulseaudio-devel"
+_wlroots=0.15
+hostmakedepends="python3-setuptools_scm python3-cairocffi python3-xcffib python3-wheel
+ pkg-config python3-pywlroots-${_wlroots} python3-pywayland python3-xkbcommon"
+makedepends="python3-devel libffi-devel pulseaudio-devel wlroots${_wlroots}-devel"
depends="python3-cairocffi python3-xcffib pango gdk-pixbuf"
short_desc="Full-featured tiling window manager written and configured in Python"
maintainer="Kai Stian Olstad <void@olstad.com>"
@@ -18,3 +20,11 @@ post_install() {
vinstall resources/qtile.desktop 644 usr/share/xsessions
vlicense LICENSE
}
+
+qtile-wayland_package() {
+ depends="${sourcepkg}>=${version}_${revision}
+ python3-pywlroots-${_wlroots} python3-pywayland python3-xkbcommon"
+ pkg_install() {
+ vmove ${py3_sitelib}/libqtile/backend/wayland
+ }
+}
From 30393c5c8e81a1db861144378f8282f05c3078f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 7 Aug 2023 15:00:06 +0700
Subject: [PATCH 5/5] wlroots: change to meta version package
Each compositor choose a different version, use this scheme for ease of
packaging other rev-deps.
---
srcpkgs/wlroots/template | 40 +++++++++---------------------------
srcpkgs/wlroots0.16-devel | 1 +
srcpkgs/wlroots0.16/template | 38 ++++++++++++++++++++++++++++++++++
3 files changed, 49 insertions(+), 30 deletions(-)
create mode 120000 srcpkgs/wlroots0.16-devel
create mode 100644 srcpkgs/wlroots0.16/template
diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index c015f8529fc2e..1f7e668303eaf 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -1,38 +1,18 @@
# Template file for 'wlroots'
+#
+# On next bump, remove the .99 part
pkgname=wlroots
-version=0.16.2
+version=0.16.99
revision=1
-build_style=meson
-# Follow upstream packaging recommendations:
-# https://gitlab.freedesktop.org/wlroots/wlroots/-/wikis/Packaging-recommendations
-configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false
- -Db_ndebug=false"
-hostmakedepends="pkg-config wayland-devel glslang hwids"
-_devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel
- libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel
- wayland-protocols vulkan-loader Vulkan-Headers xcb-util-errors-devel
- xcb-util-wm-devel xcb-util-renderutil-devel "
-makedepends="${_devel_depends}
- libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel
- xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland"
+build_style=meta
+depends="wlroots${version%.99}"
short_desc="Modular Wayland compositor library"
-maintainer="Isaac Freund <mail@isaacfreund.com>"
-license="MIT"
-homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
-distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
-checksum=83e9a11605f23d4bf781ab1947089483d9ec3f7e9ba65398e0609593b77d44aa
-
-post_install() {
- vlicense LICENSE
-}
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="BSD-2-Clause" # no vlicense
+homepage="https://github.com/swaywm/wlroots"
wlroots-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}"
- conflicts="wlroots0.15-devel"
+ depends="wlroots${version%.99}-devel"
+ build_style=meta
short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
}
diff --git a/srcpkgs/wlroots0.16-devel b/srcpkgs/wlroots0.16-devel
new file mode 120000
index 0000000000000..8fe7760ebc0f0
--- /dev/null
+++ b/srcpkgs/wlroots0.16-devel
@@ -0,0 +1 @@
+wlroots0.16
\ No newline at end of file
diff --git a/srcpkgs/wlroots0.16/template b/srcpkgs/wlroots0.16/template
new file mode 100644
index 0000000000000..ad4e17072172b
--- /dev/null
+++ b/srcpkgs/wlroots0.16/template
@@ -0,0 +1,38 @@
+# Template file for 'wlroots0.16'
+pkgname=wlroots0.16
+version=0.16.2
+revision=1
+build_style=meson
+# Follow upstream packaging recommendations:
+# https://gitlab.freedesktop.org/wlroots/wlroots/-/wikis/Packaging-recommendations
+configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false
+ -Db_ndebug=false"
+hostmakedepends="pkg-config wayland-devel glslang hwids"
+_devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel
+ libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel
+ wayland-protocols vulkan-loader Vulkan-Headers xcb-util-errors-devel
+ xcb-util-wm-devel xcb-util-renderutil-devel "
+makedepends="${_devel_depends}
+ libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel
+ xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland"
+short_desc="Modular Wayland compositor library ${pkgname#wlroots}"
+maintainer="Isaac Freund <mail@isaacfreund.com>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
+checksum=83e9a11605f23d4bf781ab1947089483d9ec3f7e9ba65398e0609593b77d44aa
+
+post_install() {
+ vlicense LICENSE
+}
+
+wlroots0.16-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}"
+ conflicts="wlroots0.15-devel wlroots0.14-devel"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] Qtile wayland
2023-08-07 7:49 [PR PATCH] Qtile wayland sgn
` (7 preceding siblings ...)
2023-08-07 15:05 ` [PR PATCH] [Updated] " sgn
@ 2023-08-07 15:07 ` sgn
2023-08-09 13:14 ` sgn
2023-08-09 23:54 ` [PR PATCH] [Merged]: " sgn
10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2023-08-07 15:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1277 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages qtile-wayland
https://github.com/void-linux/void-packages/pull/45467
Qtile wayland
<!-- Uncomment relevant sections and delete options which are not applicable -->
Close #45429
Close #45430
Close #45431
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/45467.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qtile-wayland-45467.patch --]
[-- Type: text/x-diff, Size: 10930 bytes --]
From 07164cd9ceb04d74ba5338431bbe8f927622430c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 3 Aug 2023 13:58:39 +0700
Subject: [PATCH 1/5] New package: python3-pywayland-0.4.16
Close: #45430
---
srcpkgs/python3-pywayland/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/python3-pywayland/template
diff --git a/srcpkgs/python3-pywayland/template b/srcpkgs/python3-pywayland/template
new file mode 100644
index 0000000000000..103360eaf37ff
--- /dev/null
+++ b/srcpkgs/python3-pywayland/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-pywayland'
+pkgname=python3-pywayland
+version=0.4.16
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools wayland-protocols pkg-config
+ python3-wheel python3-cffi wayland-devel"
+makedepends="python3-devel wayland-devel"
+depends="python3-cffi"
+short_desc="Python bindings for the libwayland library"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/flacjacket/pywayland"
+distfiles="${PYPI_SITE}/p/pywayland/pywayland-${version}.tar.gz"
+checksum=aaa70c870b0ab365215f8e71505f73683c4ed15b1f3638433b1dc7344fe5b5dd
+make_check=no
From fa2f7fda01c4c5ffd42b7ed14d4f6027ece8ce0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 3 Aug 2023 14:09:35 +0700
Subject: [PATCH 2/5] New package: python3-xkbcommon-0.8
Close #45431
---
srcpkgs/python3-xkbcommon/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-xkbcommon/template
diff --git a/srcpkgs/python3-xkbcommon/template b/srcpkgs/python3-xkbcommon/template
new file mode 100644
index 0000000000000..fa0f294c72fed
--- /dev/null
+++ b/srcpkgs/python3-xkbcommon/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-xkbcommon'
+pkgname=python3-xkbcommon
+version=0.8
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-cffi python3-setuptools python3-wheel"
+makedepends="libxkbcommon-devel python3-devel"
+depends="python3 python3-cffi"
+short_desc="Python bindings for libxkbcommon using cffi"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="MIT"
+homepage="https://github.com/sde1000/python-xkbcommon"
+distfiles="${PYPI_SITE}/x/xkbcommon/xkbcommon-${version}.tar.gz"
+checksum=5be5973bf5b7525687a4df6c84789b421590d7f7cf92ae56f2aab177b795d516
+
+post_install() {
+ vlicense LICENSE
+}
From 3c19fcba035691341ec1ee423d75a9ad85baba04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 3 Aug 2023 14:11:37 +0700
Subject: [PATCH 3/5] New package: python3-pywlroots-0.15-0.15.24
Close #45429
---
srcpkgs/python3-pywlroots-0.15/template | 36 +++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/python3-pywlroots-0.15/template
diff --git a/srcpkgs/python3-pywlroots-0.15/template b/srcpkgs/python3-pywlroots-0.15/template
new file mode 100644
index 0000000000000..f1d652f3f360a
--- /dev/null
+++ b/srcpkgs/python3-pywlroots-0.15/template
@@ -0,0 +1,36 @@
+# Template file for 'python3-pywlroots-0.15'
+pkgname=python3-pywlroots-0.15
+version=0.15.24
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-cffi python3-pywayland python3-xkbcommon
+ python3-wheel python3-devel wlroots${pkgname##*-}-devel"
+makedepends="python3-devel python3-cffi wlroots${pkgname##*-}-devel"
+depends="python3-pywayland python3-xkbcommon python3-cffi"
+short_desc="Python binding to the wlroots ${pkgname##*-} using cffi"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="MIT"
+homepage="https://github.com/flacjacket/pywlroots"
+distfiles="${PYPI_SITE}/p/pywlroots/pywlroots-${version}.tar.gz"
+checksum=4ef621c6201b2be9a970413dcbbf561fde9dcde0e7bc8d313da53149842ac871
+
+pre_build() {
+ [ "$CROSS_BUILD" ] || return 0
+ (
+ rm -rf wlroots/__pycache__
+ CC="$BUILD_CC"
+ CFLAGS="$BUILD_CFLAGS"
+ LDFLAGS="$BUILD_LDFLAGS"
+ unset LDSHARED
+ unset PYTHON_CONFIG
+ unset PYTHONPATH
+ unset PYPREFIX
+ unset _PYTHON_SYSCONFIGDATA_NAME
+ python3 wlroots/ffi_build.py
+ rm -f wlroots/_ffi.o wlroots/_ffi.cpython.*.so
+ )
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 4f190bd9acc39d0914b81a41ca17db4eb2292ae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 7 Aug 2023 14:33:53 +0700
Subject: [PATCH 4/5] qtile: add subpkg for wayland dependencies
---
srcpkgs/qtile-wayland | 1 +
srcpkgs/qtile/template | 16 +++++++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/qtile-wayland
diff --git a/srcpkgs/qtile-wayland b/srcpkgs/qtile-wayland
new file mode 120000
index 0000000000000..37d4345d5336d
--- /dev/null
+++ b/srcpkgs/qtile-wayland
@@ -0,0 +1 @@
+qtile
\ No newline at end of file
diff --git a/srcpkgs/qtile/template b/srcpkgs/qtile/template
index 3f16eada0cda7..7b466061079e4 100644
--- a/srcpkgs/qtile/template
+++ b/srcpkgs/qtile/template
@@ -1,10 +1,12 @@
# Template file for 'qtile'
pkgname=qtile
version=0.22.0
-revision=2
+revision=3
build_style=python3-pep517
-hostmakedepends="python3-setuptools_scm python3-cairocffi python3-xcffib python3-wheel pkg-config"
-makedepends="python3-devel libffi-devel pulseaudio-devel"
+_wlroots=0.15
+hostmakedepends="python3-setuptools_scm python3-cairocffi python3-xcffib python3-wheel
+ pkg-config python3-pywlroots-${_wlroots} python3-pywayland python3-xkbcommon"
+makedepends="python3-devel libffi-devel pulseaudio-devel wlroots${_wlroots}-devel"
depends="python3-cairocffi python3-xcffib pango gdk-pixbuf"
short_desc="Full-featured tiling window manager written and configured in Python"
maintainer="Kai Stian Olstad <void@olstad.com>"
@@ -18,3 +20,11 @@ post_install() {
vinstall resources/qtile.desktop 644 usr/share/xsessions
vlicense LICENSE
}
+
+qtile-wayland_package() {
+ depends="${sourcepkg}>=${version}_${revision}
+ python3-pywlroots-${_wlroots} python3-pywayland python3-xkbcommon"
+ pkg_install() {
+ vmove ${py3_sitelib}/libqtile/backend/wayland
+ }
+}
From 5d84b27c3a6104cdc8154594ec66aa7f3348f6a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 7 Aug 2023 15:00:06 +0700
Subject: [PATCH 5/5] wlroots: change to meta version package
Each compositor choose a different version, use this scheme for ease of
packaging other rev-deps.
---
srcpkgs/wlroots/template | 40 +++++++++---------------------------
srcpkgs/wlroots0.16-devel | 1 +
srcpkgs/wlroots0.16/template | 38 ++++++++++++++++++++++++++++++++++
3 files changed, 49 insertions(+), 30 deletions(-)
create mode 120000 srcpkgs/wlroots0.16-devel
create mode 100644 srcpkgs/wlroots0.16/template
diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index c015f8529fc2e..1f7e668303eaf 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -1,38 +1,18 @@
# Template file for 'wlroots'
+#
+# On next bump, remove the .99 part
pkgname=wlroots
-version=0.16.2
+version=0.16.99
revision=1
-build_style=meson
-# Follow upstream packaging recommendations:
-# https://gitlab.freedesktop.org/wlroots/wlroots/-/wikis/Packaging-recommendations
-configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false
- -Db_ndebug=false"
-hostmakedepends="pkg-config wayland-devel glslang hwids"
-_devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel
- libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel
- wayland-protocols vulkan-loader Vulkan-Headers xcb-util-errors-devel
- xcb-util-wm-devel xcb-util-renderutil-devel "
-makedepends="${_devel_depends}
- libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel
- xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland"
+build_style=meta
+depends="wlroots${version%.99}"
short_desc="Modular Wayland compositor library"
-maintainer="Isaac Freund <mail@isaacfreund.com>"
-license="MIT"
-homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
-distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
-checksum=83e9a11605f23d4bf781ab1947089483d9ec3f7e9ba65398e0609593b77d44aa
-
-post_install() {
- vlicense LICENSE
-}
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="BSD-2-Clause" # no vlicense
+homepage="https://github.com/swaywm/wlroots"
wlroots-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}"
- conflicts="wlroots0.15-devel"
+ depends="wlroots${version%.99}-devel"
+ build_style=meta
short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
}
diff --git a/srcpkgs/wlroots0.16-devel b/srcpkgs/wlroots0.16-devel
new file mode 120000
index 0000000000000..8fe7760ebc0f0
--- /dev/null
+++ b/srcpkgs/wlroots0.16-devel
@@ -0,0 +1 @@
+wlroots0.16
\ No newline at end of file
diff --git a/srcpkgs/wlroots0.16/template b/srcpkgs/wlroots0.16/template
new file mode 100644
index 0000000000000..ad4e17072172b
--- /dev/null
+++ b/srcpkgs/wlroots0.16/template
@@ -0,0 +1,38 @@
+# Template file for 'wlroots0.16'
+pkgname=wlroots0.16
+version=0.16.2
+revision=1
+build_style=meson
+# Follow upstream packaging recommendations:
+# https://gitlab.freedesktop.org/wlroots/wlroots/-/wikis/Packaging-recommendations
+configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false
+ -Db_ndebug=false"
+hostmakedepends="pkg-config wayland-devel glslang hwids"
+_devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel
+ libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel
+ wayland-protocols vulkan-loader Vulkan-Headers xcb-util-errors-devel
+ xcb-util-wm-devel xcb-util-renderutil-devel "
+makedepends="${_devel_depends}
+ libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel
+ xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland"
+short_desc="Modular Wayland compositor library ${pkgname#wlroots}"
+maintainer="Isaac Freund <mail@isaacfreund.com>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
+checksum=83e9a11605f23d4bf781ab1947089483d9ec3f7e9ba65398e0609593b77d44aa
+
+post_install() {
+ vlicense LICENSE
+}
+
+wlroots0.16-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}"
+ conflicts="wlroots0.15-devel wlroots0.14-devel"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: Qtile wayland
2023-08-07 7:49 [PR PATCH] Qtile wayland sgn
` (8 preceding siblings ...)
2023-08-07 15:07 ` sgn
@ 2023-08-09 13:14 ` sgn
2023-08-09 23:54 ` [PR PATCH] [Merged]: " sgn
10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2023-08-09 13:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 192 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/45467#issuecomment-1671305744
Comment:
Gonna merge this later today if noone adds objections.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Merged]: Qtile wayland
2023-08-07 7:49 [PR PATCH] Qtile wayland sgn
` (9 preceding siblings ...)
2023-08-09 13:14 ` sgn
@ 2023-08-09 23:54 ` sgn
10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2023-08-09 23:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1123 bytes --]
There's a merged pull request on the void-packages repository
Qtile wayland
https://github.com/void-linux/void-packages/pull/45467
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
Close #45429
Close #45430
Close #45431
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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
-->
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2023-08-09 23:54 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-07 7:49 [PR PATCH] Qtile wayland sgn
2023-08-07 7:51 ` [PR REVIEW] " classabbyamp
2023-08-07 8:01 ` [PR PATCH] [Updated] " sgn
2023-08-07 8:38 ` [PR REVIEW] " mhmdanas
2023-08-07 8:38 ` mhmdanas
2023-08-07 8:57 ` sgn
2023-08-07 9:00 ` sgn
2023-08-07 9:01 ` sgn
2023-08-07 15:05 ` [PR PATCH] [Updated] " sgn
2023-08-07 15:07 ` sgn
2023-08-09 13:14 ` sgn
2023-08-09 23:54 ` [PR PATCH] [Merged]: " sgn
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).