Now that 4.14 is out, here's the diff to update our port.
Comments / OKs ?
Ciao!
David
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.106
diff -u -p -u -p -r1.106 Makefile
--- Makefile 13 Nov 2016 20:46:23 -0000 1.106
+++ Makefile 4 Sep 2017 09:16:43 -0000
@@ -2,7 +2,7 @@
COMMENT = improved dynamic tiling window manager
-DISTNAME = i3-4.13
+DISTNAME = i3-4.14
CATEGORIES = x11
EXTRACT_SUFX = .tar.bz2
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/i3/distinfo,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 distinfo
--- distinfo 13 Nov 2016 20:46:23 -0000 1.26
+++ distinfo 4 Sep 2017 09:16:43 -0000
@@ -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
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/x11/i3/patches/patch-Makefile_in,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-Makefile_in
--- patches/patch-Makefile_in 13 Nov 2016 20:46:23 -0000 1.1
+++ patches/patch-Makefile_in 4 Sep 2017 09:16:43 -0000
@@ -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 = \
+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/1
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/1
@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=''.
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/x11/i3/patches/patch-configure,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-configure
--- patches/patch-configure 13 Nov 2016 20:46:23 -0000 1.1
+++ patches/patch-configure 4 Sep 2017 09:16:43 -0000
@@ -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`
+Index: configure
+--- configure.orig
++++ configure
+@@ -6388,7 +6388,7 @@ char iconv_open ();
+ int
+ main ()
+ {
+-return iconv_open ();
++return libiconv_open ();
+ ;
+ return 0;
+ }
Index: patches/patch-i3-dmenu-desktop
===================================================================
RCS file: /cvs/ports/x11/i3/patches/patch-i3-dmenu-desktop,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-i3-dmenu-desktop
--- patches/patch-i3-dmenu-desktop 13 Nov 2016 20:46:23 -0000 1.6
+++ patches/patch-i3-dmenu-desktop 4 Sep 2017 09:16:43 -0000
@@ -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
+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 2
# }
# };
-@@ -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 2
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 2
} 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 2
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.
Index: patches/patch-i3-nagbar_main_c
===================================================================
RCS file: /cvs/ports/x11/i3/patches/patch-i3-nagbar_main_c,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-i3-nagbar_main_c
--- patches/patch-i3-nagbar_main_c 13 Nov 2016 20:46:23 -0000 1.11
+++ patches/patch-i3-nagbar_main_c 4 Sep 2017 09:16:43 -0000
@@ -1,8 +1,9 @@
$OpenBSD: patch-i3-nagbar_main_c,v 1.11 2016/11/13 20:46:23 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;
Index: patches/patch-libi3_dpi_c
===================================================================
RCS file: patches/patch-libi3_dpi_c
diff -N patches/patch-libi3_dpi_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libi3_dpi_c 4 Sep 2017 09:16:43 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+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");
Index: patches/patch-libi3_get_config_path_c
===================================================================
RCS file: patches/patch-libi3_get_config_path_c
diff -N patches/patch-libi3_get_config_path_c
--- patches/patch-libi3_get_config_path_c 13 Nov 2016 20:46:23 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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, ":");
Index: patches/patch-man_i3_man
===================================================================
RCS file: /cvs/ports/x11/i3/patches/patch-man_i3_man,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-man_i3_man
--- patches/patch-man_i3_man 13 Nov 2016 20:46:23 -0000 1.1
+++ patches/patch-man_i3_man 4 Sep 2017 09:16:43 -0000
@@ -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:
+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.
Index: patches/patch-src_bindings_c
===================================================================
RCS file: /cvs/ports/x11/i3/patches/patch-src_bindings_c,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-src_bindings_c
--- patches/patch-src_bindings_c 13 Nov 2016 20:46:23 -0000 1.6
+++ patches/patch-src_bindings_c 4 Sep 2017 09:16:43 -0000
@@ -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) {
+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;
Index: patches/patch-src_manage_c
===================================================================
RCS file: /cvs/ports/x11/i3/patches/patch-src_manage_c,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 patch-src_manage_c
--- patches/patch-src_manage_c 13 Nov 2016 20:46:23 -0000 1.19
+++ patches/patch-src_manage_c 4 Sep 2017 09:16:43 -0000
@@ -1,4 +1,7 @@
$OpenBSD: patch-src_manage_c,v 1.19 2016/11/13 20:46:23 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
No comments:
Post a Comment