* [gentoo-commits] repo/gentoo:master commit in: x11-wm/qtile/files/, x11-wm/qtile/
@ 2018-09-18 21:23 Tim Harder
0 siblings, 0 replies; 6+ messages in thread
From: Tim Harder @ 2018-09-18 21:23 UTC (permalink / raw
To: gentoo-commits
commit: 7c53949742780e1d490029b6702812e43200bc2a
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 18 20:40:12 2018 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Tue Sep 18 21:21:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c539497
x11-wm/qtile: version bump to 0.12.0
Fixes: https://bugs.gentoo.org/616914
x11-wm/qtile/Manifest | 1 +
x11-wm/qtile/files/qtile-0.12.0-tests.patch | 15 +++++++++++++++
.../qtile/{qtile-9999.ebuild => qtile-0.12.0.ebuild} | 18 ++++++++++++++----
x11-wm/qtile/qtile-9999.ebuild | 18 ++++++++++++++----
4 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index 1289b157f85..63002bfde7a 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1,2 +1,3 @@
DIST qtile-0.10.5.tar.gz 325311 BLAKE2B fadf8c232d6f3840f93d61d4c8c6a2dddc61483e316b02f7a60058eac0e5da9f3b2eab99e952b7db30e29036d2db0283e07926ec054322994ebaf16a7a223906 SHA512 00fbeaa17921eb2d4014c979bcd1f81f22e155606b13340f4653c262d7fde3b1f471a7f20e9a80b58435bdc1e5479c983a72e4be180b49df2ef4a5fe568b8631
DIST qtile-0.10.6.tar.gz 328892 BLAKE2B 3a4887808b87b0cbe4410d2bac8af4664873d2aa9b8c782f8c026ae78ba586b6e02d9a50ee42434afa916e9fe9041a7a15a68f9026ee7d95a0edec2594515cfa SHA512 39eef26358e1220ca766b030733396206df68677e3f23d6847d375f479952a4e2d47e0c3e59fab2e5046e899bad91d107a913bb25458fb66859dec3fa8c0e956
+DIST qtile-0.12.0.tar.gz 447139 BLAKE2B c1bea9ba8b36ccf14b7e55b4a2cbc05714ecffef33d992e9bf1683e6f8c416d481cf9d141bbf0fe62df65aeb3555290647d072dd45f507b08e0d523f992a1671 SHA512 a94237c40775524e16aebdd8555d0ed0623c248b65aee32851145e8a6cc54ce4d46ee5cf4c4f583e468de4557a565c4281660219e4b2ee1b73fb483567e1a5b2
diff --git a/x11-wm/qtile/files/qtile-0.12.0-tests.patch b/x11-wm/qtile/files/qtile-0.12.0-tests.patch
new file mode 100644
index 00000000000..8443381b176
--- /dev/null
+++ b/x11-wm/qtile/files/qtile-0.12.0-tests.patch
@@ -0,0 +1,15 @@
+The '~' character doesn't expand to $HOME in all build envs.
+
+--- qtile-0.12.0/test/test_bar.py
++++ qtile-0.12.0/test/test_bar.py
+@@ -105,8 +105,8 @@
+ assert c.complete("/bi") == "/bin/"
+ c.reset()
+ assert c.complete("/bin") != "/bin/"
+- c.reset()
+- assert c.complete("~") != "~"
++ #c.reset()
++ #assert c.complete("~") != "~"
+
+ c.reset()
+ s = "thisisatotallynonexistantpathforsure"
diff --git a/x11-wm/qtile/qtile-9999.ebuild b/x11-wm/qtile/qtile-0.12.0.ebuild
similarity index 70%
copy from x11-wm/qtile/qtile-9999.ebuild
copy to x11-wm/qtile/qtile-0.12.0.ebuild
index fc96c05526e..5ba9a093204 100644
--- a/x11-wm/qtile/qtile-9999.ebuild
+++ b/x11-wm/qtile/qtile-0.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -34,15 +34,25 @@ RDEPEND="
"
DEPEND="${RDEPEND}
test? (
- dev-python/nose[${PYTHON_USEDEP}]
- x11-base/xorg-server[kdrive]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-cov[${PYTHON_USEDEP}]
+ dev-python/xvfbwrapper[${PYTHON_USEDEP}]
+ x11-base/xorg-server[xephyr]
+ x11-apps/xeyes
+ x11-apps/xcalc
+ x11-apps/xclock
)
"
+# display retry backoff slowness and failures
RESTRICT="test"
+PATCHES=( "${FILESDIR}"/${PN}-0.12.0-tests.patch )
+
python_test() {
- VIRTUALX_COMMAND="nosetests" virtualmake
+ # force usage of built module
+ rm -rf "${S}"/libqtile || die
+ PYTHONPATH="${BUILD_DIR}/lib" py.test -v "${S}"/test || die "tests failed under ${EPYTHON}"
}
python_install_all() {
diff --git a/x11-wm/qtile/qtile-9999.ebuild b/x11-wm/qtile/qtile-9999.ebuild
index fc96c05526e..5ba9a093204 100644
--- a/x11-wm/qtile/qtile-9999.ebuild
+++ b/x11-wm/qtile/qtile-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -34,15 +34,25 @@ RDEPEND="
"
DEPEND="${RDEPEND}
test? (
- dev-python/nose[${PYTHON_USEDEP}]
- x11-base/xorg-server[kdrive]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-cov[${PYTHON_USEDEP}]
+ dev-python/xvfbwrapper[${PYTHON_USEDEP}]
+ x11-base/xorg-server[xephyr]
+ x11-apps/xeyes
+ x11-apps/xcalc
+ x11-apps/xclock
)
"
+# display retry backoff slowness and failures
RESTRICT="test"
+PATCHES=( "${FILESDIR}"/${PN}-0.12.0-tests.patch )
+
python_test() {
- VIRTUALX_COMMAND="nosetests" virtualmake
+ # force usage of built module
+ rm -rf "${S}"/libqtile || die
+ PYTHONPATH="${BUILD_DIR}/lib" py.test -v "${S}"/test || die "tests failed under ${EPYTHON}"
}
python_install_all() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/qtile/files/, x11-wm/qtile/
@ 2020-07-30 12:38 Mikle Kolyada
0 siblings, 0 replies; 6+ messages in thread
From: Mikle Kolyada @ 2020-07-30 12:38 UTC (permalink / raw
To: gentoo-commits
commit: ca1854b7542c26505fb069357eb769b874778ada
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 30 12:38:34 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Jul 30 12:38:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca1854b7
x11-wm/qtile: Drop old
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
x11-wm/qtile/Manifest | 1 -
x11-wm/qtile/files/qtile-0.12.0-tests.patch | 15 -------
x11-wm/qtile/qtile-0.14.2-r1.ebuild | 65 -----------------------------
3 files changed, 81 deletions(-)
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index bd270165d4d..954a439a8bf 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1,3 +1,2 @@
-DIST qtile-0.14.2.tar.gz 492274 BLAKE2B b5418424a4cea6844d500ea00b4fa5c4b93d529503a3ece1f651c82cd1c63689d8ba95a706fd97e7d93cf823a6155196d724f18e47f9fe283e4df2586e55b56f SHA512 c6653e8dca24cef4b1cf48c26b2a0feb4bc125a1c966e0a3ea078fd1d1bba9c7306facf620438795aa2d2daecbd6e58bcda954753ab6b27f6c0cbead3766d8c0
DIST qtile-0.15.1.tar.gz 522233 BLAKE2B cb5c35ab6b2e22d36c2ef69a3d6367033440a25a1c06dad5c4d455b67aa1ddf2c639451e051abcd40b5a76e93250a54271408bbe09008b44a5ebf0a520b3eb2e SHA512 57dfeeea212346c14b922303b5d2fd950292383a1da3be6bf5ca0880bedaa3adb7ffc121df617cf763fcd1208c44e34a7ba128a1f2a6e8d3042dd6906ece7e20
DIST qtile-0.16.0.tar.gz 543646 BLAKE2B d0d2ae1bf44e08c7a40601fee0643fb387807546ebee5ab6f6756d7651be22fff75034227226fe978042b33594158b5493ca6203ecab92434418219a423a5817 SHA512 c8f712fcf48f166be0782560541d02959809f5c7d6ee209e3bf0b12325309521be79eab81e4f17f5111fb9426601ac5445db0bb3dc8330e9b426fa1031e95065
diff --git a/x11-wm/qtile/files/qtile-0.12.0-tests.patch b/x11-wm/qtile/files/qtile-0.12.0-tests.patch
deleted file mode 100644
index 8443381b176..00000000000
--- a/x11-wm/qtile/files/qtile-0.12.0-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-The '~' character doesn't expand to $HOME in all build envs.
-
---- qtile-0.12.0/test/test_bar.py
-+++ qtile-0.12.0/test/test_bar.py
-@@ -105,8 +105,8 @@
- assert c.complete("/bi") == "/bin/"
- c.reset()
- assert c.complete("/bin") != "/bin/"
-- c.reset()
-- assert c.complete("~") != "~"
-+ #c.reset()
-+ #assert c.complete("~") != "~"
-
- c.reset()
- s = "thisisatotallynonexistantpathforsure"
diff --git a/x11-wm/qtile/qtile-0.14.2-r1.ebuild b/x11-wm/qtile/qtile-0.14.2-r1.ebuild
deleted file mode 100644
index 0a9cd75b50d..00000000000
--- a/x11-wm/qtile/qtile-0.14.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1 virtualx
-
-if [[ ${PV} == 9999* ]] ; then
- EGIT_REPO_URI="https://github.com/qtile/qtile.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/qtile/qtile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
-HOMEPAGE="http://qtile.org/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-# docs require sphinxcontrib-blockdiag and sphinxcontrib-seqdiag
-
-RDEPEND="
- x11-libs/cairo[X,xcb(+)]
- x11-libs/pango
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
- >=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.4.1[${PYTHON_USEDEP}]
- >=dev-python/xcffib-0.8.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/xvfbwrapper[${PYTHON_USEDEP}]
- x11-base/xorg-server[xephyr]
- x11-apps/xeyes
- x11-apps/xcalc
- x11-apps/xclock
- )
-"
-
-# display retry backoff slowness and failures
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.12.0-tests.patch )
-
-python_test() {
- # force usage of built module
- rm -rf "${S}"/libqtile || die
- PYTHONPATH="${BUILD_DIR}/lib" py.test -v "${S}"/test || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
- local DOCS=( CHANGELOG README.rst )
- distutils-r1_python_install_all
-
- insinto /usr/share/xsessions
- doins resources/qtile.desktop
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}-session ${PN}
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/qtile/files/, x11-wm/qtile/
@ 2022-05-19 1:09 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-05-19 1:09 UTC (permalink / raw
To: gentoo-commits
commit: cd62e1953a2c3b84280308b57848cc47c6fdcfec
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 01:07:24 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 19 01:09:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd62e195
x11-wm/qtile: add 0.21.0
Notably no Wayland glue added yet as it's automagic by the looks of it
(see bug for details).
Some of the bits were based on the ebuild posted in bug (which itself
is from flacjacket overlay).
Bug: https://bugs.gentoo.org/846380
Closes: https://bugs.gentoo.org/846362
Closes: https://bugs.gentoo.org/809251
Thanks-to: Sean Vig <sean.v.775 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-wm/qtile/Manifest | 1 +
x11-wm/qtile/files/qtile.desktop | 6 ++++
x11-wm/qtile/qtile-0.21.0.ebuild | 69 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 76 insertions(+)
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index a8500cbec56b..aac5206b1051 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1,2 +1,3 @@
DIST qtile-0.16.1.tar.gz 324668 BLAKE2B 1f75f5dbcab6180dcf778e28108e70b6dd01105fa275aadf4a53d96ab84f3b759cb8553bcf3de2011b0990d61adc9269663afa32b83d1aa9c052b00ef9e89358 SHA512 aea42f7f6799a88b586167a57f5b5ab6f1c5bb663dec352d15eb47ce0d37fb23c31d1631cab8178c71be5ae714ec12c35a350377383dba1749a98cd45c22515b
DIST qtile-0.17.0.tar.gz 336235 BLAKE2B f2290ab823b31cd8ed512f076018a8df19bbfedbb7d5c6932eee7cd46c341a08af04ed0d99f4391d1b3ccc07eb33015bbf0050c1c5d749bace4fb6dcfcb71ac9 SHA512 bfe51aabef2d48693c5bb7525cf67b1bb99cf3af5a653cd81d523e5adaa4767a43e7a87db14f9b85fae3a9e414af41a2e66736556eb1552d099755ba6f39caeb
+DIST qtile-0.21.0.tar.gz 475428 BLAKE2B 8c63eb8776fb6feab30c7ee2a19e6f28df6715fc18b09c63b89de6bf2129cd3c5c516d0c9efc946f24590fa8afc6e87c704c8e3b7094d0843b5b6e34df57ca18 SHA512 b7c5fc478180413e263445316ac9560c1d22668194415c3e4edae5c672f4b317fd978083dc9a985f0d145aeaaa55ffab0017e83af963f30d8b36f9963e12b079
diff --git a/x11-wm/qtile/files/qtile.desktop b/x11-wm/qtile/files/qtile.desktop
new file mode 100644
index 000000000000..5b00f85a88c0
--- /dev/null
+++ b/x11-wm/qtile/files/qtile.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Qtile
+Comment=Qtile Wayland Session
+Exec=qtile start -b wayland
+Type=Application
+Keywords=wm;tiling
diff --git a/x11-wm/qtile/qtile-0.21.0.ebuild b/x11-wm/qtile/qtile-0.21.0.ebuild
new file mode 100644
index 000000000000..d219eaf9e16c
--- /dev/null
+++ b/x11-wm/qtile/qtile-0.21.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
+HOMEPAGE="http://qtile.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
+ >=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
+ dev-python/dbus-next[${PYTHON_USEDEP}]
+ dev-python/pygobject[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ >=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+ >=dev-python/xcffib-0.10.1[${PYTHON_USEDEP}]
+ media-sound/pulseaudio
+ x11-libs/cairo[X,xcb(+)]
+ x11-libs/libnotify[introspection]
+ x11-libs/pango"
+BDEPEND="test? ( x11-base/xorg-server[xephyr] )"
+
+EPYTEST_DESELECT=(
+ # Can't find built qtile like migrate
+ test/test_qtile_cmd.py::test_qtile_cmd
+ test/test_qtile_cmd.py::test_display_kb
+)
+
+EPYTEST_IGNORE=(
+ # Tries to find binary and fails; not worth running anyway?
+ test/test_migrate.py
+)
+
+distutils_enable_tests pytest
+
+src_test() {
+ virtx distutils-r1_src_test
+}
+
+python_test() {
+ # Force usage of built module
+ rm -rf "${S}"/libqtile || die
+
+ epytest || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ local DOCS=( CHANGELOG README.rst )
+ distutils-r1_python_install_all
+
+ insinto /usr/share/xsessions
+ doins resources/qtile.desktop
+
+ insinto /usr/share/wayland-sessions
+ doins "${FILESDIR}"/qtile.desktop
+
+ exeinto /etc/X11/Sessions
+ newexe "${FILESDIR}"/${PN}-session ${PN}
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/qtile/files/, x11-wm/qtile/
@ 2022-05-20 0:05 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-05-20 0:05 UTC (permalink / raw
To: gentoo-commits
commit: ecff68f05e82355c7c82b448bf1b17fce957ed6b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 20 00:04:08 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 20 00:05:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecff68f0
x11-wm/qtile: fix X session args
Closes: https://bugs.gentoo.org/846509
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-wm/qtile/files/qtile-session-r1 | 89 ++++++++++++++++++++++
...{qtile-0.21.0.ebuild => qtile-0.21.0-r1.ebuild} | 2 +-
2 files changed, 90 insertions(+), 1 deletion(-)
diff --git a/x11-wm/qtile/files/qtile-session-r1 b/x11-wm/qtile/files/qtile-session-r1
new file mode 100644
index 000000000000..f16591c87044
--- /dev/null
+++ b/x11-wm/qtile/files/qtile-session-r1
@@ -0,0 +1,89 @@
+#!/bin/sh
+# qtile Xsession starter, based on Xsession from x11-apps/xinit
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.qtile-errors" "${TMPDIR-/tmp}/qtile-$USER" "/tmp/qtile-$USER"
+do
+ if ( cp /dev/null "$errfile" 2> /dev/null )
+ then
+ chmod 600 "$errfile"
+ exec > "$errfile" 2>&1
+ break
+ fi
+done
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources
+sysmodmap=/etc/X11/Xmodmap
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources
+rh6sysmodmap=/etc/X11/xinit/Xmodmap
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+ xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+ xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+ xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+ setxkbmap `cat "$sysxkbmap"`
+ XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+ setxkbmap `cat "$userxkbmap"`
+ XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+ if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+ xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config /etc/X11/xorg.conf`
+ if [ -n "$xkbsymbols" ]; then
+ setxkbmap -symbols "$xkbsymbols"
+ XKB_IN_USE=yes
+ fi
+ fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+ if [ -f "$rh6sysmodmap" ]; then
+ xmodmap "$rh6sysmodmap"
+ fi
+
+ if [ -f "$sysmodmap" ]; then
+ xmodmap "$sysmodmap"
+ fi
+
+ if [ -f "$usermodmap" ]; then
+ xmodmap "$usermodmap"
+ fi
+fi
+
+unset XKB_IN_USE
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+ for i in /etc/X11/xinit/xinitrc.d/* ; do
+ if [ -x "$i" ]; then
+ . "$i"
+ fi
+ done
+fi
+
+exec /usr/bin/qtile start
diff --git a/x11-wm/qtile/qtile-0.21.0.ebuild b/x11-wm/qtile/qtile-0.21.0-r1.ebuild
similarity index 97%
rename from x11-wm/qtile/qtile-0.21.0.ebuild
rename to x11-wm/qtile/qtile-0.21.0-r1.ebuild
index d219eaf9e16c..9e07d2b6ddc8 100644
--- a/x11-wm/qtile/qtile-0.21.0.ebuild
+++ b/x11-wm/qtile/qtile-0.21.0-r1.ebuild
@@ -65,5 +65,5 @@ python_install_all() {
doins "${FILESDIR}"/qtile.desktop
exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}-session ${PN}
+ newexe "${FILESDIR}"/${PN}-session-r1 ${PN}
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/qtile/files/, x11-wm/qtile/
@ 2022-11-15 18:22 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2022-11-15 18:22 UTC (permalink / raw
To: gentoo-commits
commit: 57e361dc77b4fd3061bddb0676e9607a877f0439
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 18:21:42 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 18:21:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57e361dc
x11-wm/qtile: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
x11-wm/qtile/Manifest | 1 -
x11-wm/qtile/files/qtile-session | 89 -------------------------------------
x11-wm/qtile/qtile-0.17.0-r1.ebuild | 48 --------------------
3 files changed, 138 deletions(-)
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index 6f351dc9b41d..23e4e78ebf39 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1,2 +1 @@
-DIST qtile-0.17.0.tar.gz 336235 BLAKE2B f2290ab823b31cd8ed512f076018a8df19bbfedbb7d5c6932eee7cd46c341a08af04ed0d99f4391d1b3ccc07eb33015bbf0050c1c5d749bace4fb6dcfcb71ac9 SHA512 bfe51aabef2d48693c5bb7525cf67b1bb99cf3af5a653cd81d523e5adaa4767a43e7a87db14f9b85fae3a9e414af41a2e66736556eb1552d099755ba6f39caeb
DIST qtile-0.21.0.tar.gz 475428 BLAKE2B 8c63eb8776fb6feab30c7ee2a19e6f28df6715fc18b09c63b89de6bf2129cd3c5c516d0c9efc946f24590fa8afc6e87c704c8e3b7094d0843b5b6e34df57ca18 SHA512 b7c5fc478180413e263445316ac9560c1d22668194415c3e4edae5c672f4b317fd978083dc9a985f0d145aeaaa55ffab0017e83af963f30d8b36f9963e12b079
diff --git a/x11-wm/qtile/files/qtile-session b/x11-wm/qtile/files/qtile-session
deleted file mode 100644
index 56a96ddd79ea..000000000000
--- a/x11-wm/qtile/files/qtile-session
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-# qtile Xsession starter, based on Xsession from x11-apps/xinit
-
-# redirect errors to a file in user's home directory if we can
-for errfile in "$HOME/.qtile-errors" "${TMPDIR-/tmp}/qtile-$USER" "/tmp/qtile-$USER"
-do
- if ( cp /dev/null "$errfile" 2> /dev/null )
- then
- chmod 600 "$errfile"
- exec > "$errfile" 2>&1
- break
- fi
-done
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-userxkbmap=$HOME/.Xkbmap
-
-sysresources=/etc/X11/Xresources
-sysmodmap=/etc/X11/Xmodmap
-sysxkbmap=/etc/X11/Xkbmap
-
-rh6sysresources=/etc/X11/xinit/Xresources
-rh6sysmodmap=/etc/X11/xinit/Xmodmap
-
-# merge in defaults
-if [ -f "$rh6sysresources" ]; then
- xrdb -merge "$rh6sysresources"
-fi
-
-if [ -f "$sysresources" ]; then
- xrdb -merge "$sysresources"
-fi
-
-if [ -f "$userresources" ]; then
- xrdb -merge "$userresources"
-fi
-
-# merge in keymaps
-if [ -f "$sysxkbmap" ]; then
- setxkbmap `cat "$sysxkbmap"`
- XKB_IN_USE=yes
-fi
-
-if [ -f "$userxkbmap" ]; then
- setxkbmap `cat "$userxkbmap"`
- XKB_IN_USE=yes
-fi
-
-#
-# Eeek, this seems like too much magic here
-#
-if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
- if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
- xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config /etc/X11/xorg.conf`
- if [ -n "$xkbsymbols" ]; then
- setxkbmap -symbols "$xkbsymbols"
- XKB_IN_USE=yes
- fi
- fi
-fi
-
-# xkb and xmodmap don't play nice together
-if [ -z "$XKB_IN_USE" ]; then
- if [ -f "$rh6sysmodmap" ]; then
- xmodmap "$rh6sysmodmap"
- fi
-
- if [ -f "$sysmodmap" ]; then
- xmodmap "$sysmodmap"
- fi
-
- if [ -f "$usermodmap" ]; then
- xmodmap "$usermodmap"
- fi
-fi
-
-unset XKB_IN_USE
-
-# run all system xinitrc shell scripts.
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
- for i in /etc/X11/xinit/xinitrc.d/* ; do
- if [ -x "$i" ]; then
- . "$i"
- fi
- done
-fi
-
-exec /usr/bin/qtile
diff --git a/x11-wm/qtile/qtile-0.17.0-r1.ebuild b/x11-wm/qtile/qtile-0.17.0-r1.ebuild
deleted file mode 100644
index c2ca4b7e04ec..000000000000
--- a/x11-wm/qtile/qtile-0.17.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
-HOMEPAGE="http://qtile.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-
-RESTRICT="test"
-
-# requires internet and specific
-# pulseaudio settings
-
-RDEPEND="
- x11-libs/cairo[X,xcb(+)]
- x11-libs/pango
- x11-libs/libnotify[introspection]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- >=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
- >=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
- dev-python/pygobject[${PYTHON_USEDEP}]
- >=dev-python/six-1.4.1[${PYTHON_USEDEP}]
- >=dev-python/xcffib-0.8.1[${PYTHON_USEDEP}]
- media-sound/pulseaudio
-"
-
-python_install_all() {
- local DOCS=( CHANGELOG README.rst )
- distutils-r1_python_install_all
-
- insinto /usr/share/xsessions
- doins resources/qtile.desktop
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}-session ${PN}
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/qtile/files/, x11-wm/qtile/
@ 2022-12-24 7:55 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-12-24 7:55 UTC (permalink / raw
To: gentoo-commits
commit: a2c106a2f01fcb3bdc49ad0c5d9171eee0fdbdf2
Author: Charbel Assaad <sydiepus <AT> gmail <DOT> com>
AuthorDate: Wed Oct 12 09:55:28 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 07:55:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2c106a2
x11-wm/qtile: add 0.22.1, 9999
- Add 0.22.1
- Add 9999
- Use qtile-wayland.desktop provided by the package instead of the one provided by the ebuild for qtile-0.21.0-r1.ebuild
Signed-off-by: Charbel Assaad <sydiepus <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-wm/qtile/Manifest | 1 +
x11-wm/qtile/files/qtile.desktop | 6 ------
x11-wm/qtile/qtile-0.21.0-r1.ebuild | 2 +-
x11-wm/qtile/{qtile-0.21.0-r1.ebuild => qtile-0.22.1.ebuild} | 12 +++++++++---
x11-wm/qtile/{qtile-0.21.0-r1.ebuild => qtile-9999.ebuild} | 12 +++++++++---
5 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index 23e4e78ebf39..75d09b99af46 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1 +1,2 @@
DIST qtile-0.21.0.tar.gz 475428 BLAKE2B 8c63eb8776fb6feab30c7ee2a19e6f28df6715fc18b09c63b89de6bf2129cd3c5c516d0c9efc946f24590fa8afc6e87c704c8e3b7094d0843b5b6e34df57ca18 SHA512 b7c5fc478180413e263445316ac9560c1d22668194415c3e4edae5c672f4b317fd978083dc9a985f0d145aeaaa55ffab0017e83af963f30d8b36f9963e12b079
+DIST qtile-0.22.1.tar.gz 488969 BLAKE2B 3b2fce587ae39570997b503cb386314160dbefa39b1ef65dc2ff5bc2f1167251224a0f298ef8e374d0d4c034d1e5012251f96b92ce5cb74d7fd93320e14ff8bf SHA512 944ec27b5d227154624fa2a15a0840b748307a1e79ab52ccf3384763111459b3c4d26b4677f8e2ea51634206dc6d1e32e057e057db917b3705ce583d83a8056d
diff --git a/x11-wm/qtile/files/qtile.desktop b/x11-wm/qtile/files/qtile.desktop
deleted file mode 100644
index 5b00f85a88c0..000000000000
--- a/x11-wm/qtile/files/qtile.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Qtile
-Comment=Qtile Wayland Session
-Exec=qtile start -b wayland
-Type=Application
-Keywords=wm;tiling
diff --git a/x11-wm/qtile/qtile-0.21.0-r1.ebuild b/x11-wm/qtile/qtile-0.21.0-r1.ebuild
index 4bdd86e614c8..139993950102 100644
--- a/x11-wm/qtile/qtile-0.21.0-r1.ebuild
+++ b/x11-wm/qtile/qtile-0.21.0-r1.ebuild
@@ -66,7 +66,7 @@ python_install_all() {
doins resources/qtile.desktop
insinto /usr/share/wayland-sessions
- doins "${FILESDIR}"/qtile.desktop
+ doins resources/qtile-wayland.desktop
exeinto /etc/X11/Sessions
newexe "${FILESDIR}"/${PN}-session-r1 ${PN}
diff --git a/x11-wm/qtile/qtile-0.21.0-r1.ebuild b/x11-wm/qtile/qtile-0.22.1.ebuild
similarity index 87%
copy from x11-wm/qtile/qtile-0.21.0-r1.ebuild
copy to x11-wm/qtile/qtile-0.22.1.ebuild
index 4bdd86e614c8..11d0d1fd538d 100644
--- a/x11-wm/qtile/qtile-0.21.0-r1.ebuild
+++ b/x11-wm/qtile/qtile-0.22.1.ebuild
@@ -10,11 +10,17 @@ inherit distutils-r1 virtualx
DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
HOMEPAGE="http://qtile.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/qtile/qtile.git"
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~riscv ~x86"
+fi
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
RDEPEND=">=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
>=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
@@ -66,7 +72,7 @@ python_install_all() {
doins resources/qtile.desktop
insinto /usr/share/wayland-sessions
- doins "${FILESDIR}"/qtile.desktop
+ doins resources/qtile-wayland.desktop
exeinto /etc/X11/Sessions
newexe "${FILESDIR}"/${PN}-session-r1 ${PN}
diff --git a/x11-wm/qtile/qtile-0.21.0-r1.ebuild b/x11-wm/qtile/qtile-9999.ebuild
similarity index 87%
copy from x11-wm/qtile/qtile-0.21.0-r1.ebuild
copy to x11-wm/qtile/qtile-9999.ebuild
index 4bdd86e614c8..11d0d1fd538d 100644
--- a/x11-wm/qtile/qtile-0.21.0-r1.ebuild
+++ b/x11-wm/qtile/qtile-9999.ebuild
@@ -10,11 +10,17 @@ inherit distutils-r1 virtualx
DESCRIPTION="A full-featured, hackable tiling window manager written in Python"
HOMEPAGE="http://qtile.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/qtile/qtile.git"
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~riscv ~x86"
+fi
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
RDEPEND=">=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
>=dev-python/cffi-1.1.0[${PYTHON_USEDEP}]
@@ -66,7 +72,7 @@ python_install_all() {
doins resources/qtile.desktop
insinto /usr/share/wayland-sessions
- doins "${FILESDIR}"/qtile.desktop
+ doins resources/qtile-wayland.desktop
exeinto /etc/X11/Sessions
newexe "${FILESDIR}"/${PN}-session-r1 ${PN}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-12-24 7:55 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-19 1:09 [gentoo-commits] repo/gentoo:master commit in: x11-wm/qtile/files/, x11-wm/qtile/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-12-24 7:55 Sam James
2022-11-15 18:22 Michał Górny
2022-05-20 0:05 Sam James
2020-07-30 12:38 Mikle Kolyada
2018-09-18 21:23 Tim Harder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox