diff options
author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2016-01-13 09:02:29 +0000 |
---|---|---|
committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2016-01-13 09:02:29 +0000 |
commit | 7a28730ff2d0a937d5b81bedaa7a42ad9eeca010 (patch) | |
tree | 269b322d664c9b39c8c92e618fd29b83c1821085 /x11-wm | |
parent | Upgrade to 0.7.1.4. (diff) |
Upgrade to 1.16.
Notes
Notes:
svn path=/head/; revision=406025
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/flwm/Makefile | 3 | ||||
-rw-r--r-- | x11-wm/flwm/distinfo | 4 | ||||
-rw-r--r-- | x11-wm/flwm/files/patch-Frame.C | 49 | ||||
-rw-r--r-- | x11-wm/flwm/files/patch-Hotkeys.C | 27 | ||||
-rw-r--r-- | x11-wm/flwm/files/patch-Menu.C | 11 | ||||
-rw-r--r-- | x11-wm/flwm/files/patch-main.C | 32 |
6 files changed, 3 insertions, 123 deletions
diff --git a/x11-wm/flwm/Makefile b/x11-wm/flwm/Makefile index bd29a46850c8..b969d1b2f069 100644 --- a/x11-wm/flwm/Makefile +++ b/x11-wm/flwm/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= flwm -PORTVERSION= 1.14 -PORTREVISION= 2 +PORTVERSION= 1.16 CATEGORIES= x11-wm MAINTAINER= ports@FreeBSD.org diff --git a/x11-wm/flwm/distinfo b/x11-wm/flwm/distinfo index b71617a157a8..400a7b68532f 100644 --- a/x11-wm/flwm/distinfo +++ b/x11-wm/flwm/distinfo @@ -1,2 +1,2 @@ -SHA256 (bbidulock-flwm-1.14_GH0.tar.gz) = 8e4c77727363cf11324776c4f25e333c5cf0edf75a526d3cd140647551eaf4cd -SIZE (bbidulock-flwm-1.14_GH0.tar.gz) = 67897 +SHA256 (bbidulock-flwm-1.16_GH0.tar.gz) = 21785fe3a9e37354df5b99da67455fb40e3e2a67e41b53f8f7e66c396e56262b +SIZE (bbidulock-flwm-1.16_GH0.tar.gz) = 73659 diff --git a/x11-wm/flwm/files/patch-Frame.C b/x11-wm/flwm/files/patch-Frame.C deleted file mode 100644 index e04a1c63f27d..000000000000 --- a/x11-wm/flwm/files/patch-Frame.C +++ /dev/null @@ -1,49 +0,0 @@ ---- Frame.C.orig 2014-04-23 11:18:20.000000000 +0200 -+++ Frame.C 2014-04-23 11:20:51.000000000 +0200 -@@ -915,7 +915,7 @@ - // preserving stacking order: - for (p = &first; *p;) { - Frame* f = *p; -- if (f == this || f->is_transient_for(this) && f->state() != UNMAPPED) { -+ if (f == this || (f->is_transient_for(this) && f->state() != UNMAPPED)) { - *p = f->next; // remove it from list - if (previous) { - XWindowChanges w; -@@ -970,7 +970,7 @@ - - void Frame::iconize() { - for (Frame* c = first; c; c = c->next) { -- if (c == this || c->is_transient_for(this) && c->state() != UNMAPPED) -+ if (c == this || (c->is_transient_for(this) && c->state() != UNMAPPED)) - c->state(ICONIC); - } - } -@@ -1163,7 +1163,7 @@ - #endif - } - if (min_h == max_h || flag(KEEP_ASPECT|NO_RESIZE) || -- !max_h_button.value() && by+label_w+2*BUTTON_H > h()-BUTTON_BOTTOM) { -+ (!max_h_button.value() && by+label_w+2*BUTTON_H > h()-BUTTON_BOTTOM)) { - max_h_button.hide(); - } else { - max_h_button.position(BUTTON_LEFT,by); -@@ -1171,7 +1171,7 @@ - by += BUTTON_H; - } - if (min_w == max_w || flag(KEEP_ASPECT|NO_RESIZE) || -- !max_w_button.value() && by+label_w+2*BUTTON_H > h()-BUTTON_BOTTOM) { -+ (!max_w_button.value() && by+label_w+2*BUTTON_H > h()-BUTTON_BOTTOM)) { - max_w_button.hide(); - } else { - max_w_button.position(BUTTON_LEFT,by); -@@ -1653,8 +1653,8 @@ - else {ny = y(); nh = h();} - if (flag(KEEP_ASPECT)) { - if (nw-dwidth > nh-dwidth -- && (what&(FL_ALIGN_LEFT|FL_ALIGN_RIGHT)) -- || !(what&(FL_ALIGN_TOP|FL_ALIGN_BOTTOM))) -+ && ((what&(FL_ALIGN_LEFT|FL_ALIGN_RIGHT)) -+ || !(what&(FL_ALIGN_TOP|FL_ALIGN_BOTTOM)))) - nh = nw-dwidth+dheight; - else - nw = nh-dheight+dwidth; diff --git a/x11-wm/flwm/files/patch-Hotkeys.C b/x11-wm/flwm/files/patch-Hotkeys.C deleted file mode 100644 index 43b210100893..000000000000 --- a/x11-wm/flwm/files/patch-Hotkeys.C +++ /dev/null @@ -1,27 +0,0 @@ ---- Hotkeys.C.orig 2014-04-23 11:21:46.000000000 +0200 -+++ Hotkeys.C 2014-04-23 11:23:21.000000000 +0200 -@@ -86,9 +86,9 @@ - {FL_ALT+FL_SHIFT+0xfe20,PreviousWindow}, // XK_ISO_Left_Tab - #endif - #if KWM_HOTKEYS && DESKTOPS // KWM uses these to switch desktops --// {FL_CTRL+FL_Tab, NextDesk}, --// {FL_CTRL+FL_SHIFT+FL_Tab,PreviousDesk}, --// {FL_CTRL+FL_SHIFT+0xfe20,PreviousDesk}, // XK_ISO_Left_Tab -+ {FL_CTRL+FL_Tab, NextDesk}, -+ {FL_CTRL+FL_SHIFT+FL_Tab,PreviousDesk}, -+ {FL_CTRL+FL_SHIFT+0xfe20,PreviousDesk}, // XK_ISO_Left_Tab - {FL_CTRL+FL_F+1, DeskNumber}, - {FL_CTRL+FL_F+2, DeskNumber}, - {FL_CTRL+FL_F+3, DeskNumber}, -@@ -182,9 +182,10 @@ - int Handle_Hotkey() { - for (int i = 0; keybindings[i].key; i++) { - if (Fl::test_shortcut(keybindings[i].key) || -+ ( - (keybindings[i].key & 0xFFFF) == FL_Delete - && Fl::event_key() == FL_BackSpace// fltk bug? -- ) { -+ )) { - keybindings[i].func(); - return 1; - } diff --git a/x11-wm/flwm/files/patch-Menu.C b/x11-wm/flwm/files/patch-Menu.C deleted file mode 100644 index 5ebe5f1560eb..000000000000 --- a/x11-wm/flwm/files/patch-Menu.C +++ /dev/null @@ -1,11 +0,0 @@ ---- Menu.C.orig 2014-04-23 11:21:07.000000000 +0200 -+++ Menu.C 2014-04-23 11:21:32.000000000 +0200 -@@ -560,7 +560,7 @@ - if (d == Desktop::current()) first_on_desk = menu+n; - for (c = Frame::first; c; c = c->next) { - if (c->state() == UNMAPPED || c->transient_for()) continue; -- if (c->desktop() == d || !c->desktop() && d == Desktop::current()) { -+ if (c->desktop() == d || (!c->desktop() && d == Desktop::current())) { - init(menu[n],(char*)c); - #if FL_MAJOR_VERSION < 2 - init(menu[n],(char*)c); diff --git a/x11-wm/flwm/files/patch-main.C b/x11-wm/flwm/files/patch-main.C deleted file mode 100644 index ee51fb2bdaf1..000000000000 --- a/x11-wm/flwm/files/patch-main.C +++ /dev/null @@ -1,32 +0,0 @@ ---- main.C.orig 2014-04-18 19:48:14.000000000 +0200 -+++ main.C 2014-04-23 11:42:47.000000000 +0200 -@@ -4,6 +4,7 @@ - - #include "Frame.H" - #include <X11/Xproto.h> -+#include <X11/XKBlib.h> - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -@@ -102,9 +103,10 @@ - if (c->window() == window || fl_xid(c) == window) - #if CLICK_RAISES || CLICK_TO_TYPE - if (fl_xevent->type == ButtonPress) {click_raise(c); return 1;} -- else -+ else { - #endif - return c->handle(fl_xevent); -+ } - switch (fl_xevent->type) { - case ButtonPress: - printf("got a button press in main\n"); -@@ -124,7 +126,8 @@ - case KeyRelease: - if (!Fl::grab()) return 0; - Fl::e_keysym = -- XKeycodeToKeysym(fl_display, fl_xevent->xkey.keycode, 0); -+ XkbKeycodeToKeysym(fl_display, fl_xevent->xkey.keycode, -+ 0, fl_xevent->xkey.state & ShiftMask ? 1 : 0); - goto KEYUP; - #endif - } |