commit: 521ca55c9fc3fc45bb203ee0ed437784b6a7173f
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Wed May 31 17:00:11 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed May 31 17:00:11 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=521ca55c
x11-wm/i3: add most recent version
Include Alpine Linux patch for GLOB_TILDE. musl does not yet
implement it.
x11-wm/i3/Manifest | 5 ++
x11-wm/i3/files/i3-4.13-GLOB_TILDE.patch | 73 ++++++++++++++++++++
x11-wm/i3/files/i3-4.13-remove-git-polling.patch | 19 ++++++
x11-wm/i3/i3-4.13-r1.ebuild | 85 ++++++++++++++++++++++++
x11-wm/i3/metadata.xml | 12 ++++
5 files changed, 194 insertions(+)
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
new file mode 100644
index 0000000..408b6dc
--- /dev/null
+++ b/x11-wm/i3/Manifest
@@ -0,0 +1,5 @@
+AUX i3-4.13-GLOB_TILDE.patch 2473 SHA256
b7d084c53addc71fda13ccb8b3dcca2a32d9ca1590a28bf3be1a0c61870d3817 SHA512
8ce7d00371c43b93dabbe0dadf9caf7c58a68f4a0079f5a9b9552c15c55bfa0df16d7e87a281595af2ac5254632ba28ccf82a467cea16159b41490f6f2910299
WHIRLPOOL
1986a162d00573976aabcae9dda0be129a9937d2d2a7bdf345d8521908ae2a520e6dcfae3b662a0efc081ef845c285a8658abc75ffb9834b173cf6051c3ff42a
+AUX i3-4.13-remove-git-polling.patch 580 SHA256
17e814965acd6754a21a4a6d3eed5eb23e0211f9ec0f5e62e6f051b927739f39 SHA512
169eafa91f9499944f65c3b016d6760780d7ada21d718bb96e3bd822741f0d5b30e13dd7493233338e193f1f565872cf896e3e4344a1228fed596c33ed68db8b
WHIRLPOOL
87570c35cbe2829b644dff950bfde9b5142dbbcb44ab7dff5714bff44f5bd051d39bd2eaec5baf39ea1b604d92f92ea6c357c1a479d0968ac232aff5908ddd65
+DIST i3-4.13.tar.bz2 1121298 SHA256
94c13183e527a984132a3b050c8bf629626502a6e133e07b413641aec5f8cf8a SHA512
1bb1044e8d86e78d3ccb79d49f0eb26665dcd05a348058a5e57138151d74f57d77830efc3025893170fe1b8ec612f739f75247a427410f96286b09afd2c5f14c
WHIRLPOOL
c0e9b205837e30d214d525af6ceb8adcc4cbbba42d9aa0eab4e7639cbd8884d827c5783590eb23a6790e8d8d87fb81884afa369e48a7ae474613392dc6f9b371
+EBUILD i3-4.13-r1.ebuild 1890 SHA256
620119a6ddbe5304c5d4767cd1078249d8cbcaf29bf3668049dbb45e3d6e6969 SHA512
5043400c4612d9a303dfc0dae8c399f08c5fa5d975ed323851dfbb29a3b2d6368f76340ea12a292e2f71ef6afe915be3cdb031ef1fc5dd27456c5bdb23fc4d14
WHIRLPOOL
bad8c16ed20a3031d0c8b693501dcaeff2c9173c5899adb55317102f8b2eb8b1b411eed2950c2742ddcfd4ffc8b24ac4454b9ef2bfe713c18957ab8a71b37502
+MISC metadata.xml 537 SHA256
a298f706fd26f31d3947bb1646b13fb8c3cb89570adb94cd41ba70678ffa65f9 SHA512
2b59aa00eff648aacae53c1277a7a406a2208e6791aac6f194216c7150abeffcf7453f185547e958ca871a00549f290467ab81b83624567756c06e06443dd9d4
WHIRLPOOL
4bf3a69829932a6e35de2c7736b8e1610cad1c8fabd19661c2fcfbe6f2059c33fa609b68df411634cc832f8608511cd1f686b21492e41edc30bd809e40170b0c
diff --git a/x11-wm/i3/files/i3-4.13-GLOB_TILDE.patch
b/x11-wm/i3/files/i3-4.13-GLOB_TILDE.patch
new file mode 100644
index 0000000..82ad619
--- /dev/null
+++ b/x11-wm/i3/files/i3-4.13-GLOB_TILDE.patch
@@ -0,0 +1,73 @@
+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/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 0000000..ca22637
--- /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
new file mode 100644
index 0000000..8f1699b
--- /dev/null
+++ b/x11-wm/i3/i3-4.13-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 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="http://i3wm.org/";
+SRC_URI="http://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}/${P}-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() {
+ 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/i3status"
+ einfo " x11-misc/i3lock"
+ einfo "Please refer to their description for additional info."
+}
diff --git a/x11-wm/i3/metadata.xml b/x11-wm/i3/metadata.xml
new file mode 100644
index 0000000..e220080
--- /dev/null
+++ b/x11-wm/i3/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+ <maintainer type="person">
+ <email>xarthis...@gentoo.org</email>
+ <name>Kacper Kowalik</name>
+ </maintainer>
+ <use>
+ <flag name="pango">Use <pkg>x11-libs/pango</pkg> to render text
in order to support fonts which have more glyphs (e.g. Kanji). See
RELEASE-NOTES for more information</flag>
+ <flag name="doc">Build and install the HTML documentation and
regenerate the man pages</flag>
+ </use>
+</pkgmetadata>
