diff options
author | Guido Falsi <madpilot@FreeBSD.org> | 2021-01-02 16:36:33 +0000 |
---|---|---|
committer | Guido Falsi <madpilot@FreeBSD.org> | 2021-01-02 16:36:33 +0000 |
commit | b2f2269daff8c7e224099d352e652241fbdfcb7b (patch) | |
tree | 27b902ea7af0a7d6abc54b964847536e36093b87 /x11/libxfce4menu/files | |
parent | Update to upstream release 21.01. (diff) |
Welcome XFCE 4.16 to the FreeBSD ports tree!
Upstream announce: https://xfce.org/about/news/?post=1608595200
This XFCE release dropped support for GTK2 plugins and also dropped
GTK2 from all components.
WARNING: please check UPDATING before upgrading your packages. In
case of problems also read the libexo pkg-message.
Due to this some panel plugins and libraries will be removed since
they cannot compile anymore:
- print/xfce4-print
- x11/xfce4-quicklauncher-plugin
- x11/xfce4-wmdock-plugin
- x11-toolkits/libxfce4gui
These further components also fail to build or work and are being
marked BROKEN, deprecated and marked for removal:
- science/xfce4-equake-plugin
- x11/xfce4-embed-plugin
- deskutils/orage
- deskutils/xfce4-volumed [1]
deskutils/xfce4-notes-plugin will be also marked BROKEN, but there
is active development in it's upstream repository and a fixed release
is expected soon.
deskutils/xfce4-generic-slider will also be marked broken, since
it fails to compile. [2]
Thanks also to riggs, Olivier Duchateau <duchateau.olivier@gmail.com>
and the people in Approved and Reviewed lines below for help and
contributions.
Reviewed by: woodsb02
Approved by: sergey.dyatko@gmail.com (maintainer) [1],
ehaupt [2]
Differential Revision: https://reviews.freebsd.org/D27846
Notes
Notes:
svn path=/head/; revision=559953
Diffstat (limited to 'x11/libxfce4menu/files')
-rw-r--r-- | x11/libxfce4menu/files/patch-libxfce4kbd-private_xfce-shortcuts-grabber.c | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/x11/libxfce4menu/files/patch-libxfce4kbd-private_xfce-shortcuts-grabber.c b/x11/libxfce4menu/files/patch-libxfce4kbd-private_xfce-shortcuts-grabber.c deleted file mode 100644 index cc012aa82466..000000000000 --- a/x11/libxfce4menu/files/patch-libxfce4kbd-private_xfce-shortcuts-grabber.c +++ /dev/null @@ -1,74 +0,0 @@ ---- libxfce4kbd-private/xfce-shortcuts-grabber.c.orig 2019-08-11 16:02:06 UTC -+++ libxfce4kbd-private/xfce-shortcuts-grabber.c -@@ -72,8 +72,9 @@ struct _XfceShortcutsGrabberPrivate - - struct _XfceKey - { -- guint keyval; -- guint modifiers; -+ guint keyval; -+ guint modifiers; -+ GArray *keycodes; - }; - - -@@ -339,10 +340,14 @@ xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *gra - GrabModeAsync, - GrabModeAsync); - else -- XUngrabKey (GDK_DISPLAY_XDISPLAY (display), -- keys[i].keycode, -- modifiers | mod_masks [k], -- root_window); -+ { -+ if (i >= key->keycodes->len) -+ break; -+ XUngrabKey (GDK_DISPLAY_XDISPLAY (display), -+ g_array_index (key->keycodes, guint, i), -+ modifiers | mod_masks [k], -+ root_window); -+ } - } - - gdk_flush (); -@@ -355,8 +360,20 @@ xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *gra - TRACE ("Failed to ungrab"); - } - } -+ /* Remember the old keycode, as we need it to ungrab. */ -+ if (grab) -+ g_array_append_val (key->keycodes, keys[i].keycode); -+ else -+ g_array_index(key->keycodes, guint, i) = UINT_MAX; - } - -+ /* Cleanup elements containing UINT_MAX from the key->keycodes array */ -+ for (i = key->keycodes->len - 1; i >= 0; i --) -+ { -+ if (g_array_index(key->keycodes, guint, i) == UINT_MAX) -+ g_array_remove_index_fast(key->keycodes, i); -+ } -+ - g_free (keys); - } - -@@ -514,6 +531,7 @@ xfce_shortcuts_grabber_add (XfceShortcutsGrabber *grab - g_return_if_fail (shortcut != NULL); - - key = g_new0 (XfceKey, 1); -+ key->keycodes = g_array_new (FALSE, TRUE, sizeof (guint)); - - gtk_accelerator_parse (shortcut, &key->keyval, &key->modifiers); - -@@ -523,7 +541,10 @@ xfce_shortcuts_grabber_add (XfceShortcutsGrabber *grab - g_hash_table_insert (grabber->priv->keys, g_strdup (shortcut), key); - } - else -- g_free (key); -+ { -+ g_array_free (key->keycodes, TRUE); -+ g_free (key); -+ } - } - - |