diff options
author | 2018-05-09 20:17:51 +0200 | |
---|---|---|
committer | 2018-05-09 20:17:51 +0200 | |
commit | d866ee605eed53aeadec5ca59994ee278a48a697 (patch) | |
tree | 44c47618f85ed35d64c45dd69053af2f10fd1332 | |
parent | x11-wm/i3-gaps: Remove 4.15 (diff) | |
download | johu-d866ee605eed53aeadec5ca59994ee278a48a697.tar.gz johu-d866ee605eed53aeadec5ca59994ee278a48a697.tar.bz2 johu-d866ee605eed53aeadec5ca59994ee278a48a697.zip |
x11-wm/i3-gaps: Remove package
Moved to gentoo main tree.
-rw-r--r-- | x11-wm/i3-gaps/Manifest | 1 | ||||
-rw-r--r-- | x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch | 73 | ||||
-rw-r--r-- | x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild | 87 | ||||
-rw-r--r-- | x11-wm/i3-gaps/metadata.xml | 11 |
4 files changed, 0 insertions, 172 deletions
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest deleted file mode 100644 index fe96407..0000000 --- a/x11-wm/i3-gaps/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST i3-gaps-4.15.0.1.tar.gz 3965631 BLAKE2B ea65886c40f377125bafbd80e2d56c1d66a4c5c06d942d645b2cb226323a0903e98aa58b67da9c31c60240b5d99d10ecc20864aeede95a5039ea0ffdff8dcb8b SHA512 76ff860e4ca0edd0e22bdff9ae9b1bc150df2b5bc15b0d7ea7a63d373e8d156a43bd91f8a40c48b4c771603f7de7c18c6d16c53fef582e53f51c53a197fa7a0a diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch b/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch deleted file mode 100644 index 82ad619..0000000 --- a/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -urp i3-4.11/i3bar/src/main.c i3-4.11.new/i3bar/src/main.c ---- i3-4.11/i3bar/src/main.c 2015-09-30 07:55:10.000000000 +0100 -+++ i3-4.11.new/i3bar/src/main.c 2016-02-08 20:03:41.777392482 +0000 -@@ -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) { -diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c ---- i3-4.11/libi3/resolve_tilde.c 2015-09-30 07:55:10.000000000 +0100 -+++ i3-4.11.new/libi3/resolve_tilde.c 2016-02-08 20:03:47.849230953 +0000 -@@ -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-gaps/i3-gaps-4.15.0.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild deleted file mode 100644 index 54936b5..0000000 --- a/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eapi7-ver - -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="" - -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} - 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-2) ) - -PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-musl.patch" ) - -src_prepare() { - default - sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die - eautoreconf - cat <<- EOF > "${T}"/i3wm - #!/bin/sh - exec /usr/bin/i3 - EOF -} - -src_configure() { - # disable sanitizer: otherwise injects -O0 -g - local myeconfargs=( - --enable-debug=no - --disable-sanitizers - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake -C "${CBUILD}" -} - -src_install() { - emake -C "${CBUILD}" DESTDIR="${D}" install - 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." -} diff --git a/x11-wm/i3-gaps/metadata.xml b/x11-wm/i3-gaps/metadata.xml deleted file mode 100644 index 1a5dfaf..0000000 --- a/x11-wm/i3-gaps/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>johu@gentoo.org</email> - <name>Johannes Huber</name> - </maintainer> - <upstream> - <remote-id type="github">Airblader/i3</remote-id> - </upstream> -</pkgmetadata> |