cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to i3-4.10.1

Browse Source
This commit is contained in:
dcoppa 2015-03-30 12:33:46 +00:00
parent f9bc6baaeb
commit 7938a2e55e
9 changed files with 36 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/i3/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.92 2015/03/17 15:39:47 dcoppa Exp $
# $OpenBSD: Makefile,v 1.93 2015/03/30 12:33:46 dcoppa Exp $
COMMENT = improved dynamic tiling window manager
DISTNAME = i3-4.9.1
DISTNAME = i3-4.10.1
CATEGORIES = x11
EXTRACT_SUFX = .tar.bz2

4
x11/i3/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (i3-4.9.1.tar.bz2) = tw3v8CfH0FJ2yWRuU/ru7M3ecGNwubM3pjO+2FsW3EM=
SIZE (i3-4.9.1.tar.bz2) = 939630
SHA256 (i3-4.10.1.tar.bz2) = Cy3zX6vIKEn8T6J4JkNTXA5+r0n6J9hAK9Pe4l1eV+I=
SIZE (i3-4.10.1.tar.bz2) = 942981

18
x11/i3/patches/patch-i3-dump-log_main_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-i3-dump-log_main_c,v 1.2 2014/07/11 15:49:58 dcoppa Exp $
$OpenBSD: patch-i3-dump-log_main_c,v 1.3 2015/03/30 12:33:46 dcoppa Exp $
OpenBSD lacks pthread_condattr_setpshared()
--- i3-dump-log/main.c.orig Sun Jun 15 19:12:43 2014
+++ i3-dump-log/main.c Thu Jul 3 21:06:31 2014
--- i3-dump-log/main.c.orig Sun Mar 29 19:07:08 2015
+++ i3-dump-log/main.c Mon Mar 30 14:21:46 2015
@@ -28,8 +28,12 @@
#include "shmlog.h"
#include <i3/ipc.h>
@ -17,7 +17,7 @@ OpenBSD lacks pthread_condattr_setpshared()
static i3_shmlog_header *header;
static char *logbuffer,
@@ -62,17 +66,28 @@ static void print_till_end(void) {
@@ -57,17 +61,27 @@ static void print_till_end(void) {
int main(int argc, char *argv[]) {
int o, option_index = 0;
@ -35,9 +35,7 @@ OpenBSD lacks pthread_condattr_setpshared()
{"follow", no_argument, 0, 'f'},
+#endif
{"help", no_argument, 0, 'h'},
- {0, 0, 0, 0}};
+ {0, 0, 0, 0}
+ };
{0, 0, 0, 0}};
+#if !defined(__OpenBSD__)
char *options_string = "s:vfVh";
@ -47,7 +45,7 @@ OpenBSD lacks pthread_condattr_setpshared()
while ((o = getopt_long(argc, argv, options_string, long_options, &option_index)) != -1) {
if (o == 'v') {
@@ -80,11 +95,17 @@ int main(int argc, char *argv[]) {
@@ -75,11 +89,17 @@ int main(int argc, char *argv[]) {
return 0;
} else if (o == 'V') {
verbose = true;
@ -66,7 +64,7 @@ OpenBSD lacks pthread_condattr_setpshared()
return 0;
}
}
@@ -166,6 +187,7 @@ int main(int argc, char *argv[]) {
@@ -161,6 +181,7 @@ int main(int argc, char *argv[]) {
walk = logbuffer + sizeof(i3_shmlog_header);
print_till_end();
@ -74,7 +72,7 @@ OpenBSD lacks pthread_condattr_setpshared()
if (follow) {
/* Since pthread_cond_wait() expects a mutex, we need to provide one.
* To not lock i3 (that’s bad, mhkay?) we just define one outside of
@@ -181,6 +203,7 @@ int main(int argc, char *argv[]) {
@@ -176,6 +197,7 @@ int main(int argc, char *argv[]) {
}
}
}

10
x11/i3/patches/patch-i3-nagbar_main_c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-i3-nagbar_main_c,v 1.5 2014/01/22 13:48:38 dcoppa Exp $
--- i3-nagbar/main.c.orig Tue Jan 21 19:21:08 2014
+++ i3-nagbar/main.c Wed Jan 22 13:19:44 2014
@@ -167,7 +167,7 @@ static void handle_button_release(xcb_connection_t *co
symlink(exe_path, link_path);
$OpenBSD: patch-i3-nagbar_main_c,v 1.6 2015/03/30 12:33:46 dcoppa Exp $
--- i3-nagbar/main.c.orig Sun Mar 29 19:07:08 2015
+++ i3-nagbar/main.c Mon Mar 30 14:13:25 2015
@@ -169,7 +169,7 @@ static void handle_button_release(xcb_connection_t *co
}
char *terminal_cmd;
- sasprintf(&terminal_cmd, "i3-sensible-terminal -e %s", link_path);

8
x11/i3/patches/patch-i3_config
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-i3_config,v 1.15 2014/07/11 15:49:58 dcoppa Exp $
--- i3.config.orig Sun Jun 15 19:12:43 2014
+++ i3.config Thu Jul 3 21:06:32 2014
@@ -32,13 +32,13 @@ set $right semicolon
$OpenBSD: patch-i3_config,v 1.16 2015/03/30 12:33:46 dcoppa Exp $
--- i3.config.orig Sun Mar 29 19:07:08 2015
+++ i3.config Mon Mar 30 14:13:25 2015
@@ -35,13 +35,13 @@ set $right semicolon
floating_modifier Mod1
# start a terminal

14
x11/i3/patches/patch-i3_config_keycodes
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-i3_config_keycodes,v 1.11 2014/07/11 15:49:58 dcoppa Exp $
$OpenBSD: patch-i3_config_keycodes,v 1.12 2015/03/30 12:33:46 dcoppa Exp $
Fix keycodes for the "Left", "Down", "Up" and "Right" keys: they're
different between Linux and OpenBSD.
--- i3.config.keycodes.orig Sun Jun 15 19:12:43 2014
+++ i3.config.keycodes Wed Jul 2 19:48:19 2014
@@ -26,13 +26,13 @@ font pango:DejaVu Sans Mono 8
--- i3.config.keycodes.orig Sun Mar 29 19:07:08 2015
+++ i3.config.keycodes Mon Mar 30 14:13:25 2015
@@ -29,13 +29,13 @@ font pango:monospace 8
floating_modifier $mod
# start a terminal
@ -21,7 +21,7 @@ different between Linux and OpenBSD.
# There also is the (new) i3-dmenu-desktop which only displays applications
# shipping a .desktop file. It is a wrapper around dmenu, so you need that
# installed.
@@ -45,10 +45,10 @@ bindcode $mod+46 focus up
@@ -48,10 +48,10 @@ bindcode $mod+46 focus up
bindcode $mod+47 focus right
# alternatively, you can use the cursor keys:
@ -36,7 +36,7 @@ different between Linux and OpenBSD.
# move focused window
bindcode $mod+Shift+44 move left
@@ -57,10 +57,10 @@ bindcode $mod+Shift+46 move up
@@ -60,10 +60,10 @@ bindcode $mod+Shift+46 move up
bindcode $mod+Shift+47 move right
# alternatively, you can use the cursor keys:
@ -51,7 +51,7 @@ different between Linux and OpenBSD.
# split in horizontal orientation
bindcode $mod+43 split h
@@ -133,10 +133,10 @@ mode "resize" {
@@ -136,10 +136,10 @@ mode "resize" {
bindcode 47 resize grow width 10 px or 10 ppt
# same bindings, but for the arrow keys

15
x11/i3/patches/patch-man_i3-migrate-config-to-v4_1
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-man_i3-migrate-config-to-v4_1,v 1.14 2015/03/17 15:39:47 dcoppa Exp $
Fix fatal error: "argument count wrong: line arguments >= 2 (have 1)"
--- man/i3-migrate-config-to-v4.1.orig Sat Mar 7 13:26:28 2015
+++ man/i3-migrate-config-to-v4.1 Tue Mar 17 10:24:24 2015
@@ -7,7 +7,7 @@
.\" Source: i3 4.9.1
.\" Language: English
.\"
-.TH "I3\-MIGRATE\-CONFIG\" "1" "03/07/2015" "i3 4\&.9\&.1" "i3 Manual"
+.TH "I3\-MIGRATE\-CONFIG" "1" "03/07/2015" "i3 4\&.9\&.1" "i3 Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

8
x11/i3/patches/patch-src_commands_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_commands_c,v 1.13 2015/03/17 15:39:47 dcoppa Exp $
--- src/commands.c.orig Sat Mar 7 13:26:13 2015
+++ src/commands.c Tue Mar 17 10:24:24 2015
@@ -204,7 +204,7 @@ void cmd_MIGRATION_start_nagbar(void) {
$OpenBSD: patch-src_commands_c,v 1.14 2015/03/30 12:33:46 dcoppa Exp $
--- src/commands.c.orig Sun Mar 29 19:07:08 2015
+++ src/commands.c Mon Mar 30 14:13:25 2015
@@ -182,7 +182,7 @@ void cmd_MIGRATION_start_nagbar(void) {
/* child */
if (migration_pid == 0) {
char *pageraction;

8
x11/i3/patches/patch-src_config_parser_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_config_parser_c,v 1.5 2015/03/17 15:39:48 dcoppa Exp $
--- src/config_parser.c.orig Wed Feb 25 01:50:09 2015
+++ src/config_parser.c Wed Feb 25 02:16:28 2015
@@ -1007,8 +1007,8 @@ bool parse_file(const char *f, bool use_nagbar) {
$OpenBSD: patch-src_config_parser_c,v 1.6 2015/03/30 12:33:46 dcoppa Exp $
--- src/config_parser.c.orig Sun Mar 29 19:07:08 2015
+++ src/config_parser.c Mon Mar 30 14:13:25 2015
@@ -1002,8 +1002,8 @@ bool parse_file(const char *f, bool use_nagbar) {
char *editaction,
*pageraction;