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

[Git][debian-mate-team/marco][master] 5 commits: Revert "debian/patches: Add 0001_fix-segfaults.patch. Fix calculation of...



Title: GitLab

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

Commits:

5 changed files:

Changes:

  • debian/changelog
    1
    +marco (1.24.1-1) unstable; urgency=medium
    
    2
    +
    
    3
    +  * New upstream release.
    
    4
    +  * debian/control:
    
    5
    +    + Bump DH compat level to version 13.
    
    6
    +  * debian/copyright:
    
    7
    +    + Update copyright attributions.
    
    8
    +
    
    9
    + -- Mike Gabriel <sunweaver@debian.org>  Thu, 13 Aug 2020 08:37:48 +0200
    
    10
    +
    
    1 11
     marco (1.24.0-1) unstable; urgency=medium
    
    2 12
     
    
    3 13
       [ Mike Gabriel ]
    

  • debian/control
    ... ... @@ -7,7 +7,7 @@ Uploaders: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
    7 7
                Mike Gabriel <sunweaver@debian.org>,
    
    8 8
                Vangelis Mouhtsis <vangelis@gnugr.org>,
    
    9 9
     Build-Depends: autoconf-archive,
    
    10
    -               debhelper-compat (=12),
    
    10
    +               debhelper-compat (=13),
    
    11 11
                    dpkg-dev (>= 1.16.1.1),
    
    12 12
                    intltool,
    
    13 13
                    libcanberra-gtk3-dev,
    

  • debian/copyright
    ... ... @@ -368,7 +368,8 @@ Files: doc/creating_themes/C/index.docbook
    368 368
     Copyright: 2008, Thomas Thurman
    
    369 369
     License: GFDL-1.2+
    
    370 370
     
    
    371
    -Files: .github/issue_template.md
    
    371
    +Files: .build.yml
    
    372
    +       .github/issue_template.md
    
    372 373
            .github/FUNDING.yml
    
    373 374
            .travis.yml
    
    374 375
            .tx/config
    

  • debian/patches/0001_fix_segfaults.patch deleted
    1
    -Author: rcaridade145 <rcaridade145@gmail.com>
    
    2
    -Description: Introduce nullpointer checks and return null if
    
    3
    - validation fails and guard against null changes.
    
    4
    -
    
    5
    -diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c
    
    6
    -index dc7ac15f..4a05bc7a 100644
    
    7
    ---- a/src/compositor/compositor-xrender.c
    
    8
    -+++ b/src/compositor/compositor-xrender.c
    
    9
    -@@ -645,7 +645,7 @@ shadow_picture_clip (Display          *xdisplay,
    
    10
    - 
    
    11
    -   visible_region = meta_window_get_frame_bounds (cw->window);
    
    12
    - 
    
    13
    --  if (!visible_region)
    
    14
    -+  if (visible_region == NULL)
    
    15
    -     return;
    
    16
    - 
    
    17
    -   shadow_dx = -1 * (int) shadow_offsets_x [cw->shadow_type] - borders.invisible.left;
    
    18
    -@@ -1153,9 +1153,13 @@ border_size (MetaCompWindow *cw)
    
    19
    -     {
    
    20
    -       visible_region = meta_window_get_frame_bounds (cw->window);
    
    21
    - 
    
    22
    --      if (visible_region)
    
    23
    -+      if (visible_region != NULL) {
    
    24
    -         visible = cairo_region_to_xserver_region (xdisplay, visible_region);
    
    25
    -+      }
    
    26
    -+      else {
    
    27
    -+        g_warning ("Visible region is null");
    
    28
    -     }
    
    29
    -+  }
    
    30
    - 
    
    31
    -   meta_error_trap_push (display);
    
    32
    -   border = XFixesCreateRegionFromWindow (xdisplay, cw->id,
    
    33
    -diff --git a/src/core/frame.c b/src/core/frame.c
    
    34
    -index 6c1c7b21..647cae92 100644
    
    35
    ---- a/src/core/frame.c
    
    36
    -+++ b/src/core/frame.c
    
    37
    -@@ -407,10 +407,16 @@ meta_frame_sync_to_window (MetaFrame *frame,
    
    38
    - cairo_region_t *
    
    39
    - meta_frame_get_frame_bounds (MetaFrame *frame)
    
    40
    - {
    
    41
    --  return meta_ui_get_frame_bounds (frame->window->screen->ui,
    
    42
    -+  if(frame->xwindow &&
    
    43
    -+     frame->window !=NULL &&
    
    44
    -+     frame->window->screen !=NULL && 
    
    45
    -+     frame->window->screen->ui !=NULL)  {
    
    46
    -+	return meta_ui_get_frame_bounds (frame->window->screen->ui,
    
    47
    -                                    frame->xwindow,
    
    48
    -                                    frame->rect.width,
    
    49
    -                                    frame->rect.height);
    
    50
    -+  }
    
    51
    -+  return NULL;
    
    52
    - }
    
    53
    - 
    
    54
    - void
    
    55
    -
    
    56
    -
    
    57
    -marco (1.24.0-1ubuntu1~focal2.0) focal; urgency=medium
    
    58
    -
    
    59
    -  * debian/patches:
    
    60
    -    + Add 0001_fix-segfaults.patch. Fix calculation of borders to
    
    61
    -      prevent segfaults. (LP: #1863431, #1863392)
    
    62
    -
    
    63
    - -- Martin Wimpress <martin.wimpress@ubuntu.com>  Mon, 23 Mar 2020 23:03:18 +0000

  • debian/patches/series deleted
    1
    -0001_fix_segfaults.patch
    \ No newline at end of file


  • Reply to: