update i3-mousedrag to a newer checkout from the orestisfl:issue-2643
branch, closer to i3 4.17.1
This commit is contained in:
sthen
parent
64196ce59c
commit
f54a77d4ef
@ -1,13 +1,13 @@
|
||||
# $OpenBSD: Makefile,v 1.3 2019/07/12 20:51:14 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.4 2020/02/16 20:50:25 sthen Exp $
|
||||
|
||||
# see https://github.com/i3/i3/issues/3085
|
||||
# see https://github.com/i3/i3/issues/3085 / orestisfl:issue-2643
|
||||
COMMENT = improved dynamic tiling window manager, fork with mouse drag
|
||||
|
||||
GH_ACCOUNT= orestisf1993
|
||||
GH_ACCOUNT= orestisfl
|
||||
GH_PROJECT= i3
|
||||
GH_COMMIT= baff612902cc26a1760347b70cc3607a88579ebe
|
||||
GH_COMMIT= 592bd26703c8b325cf01f3b9f6ccea85751600fb
|
||||
|
||||
DISTNAME = i3-mousedrag-4.16pre20180825
|
||||
DISTNAME = i3-mousedrag-4.17.1pre20191014
|
||||
|
||||
CATEGORIES = x11
|
||||
|
||||
@ -17,11 +17,13 @@ HOMEPAGE = https://i3wm.org/
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
# uses pledge()
|
||||
WANTLIB += c cairo ev glib-2.0 gobject-2.0 iconv intl m pango-1.0
|
||||
WANTLIB += pangocairo-1.0 pcre pthread startup-notification-1 xcb
|
||||
WANTLIB += xcb-cursor xcb-icccm xcb-keysyms xcb-randr xcb-shape
|
||||
WANTLIB += xcb-util xcb-xinerama xcb-xkb xcb-xrm xkbcommon
|
||||
WANTLIB += xkbcommon-x11 yajl
|
||||
WANTLIB += c cairo ev glib-2.0 gobject-2.0 harfbuzz iconv intl
|
||||
WANTLIB += m pango-1.0 pangocairo-1.0 pcre pthread startup-notification-1
|
||||
WANTLIB += xcb xcb-cursor xcb-icccm xcb-keysyms xcb-randr xcb-shape
|
||||
WANTLIB += xcb-util xcb-xinerama xcb-xkb xcb-xrm xkbcommon xkbcommon-x11
|
||||
WANTLIB += yajl
|
||||
|
||||
DEBUG_PACKAGS = ${BUILD_PACKAGES}
|
||||
|
||||
BUILD_DEPENDS = textproc/asciidoc \
|
||||
textproc/xmlto
|
||||
@ -54,7 +56,7 @@ CONFIGURE_ENV = CPPFLAGS="-I${X11BASE}/include \
|
||||
|
||||
CONFIGURE_STYLE = autoreconf
|
||||
AUTOCONF_VERSION = 2.69
|
||||
AUTOMAKE_VERSION = 1.15
|
||||
AUTOMAKE_VERSION = 1.16
|
||||
|
||||
pre-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/etc/config \
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (i3-mousedrag-4.16pre20180825-baff6129.tar.gz) = ehVcRxbGEi41GqQfik3Z47/AvnHB2zVSsVvOiYl8USk=
|
||||
SIZE (i3-mousedrag-4.16pre20180825-baff6129.tar.gz) = 3988744
|
||||
SHA256 (i3-mousedrag-4.17.1pre20191014-592bd267.tar.gz) = 7LI2OXR1UA92x9X2O6848RtEJYBDvtJ0YE0CD9vBgKc=
|
||||
SIZE (i3-mousedrag-4.17.1pre20191014-592bd267.tar.gz) = 3997267
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-Makefile_am,v 1.1 2019/06/27 17:31:37 sthen Exp $
|
||||
$OpenBSD: patch-Makefile_am,v 1.2 2020/02/16 20:50:25 sthen Exp $
|
||||
|
||||
Index: Makefile.am
|
||||
--- Makefile.am.orig
|
||||
@ -25,7 +25,7 @@ Index: Makefile.am
|
||||
man/i3-dump-log.1
|
||||
|
||||
pod_MANS = \
|
||||
@@ -608,7 +602,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
|
||||
@@ -612,7 +606,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
|
||||
################################################################################
|
||||
|
||||
anyevent-i3.stamp: AnyEvent-I3/lib/AnyEvent/I3.pm
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
$OpenBSD: patch-etc_config,v 1.1.1.1 2019/02/16 10:09:57 sthen Exp $
|
||||
--- etc/config.orig Sun Mar 29 19:07:08 2015
|
||||
+++ etc/config Mon Mar 30 14:13:25 2015
|
||||
@@ -35,13 +35,13 @@ set $right semicolon
|
||||
$OpenBSD: patch-etc_config,v 1.2 2020/02/16 20:50:25 sthen Exp $
|
||||
|
||||
Index: etc/config
|
||||
--- etc/config.orig
|
||||
+++ etc/config
|
||||
@@ -46,13 +46,13 @@ set $right semicolon
|
||||
floating_modifier Mod1
|
||||
|
||||
# start a terminal
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-etc_config_keycodes,v 1.1.1.1 2019/02/16 10:09:57 sthen Exp $
|
||||
$OpenBSD: patch-etc_config_keycodes,v 1.2 2020/02/16 20:50:25 sthen Exp $
|
||||
|
||||
Fix keycodes for the "Left", "Down", "Up" and "Right" keys: they're
|
||||
different between Linux and OpenBSD.
|
||||
@ -6,7 +6,7 @@ different between Linux and OpenBSD.
|
||||
Index: etc/config.keycodes
|
||||
--- etc/config.keycodes.orig
|
||||
+++ etc/config.keycodes
|
||||
@@ -29,13 +29,13 @@ font pango:monospace 8
|
||||
@@ -40,13 +40,13 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl se
|
||||
floating_modifier $mod
|
||||
|
||||
# start a terminal
|
||||
@ -22,7 +22,7 @@ Index: etc/config.keycodes
|
||||
# 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.
|
||||
@@ -48,10 +48,10 @@ bindcode $mod+46 focus up
|
||||
@@ -59,10 +59,10 @@ bindcode $mod+46 focus up
|
||||
bindcode $mod+47 focus right
|
||||
|
||||
# alternatively, you can use the cursor keys:
|
||||
@ -37,7 +37,7 @@ Index: etc/config.keycodes
|
||||
|
||||
# move focused window
|
||||
bindcode $mod+Shift+44 move left
|
||||
@@ -60,10 +60,10 @@ bindcode $mod+Shift+46 move up
|
||||
@@ -71,10 +71,10 @@ bindcode $mod+Shift+46 move up
|
||||
bindcode $mod+Shift+47 move right
|
||||
|
||||
# alternatively, you can use the cursor keys:
|
||||
@ -52,7 +52,7 @@ Index: etc/config.keycodes
|
||||
|
||||
# split in horizontal orientation
|
||||
bindcode $mod+43 split h
|
||||
@@ -149,10 +149,10 @@ mode "resize" {
|
||||
@@ -160,10 +160,10 @@ mode "resize" {
|
||||
bindcode 47 resize grow width 10 px or 10 ppt
|
||||
|
||||
# same bindings, but for the arrow keys
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
$OpenBSD: patch-i3-nagbar_main_c,v 1.1.1.1 2019/02/16 10:09:57 sthen Exp $
|
||||
$OpenBSD: patch-i3-nagbar_main_c,v 1.2 2020/02/16 20:50:25 sthen Exp $
|
||||
|
||||
https://marc.info/?l=openbsd-ports&m=156762440931634&w=2
|
||||
|
||||
Index: i3-nagbar/main.c
|
||||
--- i3-nagbar/main.c.orig
|
||||
@ -12,27 +14,12 @@ Index: i3-nagbar/main.c
|
||||
} else {
|
||||
terminal_cmd = sstrdup(link_path);
|
||||
}
|
||||
@@ -454,11 +454,6 @@ int main(int argc, char *argv[]) {
|
||||
@@ -461,7 +461,7 @@ int main(int argc, char *argv[]) {
|
||||
font = load_font(pattern, true);
|
||||
set_font(&font);
|
||||
|
||||
-#if defined(__OpenBSD__)
|
||||
- if (pledge("stdio rpath wpath cpath getpw proc exec", NULL) == -1)
|
||||
- err(EXIT_FAILURE, "pledge");
|
||||
-#endif
|
||||
-
|
||||
xcb_rectangle_t win_pos = get_window_position();
|
||||
|
||||
xcb_cursor_t cursor;
|
||||
@@ -562,6 +557,11 @@ int main(int argc, char *argv[]) {
|
||||
|
||||
/* Initialize the drawable bar */
|
||||
draw_util_surface_init(conn, &bar, win, get_visualtype(root_screen), win_pos.width, win_pos.height);
|
||||
+
|
||||
+#if defined(__OpenBSD__)
|
||||
+ if (pledge("stdio rpath wpath cpath getpw proc exec", NULL) == -1)
|
||||
+ err(EXIT_FAILURE, "pledge");
|
||||
+#endif
|
||||
|
||||
/* Startup complete. */
|
||||
if (sncontext) {
|
||||
+#if 0
|
||||
if (pledge("stdio rpath wpath cpath getpw proc exec", NULL) == -1)
|
||||
err(EXIT_FAILURE, "pledge");
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user