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

update to i3-4.21, merging in x11/i3-mousedrag. This is very close to 

the code previously in x11/i3-mousedrag plus a couple of commits on top.
This commit is contained in:
sthen 2022-09-22 09:59:58 +00:00
parent c7393cb8b9
commit f6366ff551
29 changed files with 15 additions and 624 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/quirks/Makefile
View File

@ -3,7 +3,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-6.41
PKGNAME = quirks-6.42
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

3
devel/quirks/files/Quirks.pm
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.1435 2022/09/18 10:37:03 ajacoutot Exp $
# $OpenBSD: Quirks.pm,v 1.1436 2022/09/22 09:59:59 sthen Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -746,6 +746,7 @@ my $stem_extensions = {
'py-dpkt' => 'py3-dpkt',
'py-dbus' => 'py3-dbus',
'dspy' => 'd-spy',
'i3-mousedrag' => 'i3',
};
my $obsolete_reason = {};

1
x11/Makefile
View File

@ -127,7 +127,6 @@
SUBDIR += human-icon-theme
SUBDIR += i3
SUBDIR += i3-gaps
SUBDIR += i3-mousedrag
SUBDIR += i3lock
SUBDIR += i3status
SUBDIR += icewm

68
x11/i3-mousedrag/Makefile
View File

@ -1,68 +0,0 @@
# now merged into main i3; this port can be merged into the next x11/i3 update
COMMENT= improved dynamic tiling window manager, fork with mouse drag
GH_ACCOUNT= i3
GH_PROJECT= i3
GH_COMMIT= ebcd1d43ea9fd08a1dbb1212fb61e42f05a22684
DISTNAME= i3-mousedrag-4.20.1pl20220728
CATEGORIES= x11
HOMEPAGE= https://i3wm.org/
# BSD
PERMIT_PACKAGE= Yes
WANTLIB += c cairo ev glib-2.0 gobject-2.0 iconv m pango-1.0 pangocairo-1.0
WANTLIB += pcre2-8 startup-notification-1 xcb xcb-cursor xcb-icccm
WANTLIB += xcb-keysyms xcb-randr xcb-shape xcb-util xcb-xinerama
WANTLIB += xcb-xkb xcb-xrm xkbcommon xkbcommon-x11 yajl
# C11
COMPILER= base-clang ports-gcc
COMPILER_LANGS= c
DEBUG_PACKAGES= ${BUILD_PACKAGES}
LIB_DEPENDS= devel/libev \
devel/libyajl>=2.0.0 \
devel/pango \
devel/pcre2 \
devel/startup-notification \
x11/xkbcommon
RUN_DEPENDS= devel/desktop-file-utils \
x11/dmenu \
x11/i3status \
x11/p5-AnyEvent-I3
# Tests now use the X11::XCB Perl module, not yet in ports and a bit complex
#TEST_DEPENDS= x11/p5-AnyEvent-I3
NO_TEST= Yes
MODULES= devel/meson
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
# only needed for git builds; release builds use pre-generated docs
CONFIGURE_ARGS= -Dmans=true \
-Ddocs=true
BUILD_DEPENDS= textproc/asciidoc \
textproc/xmlto
pre-configure:
${SUBST_CMD} ${WRKSRC}/etc/config \
${WRKSRC}/etc/config.keycodes \
${WRKSRC}/i3-dmenu-desktop \
${WRKSRC}/i3-nagbar/main.c \
${WRKSRC}/libi3/get_config_path.c \
${WRKSRC}/libi3/get_exe_path.c \
${WRKSRC}/man/i3-config-wizard.man \
${WRKSRC}/man/i3.man
post-install:
rm ${WRKINST}/etc/i3/*{${PATCHORIG},.beforesubst}
mv ${WRKINST}/etc/i3 ${PREFIX}/share/examples/
.include <bsd.port.mk>

2
x11/i3-mousedrag/distinfo
View File

@ -1,2 +0,0 @@
SHA256 (i3-mousedrag-4.20.1pl20220728-ebcd1d43.tar.gz) = 4/iAwULhUMtZZGM16OhIwnth01VOpLNNQV9e/lwue0o=
SIZE (i3-mousedrag-4.20.1pl20220728-ebcd1d43.tar.gz) = 4203350

45
x11/i3-mousedrag/patches/patch-etc_config
View File

@ -1,45 +0,0 @@
Index: etc/config
--- etc/config.orig
+++ etc/config
@@ -26,18 +26,18 @@ exec --no-startup-id dex --autostart --environment i3
# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
# screen before suspend. Use loginctl lock-session to lock your screen.
-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
+#exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
# NetworkManager is the most popular way to manage wireless networks on Linux,
# and nm-applet is a desktop environment-independent system tray GUI for it.
-exec --no-startup-id nm-applet
+#exec --no-startup-id nm-applet
# Use pactl to adjust volume in PulseAudio.
-set $refresh_i3status killall -SIGUSR1 i3status
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
-bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
+#set $refresh_i3status pkill -SIGUSR1 i3status
+#bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
+#bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
+#bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
+#bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
# use these keys for focus, movement, and resize directions when reaching for
# the arrows is not convenient
@@ -50,13 +50,13 @@ set $right semicolon
floating_modifier Mod1
# start a terminal
-bindsym Mod1+Return exec i3-sensible-terminal
+bindsym Mod1+Return exec ${X11BASE}/bin/xterm
# kill focused window
bindsym Mod1+Shift+q kill
# start dmenu (a program launcher)
-bindsym Mod1+d exec --no-startup-id dmenu_run
+bindsym Mod1+d exec --no-startup-id ${LOCALBASE}/bin/dmenu_run
# A more modern dmenu replacement is rofi:
# bindsym Mod1+d exec "rofi -modi drun,run -show drun"
# There also is i3-dmenu-desktop which only displays applications shipping a

91
x11/i3-mousedrag/patches/patch-etc_config_keycodes
View File

@ -1,91 +0,0 @@
Fix keycodes for the "Left", "Down", "Up" and "Right" keys: they're
different between Linux and OpenBSD.
Index: etc/config.keycodes
--- etc/config.keycodes.orig
+++ etc/config.keycodes
@@ -27,30 +27,30 @@ exec --no-startup-id dex --autostart --environment i3
# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
# screen before suspend. Use loginctl lock-session to lock your screen.
-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
+#exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
# NetworkManager is the most popular way to manage wireless networks on Linux,
# and nm-applet is a desktop environment-independent system tray GUI for it.
-exec --no-startup-id nm-applet
+#exec --no-startup-id nm-applet
# Use pactl to adjust volume in PulseAudio.
-set $refresh_i3status killall -SIGUSR1 i3status
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
-bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
+#set $refresh_i3status pkill -SIGUSR1 i3status
+#bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
+#bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
+#bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
+#bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
# Use Mouse+$mod to drag floating windows to their wanted position
floating_modifier $mod
# start a terminal
-bindcode $mod+36 exec i3-sensible-terminal
+bindcode $mod+36 exec ${X11BASE}/bin/xterm
# kill focused window
bindcode $mod+Shift+24 kill
# start dmenu (a program launcher)
-bindcode $mod+40 exec --no-startup-id dmenu_run
+bindcode $mod+40 exec --no-startup-id ${LOCALBASE}/bin/dmenu_run
# A more modern dmenu replacement is rofi:
# bindcode $mod+40 exec "rofi -modi drun,run -show drun"
# There also is i3-dmenu-desktop which only displays applications shipping a
@@ -64,10 +64,10 @@ bindcode $mod+46 focus up
bindcode $mod+47 focus right
# alternatively, you can use the cursor keys:
-bindcode $mod+113 focus left
-bindcode $mod+116 focus down
-bindcode $mod+111 focus up
-bindcode $mod+114 focus right
+bindcode $mod+100 focus left
+bindcode $mod+104 focus down
+bindcode $mod+98 focus up
+bindcode $mod+102 focus right
# move focused window
bindcode $mod+Shift+44 move left
@@ -76,10 +76,10 @@ bindcode $mod+Shift+46 move up
bindcode $mod+Shift+47 move right
# alternatively, you can use the cursor keys:
-bindcode $mod+Shift+113 move left
-bindcode $mod+Shift+116 move down
-bindcode $mod+Shift+111 move up
-bindcode $mod+Shift+114 move right
+bindcode $mod+Shift+100 move left
+bindcode $mod+Shift+104 move down
+bindcode $mod+Shift+98 move up
+bindcode $mod+Shift+102 move right
# split in horizontal orientation
bindcode $mod+43 split h
@@ -165,10 +165,10 @@ mode "resize" {
bindcode 47 resize grow width 10 px or 10 ppt
# same bindings, but for the arrow keys
- bindcode 113 resize shrink width 10 px or 10 ppt
- bindcode 116 resize grow height 10 px or 10 ppt
- bindcode 111 resize shrink height 10 px or 10 ppt
- bindcode 114 resize grow width 10 px or 10 ppt
+ bindcode 100 resize shrink width 10 px or 10 ppt
+ bindcode 104 resize grow height 10 px or 10 ppt
+ bindcode 98 resize shrink height 10 px or 10 ppt
+ bindcode 102 resize grow width 10 px or 10 ppt
# back to normal: Enter or Escape or $mod+r
bindcode 36 mode "default"

63
x11/i3-mousedrag/patches/patch-i3-dmenu-desktop
View File

@ -1,63 +0,0 @@
Index: i3-dmenu-desktop
--- i3-dmenu-desktop.orig
+++ i3-dmenu-desktop
@@ -112,7 +112,7 @@ $xdg_data_home = $ENV{HOME} . '/.local/share' if
! -d $xdg_data_home;
my $xdg_data_dirs = $ENV{XDG_DATA_DIRS};
-$xdg_data_dirs = '/usr/local/share/:/usr/share/' if
+$xdg_data_dirs = '${LOCALBASE}/share/' if
!defined($xdg_data_dirs) ||
$xdg_data_dirs eq '';
@@ -226,12 +226,12 @@ for my $file (values %desktops) {
# 'evince.desktop' => {
# 'Exec' => 'evince %U',
# 'Name' => 'Dokumentenbetrachter',
-# '_Location' => '/usr/share/applications/evince.desktop'
+# '_Location' => '${LOCALBASE}/share/applications/evince.desktop'
# },
# 'gedit.desktop' => {
# 'Exec' => 'gedit %U',
# 'Name' => 'gedit',
-# '_Location' => '/usr/share/applications/gedit.desktop'
+# '_Location' => '${LOCALBASE}/share/applications/gedit.desktop'
# }
# };
@@ -463,7 +463,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.
- # Then, we launch that script with i3-sensible-terminal.
+ # Then, we launch that script with xterm.
my ($fh, $filename) = tempfile();
binmode($fh, ':utf8');
say $fh <<EOT;
@@ -474,7 +474,7 @@ EOT
close($fh);
chmod 0755, $filename;
- $cmd = qq|exec i3-sensible-terminal -e "$filename"|;
+ $cmd = qq|exec ${X11BASE}/bin/xterm -e "$filename"|;
} 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
@@ -516,7 +516,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
-entry of $XDG_DATA_DIRS (by default /usr/local/share/:/usr/share/).
+entry of $XDG_DATA_DIRS (by default ${LOCALBASE}/share/).
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
@@ -530,7 +530,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.
-.desktop files with Terminal=true are started using i3-sensible-terminal(1).
+.desktop files with Terminal=true are started using xterm(1).
.desktop files with NoDisplay=true or Hidden=true are skipped.

14
x11/i3-mousedrag/patches/patch-i3-msg_main_c
View File

@ -1,14 +0,0 @@
https://marc.info/?l=openbsd-ports&m=156762440931634&w=2
Index: i3-msg/main.c
--- i3-msg/main.c.orig
+++ i3-msg/main.c
@@ -146,7 +146,7 @@ static yajl_callbacks config_callbacks = {
};
int main(int argc, char *argv[]) {
-#if defined(__OpenBSD__)
+#if 0
if (pledge("stdio rpath unix", NULL) == -1)
err(EXIT_FAILURE, "pledge");
#endif

23
x11/i3-mousedrag/patches/patch-i3-nagbar_main_c
View File

@ -1,23 +0,0 @@
https://marc.info/?l=openbsd-ports&m=156762440931634&w=2
Index: i3-nagbar/main.c
--- i3-nagbar/main.c.orig
+++ i3-nagbar/main.c
@@ -187,7 +187,7 @@ static void handle_button_release(xcb_connection_t *co
char *terminal_cmd;
if (button->terminal) {
- sasprintf(&terminal_cmd, "i3-sensible-terminal -e %s", link_path);
+ sasprintf(&terminal_cmd, "${X11BASE}/bin/xterm -e %s", link_path);
} else {
terminal_cmd = sstrdup(link_path);
}
@@ -507,7 +507,7 @@ int main(int argc, char *argv[]) {
font = load_font(pattern, true);
set_font(&font);
-#if defined(__OpenBSD__)
+#if 0
if (pledge("stdio rpath wpath cpath getpw proc exec", NULL) == -1)
err(EXIT_FAILURE, "pledge");
#endif

10
x11/i3-mousedrag/patches/patch-libi3_get_exe_path_c
View File

@ -1,10 +0,0 @@
Index: libi3/get_exe_path.c
--- libi3/get_exe_path.c.orig
+++ libi3/get_exe_path.c
@@ -101,5 +101,5 @@ char *get_exe_path(const char *argv0) {
free(tmp);
/* Last resort: maybe it’s in /usr/bin? */
- return sstrdup("/usr/bin/i3-nagbar");
+ return sstrdup("${TRUEPREFIX}/bin/i3-nagbar");
}

16
x11/i3-mousedrag/patches/patch-libi3_is_debug_build_c
View File

@ -1,16 +0,0 @@
i3-mousedrag is from git source rather than a proper release distfile so
normally has debugging on by default as per i3 build config; disable as
debug logging has a lot of %s null which are very noisy in syslog
Index: libi3/is_debug_build.c
--- libi3/is_debug_build.c.orig
+++ libi3/is_debug_build.c
@@ -15,6 +15,8 @@
*
*/
bool is_debug_build(void) {
+ return false;
+
/* i3_version contains either something like this:
* "4.0.2 (2011-11-11)" (release version)
* or: "4.0.2-123-gC0FFEE" (debug version)

21
x11/i3-mousedrag/patches/patch-man_i3-config-wizard_man
View File

@ -1,21 +0,0 @@
Index: man/i3-config-wizard.man
--- man/i3-config-wizard.man.orig
+++ man/i3-config-wizard.man
@@ -27,7 +27,7 @@ Display a short help message and exit.
== FILES
-=== /etc/i3/config.keycodes
+=== ${SYSCONFDIR}/i3/config.keycodes
This file contains the default configuration with keycodes. All the bindcode
lines will be transformed to bindsym and the user-specified modifier will be
@@ -37,7 +37,7 @@ used.
i3-config-wizard is started by i3 in its default config, unless ~/.i3/config
exists. i3-config-wizard creates a keysym based i3 config file (based on
-/etc/i3/config.keycodes) in ~/.i3/config.
+${SYSCONFDIR}/i3/config.keycodes) in ~/.i3/config.
The advantage of using keysyms is that the config file is easy to read,
understand and modify. However, if we shipped with a keysym based default

21
x11/i3-mousedrag/patches/patch-man_i3-dump-log_man
View File

@ -1,21 +0,0 @@
--- man/i3-dump-log.man.orig Fri Nov 11 11:05:52 2016
+++ man/i3-dump-log.man Fri Nov 11 11:07:08 2016
@@ -9,7 +9,7 @@ i3-dump-log - dumps the i3 SHM log
== SYNOPSIS
-i3-dump-log [-s <socketpath>] [-f]
+i3-dump-log [-hVv]
== DESCRIPTION
@@ -18,9 +18,6 @@ full debug log output. This is extremely helpful for b
figuring out what is going on, without permanently logging to a file.
With i3-dump-log, you can dump the SHM log to stdout.
-
-The -f flag works like tail -f, i.e. the process does not terminate after
-dumping the log, but prints new lines as they appear.
== EXAMPLE

12
x11/i3-mousedrag/patches/patch-man_i3-nagbar_man
View File

@ -1,12 +0,0 @@
Index: man/i3-nagbar.man
--- man/i3-nagbar.man.orig
+++ man/i3-nagbar.man
@@ -54,7 +54,7 @@ after modifying the configuration file.
------------------------------------------------
i3-nagbar -m 'You have an error in your i3 config file!' \
--b 'edit config' 'i3-sensible-editor ~/.config/i3/config'
+-b 'edit config' '/usr/bin/vi ~/.config/i3/config'
------------------------------------------------
== SEE ALSO

28
x11/i3-mousedrag/patches/patch-man_i3_man
View File

@ -1,28 +0,0 @@
Index: man/i3.man
--- man/i3.man.orig
+++ man/i3.man
@@ -200,13 +200,13 @@ font pango:DejaVu Sans Mono 8
floating_modifier Mod1
# start a terminal
-bindsym Mod1+Return exec /usr/bin/urxvt
+bindsym Mod1+Return exec ${X11BASE}/bin/xterm
# kill focused window
bindsym Mod1+Shift+q kill
# start dmenu (a program launcher)
-bindsym Mod1+d exec /usr/bin/dmenu_run
+bindsym Mod1+d exec ${LOCALBASE}/bin/dmenu_run
# change focus
bindsym Mod1+j focus left
@@ -319,7 +319,7 @@ ulimit -c unlimited
# Start i3 and log to ~/.i3/logfile
echo "Starting at $(date)" >> ~/.i3/logfile
-exec /usr/bin/i3 -V -d all >> ~/.i3/logfile
+exec ${TRUEPREFIX}/bin/i3 -V -d all >> ~/.i3/logfile
-------------------------------------------------------------
== ENVIRONMENT

24
x11/i3-mousedrag/patches/patch-meson_build
View File

@ -1,24 +0,0 @@
OpenBSD will not implement wordexp(3); use glob(3) instead
Index: meson.build
--- meson.build.orig
+++ meson.build
@@ -52,7 +52,9 @@ endif
cdata.set('HAVE_STRNDUP', cc.has_function('strndup'))
cdata.set('HAVE_MKDIRP', cc.has_function('mkdirp'))
+cdata.set('HAVE_WORDEXP', cc.has_function('wordexp'))
+
# Instead of generating config.h directly, make vcs_tag generate it so that
# @VCS_TAG@ is replaced.
config_h_in = configure_file(
@@ -608,7 +610,7 @@ install_headers(
# because configure_file strips the backslash in e.g. \@display,
# resulting in @display, breaking our Perl code:
# https://github.com/mesonbuild/meson/issues/7165
-bash = find_program('bash')
+bash = find_program('sh')
replace_dirs = [
bash, '-c', # Use bash to capture output and mark as executable
'sed -e \'s,@abs_top_builddir@,'

12
x11/i3-mousedrag/patches/patch-src_bindings_c
View File

@ -1,12 +0,0 @@
Index: src/bindings.c
--- src/bindings.c.orig
+++ src/bindings.c
@@ -851,7 +851,7 @@ CommandResult *run_binding(Binding *bind, Con *con) {
if (result->parse_error) {
char *pageraction;
- sasprintf(&pageraction, "i3-sensible-pager \"%s\"\n", errorfilename);
+ sasprintf(&pageraction, "/usr/bin/less \"%s\"\n", errorfilename);
char *argv[] = {
NULL, /* will be replaced by the executable path */
"-f",

52
x11/i3-mousedrag/patches/patch-src_config_directives_c
View File

@ -1,52 +0,0 @@
OpenBSD will not implement wordexp(3); use glob(3) instead
Index: src/config_directives.c
--- src/config_directives.c.orig
+++ src/config_directives.c
@@ -9,7 +9,7 @@
*/
#include "all.h"
-#include <wordexp.h>
+#include <glob.h>
/*******************************************************************************
* Include functions.
@@ -18,6 +18,7 @@
CFGFUN(include, const char *pattern) {
DLOG("include %s\n", pattern);
+#ifdef HAVE_WORDEXP
wordexp_t p;
const int ret = wordexp(pattern, &p, 0);
if (ret != 0) {
@@ -27,6 +28,17 @@ CFGFUN(include, const char *pattern) {
}
char **w = p.we_wordv;
for (size_t i = 0; i < p.we_wordc; i++) {
+#else
+ glob_t p;
+ const int ret = glob(pattern, GLOB_ERR, NULL, &p );
+ if (ret != 0) {
+ ELOG("glob(%s): error %d\n", pattern, ret);
+ result->has_errors = true;
+ return;
+ }
+ char **w = p.gl_pathv;
+ for (size_t i = 0; i < p.gl_pathc; i++) {
+#endif
char resolved_path[PATH_MAX] = {'\0'};
if (realpath(w[i], resolved_path) == NULL) {
LOG("Skipping %s: %s\n", w[i], strerror(errno));
@@ -86,7 +98,11 @@ CFGFUN(include, const char *pattern) {
break;
}
}
+#ifdef HAVE_WORDEXP
wordfree(&p);
+#else
+ globfree(&p);
+#endif
}
/*******************************************************************************

14
x11/i3-mousedrag/patches/patch-src_config_parser_c
View File

@ -1,14 +0,0 @@
Index: src/config_parser.c
--- src/config_parser.c.orig
+++ src/config_parser.c
@@ -752,8 +752,8 @@ static char *migrate_config(char *input, off_t size) {
*/
void start_config_error_nagbar(const char *configpath, bool has_errors) {
char *editaction, *pageraction;
- sasprintf(&editaction, "i3-sensible-editor \"%s\" && i3-msg reload\n", configpath);
- sasprintf(&pageraction, "i3-sensible-pager \"%s\"\n", errorfilename);
+ sasprintf(&editaction, "/usr/bin/vi \"%s\" && i3-msg reload\n", configpath);
+ sasprintf(&pageraction, "/usr/bin/less \"%s\"\n", errorfilename);
char *argv[] = {
NULL, /* will be replaced by the executable path */
"-f",

14
x11/i3-mousedrag/patches/patch-src_main_c
View File

@ -1,14 +0,0 @@
https://marc.info/?l=openbsd-ports&m=156762440931634&w=2
Index: src/main.c
--- src/main.c.orig
+++ src/main.c
@@ -1125,7 +1125,7 @@ int main(int argc, char *argv[]) {
}
}
-#if defined(__OpenBSD__)
+#if 0
if (pledge("stdio rpath wpath cpath proc exec unix", NULL) == -1)
err(EXIT_FAILURE, "pledge");
#endif

7
x11/i3-mousedrag/pkg/DESCR
View File

@ -1,7 +0,0 @@
i3 is an improved dynamic, tiling window manager originally inspired
by wmii.
This fork adds support for dragging tiled windows using the mouse.
Hopefully it will be merged to the main branch at some point (see
https://github.com/i3/i3/pull/3085) and this separate package will
no longer be necessary.

75
x11/i3-mousedrag/pkg/PLIST
View File

@ -1,75 +0,0 @@
@conflict i3-gaps-*
@conflict i3-*
@bin bin/i3
@bin bin/i3-config-wizard
bin/i3-dmenu-desktop
@bin bin/i3-dump-log
@bin bin/i3-input
bin/i3-migrate-config-to-v4
@bin bin/i3-msg
@bin bin/i3-nagbar
bin/i3-save-tree
bin/i3-sensible-editor
bin/i3-sensible-pager
bin/i3-sensible-terminal
bin/i3-with-shmlog
@bin bin/i3bar
include/i3/
include/i3/ipc.h
@man man/man1/i3-config-wizard.1
@man man/man1/i3-dmenu-desktop.1
@man man/man1/i3-dump-log.1
@man man/man1/i3-input.1
@man man/man1/i3-migrate-config-to-v4.1
@man man/man1/i3-msg.1
@man man/man1/i3-nagbar.1
@man man/man1/i3-save-tree.1
@man man/man1/i3-sensible-editor.1
@man man/man1/i3-sensible-pager.1
@man man/man1/i3-sensible-terminal.1
@man man/man1/i3.1
@man man/man1/i3bar.1
share/applications/i3.desktop
share/doc/i3/
share/doc/i3/bigpicture.png
share/doc/i3/debugging.html
share/doc/i3/hacking-howto.html
share/doc/i3/i3-sync-working.png
share/doc/i3/i3-sync.png
share/doc/i3/i3bar-protocol.html
share/doc/i3/ipc.html
share/doc/i3/keyboard-layer1.png
share/doc/i3/keyboard-layer2.png
share/doc/i3/layout-saving-1.png
share/doc/i3/layout-saving.html
share/doc/i3/lib-i3test-test.html
share/doc/i3/lib-i3test.html
share/doc/i3/logo-30.png
share/doc/i3/modes.png
share/doc/i3/multi-monitor.html
share/doc/i3/refcard.html
share/doc/i3/refcard_style.css
share/doc/i3/single_terminal.png
share/doc/i3/snapping.png
share/doc/i3/testsuite.html
share/doc/i3/tree-layout1.png
share/doc/i3/tree-layout2.png
share/doc/i3/tree-shot1.png
share/doc/i3/tree-shot2.png
share/doc/i3/tree-shot3.png
share/doc/i3/tree-shot4.png
share/doc/i3/two_columns.png
share/doc/i3/two_terminals.png
share/doc/i3/userguide.html
share/doc/i3/wsbar.html
share/doc/i3/wsbar.png
share/examples/i3/
@sample ${SYSCONFDIR}/i3/
share/examples/i3/config
@sample ${SYSCONFDIR}/i3/config
share/examples/i3/config.keycodes
@sample ${SYSCONFDIR}/i3/config.keycodes
share/xsessions/
share/xsessions/i3-with-shmlog.desktop
share/xsessions/i3.desktop
@tag update-desktop-database

8
x11/i3/Makefile
View File

@ -1,6 +1,6 @@
COMMENT= improved dynamic tiling window manager
DISTNAME= i3-4.20.1
DISTNAME= i3-4.21
CATEGORIES= x11
@ -12,7 +12,7 @@ PERMIT_PACKAGE= Yes
# XXX use of pledge has been neutered. For more details see
# https://marc.info/?l=openbsd-ports&m=156762440931634&w=2
WANTLIB += c cairo ev glib-2.0 gobject-2.0 iconv m pango-1.0 pangocairo-1.0
WANTLIB += pcre startup-notification-1 xcb xcb-cursor xcb-icccm
WANTLIB += pcre2-8 startup-notification-1 xcb xcb-cursor xcb-icccm
WANTLIB += xcb-keysyms xcb-randr xcb-shape xcb-util xcb-xinerama
WANTLIB += xcb-xkb xcb-xrm xkbcommon xkbcommon-x11 yajl
@ -20,6 +20,8 @@ WANTLIB += xcb-xkb xcb-xrm xkbcommon xkbcommon-x11 yajl
COMPILER= base-clang ports-gcc
COMPILER_LANGS= c
MAINTAINER= Stuart Henderson <stu.ports@spacehopper.org>
MASTER_SITES= ${HOMEPAGE}/downloads/
EXTRACT_SUFX= .tar.xz
DEBUG_PACKAGES= ${BUILD_PACKAGES}
@ -27,7 +29,7 @@ DEBUG_PACKAGES= ${BUILD_PACKAGES}
LIB_DEPENDS= devel/libev \
devel/libyajl>=2.0.0 \
devel/pango \
devel/pcre \
devel/pcre2 \
devel/startup-notification \
x11/xkbcommon
RUN_DEPENDS= devel/desktop-file-utils \

4
x11/i3/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (i3-4.20.1.tar.xz) = I+HsryCMHRYqDIxmxFkLMBpCTuXAESJ+q7luNv1r/OY=
SIZE (i3-4.20.1.tar.xz) = 1284984
SHA256 (i3-4.21.tar.xz) = jcUgXg80Q9WGYeMHg1If2cbUJtHn82Z6sS8qwbLTIHg=
SIZE (i3-4.21.tar.xz) = 1294968

4
x11/i3/patches/patch-i3-dmenu-desktop
View File

@ -43,7 +43,7 @@ Index: i3-dmenu-desktop
} 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
@@ -515,7 +515,7 @@ notifications.
@@ -516,7 +516,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 +52,7 @@ Index: i3-dmenu-desktop
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
@@ -529,7 +529,7 @@ file respectively) by appending it to the name of the
@@ -530,7 +530,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.

2
x11/i3/patches/patch-meson_build
View File

@ -13,7 +13,7 @@ Index: meson.build
# Instead of generating config.h directly, make vcs_tag generate it so that
# @VCS_TAG@ is replaced.
config_h_in = configure_file(
@@ -607,7 +609,7 @@ install_headers(
@@ -608,7 +610,7 @@ install_headers(
# because configure_file strips the backslash in e.g. \@display,
# resulting in @display, breaking our Perl code:
# https://github.com/mesonbuild/meson/issues/7165

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

@ -1,7 +1,7 @@
Index: src/config_parser.c
--- src/config_parser.c.orig
+++ src/config_parser.c
@@ -752,8 +752,8 @@ static char *migrate_config(char *input, off_t size) {
@@ -745,8 +745,8 @@ static char *migrate_config(char *input, off_t size) {
*/
void start_config_error_nagbar(const char *configpath, bool has_errors) {
char *editaction, *pageraction;

1
x11/i3/pkg/PLIST
View File

@ -1,5 +1,6 @@
@conflict i3-gaps-*
@conflict i3-mousedrag-*
@pkgpath x11/i3-mousedrag
@bin bin/i3
@bin bin/i3-config-wizard
bin/i3-dmenu-desktop