[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][debian-mate-team/mate-panel][master] 3 commits: debian/patches: Rebase patches 0003, 0004, 0005.

Title: GitLab

Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / mate-panel

Commits:

6 changed files:

Changes:

  • debian/changelog
    1 
    +mate-panel (1.22.1-2) unstable; urgency=medium
    2 
    +
    3 
    +  * debian/patches:
    4 
    +    + Rebase patches 0003, 0004, 0005.
    5 
    +    + Add 0006_Fix-panel-applet-keyboard-focus-trap.patch. (Closes: #933714).
    6 
    +
    7 
    + -- Mike Gabriel <sunweaver@debian.org>  Fri, 02 Aug 2019 18:28:19 +0200
    8 
    +
    1 9 
     mate-panel (1.22.1-1) unstable; urgency=medium
    2 10
    3 11 
       [ Martin Wimpress ]

  • debian/patches/0003_configure.ac-Report-RDA-support-status-in-configurat.patch
    ... ... @@ -8,11 +8,9 @@ Subject: [PATCH] configure.ac: Report RDA support status in configuration
    8 8 
      configure.ac | 1 +
    9 9 
      1 file changed, 1 insertion(+)
    10 10
    11 
    -diff --git a/configure.ac b/configure.ac
    12 
    -index c6c61c3b..5b0ba29f 100644
    13 11 
     --- a/configure.ac
    14 12 
     +++ b/configure.ac
    15 
    -@@ -372,6 +372,7 @@ echo "
    13 
    +@@ -371,6 +371,7 @@
    16 14 
              Wayland support:               ${have_wayland}
    17 15 
              X11 support:                   ${have_x11}
    18 16 
              XRandr support:                ${have_randr}

  • debian/patches/0004_configure.ac-Explicitly-require-in-RDA-0.0.3.patch
    ... ... @@ -7,11 +7,9 @@ Subject: [PATCH] configure.ac: Explicitly require in RDA >= 0.0.3.
    7 7 
      configure.ac | 3 ++-
    8 8 
      1 file changed, 2 insertions(+), 1 deletion(-)
    9 9
    10 
    -diff --git a/configure.ac b/configure.ac
    11 
    -index a41a93c..cbdc149 100644
    12 10 
     --- a/configure.ac
    13 11 
     +++ b/configure.ac
    14 
    -@@ -66,6 +66,7 @@ LIBRSVG_REQUIRED=2.36.2
    12 
    +@@ -65,6 +65,7 @@
    15 13 
      GTK_REQUIRED=3.22.0
    16 14 
      LIBWNCK_REQUIRED=3.4.6
    17 15 
      WEATHER_REQUIRED=1.17.0
    ... ... @@ -19,7 +17,7 @@ index a41a93c..cbdc149 100644
    19 17
    20 18 
      dnl pkg-config dependency checks
    21 19
    22 
    -@@ -204,7 +205,7 @@ fi
    20 
    +@@ -235,7 +236,7 @@
    23 21
    24 22 
      dnl Remote Desktop Awareness
    25 23
    ... ... @@ -28,6 +26,3 @@ index a41a93c..cbdc149 100644
    28 26 
      if test "x$have_rda" = "xyes"; then
    29 27 
        AC_DEFINE(HAVE_RDA, 1, [Have the Remote Desktop Awareness library])
    30 28 
      fi
    31 
    ---
    32 
    -2.11.0
    33 
    -

  • debian/patches/0005_fix_panel_resets.patch
    1 1 
     Author: Vlad Orlov
    2 2 
     Description: FIx random panel crashes on reset.
    3 3
    4 
    -diff --git a/mate-panel/panel-profile.c b/mate-panel/panel-profile.c
    5 
    -index 15cf114e..7d787755 100644
    6 4 
     --- a/mate-panel/panel-profile.c
    7 5 
     +++ b/mate-panel/panel-profile.c
    8 
    -@@ -1029,16 +1029,6 @@ panel_profile_delete_toplevel (PanelToplevel *toplevel)
    6 
    +@@ -1029,16 +1029,6 @@
    9 7
    10 8 
      	toplevel_id = panel_profile_get_toplevel_id (toplevel);
    11 9
    ... ... @@ -22,7 +20,7 @@ index 15cf114e..7d787755 100644
    22 20 
      	panel_profile_delete_toplevel_objects (toplevel_id);
    23 21
    24 22 
      	panel_profile_remove_from_list (PANEL_GSETTINGS_TOPLEVELS, toplevel_id);
    25 
    -@@ -1445,6 +1435,18 @@ panel_profile_delete_removed_ids (PanelGSettingsKeyType    type,
    23 
    +@@ -1445,6 +1435,18 @@
    26 24 
      	g_slist_free (removed_ids);
    27 25 
      }
    28 26
    ... ... @@ -41,7 +39,7 @@ index 15cf114e..7d787755 100644
    41 39 
      static void
    42 40 
      panel_profile_toplevel_id_list_notify (GSettings *settings,
    43 41 
      									   gchar *key,
    44 
    -@@ -1487,7 +1489,7 @@ panel_profile_toplevel_id_list_notify (GSettings *settings,
    42 
    +@@ -1487,7 +1489,7 @@
    45 43
    46 44 
      	/* if there are no panels, reset layout to default */
    47 45 
      	if (g_slist_length (toplevel_ids) == 0)
    ... ... @@ -50,11 +48,9 @@ index 15cf114e..7d787755 100644
    50 48
    51 49 
      	g_slist_free (existing_toplevels);
    52 50 
      	g_slist_free (toplevel_ids);
    53 
    -diff --git a/mate-panel/panel-toplevel.c b/mate-panel/panel-toplevel.c
    54 
    -index ab203a66..5d43870e 100644
    55 51 
     --- a/mate-panel/panel-toplevel.c
    56 52 
     +++ b/mate-panel/panel-toplevel.c
    57 
    -@@ -246,6 +246,8 @@ static void panel_toplevel_calculate_animation_end_geometry(PanelToplevel *tople
    53 
    +@@ -246,6 +246,8 @@
    58 54 
      static void panel_toplevel_update_monitor(PanelToplevel* toplevel);
    59 55 
      static void panel_toplevel_set_monitor_internal(PanelToplevel* toplevel, int monitor, gboolean force_resize);
    60 56
    ... ... @@ -63,7 +59,7 @@ index ab203a66..5d43870e 100644
    63 59 
      static void
    64 60 
      update_style_classes (PanelToplevel *toplevel)
    65 61 
      {
    66 
    -@@ -3072,6 +3074,37 @@ panel_toplevel_dispose (GObject *widget)
    62 
    +@@ -3102,6 +3104,37 @@
    67 63 
      {
    68 64 
      	PanelToplevel *toplevel = (PanelToplevel *) widget;
    69 65
    ... ... @@ -101,7 +97,7 @@ index ab203a66..5d43870e 100644
    101 97 
      	if (toplevel->priv->attached) {
    102 98 
      		panel_toplevel_disconnect_attached (toplevel);
    103 99 
      		toplevel->priv->attached = FALSE;
    104 
    -@@ -3080,6 +3113,16 @@ panel_toplevel_dispose (GObject *widget)
    100 
    +@@ -3110,6 +3143,16 @@
    105 101 
      		toplevel->priv->attach_widget   = NULL;
    106 102 
      	}
    107 103
    ... ... @@ -118,7 +114,7 @@ index ab203a66..5d43870e 100644
    118 114 
      	panel_toplevel_disconnect_timeouts (toplevel);
    119 115
    120 116 
      	G_OBJECT_CLASS (panel_toplevel_parent_class)->dispose (widget);
    121 
    -@@ -4218,47 +4261,6 @@ panel_toplevel_finalize (GObject *object)
    117 
    +@@ -4252,47 +4295,6 @@
    122 118
    123 119 
      	toplevel_list = g_slist_remove (toplevel_list, toplevel);
    124 120

  • debian/patches/0006_Fix-panel-applet-keyboard-focus-trap.patch
    1 
    +From a2cdef91974fbe83995791e98f19ed58ec04a43c Mon Sep 17 00:00:00 2001
    2 
    +From: lukefromdc <lukefromdc@hushmail.com>
    3 
    +Date: Mon, 6 May 2019 02:04:12 -0400
    4 
    +Subject: [PATCH] Fix panel applet keyboard focus trap
    5 
    +
    6 
    +Do not open the context menu on tab-or on anything but the menu key. Note that Return must be used by some applets (e.g. the clock) for something else
    7 
    +---
    8 
    + libmate-panel-applet/mate-panel-applet.c | 12 +++++++++---
    9 
    + 1 file changed, 9 insertions(+), 3 deletions(-)
    10 
    +
    11 
    +diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c
    12 
    +index d7d510e..e98fc08 100644
    13 
    +--- a/libmate-panel-applet/mate-panel-applet.c
    14 
    ++++ b/libmate-panel-applet/mate-panel-applet.c
    15 
    +@@ -985,13 +985,19 @@ mate_panel_applet_button_release (GtkWidget      *widget,
    16 
    + 	return mate_panel_applet_button_event (applet, event);
    17 
    + }
    18 
    +
    19 
    ++/*Open the applet context menu only on Menu key
    20 
    ++ *Do not open it on Return or some applets won't work
    21 
    ++ */
    22 
    + static gboolean
    23 
    + mate_panel_applet_key_press_event (GtkWidget   *widget,
    24 
    + 			      GdkEventKey *event)
    25 
    + {
    26 
    +-	mate_panel_applet_menu_popup (MATE_PANEL_APPLET (widget), (GdkEvent *) event);
    27 
    +-
    28 
    +-	return TRUE;
    29 
    ++    if (event->keyval == GDK_KEY_Menu) {
    30 
    ++        mate_panel_applet_menu_popup (MATE_PANEL_APPLET (widget), (GdkEvent *) event);
    31 
    ++        return TRUE;
    32 
    ++    }
    33 
    ++    else
    34 
    ++        return FALSE;
    35 
    + }
    36 
    +
    37 
    + static void
    38 
    +--
    39 
    +2.20.1
    40 
    +

  • debian/patches/series
    ... ... @@ -3,3 +3,4 @@
    3 3 
     0003_configure.ac-Report-RDA-support-status-in-configurat.patch
    4 4 
     0004_configure.ac-Explicitly-require-in-RDA-0.0.3.patch
    5 5 
     0005_fix_panel_resets.patch
    6 
    +0006_Fix-panel-applet-keyboard-focus-trap.patch

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: