Accepting request 30582 from home:vuntz:branches:GNOME:Factory
Copy from home:vuntz:branches:GNOME:Factory/gtk2 via accept of submit request 30582 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/30582 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=93
This commit is contained in:
Vincent Untz
Git OBS Bridge
parent
cf43317c6e
commit
cc57db962b
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:60ab4e5df560f4d700b3d89ce5fb053895332986e3cfdead129d93cbff18cc50
|
||||
size 18519756
|
||||
3
gtk+-2.19.4.tar.bz2
Normal file
3
gtk+-2.19.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3818418e9ae51dbdffb65edc65b408a1f9318ab2256faf4d3c42dabf2e14417a
|
||||
size 18907416
|
||||
@ -1,36 +0,0 @@
|
||||
From f96e51db46f2196707c0ea44a46f1d67f9a069d4 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Larsson <alexl@redhat.com>
|
||||
Date: Fri, 15 Jan 2010 15:06:12 +0000
|
||||
Subject: Avoid drawing implicit paints to destroyed windows
|
||||
|
||||
It may happen that a window gets destroyed during painting, if so
|
||||
we should not draw the implicit paint double-buffered pixmap to it
|
||||
as that will cause a BadDrawable X error.
|
||||
|
||||
This fixes bug 600865
|
||||
---
|
||||
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
|
||||
index eeaee78..9e6b14a 100644
|
||||
--- a/gdk/gdkwindow.c
|
||||
+++ b/gdk/gdkwindow.c
|
||||
@@ -2679,7 +2679,7 @@ gdk_window_flush_implicit_paint (GdkWindow *window)
|
||||
gdk_region_offset (region, private->abs_x, private->abs_y);
|
||||
gdk_region_intersect (region, paint->region);
|
||||
|
||||
- if (!gdk_region_empty (region))
|
||||
+ if (!GDK_WINDOW_DESTROYED (window) && !gdk_region_empty (region))
|
||||
{
|
||||
/* Remove flushed region from the implicit paint */
|
||||
gdk_region_subtract (paint->region, region);
|
||||
@@ -2712,7 +2712,7 @@ gdk_window_end_implicit_paint (GdkWindow *window)
|
||||
|
||||
private->implicit_paint = NULL;
|
||||
|
||||
- if (!gdk_region_empty (paint->region))
|
||||
+ if (!GDK_WINDOW_DESTROYED (window) && !gdk_region_empty (paint->region))
|
||||
{
|
||||
/* Some regions are valid, push these to window now */
|
||||
tmp_gc = _gdk_drawable_get_scratch_gc ((GdkDrawable *)window, FALSE);
|
||||
--
|
||||
cgit v0.8.3.1
|
||||
|
||||
35
gtk2.changes
35
gtk2.changes
@ -1,3 +1,38 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 27 13:06:30 CET 2010 - vuntz@opensuse.org
|
||||
|
||||
- Update to version 2.19.4:
|
||||
+ GSeal:
|
||||
- New accessors for GtkEntry windows
|
||||
- New accessors for GtkRange members
|
||||
+ Bugs fixed:
|
||||
- bgo#607082 - Add accessors for sealed GtkRange members
|
||||
- bgo#567729 - Add GtkToolPalette
|
||||
- bgo#591102 - Remove the destination file if trying to save a
|
||||
pixbuf failed
|
||||
- bgo#600865 - Avoid drawing implicit paints to destroyed
|
||||
windows
|
||||
- bgo#601412 - Fix some issues with action widgets
|
||||
- bgo#603144 - Correct PRC6 and PRC9 envelope sizes
|
||||
- bgo#606009 - weirdness with clipping in abiword - csw
|
||||
- bgo#606698 - Misplaced declaration of
|
||||
gtk_print_job_set_status
|
||||
- bgo#606761 - pixops.c: variables are declared at middle of
|
||||
block
|
||||
- bgo#607217 - Mixing calls to _set_markup and _set_text
|
||||
causes...
|
||||
- bgo#607269 - gtk_label_set_attributes with empty list no
|
||||
longer...
|
||||
- bgo#607322 - Double-click doesn't work if the item is
|
||||
selected...
|
||||
- bgo#607687 - Avoid integer overflow in
|
||||
gdk_rectangle_intersect
|
||||
- bgo#607778 - Add accessors for GtkEntry's windows
|
||||
- bgo#607770 - Leak in GtkTreeView with HildonPannableArea
|
||||
- bgo#603245 - Fix a redraw problem with action widgets
|
||||
+ Updated translations.
|
||||
- Drop gtk2-bad-drawable-errors.patch: fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 16 11:40:10 UTC 2010 - andrea@opensuse.org
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package gtk2 (Version 2.19.3)
|
||||
# spec file for package gtk2 (Version 2.19.4)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
Name: gtk2
|
||||
%define _name gtk+
|
||||
Version: 2.19.3
|
||||
Version: 2.19.4
|
||||
# FIXME: 2.19.3 doesn't compile with parallel build. Check if this is still true for later versions.
|
||||
# FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer)
|
||||
Release: 1
|
||||
@ -44,8 +44,6 @@ Patch22: bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff
|
||||
Patch23: bugzilla-131498-allow-xim-for-all-languages.patch
|
||||
# PATCH-FIX-UPSTREAM gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages
|
||||
Patch24: gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff
|
||||
# PATCH-FIX-UPSTREAM gtk2-bad-drawable-errors.patch bgo600865 bnc570941 andrea@opensuse.org -- Patch taken from upstream
|
||||
Patch25: gtk2-bad-drawable-errors.patch
|
||||
# Patches taken from upstream or slated to go upstream. We can expect these to become obsolete
|
||||
# in future releases.
|
||||
# Please don't delete this comment even if this section is empty -- "# empty" should
|
||||
@ -168,7 +166,6 @@ cp -a %{S:2} .
|
||||
%patch22 -p1
|
||||
%patch23 -p1
|
||||
%patch24 -p1
|
||||
%patch25 -p1
|
||||
%patch53
|
||||
gnome-patch-translation-update
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user