Update to i3-4.14
Tested by Josh Grosse Tests, feedback and ok tb@
This commit is contained in:
parent
2100db8daf
commit
f6e0dadc67
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.106 2016/11/13 20:46:23 dcoppa Exp $
|
||||
# $OpenBSD: Makefile,v 1.107 2017/09/04 14:33:07 dcoppa Exp $
|
||||
|
||||
COMMENT = improved dynamic tiling window manager
|
||||
|
||||
DISTNAME = i3-4.13
|
||||
DISTNAME = i3-4.14
|
||||
CATEGORIES = x11
|
||||
|
||||
EXTRACT_SUFX = .tar.bz2
|
||||
@ -43,7 +43,8 @@ USE_GMAKE = Yes
|
||||
|
||||
CONFIGURE_STYLE = gnu
|
||||
|
||||
CONFIGURE_ARGS = --enable-builddir=${WRKBUILD}
|
||||
CONFIGURE_ARGS = --enable-builddir=${WRKBUILD} \
|
||||
--enable-debug=no
|
||||
|
||||
CONFIGURE_ENV = CPPFLAGS="-I${X11BASE}/include \
|
||||
-I${LOCALBASE}/include" \
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (i3-4.13.tar.bz2) = lMExg+UnqYQTKjsFDIv2KWJlAqbhM+B7QTZBrsX4z4o=
|
||||
SIZE (i3-4.13.tar.bz2) = 1121298
|
||||
SHA256 (i3-4.14.tar.bz2) = rjq9468bh+Jp2KrSNIvm9ymDOMuOBrrRHL+Rzb+SpdY=
|
||||
SIZE (i3-4.14.tar.bz2) = 1152501
|
||||
|
@ -1,7 +1,8 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.1 2016/11/13 20:46:23 dcoppa Exp $
|
||||
--- Makefile.in.orig Tue Nov 8 19:54:08 2016
|
||||
+++ Makefile.in Thu Nov 10 19:44:19 2016
|
||||
@@ -744,10 +744,7 @@ i3include_HEADERS = \
|
||||
$OpenBSD: patch-Makefile_in,v 1.2 2017/09/04 14:33:07 dcoppa Exp $
|
||||
Index: Makefile.in
|
||||
--- Makefile.in.orig
|
||||
+++ Makefile.in
|
||||
@@ -752,10 +752,7 @@ i3include_HEADERS = \
|
||||
dist_bin_SCRIPTS = \
|
||||
i3-dmenu-desktop \
|
||||
i3-migrate-config-to-v4 \
|
||||
@ -13,7 +14,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2016/11/13 20:46:23 dcoppa Exp $
|
||||
|
||||
i3confdir = $(sysconfdir)/i3
|
||||
dist_i3conf_DATA = \
|
||||
@@ -882,9 +879,6 @@ docs_poddir = ${docdir}
|
||||
@@ -893,9 +890,6 @@ docs_poddir = ${docdir}
|
||||
@BUILD_MANS_TRUE@ man/i3-nagbar.1 \
|
||||
@BUILD_MANS_TRUE@ man/i3-config-wizard.1 \
|
||||
@BUILD_MANS_TRUE@ man/i3-migrate-config-to-v4.1 \
|
||||
@ -23,7 +24,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2016/11/13 20:46:23 dcoppa Exp $
|
||||
@BUILD_MANS_TRUE@ man/i3-dump-log.1
|
||||
|
||||
@BUILD_MANS_TRUE@pod_MANS = \
|
||||
@@ -3121,7 +3115,7 @@ distclean-tags:
|
||||
@@ -3156,7 +3150,7 @@ distclean-tags:
|
||||
|
||||
# Leading 'am--fnord' is there to ensure the list of targets does not
|
||||
# expand to empty, as could happen e.g. with make check TESTS=''.
|
||||
|
@ -1,12 +1,13 @@
|
||||
$OpenBSD: patch-configure,v 1.1 2016/11/13 20:46:23 dcoppa Exp $
|
||||
--- configure.orig Thu Nov 10 21:43:14 2016
|
||||
+++ configure Thu Nov 10 21:43:53 2016
|
||||
@@ -3351,7 +3351,7 @@ if test "x$_cv_gnu_make_command" = x""; then :
|
||||
fi
|
||||
|
||||
case $srcdir in #(
|
||||
- .|.*) :
|
||||
+ /*|.|.*) :
|
||||
|
||||
# pwd -P is specified in IEEE 1003.1 from 2004
|
||||
as_dir=`cd "$srcdir" && pwd -P`
|
||||
$OpenBSD: patch-configure,v 1.2 2017/09/04 14:33:07 dcoppa Exp $
|
||||
Index: configure
|
||||
--- configure.orig
|
||||
+++ configure
|
||||
@@ -6388,7 +6388,7 @@ char iconv_open ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
-return iconv_open ();
|
||||
+return libiconv_open ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
|
@ -1,6 +1,7 @@
|
||||
$OpenBSD: patch-i3-dmenu-desktop,v 1.6 2016/11/13 20:46:23 dcoppa Exp $
|
||||
--- i3-dmenu-desktop.orig Tue Nov 8 19:54:01 2016
|
||||
+++ i3-dmenu-desktop Thu Nov 10 18:04:35 2016
|
||||
$OpenBSD: patch-i3-dmenu-desktop,v 1.7 2017/09/04 14:33:07 dcoppa Exp $
|
||||
Index: i3-dmenu-desktop
|
||||
--- i3-dmenu-desktop.orig
|
||||
+++ i3-dmenu-desktop
|
||||
@@ -111,7 +111,7 @@ $xdg_data_home = $ENV{HOME} . '/.local/share' if
|
||||
! -d $xdg_data_home;
|
||||
|
||||
@ -25,7 +26,7 @@ $OpenBSD: patch-i3-dmenu-desktop,v 1.6 2016/11/13 20:46:23 dcoppa Exp $
|
||||
# }
|
||||
# };
|
||||
|
||||
@@ -424,7 +424,7 @@ if (exists($app->{Terminal}) && $app->{Terminal}) {
|
||||
@@ -450,7 +450,7 @@ if (exists($app->{Terminal}) && $app->{Terminal}) {
|
||||
# we need to create a temporary script that contains the full command line
|
||||
# as the syntax for starting commands with arguments varies from terminal
|
||||
# emulator to terminal emulator.
|
||||
@ -34,7 +35,7 @@ $OpenBSD: patch-i3-dmenu-desktop,v 1.6 2016/11/13 20:46:23 dcoppa Exp $
|
||||
my ($fh, $filename) = tempfile();
|
||||
binmode($fh, ':utf8');
|
||||
say $fh <<EOT;
|
||||
@@ -435,7 +435,7 @@ EOT
|
||||
@@ -461,7 +461,7 @@ EOT
|
||||
close($fh);
|
||||
chmod 0755, $filename;
|
||||
|
||||
@ -43,7 +44,7 @@ $OpenBSD: patch-i3-dmenu-desktop,v 1.6 2016/11/13 20:46:23 dcoppa Exp $
|
||||
} else {
|
||||
# i3 executes applications by passing the argument to i3’s “exec” command
|
||||
# as-is to $SHELL -c. The i3 parser supports quoted strings: When a string
|
||||
@@ -476,7 +476,7 @@ notifications.
|
||||
@@ -502,7 +502,7 @@ notifications.
|
||||
|
||||
The .desktop files are searched in $XDG_DATA_HOME/applications (by default
|
||||
$HOME/.local/share/applications) and in the "applications" subdirectory of each
|
||||
@ -52,7 +53,7 @@ $OpenBSD: patch-i3-dmenu-desktop,v 1.6 2016/11/13 20:46:23 dcoppa Exp $
|
||||
|
||||
Files with the same name in $XDG_DATA_HOME/applications take precedence over
|
||||
files in $XDG_DATA_DIRS, so that you can overwrite parts of the system-wide
|
||||
@@ -490,7 +490,7 @@ file respectively) by appending it to the name of the
|
||||
@@ -516,7 +516,7 @@ file respectively) by appending it to the name of the
|
||||
want to launch "GNU Emacs 24" with the patch /tmp/foobar.txt, you would type
|
||||
"emacs", press TAB, type " /tmp/foobar.txt" and press ENTER.
|
||||
|
||||
|
@ -1,8 +1,9 @@
|
||||
$OpenBSD: patch-i3-nagbar_main_c,v 1.11 2016/11/13 20:46:23 dcoppa Exp $
|
||||
$OpenBSD: patch-i3-nagbar_main_c,v 1.12 2017/09/04 14:33:07 dcoppa Exp $
|
||||
|
||||
--- i3-nagbar/main.c.orig Tue Nov 8 19:54:01 2016
|
||||
+++ i3-nagbar/main.c Thu Nov 10 18:04:35 2016
|
||||
@@ -176,7 +176,7 @@ static void handle_button_release(xcb_connection_t *co
|
||||
Index: i3-nagbar/main.c
|
||||
--- i3-nagbar/main.c.orig
|
||||
+++ i3-nagbar/main.c
|
||||
@@ -184,7 +184,7 @@ static void handle_button_release(xcb_connection_t *co
|
||||
}
|
||||
|
||||
char *terminal_cmd;
|
||||
|
24
x11/i3/patches/patch-libi3_dpi_c
Normal file
24
x11/i3/patches/patch-libi3_dpi_c
Normal file
@ -0,0 +1,24 @@
|
||||
$OpenBSD: patch-libi3_dpi_c,v 1.1 2017/09/04 14:33:07 dcoppa Exp $
|
||||
|
||||
Silence a clang -Wsometimes-uninitialized warning
|
||||
https://github.com/i3/i3/pull/2875
|
||||
|
||||
Index: libi3/dpi.c
|
||||
--- libi3/dpi.c.orig
|
||||
+++ libi3/dpi.c
|
||||
@@ -24,6 +24,7 @@ static long init_dpi_fallback(void) {
|
||||
*/
|
||||
void init_dpi(void) {
|
||||
xcb_xrm_database_t *database = NULL;
|
||||
+ char *resource = NULL;
|
||||
|
||||
if (conn == NULL) {
|
||||
goto init_dpi_end;
|
||||
@@ -35,7 +36,6 @@ void init_dpi(void) {
|
||||
goto init_dpi_end;
|
||||
}
|
||||
|
||||
- char *resource;
|
||||
xcb_xrm_resource_get_string(database, "Xft.dpi", NULL, &resource);
|
||||
if (resource == NULL) {
|
||||
DLOG("Resource Xft.dpi not specified, skipping.\n");
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-libi3_get_config_path_c,v 1.2 2016/11/13 20:46:23 dcoppa Exp $
|
||||
--- libi3/get_config_path.c.orig Tue Nov 8 19:54:01 2016
|
||||
+++ libi3/get_config_path.c Thu Nov 10 18:04:35 2016
|
||||
@@ -71,7 +71,7 @@ char *get_config_path(const char *override_configpath,
|
||||
|
||||
/* 4: check for $XDG_CONFIG_DIRS/i3/config */
|
||||
if ((xdg_config_dirs = getenv("XDG_CONFIG_DIRS")) == NULL)
|
||||
- xdg_config_dirs = "/etc/xdg";
|
||||
+ xdg_config_dirs = "${SYSCONFDIR}/xdg";
|
||||
|
||||
char *buf = sstrdup(xdg_config_dirs);
|
||||
char *tok = strtok(buf, ":");
|
@ -1,15 +1,15 @@
|
||||
$OpenBSD: patch-man_i3_man,v 1.1 2016/11/13 20:46:23 dcoppa Exp $
|
||||
--- man/i3.man.orig Fri Nov 11 11:07:56 2016
|
||||
+++ man/i3.man Fri Nov 11 11:10:25 2016
|
||||
@@ -171,9 +171,9 @@ Exits i3.
|
||||
When starting, i3 looks for configuration files in the following order:
|
||||
$OpenBSD: patch-man_i3_man,v 1.2 2017/09/04 14:33:07 dcoppa Exp $
|
||||
Index: man/i3.man
|
||||
--- man/i3.man.orig
|
||||
+++ man/i3.man
|
||||
@@ -172,8 +172,8 @@ When starting, i3 looks for configuration files in the
|
||||
|
||||
1. ~/.config/i3/config (or $XDG_CONFIG_HOME/i3/config if set)
|
||||
-2. /etc/xdg/i3/config (or $XDG_CONFIG_DIRS/i3/config if set)
|
||||
+2. ${SYSCONFDIR}/xdg/i3/config (or $XDG_CONFIG_DIRS/i3/config if set)
|
||||
3. ~/.i3/config
|
||||
-4. /etc/i3/config
|
||||
+4. ${SYSCONFDIR}/i3/config
|
||||
1. ~/.i3/config
|
||||
2. ~/.config/i3/config (or $XDG_CONFIG_HOME/i3/config if set)
|
||||
-3. /etc/i3/config
|
||||
-4. /etc/xdg/i3/config (or $XDG_CONFIG_DIRS/i3/config if set)
|
||||
+3. ${SYSCONFDIR}/i3/config
|
||||
+4. ${SYSCONFDIR}/xdg/i3/config (or $XDG_CONFIG_DIRS/i3/config if set)
|
||||
|
||||
You can specify a custom path using the -c option.
|
||||
|
||||
|
@ -1,7 +1,8 @@
|
||||
$OpenBSD: patch-src_bindings_c,v 1.6 2016/11/13 20:46:23 dcoppa Exp $
|
||||
--- src/bindings.c.orig Tue Nov 8 19:54:01 2016
|
||||
+++ src/bindings.c Thu Nov 10 18:04:35 2016
|
||||
@@ -797,7 +797,7 @@ CommandResult *run_binding(Binding *bind, Con *con) {
|
||||
$OpenBSD: patch-src_bindings_c,v 1.7 2017/09/04 14:33:07 dcoppa Exp $
|
||||
Index: src/bindings.c
|
||||
--- src/bindings.c.orig
|
||||
+++ src/bindings.c
|
||||
@@ -843,7 +843,7 @@ CommandResult *run_binding(Binding *bind, Con *con) {
|
||||
|
||||
if (result->parse_error) {
|
||||
char *pageraction;
|
||||
|
@ -1,4 +1,7 @@
|
||||
$OpenBSD: patch-src_manage_c,v 1.19 2016/11/13 20:46:23 dcoppa Exp $
|
||||
$OpenBSD: patch-src_manage_c,v 1.20 2017/09/04 14:33:07 dcoppa Exp $
|
||||
|
||||
Fix size hints for ssh-askpass
|
||||
|
||||
--- src/manage.c.orig Tue Nov 8 19:54:01 2016
|
||||
+++ src/manage.c Thu Nov 10 18:04:35 2016
|
||||
@@ -480,10 +480,16 @@ void manage_window(xcb_window_t window, xcb_get_window
|
||||
|
15
x11/i3/patches/patch-testcases_inject_randr1_5_c
Normal file
15
x11/i3/patches/patch-testcases_inject_randr1_5_c
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-testcases_inject_randr1_5_c,v 1.1 2017/09/04 14:33:07 dcoppa Exp $
|
||||
|
||||
missing include
|
||||
|
||||
Index: testcases/inject_randr1.5.c
|
||||
--- testcases/inject_randr1.5.c.orig
|
||||
+++ testcases/inject_randr1.5.c
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <sys/resource.h>
|
||||
#include <sys/mman.h>
|
||||
#include <sys/stat.h>
|
||||
+#include <sys/wait.h>
|
||||
#include <libgen.h>
|
||||
|
||||
static void uds_connection_cb(EV_P_ ev_io *w, int revents);
|
Loading…
Reference in New Issue
Block a user