testing/i3wm: upgrade to 4.11

2 files changed, 52 insertions, 93 deletions

diff --git a/testing/i3wm/APKBUILD b/testing/i3wm/APKBUILD
index ac38fb657b..57597b6429 100644
--- a/testing/i3wm/APKBUILD
+++ b/testing/i3wm/APKBUILD
@@ -1,6 +1,7 @@
+# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=i3wm
-pkgver=4.10.4
+pkgver=4.11
 pkgrel=0
 pkgdesc="A tiling window manager"
 url="http://i3wm.org"
@@ -13,7 +14,8 @@ makedepends="$depends_dev bison flex libxcb-dev xcb-util-cursor-dev
 	yajl-dev startup-notification-dev pcre-dev libxkbcommon-dev"
 install=""
 subpackages="$pkgname-doc"
-source="http://i3wm.org/downloads/i3-${pkgver}.tar.bz2 musl.patch"
+source="http://i3wm.org/downloads/i3-${pkgver}.tar.bz2
+	musl.patch"
 
 _builddir="$srcdir/i3-$pkgver"
 prepare() {
@@ -28,7 +30,7 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	make
+	make || return 1
 }
 
 package() {
@@ -39,9 +41,9 @@ package() {
 	install -m644 man/*.1 "$pkgdir"/usr/share/man/man1/ || return 1
 }
 
-md5sums="fbfcf6e7de9c53894ae2d475a870c16f  i3-4.10.4.tar.bz2
-f4baffffe55d83deb61bfe880c248794  musl.patch"
-sha256sums="dd4fa7a5c5b8feaf83f196fc181bfd33aff65c11d81c91b3ae9d9d3d2540655e  i3-4.10.4.tar.bz2
-bcbecf73b63715b88264e5a1628a1267ce996431b57a3fc2db336b42e08626b9  musl.patch"
-sha512sums="e777d1ca8ebeada185dfe11443a8b731cb72b6f836a0848e24291ea5d70e4b6d6c414acd58c156be97bd90d07ba4019a713cdb406a24fda33afeae08ceb6ed18  i3-4.10.4.tar.bz2
-860b2c3d3977652e81781bf30319b22dd9f3285ed2ca9474d2dd23e4787d9e19954ca7de6f320f1c6c326ee776cbf475d5aa6d861c49e59af6a831f601ba17a9  musl.patch"
+md5sums="6b003955333a90cb831516f8dbf6e57d  i3-4.11.tar.bz2
+c111abf5d38d2ad356923047a47f6a65  musl.patch"
+sha256sums="78ce1e06fbd92fd63765bbe23faa7b8f929c17f99ed623f7abf2e568169d982f  i3-4.11.tar.bz2
+626886ec7edfa768b4ab8cb9eaef4b3944e0a7cac2bb6748b7ce2622c409d08a  musl.patch"
+sha512sums="76d45be9006973dd4093fd21ea1c83742b7977c7698e133ce8f9e7826d97d1631fbe6c3ea4a7eb3d989027f98e12738158e72ec450b0df3dddd28f912ff49a4f  i3-4.11.tar.bz2
+b3d2947f95b83f4421b54899d6411d93124828fcb06d6777330db523b8a101ab425bc3201c1aaed00206b468320c85617a6e0657427a7a1aec4d671082aa6494  musl.patch"
diff --git a/testing/i3wm/musl.patch b/testing/i3wm/musl.patch
index 47a0f23316..56feaa9814 100644
--- a/testing/i3wm/musl.patch
+++ b/testing/i3wm/musl.patch
@@ -1,94 +1,51 @@
-diff -urw i3-4.7.2/common.mk i3-4.7.2-musl/common.mk
---- i3-4.7.2/common.mk	2014-01-23 21:52:24.000000000 +0000
-+++ i3-4.7.2-musl/common.mk	2014-05-15 18:42:55.620000001 +0000
-@@ -136,6 +136,7 @@
- LIBSN_LIBS   := $(call ldflags_for_lib, libstartup-notification-1.0,startup-notification-1)
- 
- # Pango
-+PANGO_CFLAGS := $(call cflags_for_lib, pango)
- PANGO_CFLAGS := $(call cflags_for_lib, cairo)
- PANGO_CFLAGS += $(call cflags_for_lib, pangocairo)
- I3_CPPFLAGS  += -DPANGO_SUPPORT=1
-diff -urw i3-4.7.2/i3-config-wizard/main.c i3-4.7.2-musl/i3-config-wizard/main.c
---- i3-4.7.2/i3-config-wizard/main.c	2014-01-23 21:52:24.000000000 +0000
-+++ i3-4.7.2-musl/i3-config-wizard/main.c	2014-05-15 18:42:55.646666668 +0000
-@@ -448,6 +448,8 @@
-  * or multiple matches are found, it just returns a copy of path as given.
-  *
-  */
-+
-+#ifdef GLOB_TILDE
- static char *resolve_tilde(const char *path) {
-     static glob_t globbuf;
-     char *head, *tail, *result;
-@@ -473,6 +475,11 @@
- 
-     return result;
- }
-+#else // glob-tilde is a glibc gnuism
-+static char *resolve_tilde(const char *path) {
-+    return strdup(path);
-+}
-+#endif
- 
- /*
-  * Handles expose events, that is, draws the window contents.
-diff -urw i3-4.7.2/i3bar/src/main.c i3-4.7.2-musl/i3bar/src/main.c
---- i3-4.7.2/i3bar/src/main.c	2014-01-23 21:52:24.000000000 +0000
-+++ i3-4.7.2-musl/i3bar/src/main.c	2014-05-15 18:42:55.520000001 +0000
-@@ -44,6 +44,7 @@
-  * Glob path, i.e. expand ~
+diff -upr i3-4.11.orig/i3bar/src/main.c i3-4.11/i3bar/src/main.c
+--- i3-4.11.orig/i3bar/src/main.c	2015-10-06 22:45:01.791199587 +0200
++++ i3-4.11/i3bar/src/main.c	2015-10-06 22:45:52.921029327 +0200
+@@ -45,14 +45,7 @@ void debuglog(char *fmt, ...) {
   *
   */
-+#ifdef GLOB_TILDE
  char *expand_path(char *path) {
-     static glob_t globbuf;
-     if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
-@@ -54,6 +55,11 @@
-     globfree(&globbuf);
-     return result;
+-    static glob_t globbuf;
+-    if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
+-        ELOG("glob() failed\n");
+-        exit(EXIT_FAILURE);
+-    }
+-    char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
+-    globfree(&globbuf);
+-    return result;
++    return sstrdup(path);
  }
-+#else
-+char *expand_path(char *path) {
-+    return strdup(path);
-+}
-+#endif
  
  void print_usage(char *elf_name) {
-     printf("Usage: %s -b bar_id [-s sock_path] [-h] [-v]\n", elf_name);
-diff -urw i3-4.7.2/libi3/libi3.mk i3-4.7.2-musl/libi3/libi3.mk
---- i3-4.7.2/libi3/libi3.mk	2014-01-23 21:52:24.000000000 +0000
-+++ i3-4.7.2-musl/libi3/libi3.mk	2014-05-15 18:42:55.653333335 +0000
-@@ -10,7 +10,7 @@
- 
- libi3/%.o: libi3/%.c $(libi3_HEADERS)
- 	echo "[libi3] CC $<"
--	$(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(libi3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) -c -o $@ $<
-+	$(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(libi3_CFLAGS) $(I3_CFLAGS) $(PANGO_CFLAGS) $(CFLAGS) -c -o $@ $<
- 
- libi3.a: $(libi3_OBJECTS)
- 	echo "[libi3] AR libi3.a"
-diff -urw i3-4.7.2/src/util.c i3-4.7.2-musl/src/util.c
---- i3-4.7.2/src/util.c	2014-01-23 21:52:24.000000000 +0000
-+++ i3-4.7.2-musl/src/util.c	2014-05-15 18:42:55.490000000 +0000
-@@ -125,6 +125,7 @@
-  * or multiple matches are found, it just returns a copy of path as given.
+diff -upr i3-4.11.orig/libi3/resolve_tilde.c i3-4.11/libi3/resolve_tilde.c
+--- i3-4.11.orig/libi3/resolve_tilde.c	2015-10-06 22:45:01.801199553 +0200
++++ i3-4.11/libi3/resolve_tilde.c	2015-10-06 22:46:32.874229612 +0200
+@@ -19,27 +19,5 @@
   *
   */
-+#ifdef GLOB_TILDE
  char *resolve_tilde(const char *path) {
-         static glob_t globbuf;
-         char *head, *tail, *result;
-@@ -150,6 +151,12 @@
- 
-         return result;
+-    static glob_t globbuf;
+-    char *head, *tail, *result;
+-
+-    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));
+-    }
+-    globfree(&globbuf);
+-
+-    return result;
++    return sstrdup(path);
  }
-+#else
-+// libc like musl does not support this gnuism
-+char *resolve_tilde(const char *path) {
-+        return sstrdup(path);
-+}
-+#endif
- 
- /*
-  * Checks if the given path exists by calling stat().