From b9f1e0c963275ff665f887ce1af669ca50ddd227 Mon Sep 17 00:00:00 2001
From: prspkt <prspkt@protonmail.com>
Date: Tue, 19 Feb 2019 10:17:01 +0200
Subject: community/i3wm: upgrade to 4.16.1, use https

---
 community/i3wm/APKBUILD                   |  8 ++++----
 community/i3wm/i3wm-musl-glob-tilde.patch | 30 ++++++++++++++----------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/community/i3wm/APKBUILD b/community/i3wm/APKBUILD
index d7545ee975f..03e76de262b 100644
--- a/community/i3wm/APKBUILD
+++ b/community/i3wm/APKBUILD
@@ -1,10 +1,10 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=i3wm
-pkgver=4.15
+pkgver=4.16.1
 pkgrel=0
 pkgdesc="Improved dynamic tiling window manager"
-url="http://i3wm.org"
+url="https://i3wm.org"
 arch="all"
 license="BSD-3-Clause"
 makedepends="$depends_dev bison flex libxcb-dev xcb-util-cursor-dev
@@ -39,5 +39,5 @@ package() {
 	install -m644 man/*.1 "$pkgdir"/usr/share/man/man1/
 }
 
-sha512sums="60ab61b7e380342126bea12fb4371f98fcf18f6435f79a9519d3f59cfabdb170634366036e1aa20c5592da0832b03140ad1f0c72bad3cfaace0b7c57ad01dfc4  i3-4.15.tar.bz2
-8ce7d00371c43b93dabbe0dadf9caf7c58a68f4a0079f5a9b9552c15c55bfa0df16d7e87a281595af2ac5254632ba28ccf82a467cea16159b41490f6f2910299  i3wm-musl-glob-tilde.patch"
+sha512sums="3e328f8c7216697c5e484ca854605350f78844e24cc6cfb9c10e71368c2c0457387a14f819abdf8be2370d437889297f452fbf63f3924766ca81c157ab27e1b0  i3-4.16.1.tar.bz2
+c6ae3f22d0303da5de7ca4c92734b043a76d7447559fe2ffc308a8d135076cf05ee53ef63eb28c1bd628a1edfb2d1a0ed2d090836cb5fc70f2b882ee1105dad3  i3wm-musl-glob-tilde.patch"
diff --git a/community/i3wm/i3wm-musl-glob-tilde.patch b/community/i3wm/i3wm-musl-glob-tilde.patch
index 82ad6195b8e..d4f9113e6b1 100644
--- a/community/i3wm/i3wm-musl-glob-tilde.patch
+++ b/community/i3wm/i3wm-musl-glob-tilde.patch
@@ -1,10 +1,9 @@
-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, ...) {
+--- a/i3bar/src/main.c
++++ b/i3bar/src/main.c
+@@ -48,14 +48,20 @@ void debuglog(char *fmt, ...) {
   *
   */
- char *expand_path(char *path) {
+ static char *expand_path(char *path) {
 -    static glob_t globbuf;
 -    if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
 -        ELOG("glob() failed\n");
@@ -27,19 +26,18 @@ diff -urp i3-4.11/i3bar/src/main.c i3-4.11.new/i3bar/src/main.c
 +
 +    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 @@
+--- 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));
 -
@@ -53,9 +51,9 @@ diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c
 -    } 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));
+-        strcpy(result, head);
+-        if (tail) {
+-            strcat(result, tail);
 +    if (strncmp(path, "~/", 2) == 0) {
 +        home = getenv("HOME");
 +        if (home != NULL) {
@@ -64,10 +62,10 @@ diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c
 +            strcpy(expanded, home);
 +            strcat(expanded, path+1);
 +            return expanded;
-+        }
+         }
      }
 -    globfree(&globbuf);
- 
+
 -    return result;
 +    return sstrdup(path);
  }
-- 
cgit v1.2.3