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

[Git][debian-mate-team/marco][master] 5 commits: prepare new upstream release (v1.26.2)



Title: GitLab

Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / marco

Commits:

  • c4053ca1
    by Mike Gabriel at 2023-07-10T06:15:56+02:00
    prepare new upstream release (v1.26.2)
    
  • 6e9f1bc8
    by Mike Gabriel at 2023-07-10T06:16:04+02:00
    debian/control: Bump Standards-Version: to 4.6.2. No changes needed.
    
  • a532ba01
    by Mike Gabriel at 2023-07-10T06:16:24+02:00
    debian/copyright: Update copyright attribution for debian/ folder.
    
  • 7dcfd54b
    by Mike Gabriel at 2023-07-10T06:35:49+02:00
    debian/patches: Drop patches 0001, 0002 and 0003. Applied upstream.
    
  • 6c9f11de
    by Mike Gabriel at 2023-07-10T06:43:24+02:00
    upload to unstable (debian/1.26.2-1)
    

7 changed files:

Changes:

  • debian/changelog
    1
    +marco (1.26.2-1) unstable; urgency=medium
    
    2
    +
    
    3
    +  * New upstream release.
    
    4
    +    - Fix window titles sometimes shown incorrectly when owned as root.
    
    5
    +      This affects mostly KDE apps if they are run on MATE. (Closes:
    
    6
    +      #1040752)
    
    7
    +  * debian/patches: Drop patches 0001, 0002 and 0003. Applied upstream.
    
    8
    +  * debian/control:
    
    9
    +    + Bump Standards-Version: to 4.6.2. No changes needed.
    
    10
    +  * debian/copyright:
    
    11
    +    + Update copyright attribution for debian/ folder.
    
    12
    +
    
    13
    + -- Mike Gabriel <sunweaver@debian.org>  Mon, 10 Jul 2023 06:16:29 +0200
    
    14
    +
    
    1 15
     marco (1.26.1-3) unstable; urgency=medium
    
    2 16
     
    
    3 17
       * Revert "debian/control: Drop B-D: libxpresent-dev." introduced with
    

  • debian/control
    ... ... @@ -34,7 +34,7 @@ Build-Depends: autoconf-archive,
    34 34
                    x11proto-present-dev,
    
    35 35
                    yelp-tools,
    
    36 36
                    zenity,
    
    37
    -Standards-Version: 4.6.1
    
    37
    +Standards-Version: 4.6.2
    
    38 38
     Rules-Requires-Root: no
    
    39 39
     Homepage: http://www.mate-desktop.org/
    
    40 40
     Vcs-Browser: https://salsa.debian.org/debian-mate-team/marco
    

  • debian/copyright
    ... ... @@ -426,7 +426,7 @@ Comment:
    426 426
     
    
    427 427
     Files: debian/*
    
    428 428
     Copyright: 2011-2014, Stefano Karapetsas <stefano@karapetsas.com>
    
    429
    -           2014-2022, Mike Gabriel <sunweaver@debian.org>
    
    429
    +           2014-2023, Mike Gabriel <sunweaver@debian.org>
    
    430 430
     License: GPL-2+ or LGPL-2+ or MIT-OpenGroup
    
    431 431
     
    
    432 432
     License: GPL-2+
    

  • debian/patches/0001_test-retval-from-XResQueryClientIds.patch deleted
    1
    -From 9c8e9564d2f5ed27175c0a6061394c25889dfb31 Mon Sep 17 00:00:00 2001
    
    2
    -From: Joakim Tjernlund <joakim.tjernlund@infinera.com>
    
    3
    -Date: Mon, 19 Dec 2022 16:58:10 +0100
    
    4
    -Subject: [PATCH] test return value from XResQueryClientIds()
    
    5
    -
    
    6
    ----
    
    7
    - src/core/window-props.c | 11 ++++++-----
    
    8
    - 1 file changed, 6 insertions(+), 5 deletions(-)
    
    9
    -
    
    10
    -diff --git a/src/core/window-props.c b/src/core/window-props.c
    
    11
    -index 3414a3d9a..b27809ab4 100644
    
    12
    ---- a/src/core/window-props.c
    
    13
    -+++ b/src/core/window-props.c
    
    14
    -@@ -309,11 +309,12 @@ get_local_pid (MetaWindow *window)
    
    15
    -   spec.client = window->xwindow;
    
    16
    -   spec.mask = XRES_CLIENT_ID_PID_MASK;
    
    17
    - 
    
    18
    --  XResQueryClientIds (window->display->xdisplay,
    
    19
    --                      1,
    
    20
    --                      &spec,
    
    21
    --                      &num_ids,
    
    22
    --                      &client_ids);
    
    23
    -+  if (!XResQueryClientIds (window->display->xdisplay,
    
    24
    -+                          1,
    
    25
    -+                          &spec,
    
    26
    -+                          &num_ids,
    
    27
    -+                          &client_ids))
    
    28
    -+      return pid;
    
    29
    - 
    
    30
    -   for (i = 0; i < num_ids; i++)
    
    31
    -     {

  • debian/patches/0002_test-xres-1.2-is-present.patch deleted
    1
    -From 066888715066fbc4625612c8738c32b66666ceee Mon Sep 17 00:00:00 2001
    
    2
    -From: Joakim Tjernlund <joakim.tjernlund@infinera.com>
    
    3
    -Date: Mon, 19 Dec 2022 16:59:06 +0100
    
    4
    -Subject: [PATCH] Test Xres 1.2 is present
    
    5
    -
    
    6
    -Before using any Xres extension one must call XResQueryExtension()
    
    7
    -Also make sure Xres 1.2 is available as marco need XResQueryClientIds()
    
    8
    ----
    
    9
    - src/core/display-private.h |  1 +
    
    10
    - src/core/display.c         | 14 ++++++++++++--
    
    11
    - 2 files changed, 13 insertions(+), 2 deletions(-)
    
    12
    -
    
    13
    ---- a/src/core/display-private.h
    
    14
    -+++ b/src/core/display-private.h
    
    15
    -@@ -80,6 +80,7 @@
    
    16
    - struct _MetaDisplay {
    
    17
    - 	char* name;
    
    18
    - 	Display* xdisplay;
    
    19
    -+	gboolean have_xres; /* Got XRES >= 1.2 */
    
    20
    - 
    
    21
    - 	Window leader_window;
    
    22
    - 	Window timestamp_pinging_window;
    
    23
    ---- a/src/core/display.c
    
    24
    -+++ b/src/core/display.c
    
    25
    -@@ -50,6 +50,7 @@
    
    26
    - #include "compositor.h"
    
    27
    - #include <X11/Xatom.h>
    
    28
    - #include <X11/cursorfont.h>
    
    29
    -+#include <X11/extensions/XRes.h>
    
    30
    - 
    
    31
    - #ifdef HAVE_SOLARIS_XINERAMA
    
    32
    - 	#include <X11/extensions/xinerama.h>
    
    33
    -@@ -329,7 +330,8 @@
    
    34
    -   Display *xdisplay;
    
    35
    -   GSList *screens;
    
    36
    -   GSList *tmp;
    
    37
    --  int i;
    
    38
    -+  int i, event_base, error_base, major, minor;
    
    39
    -+  gboolean have_xres = FALSE;
    
    40
    -   guint32 timestamp;
    
    41
    - 
    
    42
    -   /* A list of all atom names, so that we can intern them in one go. */
    
    43
    -@@ -343,6 +345,7 @@
    
    44
    -   meta_verbose ("Opening display '%s'\n", XDisplayName (NULL));
    
    45
    - 
    
    46
    -   xdisplay = meta_ui_get_display ();
    
    47
    -+  event_base = error_base = major = minor = 0;
    
    48
    - 
    
    49
    -   if (xdisplay == NULL)
    
    50
    -     {
    
    51
    -@@ -350,7 +353,13 @@
    
    52
    - 		    XDisplayName (NULL));
    
    53
    -       return FALSE;
    
    54
    -     }
    
    55
    --
    
    56
    -+  /* Make sure to init Xres any extensions */
    
    57
    -+  if (XResQueryExtension(xdisplay, &event_base, &error_base) &&
    
    58
    -+      XResQueryVersion (xdisplay, &major, &minor) == 1)
    
    59
    -+    {
    
    60
    -+      if (major > 1 || (major == 1 && minor >= 2))
    
    61
    -+          have_xres = TRUE;
    
    62
    -+    }
    
    63
    -   if (meta_is_syncing ())
    
    64
    -     XSynchronize (xdisplay, True);
    
    65
    - 
    
    66
    -@@ -365,6 +374,7 @@
    
    67
    -    */
    
    68
    -   the_display->name = g_strdup (XDisplayName (NULL));
    
    69
    -   the_display->xdisplay = xdisplay;
    
    70
    -+  the_display->have_xres = have_xres;
    
    71
    -   the_display->error_trap_synced_at_last_pop = TRUE;
    
    72
    -   the_display->error_traps = 0;
    
    73
    -   the_display->error_trap_handler = NULL;

  • debian/patches/0003_test-if-XResQueryClientIds-is-available.patch deleted
    1
    -From 6cc8a2ff1e80d55d8edd7cd9c605bd068e83a72b Mon Sep 17 00:00:00 2001
    
    2
    -From: Joakim Tjernlund <joakim.tjernlund@infinera.com>
    
    3
    -Date: Thu, 29 Dec 2022 14:51:57 +0100
    
    4
    -Subject: [PATCH] Test if XResQueryClientIds() is available before using it.
    
    5
    -
    
    6
    -Needed for X2Go as it does not have XRES 1.2 extension.
    
    7
    ----
    
    8
    - src/core/window-props.c | 2 ++
    
    9
    - 1 file changed, 2 insertions(+)
    
    10
    -
    
    11
    -diff --git a/src/core/window-props.c b/src/core/window-props.c
    
    12
    -index b27809ab4..06df9e660 100644
    
    13
    ---- a/src/core/window-props.c
    
    14
    -+++ b/src/core/window-props.c
    
    15
    -@@ -305,6 +305,8 @@ get_local_pid (MetaWindow *window)
    
    16
    -   long i;
    
    17
    - 
    
    18
    -   pid = -1;
    
    19
    -+  if (window->display->have_xres == FALSE)
    
    20
    -+    return pid;
    
    21
    - 
    
    22
    -   spec.client = window->xwindow;
    
    23
    -   spec.mask = XRES_CLIENT_ID_PID_MASK;

  • debian/patches/series
    1
    -
    
    2 1
     0000_shadows.patch
    
    3 2
     1001_marco-Add-cmdline-option-no-keybindings-for-disablin.patch
    4
    -0001_test-retval-from-XResQueryClientIds.patch
    
    5
    -0002_test-xres-1.2-is-present.patch
    
    6
    -0003_test-if-XResQueryClientIds-is-available.patch


  • Reply to: