From 5188d28b5db246fd32281e80e7a62d3694c68836 Mon Sep 17 00:00:00 2001
From: Łukasz Jendrysik <scadu@yandex.com>
Date: Tue, 16 May 2017 20:52:56 +0200
Subject: testing/i3wm-gaps: new aport

---
 testing/i3wm-gaps/APKBUILD   | 47 ++++++++++++++++++++++++++++
 testing/i3wm-gaps/musl.patch | 73 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 120 insertions(+)
 create mode 100644 testing/i3wm-gaps/APKBUILD
 create mode 100644 testing/i3wm-gaps/musl.patch

(limited to 'testing/i3wm-gaps')

diff --git a/testing/i3wm-gaps/APKBUILD b/testing/i3wm-gaps/APKBUILD
new file mode 100644
index 00000000000..02e66afd836
--- /dev/null
+++ b/testing/i3wm-gaps/APKBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Łukasz Jendrysik <scadu@yandex.com>
+pkgname=i3wm-gaps
+pkgver=4.13
+pkgrel=0
+pkgdesc="A tiling window manager with gaps and other additional features"
+url="https://github.com/Airblader/i3"
+arch="all"
+license="BSD"
+replaces="i3wm"
+makedepends="bison flex libxcb-dev xcb-util-cursor-dev
+	xcb-util-keysyms-dev xcb-util-wm-dev libev-dev pango-dev cairo-dev
+	yajl-dev startup-notification-dev pcre-dev libxkbcommon-dev
+	xcb-util-xrm-dev asciidoc perl xmlto autoconf automake libtool"
+subpackages="$pkgname-doc"
+source="i3wm-$pkgver.tar.gz::https://github.com/Airblader/i3/archive/$pkgver.tar.gz
+	musl.patch"
+
+builddir="$srcdir/i3-$pkgver"
+
+build() {
+	cd "$srcdir/i3-$pkgver"
+  	autoreconf -fi
+  	./configure --prefix="/usr" --sysconfdir="/etc" --disable-builddir
+  	make
+}
+
+package() {
+  	cd "$builddir"
+  	make DESTDIR="$pkgdir/" install
+
+  	install -d "$pkgdir/usr/share/man/man1"
+  	install -m644 man/*.1 "$pkgdir"/usr/share/man/man1/
+}
+
+check() {
+	cd "$builddir"
+	./i3 --version
+}
+	
+
+md5sums="a591216c8a84d27431b057e4d01b151e  i3wm-4.13.tar.gz
+aa998beb0b9a83d2910508768ac7faae  musl.patch"
+sha256sums="e80c07e525a07f2d3d2f02d282774d3264b6d1f165713c9903c06626ba4d2571  i3wm-4.13.tar.gz
+b7d084c53addc71fda13ccb8b3dcca2a32d9ca1590a28bf3be1a0c61870d3817  musl.patch"
+sha512sums="9b0c888c1c412622282f5e56ba6763eba3af88682d1652d1a1e6ce4e7fcdbec30e4fd6731b7e4d306bd33871a2581e0979714b47c9614210302c491ce9366ba8  i3wm-4.13.tar.gz
+8ce7d00371c43b93dabbe0dadf9caf7c58a68f4a0079f5a9b9552c15c55bfa0df16d7e87a281595af2ac5254632ba28ccf82a467cea16159b41490f6f2910299  musl.patch"
+
diff --git a/testing/i3wm-gaps/musl.patch b/testing/i3wm-gaps/musl.patch
new file mode 100644
index 00000000000..82ad6195b8e
--- /dev/null
+++ b/testing/i3wm-gaps/musl.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);
+ }
-- 
cgit v1.2.3