* [gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/, x11-wm/i3/files/
@ 2017-05-08 20:01 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2017-05-08 20:01 UTC (permalink / raw
To: gentoo-commits
commit: cacee360e28112a11456d7fd70b964f3016fb26f
Author: tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Fri Jan 13 12:49:35 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 8 20:01:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cacee360
x11-wm/i3: remove git polling
Closes: https://github.com/gentoo/gentoo/pull/3450
Package-Manager: portage-2.3.0
x11-wm/i3/files/i3-4.13-remove-git-polling.patch | 19 +++++++++++++++++++
x11-wm/i3/i3-4.13-r1.ebuild | 3 +++
2 files changed, 22 insertions(+)
diff --git a/x11-wm/i3/files/i3-4.13-remove-git-polling.patch b/x11-wm/i3/files/i3-4.13-remove-git-polling.patch
new file mode 100644
index 00000000000..ca226378ed7
--- /dev/null
+++ b/x11-wm/i3/files/i3-4.13-remove-git-polling.patch
@@ -0,0 +1,19 @@
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac 2017-01-13 13:31:25.250216293 +0100
++++ b/configure.ac 2017-01-13 13:31:55.930217956 +0100
+@@ -146,15 +146,6 @@
+ print_BUILD_MANS=no
+ fi
+
+-git_dir=`git rev-parse --git-dir 2>/dev/null`
+-if test -n "$git_dir"; then
+- srcdir=`dirname "$git_dir"`
+- exclude_dir=`pwd | sed "s,^$srcdir,,g"`
+- if ! grep -q "^$exclude_dir" "$git_dir/info/exclude"; then
+- echo "$exclude_dir" >> "$git_dir/info/exclude"
+- fi
+-fi
+-
+ echo \
+ "--------------------------------------------------------------------------------
+ build configured:
diff --git a/x11-wm/i3/i3-4.13-r1.ebuild b/x11-wm/i3/i3-4.13-r1.ebuild
index bcdf6f235b6..2311d42860a 100644
--- a/x11-wm/i3/i3-4.13-r1.ebuild
+++ b/x11-wm/i3/i3-4.13-r1.ebuild
@@ -36,6 +36,9 @@ RDEPEND="${CDEPEND}
dev-perl/JSON-XS"
DOCS=( RELEASE-NOTES-${PV} )
+PATCHES=(
+ "${FILESDIR}/${P}-remove-git-polling.patch"
+)
src_prepare() {
default
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/, x11-wm/i3/files/
@ 2017-07-28 11:33 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2017-07-28 11:33 UTC (permalink / raw
To: gentoo-commits
commit: a3dbdbc5eefa388846591a72ec6a48bfa2db82a9
Author: Nelo-T. Wallus <nelo <AT> wallus <DOT> de>
AuthorDate: Thu Jul 13 19:17:15 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jul 28 11:33:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3dbdbc5
x11-wm/i3: Add GLOB_TILDE patch for musl
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/5230
x11-wm/i3/files/i3-musl-GLOB_TILDE.patch | 86 ++++++++++++++++++++++++++++++++
x11-wm/i3/i3-4.13-r1.ebuild | 1 +
x11-wm/i3/i3-9999.ebuild | 6 ++-
3 files changed, 92 insertions(+), 1 deletion(-)
diff --git a/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch b/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch
new file mode 100644
index 00000000000..d241a748186
--- /dev/null
+++ b/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch
@@ -0,0 +1,86 @@
+From: Natanael Copa <ncopa@alpinelinux.org>
+Patch-Source: https://git.alpinelinux.org/cgit/aports/tree/community/i3wm/musl.patch
+Project-Bug-URL: https://github.com/i3/i3/issues/1859
+Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=609306
+
+Musl doesn't implement GLOB_TILDE, which is used by i3 when expanding paths.
+
+This patch replaces usage of GLOB_TILDE in glob() by replacing tilde
+with the content of $HOME - if set - manually.
+
+As mentioned in the i3 bugtracker this is an issue that should be solved by musl.
+
+A patch has been sent to musl upstream, but it hasn't been merged yet:
+http://www.openwall.com/lists/musl/2017/01/17/1
+---
+--- i3-4.11/i3bar/src/main.c
++++ i3-4.11/i3bar/src/main.c
+@@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) {
+ *
+ */
+ char *expand_path(char *path) {
+- static glob_t globbuf;
+- if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
+- ELOG("glob() failed\n");
+- exit(EXIT_FAILURE);
++ char *home, *expanded;
++
++ if (strncmp(path, "~/", 2) == 0) {
++ home = getenv("HOME");
++ if (home != NULL) {
++ /* new length: sum - 1 (omit '~') + 1 (for '\0') */
++ expanded = scalloc(strlen(home)+strlen(path), 1);
++ strcpy(expanded, home);
++ strcat(expanded, path+1);
++ return expanded;
++ }
+ }
+- char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
+- globfree(&globbuf);
+- return result;
++
++ return sstrdup(path);
+ }
+
+ void print_usage(char *elf_name) {
+--- i3-4.11/libi3/resolve_tilde.c
++++ i3-4.11/libi3/resolve_tilde.c
+@@ -19,27 +19,18 @@
+ *
+ */
+ char *resolve_tilde(const char *path) {
+- static glob_t globbuf;
+- char *head, *tail, *result;
++ char *home, *expanded;
+
+- tail = strchr(path, '/');
+- head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
+-
+- int res = glob(head, GLOB_TILDE, NULL, &globbuf);
+- free(head);
+- /* no match, or many wildcard matches are bad */
+- if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
+- result = sstrdup(path);
+- else if (res != 0) {
+- err(EXIT_FAILURE, "glob() failed");
+- } else {
+- head = globbuf.gl_pathv[0];
+- result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
+- strncpy(result, head, strlen(head));
+- if (tail)
+- strncat(result, tail, strlen(tail));
++ if (strncmp(path, "~/", 2) == 0) {
++ home = getenv("HOME");
++ if (home != NULL) {
++ /* new length: sum - 1 (omit '~') + 1 (for '\0') */
++ expanded = scalloc(strlen(home)+strlen(path), 1);
++ strcpy(expanded, home);
++ strcat(expanded, path+1);
++ return expanded;
++ }
+ }
+- globfree(&globbuf);
+
+- return result;
++ return sstrdup(path);
+ }
diff --git a/x11-wm/i3/i3-4.13-r1.ebuild b/x11-wm/i3/i3-4.13-r1.ebuild
index 2311d42860a..047df54a6e2 100644
--- a/x11-wm/i3/i3-4.13-r1.ebuild
+++ b/x11-wm/i3/i3-4.13-r1.ebuild
@@ -38,6 +38,7 @@ RDEPEND="${CDEPEND}
DOCS=( RELEASE-NOTES-${PV} )
PATCHES=(
"${FILESDIR}/${P}-remove-git-polling.patch"
+ "${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
)
src_prepare() {
diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
index 1e6ce9e0da2..09c27735f9e 100644
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -37,6 +37,10 @@ RDEPEND="${CDEPEND}
dev-perl/AnyEvent-I3
dev-perl/JSON-XS"
+PATCHES=(
+ "${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
+)
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/, x11-wm/i3/files/
@ 2018-11-08 9:49 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2018-11-08 9:49 UTC (permalink / raw
To: gentoo-commits
commit: 5e19b9fce12ec9abab5948ddfccaf74b620e93d9
Author: Nelo-T. Wallus <nelo <AT> wallus <DOT> de>
AuthorDate: Wed Nov 7 20:40:33 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Nov 8 09:49:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e19b9fc
x11-wm/i3: Bump to v4.16
Closes: https://bugs.gentoo.org/670570
Package-Manager: Portage-2.3.51, Repoman-2.3.10
Signed-off-by: Nelo-Thara Nahum Nathanael Wallus <nelo <AT> wallus.de>
Closes: https://github.com/gentoo/gentoo/pull/10357
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
x11-wm/i3/Manifest | 1 +
x11-wm/i3/files/i3-4.16-musl-GLOB_TILDE.patch | 86 ++++++++++++++++++++
x11-wm/i3/i3-4.16.ebuild | 110 ++++++++++++++++++++++++++
3 files changed, 197 insertions(+)
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 918f8f2a026..37fd66cefdd 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -2,3 +2,4 @@ DIST i3-4.13.tar.bz2 1121298 BLAKE2B 94f3940406d43083c8dc577b4216a32a08ad4c4b58e
DIST i3-4.14.1.tar.bz2 1173560 BLAKE2B 96a0e1d75be13098fd530c3970464ce7710063f517c0d538939de6e7c799ab6b3ec005fb50216b1db4ccefd44584c584b263ac359bd9a86be53418d8f8d4beba SHA512 ef628af002947b40e1c88b0e872c6e93d4377a9674a120bd9adc3f323a38570b05124cd3047b5a26659e72070de2d00d83fb93186510c74ad8ddbf4f3df85472
DIST i3-4.14.tar.gz 3936748 BLAKE2B 42678130be56bc695e5700e978ddbd34bfdaeda7a65252a05568581d76fe613e80e710f3a507110e7988077fe62048bf984d4009e722d877b178206cef600221 SHA512 fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
DIST i3-4.15.tar.bz2 1196263 BLAKE2B 36f20327202957dba30aface91af4d2c6261979e726584712a508a11cb4a612d812e771dc9f28ec4cfcbf3ebc9d92c72f5e940048516cca0f185eab20f95ae32 SHA512 60ab61b7e380342126bea12fb4371f98fcf18f6435f79a9519d3f59cfabdb170634366036e1aa20c5592da0832b03140ad1f0c72bad3cfaace0b7c57ad01dfc4
+DIST i3-4.16.tar.bz2 1213251 BLAKE2B a65d15278a83bac9903a611628ea53c64cd554ab9fff2a8864e649fd962858b2f3e77fe69d0dc70affc93dc69b3cbbd7b3ee670a2af9d697e28e9e4ea3323f67 SHA512 99abd15349ee8e61c084b3664ef3a189c92ea07812ac59eb6a5441df7cebea8211be52204e39bddcc33d8c714447fddbbe2c5c8a25b756a96e2dc6732526cbf8
diff --git a/x11-wm/i3/files/i3-4.16-musl-GLOB_TILDE.patch b/x11-wm/i3/files/i3-4.16-musl-GLOB_TILDE.patch
new file mode 100644
index 00000000000..1e67ec2a3c4
--- /dev/null
+++ b/x11-wm/i3/files/i3-4.16-musl-GLOB_TILDE.patch
@@ -0,0 +1,86 @@
+From: Natanael Copa <ncopa@alpinelinux.org>
+Patch-Source: https://git.alpinelinux.org/cgit/aports/tree/community/i3wm/musl.patch
+Project-Bug-URL: https://github.com/i3/i3/issues/1859
+Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=609306
+
+Musl doesn't implement GLOB_TILDE, which is used by i3 when expanding paths.
+
+This patch replaces usage of GLOB_TILDE in glob() by replacing tilde
+with the content of $HOME - if set - manually.
+
+As mentioned in the i3 bugtracker this is an issue that should be solved by musl.
+
+A patch has been sent to musl upstream, but it hasn't been merged yet:
+http://www.openwall.com/lists/musl/2017/01/17/1
+---
+--- a/i3bar/src/main.c
++++ b/i3bar/src/main.c
+@@ -48,14 +48,20 @@ void debuglog(char *fmt, ...) {
+ *
+ */
+ static char *expand_path(char *path) {
+- static glob_t globbuf;
+- if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
+- ELOG("glob() failed\n");
+- exit(EXIT_FAILURE);
++ char *home, *expanded;
++
++ if (strncmp(path, "~/", 2) == 0) {
++ home = getenv("HOME");
++ if (home != NULL) {
++ /* new length: sum - 1 (omit '~') + 1 (for '\0') */
++ expanded = scalloc(strlen(home)+strlen(path), 1);
++ strcpy(expanded, home);
++ strcat(expanded, path+1);
++ return expanded;
++ }
+ }
+- char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
+- globfree(&globbuf);
+- return result;
++
++ return sstrdup(path);
+ }
+
+ void print_usage(char *elf_name) {
+--- a/libi3/resolve_tilde.c
++++ b/libi3/resolve_tilde.c
+@@ -19,28 +19,18 @@
+ *
+ */
+ char *resolve_tilde(const char *path) {
+- static glob_t globbuf;
+- char *head, *tail, *result;
++ char *home, *expanded;
+
+- tail = strchr(path, '/');
+- head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
+-
+- int res = glob(head, GLOB_TILDE, NULL, &globbuf);
+- free(head);
+- /* no match, or many wildcard matches are bad */
+- if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
+- result = sstrdup(path);
+- else if (res != 0) {
+- err(EXIT_FAILURE, "glob() failed");
+- } else {
+- head = globbuf.gl_pathv[0];
+- result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
+- strcpy(result, head);
+- if (tail) {
+- strcat(result, tail);
++ if (strncmp(path, "~/", 2) == 0) {
++ home = getenv("HOME");
++ if (home != NULL) {
++ /* new length: sum - 1 (omit '~') + 1 (for '\0') */
++ expanded = scalloc(strlen(home)+strlen(path), 1);
++ strcpy(expanded, home);
++ strcat(expanded, path+1);
++ return expanded;
+ }
+ }
+- globfree(&globbuf);
+
+- return result;
++ return sstrdup(path);
+ }
diff --git a/x11-wm/i3/i3-4.16.ebuild b/x11-wm/i3/i3-4.16.ebuild
new file mode 100644
index 00000000000..270dae55f6a
--- /dev/null
+++ b/x11-wm/i3/i3-4.16.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools out-of-source virtualx
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="https://i3wm.org/"
+SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc debug test"
+
+CDEPEND="dev-libs/libev
+ dev-libs/libpcre
+ >=dev-libs/yajl-2.0.3
+ x11-libs/libxcb[xkb]
+ x11-libs/libxkbcommon[X]
+ x11-libs/startup-notification
+ x11-libs/xcb-util
+ x11-libs/xcb-util-cursor
+ x11-libs/xcb-util-keysyms
+ x11-libs/xcb-util-wm
+ x11-libs/xcb-util-xrm
+ x11-misc/xkeyboard-config
+ >=x11-libs/cairo-1.14.4[X,xcb]
+ >=x11-libs/pango-1.30.0[X]"
+DEPEND="${CDEPEND}
+ test? (
+ dev-perl/AnyEvent
+ >=dev-perl/X11-XCB-0.120.0
+ dev-perl/Inline
+ dev-perl/Inline-C
+ dev-perl/IPC-Run
+ dev-perl/ExtUtils-PkgConfig
+ dev-perl/local-lib
+ >=virtual/perl-Test-Simple-0.940.0
+ x11-base/xorg-server[xephyr]
+ )
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ dev-lang/perl
+ dev-perl/AnyEvent-I3
+ dev-perl/JSON-XS"
+
+# Test without debug will apply optimization levels, which results
+# in type-punned pointers - which in turn causes test failures.
+REQUIRED_USE="test? ( debug )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
+)
+
+# https://github.com/i3/i3/issues/3013
+RESTRICT="test"
+
+src_prepare() {
+ default
+
+ cat <<- EOF > "${T}"/i3wm
+ #!/bin/sh
+ exec /usr/bin/i3
+ EOF
+
+ eautoreconf
+}
+
+my_src_configure() {
+ local myeconfargs=(
+ $(use_enable debug)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+my_src_test() {
+ emake \
+ test.commands_parser \
+ test.config_parser \
+ test.inject_randr15
+
+ virtx perl \
+ -I "${S}/testcases/lib" \
+ -I "${BUILD_DIR}/testcases/lib" \
+ testcases/complete-run.pl
+}
+
+my_src_install_all() {
+ doman man/*.1
+
+ einstalldocs
+ use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
+
+ exeinto /etc/X11/Sessions
+ doexe "${T}/i3wm"
+}
+
+pkg_postinst() {
+ # Only show the elog information on a new install
+ if [[ ! ${REPLACING_VERSIONS} ]]; then
+ elog "There are several packages that you may find useful with ${PN} and"
+ elog "their usage is suggested by the upstream maintainers, namely:"
+ elog " x11-misc/dmenu"
+ elog " x11-misc/i3status"
+ elog " x11-misc/i3lock"
+ elog "Please refer to their description for additional info."
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/, x11-wm/i3/files/
@ 2019-03-26 8:58 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2019-03-26 8:58 UTC (permalink / raw
To: gentoo-commits
commit: bbdedd01a640f44a3d11dfc9fb3def8907260f64
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 08:54:57 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 08:58:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbdedd01
x11-wm/i3: Removed old.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
x11-wm/i3/Manifest | 2 -
x11-wm/i3/files/i3-4.13-remove-git-polling.patch | 19 ----
x11-wm/i3/i3-4.13-r1.ebuild | 88 -----------------
x11-wm/i3/i3-4.14.1.ebuild | 114 -----------------------
4 files changed, 223 deletions(-)
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 815dd064801..c2509315514 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,5 +1,3 @@
-DIST i3-4.13.tar.bz2 1121298 BLAKE2B 94f3940406d43083c8dc577b4216a32a08ad4c4b58e7707cc9e3129038f4d13043c1f86e8de03d0fdfcff73f0de582fc8b3c88d71c0161ac3eefe28329f67a64 SHA512 1bb1044e8d86e78d3ccb79d49f0eb26665dcd05a348058a5e57138151d74f57d77830efc3025893170fe1b8ec612f739f75247a427410f96286b09afd2c5f14c
-DIST i3-4.14.1.tar.bz2 1173560 BLAKE2B 96a0e1d75be13098fd530c3970464ce7710063f517c0d538939de6e7c799ab6b3ec005fb50216b1db4ccefd44584c584b263ac359bd9a86be53418d8f8d4beba SHA512 ef628af002947b40e1c88b0e872c6e93d4377a9674a120bd9adc3f323a38570b05124cd3047b5a26659e72070de2d00d83fb93186510c74ad8ddbf4f3df85472
DIST i3-4.14.tar.gz 3936748 BLAKE2B 42678130be56bc695e5700e978ddbd34bfdaeda7a65252a05568581d76fe613e80e710f3a507110e7988077fe62048bf984d4009e722d877b178206cef600221 SHA512 fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
DIST i3-4.15.tar.bz2 1196263 BLAKE2B 36f20327202957dba30aface91af4d2c6261979e726584712a508a11cb4a612d812e771dc9f28ec4cfcbf3ebc9d92c72f5e940048516cca0f185eab20f95ae32 SHA512 60ab61b7e380342126bea12fb4371f98fcf18f6435f79a9519d3f59cfabdb170634366036e1aa20c5592da0832b03140ad1f0c72bad3cfaace0b7c57ad01dfc4
DIST i3-4.16.1.tar.bz2 1211532 BLAKE2B 64a6996c0b89516069b58bf1cba92908a7f61ab04d66659b612b27411eb92fa9d49a7214eccdba33e7c33605b5f9247f69c1f0e23de629552edf113ab7520747 SHA512 3e328f8c7216697c5e484ca854605350f78844e24cc6cfb9c10e71368c2c0457387a14f819abdf8be2370d437889297f452fbf63f3924766ca81c157ab27e1b0
diff --git a/x11-wm/i3/files/i3-4.13-remove-git-polling.patch b/x11-wm/i3/files/i3-4.13-remove-git-polling.patch
deleted file mode 100644
index ca226378ed7..00000000000
--- a/x11-wm/i3/files/i3-4.13-remove-git-polling.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac 2017-01-13 13:31:25.250216293 +0100
-+++ b/configure.ac 2017-01-13 13:31:55.930217956 +0100
-@@ -146,15 +146,6 @@
- print_BUILD_MANS=no
- fi
-
--git_dir=`git rev-parse --git-dir 2>/dev/null`
--if test -n "$git_dir"; then
-- srcdir=`dirname "$git_dir"`
-- exclude_dir=`pwd | sed "s,^$srcdir,,g"`
-- if ! grep -q "^$exclude_dir" "$git_dir/info/exclude"; then
-- echo "$exclude_dir" >> "$git_dir/info/exclude"
-- fi
--fi
--
- echo \
- "--------------------------------------------------------------------------------
- build configured:
diff --git a/x11-wm/i3/i3-4.13-r1.ebuild b/x11-wm/i3/i3-4.13-r1.ebuild
deleted file mode 100644
index 2b809ac551d..00000000000
--- a/x11-wm/i3/i3-4.13-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc"
-
-CDEPEND="dev-libs/libev
- dev-libs/libpcre
- >=dev-libs/yajl-2.0.3
- x11-libs/libxcb[xkb]
- x11-libs/libxkbcommon[X]
- x11-libs/startup-notification
- x11-libs/xcb-util
- x11-libs/xcb-util-cursor
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-wm
- x11-libs/xcb-util-xrm
- >=x11-libs/cairo-1.14.4[X,xcb]
- >=x11-libs/pango-1.30.0[X]"
-DEPEND="${CDEPEND}
- doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- dev-lang/perl
- dev-perl/AnyEvent-I3
- dev-perl/JSON-XS"
-
-DOCS=( RELEASE-NOTES-${PV} )
-PATCHES=(
- "${FILESDIR}/${P}-remove-git-polling.patch"
- "${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
-)
-
-src_prepare() {
- default
- if ! use doc ; then
- sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die
- eautoreconf
- fi
- cat <<- EOF > "${T}"/i3wm
- #!/bin/sh
- exec /usr/bin/i3
- EOF
-}
-
-src_configure() {
- local myeconfargs=( --enable-debug=no ) # otherwise injects -O0 -g
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- emake -C "${CBUILD}"
-}
-
-src_install() {
- emake -C "${CBUILD}" DESTDIR="${D}" install
- if ! use doc ; then
- # install docs shipped with source tarball
- # local HTML_DOCS=( docs/. ) # TODO: install unconditionally?
- doman man/*.1
- fi
- einstalldocs
-
- exeinto /etc/X11/Sessions
- doexe "${T}"/i3wm
-}
-
-pkg_postinst() {
- # Only show the elog information on a new install
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- elog "There are several packages that you may find useful with ${PN} and"
- elog "their usage is suggested by the upstream maintainers, namely:"
- elog " x11-misc/dmenu"
- elog " x11-misc/i3status"
- elog " x11-misc/i3lock"
- elog "Please refer to their description for additional info."
- fi
-}
diff --git a/x11-wm/i3/i3-4.14.1.ebuild b/x11-wm/i3/i3-4.14.1.ebuild
deleted file mode 100644
index a10e0a5f9e4..00000000000
--- a/x11-wm/i3/i3-4.14.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-AEVER=0.17
-
-inherit autotools out-of-source virtualx
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc debug test"
-
-CDEPEND="dev-libs/libev
- dev-libs/libpcre
- >=dev-libs/yajl-2.0.3
- x11-libs/libxcb[xkb]
- x11-libs/libxkbcommon[X]
- x11-libs/startup-notification
- x11-libs/xcb-util
- x11-libs/xcb-util-cursor
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-wm
- x11-libs/xcb-util-xrm
- x11-misc/xkeyboard-config
- >=x11-libs/cairo-1.14.4[X,xcb]
- >=x11-libs/pango-1.30.0[X]"
-DEPEND="${CDEPEND}
- app-text/asciidoc
- doc? ( app-text/xmlto dev-lang/perl )
- test? (
- dev-perl/AnyEvent
- >=dev-perl/X11-XCB-0.120.0
- dev-perl/Inline
- dev-perl/Inline-C
- dev-perl/IPC-Run
- dev-perl/ExtUtils-PkgConfig
- dev-perl/local-lib
- >=virtual/perl-Test-Simple-0.940.0
- x11-base/xorg-server[xephyr]
- )
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- dev-lang/perl
- dev-perl/AnyEvent-I3
- dev-perl/JSON-XS"
-
-# Test without debug will apply optimization levels, which results
-# in type-punned pointers - which in turn causes test failures.
-REQUIRED_USE="test? ( debug )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
-)
-
-# https://github.com/i3/i3/issues/3013
-RESTRICT="test"
-
-src_prepare() {
- default
-
- cat <<- EOF > "${T}"/i3wm
- #!/bin/sh
- exec /usr/bin/i3
- EOF
-
- eautoreconf
-}
-
-my_src_configure() {
- local myeconfargs=(
- $(use_enable debug)
- )
- econf "${myeconfargs[@]}"
-}
-
-my_src_test() {
- emake \
- test.commands_parser \
- test.config_parser \
- test.inject_randr15
-
- virtx perl \
- -I "${S}/testcases/lib" \
- -I "${BUILD_DIR}/testcases/lib" \
- testcases/complete-run.pl
-}
-
-my_src_install_all() {
- doman man/*.1
-
- einstalldocs
- use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
-
- exeinto /etc/X11/Sessions
- doexe "${T}/i3wm"
-}
-
-pkg_postinst() {
- # Only show the elog information on a new install
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- elog "There are several packages that you may find useful with ${PN} and"
- elog "their usage is suggested by the upstream maintainers, namely:"
- elog " x11-misc/dmenu"
- elog " x11-misc/i3status"
- elog " x11-misc/i3lock"
- elog "Please refer to their description for additional info."
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/, x11-wm/i3/files/
@ 2020-11-17 10:29 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2020-11-17 10:29 UTC (permalink / raw
To: gentoo-commits
commit: d5a531d926baab352b03851f4856a92f30c43fe6
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 17 10:29:40 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Nov 17 10:29:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5a531d9
x11-wm/i3: Removed old
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
x11-wm/i3/Manifest | 4 --
x11-wm/i3/files/i3-musl-GLOB_TILDE.patch | 86 ------------------------
x11-wm/i3/i3-4.14-r1.ebuild | 103 -----------------------------
x11-wm/i3/i3-4.17.1-r1.ebuild | 110 -------------------------------
x11-wm/i3/i3-4.18.1.ebuild | 103 -----------------------------
x11-wm/i3/i3-4.18.2.ebuild | 103 -----------------------------
6 files changed, 509 deletions(-)
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 231429f4aa1..1f67acc92cd 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,7 +1,3 @@
-DIST i3-4.14.tar.gz 3936748 BLAKE2B 42678130be56bc695e5700e978ddbd34bfdaeda7a65252a05568581d76fe613e80e710f3a507110e7988077fe62048bf984d4009e722d877b178206cef600221 SHA512 fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
-DIST i3-4.17.1.tar.bz2 1218418 BLAKE2B eb798eee2b618691ceb47b72c08fe09b09e2913c17fe667fab95426069c86497bff67278bea5fc97fdf90ebdfc6574e68cad36b21036a63d053edced1edf8592 SHA512 af397dc1768ea6530e4b2ce8ef21b20ecff8ab9eebf380df224456173eea4c3bacf28b55c8efcdc70f76f0d66543c163564a94cfd66028221ace481fa3c2913f
-DIST i3-4.18.1.tar.bz2 1217703 BLAKE2B 469a6ac09004f95861655858c47d9e6b2f378152bec7b7c6e7b08f06ee387043b8e2c382f888f14daf806ae8764d934025118e997f072709eee23c5cc52de21d SHA512 b001f539b1daf78be6dd9335a7c0474d30f8d969f79d131391ebd9ca310a058a1cc1234e4a9e60552efd520fc4983571f3c0b8cbd7be978e45957daaf86b3e90
-DIST i3-4.18.2.tar.bz2 1218440 BLAKE2B 55fba66b2399730cb3bc63d76efff18a439aad755c943f06d7622bd7c4d91502b3750cff638b98ef86d6f99746bc1858ffbd9396e2d89a7220f513575879e08a SHA512 997c7cdf32f95ba25cfcd483a09f7e37e5219e4501baefa5c1865ddffd206bc9725211e4082663fab4174dc947b663ff454d343a7e30340ac3ea451f999417fc
DIST i3-4.18.3.tar.bz2 1218766 BLAKE2B c394bbe9882dc893107f0c948632a3a79c52db75b75b2890f6f43fa60d80ce82d1c8a8c32a8793f59d9a6f929ab038765dbe3813c3c6bc1b79bebbbbde772451 SHA512 61599b79247ec546819bab22666a78fc8dc77eecbcf6055efb6b52720290fa7f72719ac6670396a6dfb54858781e438b5207c15fdf2cf9e2424a1b84ffeb749c
DIST i3-4.18.tar.bz2 1218591 BLAKE2B 582b7ba3a54edf8dd2657add05eb54a64b7c004761a1a248d91dfcb061cb9df215ff35301c125b11aa69b571daeacd5732b498934c1fb17f69404a101fd16ec8 SHA512 0bbfda7f4b20a92a50ffb6abbfc3f6bfe6bb4c987ad4b5b1791192eb23b8c3389cc9949a699901797370c14de1ff8e12447a3b8ce330ab7d300fafdb60a432ec
DIST i3-4.19.tar.xz 1278600 BLAKE2B 3af5eac9cb618bc3b3da0bca430e1882701802f49e092d1e6fa7a35ceb3f2c0287b66eceeb0123a7dfda9976df06227bec34d7d98873aedc2292a2ba94584d84 SHA512 e9e85dfa099751e95f05e8ed5048535bc669d73c51d3bd7e83740ee79d613f981a1130c35f54fb4725b31d18bed63d6bd5efacce8e086483e28d7c778407653a
diff --git a/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch b/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch
deleted file mode 100644
index d241a748186..00000000000
--- a/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: Natanael Copa <ncopa@alpinelinux.org>
-Patch-Source: https://git.alpinelinux.org/cgit/aports/tree/community/i3wm/musl.patch
-Project-Bug-URL: https://github.com/i3/i3/issues/1859
-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=609306
-
-Musl doesn't implement GLOB_TILDE, which is used by i3 when expanding paths.
-
-This patch replaces usage of GLOB_TILDE in glob() by replacing tilde
-with the content of $HOME - if set - manually.
-
-As mentioned in the i3 bugtracker this is an issue that should be solved by musl.
-
-A patch has been sent to musl upstream, but it hasn't been merged yet:
-http://www.openwall.com/lists/musl/2017/01/17/1
----
---- i3-4.11/i3bar/src/main.c
-+++ i3-4.11/i3bar/src/main.c
-@@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) {
- *
- */
- char *expand_path(char *path) {
-- static glob_t globbuf;
-- if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
-- ELOG("glob() failed\n");
-- exit(EXIT_FAILURE);
-+ char *home, *expanded;
-+
-+ if (strncmp(path, "~/", 2) == 0) {
-+ home = getenv("HOME");
-+ if (home != NULL) {
-+ /* new length: sum - 1 (omit '~') + 1 (for '\0') */
-+ expanded = scalloc(strlen(home)+strlen(path), 1);
-+ strcpy(expanded, home);
-+ strcat(expanded, path+1);
-+ return expanded;
-+ }
- }
-- char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
-- globfree(&globbuf);
-- return result;
-+
-+ return sstrdup(path);
- }
-
- void print_usage(char *elf_name) {
---- i3-4.11/libi3/resolve_tilde.c
-+++ i3-4.11/libi3/resolve_tilde.c
-@@ -19,27 +19,18 @@
- *
- */
- char *resolve_tilde(const char *path) {
-- static glob_t globbuf;
-- char *head, *tail, *result;
-+ char *home, *expanded;
-
-- tail = strchr(path, '/');
-- head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
--
-- int res = glob(head, GLOB_TILDE, NULL, &globbuf);
-- free(head);
-- /* no match, or many wildcard matches are bad */
-- if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
-- result = sstrdup(path);
-- else if (res != 0) {
-- err(EXIT_FAILURE, "glob() failed");
-- } else {
-- head = globbuf.gl_pathv[0];
-- result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
-- strncpy(result, head, strlen(head));
-- if (tail)
-- strncat(result, tail, strlen(tail));
-+ if (strncmp(path, "~/", 2) == 0) {
-+ home = getenv("HOME");
-+ if (home != NULL) {
-+ /* new length: sum - 1 (omit '~') + 1 (for '\0') */
-+ expanded = scalloc(strlen(home)+strlen(path), 1);
-+ strcpy(expanded, home);
-+ strcat(expanded, path+1);
-+ return expanded;
-+ }
- }
-- globfree(&globbuf);
-
-- return result;
-+ return sstrdup(path);
- }
diff --git a/x11-wm/i3/i3-4.14-r1.ebuild b/x11-wm/i3/i3-4.14-r1.ebuild
deleted file mode 100644
index 8f1c907d1b1..00000000000
--- a/x11-wm/i3/i3-4.14-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-# iw3m.org tarball for 4.14 is broken, see https://github.com/i3/i3/issues/2905
-SRC_URI="https://github.com/i3/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc debug test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-libs/libev
- dev-libs/libpcre
- >=dev-libs/yajl-2.0.3
- x11-libs/libxcb[xkb]
- x11-libs/libxkbcommon[X]
- x11-libs/startup-notification
- x11-libs/xcb-util
- x11-libs/xcb-util-cursor
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-wm
- x11-libs/xcb-util-xrm
- >=x11-libs/cairo-1.14.4[X,xcb(+)]
- >=x11-libs/pango-1.30.0[X]"
-DEPEND="${CDEPEND}
- app-text/asciidoc
- doc? ( app-text/xmlto dev-lang/perl )
- test? (
- dev-perl/Module-Install
- )
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- dev-lang/perl
- dev-perl/AnyEvent-I3
- dev-perl/JSON-XS"
-
-# Test without debug will apply optimization levels, which results
-# in type-punned pointers - which in turn causes test failures.
-REQUIRED_USE="test? ( debug )"
-
-DOCS=(
- "RELEASE-NOTES-${PV}"
- docs
-)
-PATCHES=(
- "${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
-)
-
-src_test() {
- emake -C "${CBUILD}" check
-}
-
-src_prepare() {
- default
-
- cat <<- EOF > "${T}"/i3wm
- #!/bin/sh
- exec /usr/bin/i3
- EOF
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable debug)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- emake -C "${CBUILD}"
-}
-
-src_install() {
- emake -C "${CBUILD}" DESTDIR="${D}" install
- doman "${CBUILD}"/man/*.1
-
- use doc && einstalldocs
-
- exeinto /etc/X11/Sessions
- doexe "${T}/i3wm"
-}
-
-pkg_postinst() {
- # Only show the elog information on a new install
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- elog "There are several packages that you may find useful with ${PN} and"
- elog "their usage is suggested by the upstream maintainers, namely:"
- elog " x11-misc/dmenu"
- elog " x11-misc/i3status"
- elog " x11-misc/i3lock"
- elog "Please refer to their description for additional info."
- fi
-}
diff --git a/x11-wm/i3/i3-4.17.1-r1.ebuild b/x11-wm/i3/i3-4.17.1-r1.ebuild
deleted file mode 100644
index ef11b20be55..00000000000
--- a/x11-wm/i3/i3-4.17.1-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools out-of-source virtualx
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc debug test"
-
-CDEPEND="dev-libs/libev
- dev-libs/libpcre
- >=dev-libs/yajl-2.0.3
- x11-libs/libxcb[xkb]
- x11-libs/libxkbcommon[X]
- x11-libs/startup-notification
- x11-libs/xcb-util
- x11-libs/xcb-util-cursor
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-wm
- x11-libs/xcb-util-xrm
- x11-misc/xkeyboard-config
- >=x11-libs/cairo-1.14.4[X,xcb(+)]
- >=x11-libs/pango-1.30.0[X]"
-DEPEND="${CDEPEND}
- test? (
- dev-perl/AnyEvent
- >=dev-perl/X11-XCB-0.120.0
- dev-perl/Inline
- dev-perl/Inline-C
- dev-perl/IPC-Run
- dev-perl/ExtUtils-PkgConfig
- dev-perl/local-lib
- >=virtual/perl-Test-Simple-0.940.0
- x11-base/xorg-server[xephyr]
- )"
-RDEPEND="${CDEPEND}
- dev-lang/perl
- dev-perl/AnyEvent-I3
- dev-perl/JSON-XS"
-BDEPEND="virtual/pkgconfig"
-
-# Test without debug will apply optimization levels, which results
-# in type-punned pointers - which in turn causes test failures.
-REQUIRED_USE="test? ( debug )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
-)
-
-# https://github.com/i3/i3/issues/3013
-RESTRICT="test"
-
-src_prepare() {
- default
-
- cat <<- EOF > "${T}"/i3wm
- #!/bin/sh
- exec /usr/bin/i3
- EOF
-
- eautoreconf
-}
-
-my_src_configure() {
- local myeconfargs=(
- $(use_enable debug)
- )
- econf "${myeconfargs[@]}"
-}
-
-my_src_test() {
- emake \
- test.commands_parser \
- test.config_parser \
- test.inject_randr15
-
- virtx perl \
- -I "${S}/testcases/lib" \
- -I "${BUILD_DIR}/testcases/lib" \
- testcases/complete-run.pl
-}
-
-my_src_install_all() {
- doman man/*.1
-
- einstalldocs
- use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
-
- exeinto /etc/X11/Sessions
- doexe "${T}/i3wm"
-}
-
-pkg_postinst() {
- # Only show the elog information on a new install
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- elog "There are several packages that you may find useful with ${PN} and"
- elog "their usage is suggested by the upstream maintainers, namely:"
- elog " x11-misc/dmenu"
- elog " x11-misc/i3status"
- elog " x11-misc/i3lock"
- elog "Please refer to their description for additional info."
- fi
-}
diff --git a/x11-wm/i3/i3-4.18.1.ebuild b/x11-wm/i3/i3-4.18.1.ebuild
deleted file mode 100644
index 58a3f832182..00000000000
--- a/x11-wm/i3/i3-4.18.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools out-of-source virtualx
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc debug test"
-
-CDEPEND="dev-libs/libev
- dev-libs/libpcre
- dev-libs/yajl
- x11-libs/libxcb[xkb]
- x11-libs/libxkbcommon[X]
- x11-libs/startup-notification
- x11-libs/xcb-util
- x11-libs/xcb-util-cursor
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-wm
- x11-libs/xcb-util-xrm
- x11-misc/xkeyboard-config
- x11-libs/cairo[X,xcb(+)]
- x11-libs/pango[X]"
-DEPEND="${CDEPEND}
- test? (
- dev-perl/AnyEvent
- dev-perl/X11-XCB
- dev-perl/Inline
- dev-perl/Inline-C
- dev-perl/IPC-Run
- dev-perl/ExtUtils-PkgConfig
- dev-perl/local-lib
- virtual/perl-Test-Simple
- x11-base/xorg-server[xephyr]
- x11-misc/xvfb-run
- )"
-RDEPEND="${CDEPEND}
- dev-lang/perl
- dev-perl/AnyEvent-I3
- dev-perl/JSON-XS"
-BDEPEND="virtual/pkgconfig"
-
-# Test without debug will apply optimization levels, which results
-# in type-punned pointers - which in turn causes test failures.
-REQUIRED_USE="test? ( debug )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
-)
-
-# https://github.com/i3/i3/issues/3013
-RESTRICT="test"
-
-src_prepare() {
- default
-
- cat <<- EOF > "${T}"/i3wm
- #!/bin/sh
- exec /usr/bin/i3
- EOF
-
- eautoreconf
-}
-
-my_src_configure() {
- local myeconfargs=(
- $(use_enable debug)
- )
- econf "${myeconfargs[@]}"
-}
-
-my_src_test() {
- emake check
-}
-
-my_src_install_all() {
- doman man/*.1
-
- einstalldocs
- use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
-
- exeinto /etc/X11/Sessions
- doexe "${T}/i3wm"
-}
-
-pkg_postinst() {
- # Only show the elog information on a new install
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- elog "There are several packages that you may find useful with ${PN} and"
- elog "their usage is suggested by the upstream maintainers, namely:"
- elog " x11-misc/dmenu"
- elog " x11-misc/i3status"
- elog " x11-misc/i3lock"
- elog "Please refer to their description for additional info."
- fi
-}
diff --git a/x11-wm/i3/i3-4.18.2.ebuild b/x11-wm/i3/i3-4.18.2.ebuild
deleted file mode 100644
index 58a3f832182..00000000000
--- a/x11-wm/i3/i3-4.18.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools out-of-source virtualx
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc debug test"
-
-CDEPEND="dev-libs/libev
- dev-libs/libpcre
- dev-libs/yajl
- x11-libs/libxcb[xkb]
- x11-libs/libxkbcommon[X]
- x11-libs/startup-notification
- x11-libs/xcb-util
- x11-libs/xcb-util-cursor
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-wm
- x11-libs/xcb-util-xrm
- x11-misc/xkeyboard-config
- x11-libs/cairo[X,xcb(+)]
- x11-libs/pango[X]"
-DEPEND="${CDEPEND}
- test? (
- dev-perl/AnyEvent
- dev-perl/X11-XCB
- dev-perl/Inline
- dev-perl/Inline-C
- dev-perl/IPC-Run
- dev-perl/ExtUtils-PkgConfig
- dev-perl/local-lib
- virtual/perl-Test-Simple
- x11-base/xorg-server[xephyr]
- x11-misc/xvfb-run
- )"
-RDEPEND="${CDEPEND}
- dev-lang/perl
- dev-perl/AnyEvent-I3
- dev-perl/JSON-XS"
-BDEPEND="virtual/pkgconfig"
-
-# Test without debug will apply optimization levels, which results
-# in type-punned pointers - which in turn causes test failures.
-REQUIRED_USE="test? ( debug )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
-)
-
-# https://github.com/i3/i3/issues/3013
-RESTRICT="test"
-
-src_prepare() {
- default
-
- cat <<- EOF > "${T}"/i3wm
- #!/bin/sh
- exec /usr/bin/i3
- EOF
-
- eautoreconf
-}
-
-my_src_configure() {
- local myeconfargs=(
- $(use_enable debug)
- )
- econf "${myeconfargs[@]}"
-}
-
-my_src_test() {
- emake check
-}
-
-my_src_install_all() {
- doman man/*.1
-
- einstalldocs
- use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
-
- exeinto /etc/X11/Sessions
- doexe "${T}/i3wm"
-}
-
-pkg_postinst() {
- # Only show the elog information on a new install
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- elog "There are several packages that you may find useful with ${PN} and"
- elog "their usage is suggested by the upstream maintainers, namely:"
- elog " x11-misc/dmenu"
- elog " x11-misc/i3status"
- elog " x11-misc/i3lock"
- elog "Please refer to their description for additional info."
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/, x11-wm/i3/files/
@ 2020-11-24 9:37 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2020-11-24 9:37 UTC (permalink / raw
To: gentoo-commits
commit: ffcb27343cfc875fe62bb77a6f148cf33e4df946
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 06:53:22 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 09:36:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffcb2734
x11-wm/i3: use optfeature, fix docdir path on 4.19-r1
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
Acked-by: Nelo-T. Wallus <nelo <AT> wallus.de>
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
x11-wm/i3/files/i3-gaps-4.19-fix-docdir.patch | 22 ++++++++++++++++++++++
x11-wm/i3/i3-4.19-r1.ebuild | 25 ++++++++++++-------------
2 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/x11-wm/i3/files/i3-gaps-4.19-fix-docdir.patch b/x11-wm/i3/files/i3-gaps-4.19-fix-docdir.patch
new file mode 100644
index 00000000000..6917aa091df
--- /dev/null
+++ b/x11-wm/i3/files/i3-gaps-4.19-fix-docdir.patch
@@ -0,0 +1,22 @@
+diff --git a/meson.build b/meson.build
+index 11541e21..a6f8974e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -642,7 +642,7 @@ if get_option('docs')
+ '@OUTPUT@',
+ ],
+ install: true,
+- install_dir: join_paths(get_option('datadir'), 'doc', 'i3'),
++ install_dir: docdir,
+ )
+
+ custom_target(
+@@ -655,7 +655,7 @@ if get_option('docs')
+ '@OUTPUT@',
+ ],
+ install: true,
+- install_dir: join_paths(get_option('datadir'), 'doc', 'i3'),
++ install_dir: docdir,
+ )
+ endif
+
diff --git a/x11-wm/i3/i3-4.19-r1.ebuild b/x11-wm/i3/i3-4.19-r1.ebuild
index 3c6f131dc56..3ef5738dadd 100644
--- a/x11-wm/i3/i3-4.19-r1.ebuild
+++ b/x11-wm/i3/i3-4.19-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit meson virtualx
+inherit meson optfeature virtualx
if [[ "${PV}" = *9999 ]]; then
inherit git-r3
fi
@@ -22,7 +22,7 @@ LICENSE="BSD"
SLOT="0"
IUSE="doc test"
-CDEPEND="dev-libs/libev
+COMMON_DEPEND="dev-libs/libev
dev-libs/libpcre
dev-libs/yajl
x11-libs/libxcb[xkb]
@@ -36,7 +36,7 @@ CDEPEND="dev-libs/libev
x11-misc/xkeyboard-config
x11-libs/cairo[X,xcb(+)]
x11-libs/pango[X]"
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
test? (
dev-perl/AnyEvent
dev-perl/X11-XCB
@@ -54,7 +54,7 @@ DEPEND="${CDEPEND}
app-text/xmlto
dev-lang/perl
)"
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
dev-lang/perl
dev-perl/AnyEvent-I3
dev-perl/JSON-XS"
@@ -62,6 +62,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
+ "${FILESDIR}/i3-gaps-4.19-fix-docdir.patch"
)
src_prepare() {
@@ -75,6 +76,7 @@ src_prepare() {
src_configure() {
local emesonargs=(
+ -Ddocdir="/usr/share/doc/${PF}"
$(meson_use doc docs)
$(meson_use doc mans)
)
@@ -94,13 +96,10 @@ src_test() {
}
pkg_postinst() {
- # Only show the elog information on a new install
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- elog "There are several packages that you may find useful with ${PN} and"
- elog "their usage is suggested by the upstream maintainers, namely:"
- elog " x11-misc/dmenu"
- elog " x11-misc/i3status"
- elog " x11-misc/i3lock"
- elog "Please refer to their description for additional info."
- fi
+ elog "There are several packages that you may find useful with i3 and"
+ elog "their usage is suggested by the upstream maintainers."
+ elog "Uninstalled optional dependencies:"
+ optfeature "Application launcher" x11-misc/dmenu
+ optfeature "Simple screen locker" x11-misc/i3lock
+ optfeature "Status bar generator" x11-misc/i3status
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-11-24 9:37 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-17 10:29 [gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/, x11-wm/i3/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2020-11-24 9:37 Lars Wendler
2019-03-26 8:58 Lars Wendler
2018-11-08 9:49 Lars Wendler
2017-07-28 11:33 Lars Wendler
2017-05-08 20:01 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox