mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-01 11:18:09 -07:00
x11-wm/i3-gaps: drop old
Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: John Helmert III <jchelmert3@posteo.net> Closes: https://github.com/gentoo/gentoo/pull/18311 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
This commit is contained in:
John Helmert III
committed by
Joonas Niilola
Joonas Niilola
parent
5f5d596563
commit
ff7d44ac0a
@@ -1,4 +1,2 @@
|
||||
DIST i3-gaps-4.16.1.tar.gz 3983420 BLAKE2B f0d5a85b06ce33e1cc177af6da29f9cdf42ed754bb767aa9eaa5ab52f3b9f4f688d251f2a16fb222fc8cf5052e79859891c4185b1325b2ef6c1a813aa220468c SHA512 904c2f63c6a35573f13fd216625c1349ac71de70ae8f0440667c9d76048cdaf30a398ab358f2366d5f46502d87e801713b625cb509a05f39dbca1371d2b8d0e9
|
||||
DIST i3-gaps-4.18.2.tar.gz 3999555 BLAKE2B d825bb4acb76a7909569aa10c6cab517ff08ee4d4d29175c9a84686c83f225a8a090c26ad4bf4ef03e2062bf4d48c7e2e2bf70b49f7a67ecad386597fc1602bd SHA512 86c76340d1df40bbd7e804515ae9dda350458d22651bee508f9f141acd3f4ea4025c8f40ddf0cdfe1fc3c6b26cbf5c3900204545468776721857bb104200ee34
|
||||
DIST i3-gaps-4.18.3.tar.gz 3998976 BLAKE2B 2512f4e0c8ce05874a63bc498d48a14dc5e3fc2f0d68da0d88fcee7deeed68994f07cd3c2f3f55e5c564d40507546358f93c139bece86090137142ec2d2ba9a6 SHA512 e562ea1d75300cb69005d6f5ee8e3d05c8c7cfe1046154b9798f554fa81946f9ff6f8967d5acae2e2e4cbd4e2bce865119edba5e8c1e12febb6122e9c7f63534
|
||||
DIST i3-gaps-4.19.tar.gz 4192134 BLAKE2B cc70e36fd01e777e1e4357d1799777eb42c21f1666759d8730c548773c87e4c2806ae5376703956761a8fc036c5e847a4734cddd695067f684038c1cc9a8905e SHA512 db09203256172cc4807189bbf16d793c9203c908d2e75cbb7d973d1f0338f6e3734afe68ffe1c43ef3e43e5b2c6dba1ab9135625e4d42d10a9ea6f44f673d384
|
||||
|
||||
@@ -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
|
||||
---
|
||||
--- 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);
|
||||
}
|
||||
@@ -1,87 +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
|
||||
|
||||
DESCRIPTION="i3 fork with gaps and some more features"
|
||||
HOMEPAGE="https://github.com/Airblader/i3"
|
||||
SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="doc"
|
||||
|
||||
DEPEND="
|
||||
dev-libs/glib:2
|
||||
dev-libs/libev
|
||||
dev-libs/libpcre
|
||||
dev-libs/yajl
|
||||
x11-libs/cairo[X,xcb(+)]
|
||||
x11-libs/libxcb[xkb]
|
||||
x11-libs/libxkbcommon[X]
|
||||
x11-libs/pango[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
|
||||
"
|
||||
BDEPEND="
|
||||
app-text/asciidoc
|
||||
app-text/xmlto
|
||||
dev-lang/perl
|
||||
virtual/pkgconfig
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
dev-lang/perl
|
||||
dev-perl/AnyEvent-I3
|
||||
dev-perl/JSON-XS
|
||||
!x11-wm/i3
|
||||
"
|
||||
|
||||
S=${WORKDIR}/i3-${PV}
|
||||
|
||||
DOCS=( RELEASE-NOTES-$(ver_cut 1-3) )
|
||||
|
||||
PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-musl.patch" )
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
cat <<- EOF > "${T}"/i3wm
|
||||
#!/bin/sh
|
||||
exec /usr/bin/i3
|
||||
EOF
|
||||
}
|
||||
|
||||
my_src_configure() {
|
||||
# disable sanitizer: otherwise injects -O0 -g
|
||||
local myeconfargs=(
|
||||
$(use_enable doc docs)
|
||||
--enable-debug=no
|
||||
--enable-mans
|
||||
--disable-sanitizers
|
||||
)
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
my_src_install_all() {
|
||||
doman "${BUILD_DIR}"/man/*.1
|
||||
einstalldocs
|
||||
|
||||
exeinto /etc/X11/Sessions
|
||||
doexe "${T}"/i3wm
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "There are several packages that you may find useful with ${PN} and"
|
||||
einfo "their usage is suggested by the upstream maintainers, namely:"
|
||||
einfo " x11-misc/dmenu"
|
||||
einfo " x11-misc/i3lock"
|
||||
einfo " x11-misc/i3status"
|
||||
einfo "Please refer to their description for additional info."
|
||||
}
|
||||
@@ -1,101 +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
|
||||
|
||||
DESCRIPTION="i3 fork with gaps and some more features"
|
||||
HOMEPAGE="https://github.com/Airblader/i3"
|
||||
SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc64 ~x86"
|
||||
IUSE="doc test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
CDEPEND="dev-libs/glib:2
|
||||
dev-libs/libev
|
||||
dev-libs/libpcre
|
||||
dev-libs/yajl
|
||||
x11-libs/cairo[X,xcb(+)]
|
||||
x11-libs/libxcb[xkb]
|
||||
x11-libs/libxkbcommon[X]
|
||||
x11-libs/pango[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
|
||||
"
|
||||
DEPEND="${CDEPEND}
|
||||
test? (
|
||||
dev-perl/ExtUtils-PkgConfig
|
||||
dev-perl/IPC-Run
|
||||
dev-perl/Inline
|
||||
dev-perl/Inline-C
|
||||
dev-perl/X11-XCB
|
||||
dev-perl/XS-Object-Magic
|
||||
x11-base/xorg-server[xephyr,xvfb]
|
||||
x11-misc/xvfb-run
|
||||
)
|
||||
"
|
||||
BDEPEND="
|
||||
app-text/asciidoc
|
||||
app-text/xmlto
|
||||
dev-lang/perl
|
||||
virtual/pkgconfig
|
||||
"
|
||||
RDEPEND="${CDEPEND}
|
||||
dev-lang/perl
|
||||
dev-perl/AnyEvent-I3
|
||||
dev-perl/JSON-XS
|
||||
!x11-wm/i3
|
||||
"
|
||||
|
||||
S="${WORKDIR}/i3-${PV}"
|
||||
|
||||
DOCS=( RELEASE-NOTES-$(ver_cut 1-3) )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-$(ver_cut 1-2)-musl.patch"
|
||||
"${FILESDIR}/${PN}-4.18.2-drop-branch-test.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
my_src_configure() {
|
||||
# disable sanitizer: otherwise injects -O0 -g
|
||||
local myeconfargs=(
|
||||
$(use_enable doc docs)
|
||||
--enable-debug=no
|
||||
--enable-mans
|
||||
--disable-sanitizers
|
||||
)
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
my_src_install_all() {
|
||||
doman "${BUILD_DIR}"/man/*.1
|
||||
einstalldocs
|
||||
|
||||
exeinto /etc/X11/Sessions
|
||||
newexe - i3wm <<- EOF
|
||||
#!/usr/bin/env sh
|
||||
exec /usr/bin/i3
|
||||
EOF
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "There are several packages that you may find useful with ${PN} and"
|
||||
einfo "their usage is suggested by the upstream maintainers, namely:"
|
||||
einfo " x11-misc/dmenu"
|
||||
einfo " x11-misc/i3lock"
|
||||
einfo " x11-misc/i3status"
|
||||
einfo "Please refer to their description for additional info."
|
||||
}
|
||||
Reference in New Issue
Block a user