i3: update to 4.11

This commit is contained in:
Steve Prybylski 2015-10-07 20:28:56 -04:00
parent afe1fb40c8
commit 81d8d08d14
2 changed files with 12 additions and 60 deletions

View File

@ -1,38 +1,24 @@
--- common.mk 2014-01-23 21:52:24.000000000 +0000
+++ 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
--- i3-config-wizard/main.c 2014-01-23 21:52:24.000000000 +0000
+++ i3-config-wizard/main.c 2014-05-15 18:42:55.646666668 +0000
@@ -448,6 +448,8 @@
--- ./libi3/resolve_tilde.c.orig 2015-10-07 20:13:31.744138877 -0400
+++ ./libi3/resolve_tilde.c 2015-10-07 20:16:03.268127887 -0400
@@ -18,6 +18,7 @@
* or multiple matches are found, it just returns a copy of path as given.
*
*/
+
+#ifdef GLOB_TILDE
static char *resolve_tilde(const char *path) {
char *resolve_tilde(const char *path) {
static glob_t globbuf;
char *head, *tail, *result;
@@ -473,6 +475,11 @@
@@ -43,3 +44,8 @@
return result;
}
+#else // glob-tilde is a glibc gnuism
+static char *resolve_tilde(const char *path) {
+#else
+char *resolve_tilde(const char *path) {
+ return strdup(path);
+}
+#endif
/*
* Handles expose events, that is, draws the window contents.
--- i3bar/src/main.c 2014-01-23 21:52:24.000000000 +0000
+++ i3bar/src/main.c 2014-05-15 18:42:55.520000001 +0000
--- ./i3bar/src/main.c.orig 2015-10-07 20:17:02.226123611 -0400
+++ ./i3bar/src/main.c 2015-10-07 20:20:58.476106477 -0400
@@ -44,6 +44,7 @@
* Glob path, i.e. expand ~
*
@ -53,37 +39,3 @@
void print_usage(char *elf_name) {
printf("Usage: %s -b bar_id [-s sock_path] [-h] [-v]\n", elf_name);
--- libi3/libi3.mk 2014-01-23 21:52:24.000000000 +0000
+++ 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"
--- src/util.c 2014-01-23 21:52:24.000000000 +0000
+++ 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.
*
*/
+#ifdef GLOB_TILDE
char *resolve_tilde(const char *path) {
static glob_t globbuf;
char *head, *tail, *result;
@@ -150,6 +151,12 @@
return result;
}
+#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().

View File

@ -1,6 +1,6 @@
# Template file for 'i3'
pkgname=i3
version=4.10.4
version=4.11
revision=1
build_pie=yes
build_style=gnu-makefile
@ -14,7 +14,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="BSD"
homepage="http://i3wm.org/"
distfiles="${homepage}/downloads/${pkgname}-${version}.tar.bz2"
checksum=dd4fa7a5c5b8feaf83f196fc181bfd33aff65c11d81c91b3ae9d9d3d2540655e
checksum=78ce1e06fbd92fd63765bbe23faa7b8f929c17f99ed623f7abf2e568169d982f
post_install() {
vlicense LICENSE