Accepting request 21521 from home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/gtk2 via accept of submit request 21521 revision 5.

OBS-URL: https://build.opensuse.org/request/show/21521
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=74
This commit is contained in:
Vincent Untz 2009-10-01 18:18:12 +00:00 committed by Git OBS Bridge
parent b2ac124b58
commit 10c26e561e
6 changed files with 55 additions and 53 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:05fce9327dbe78a74ad4cd45383d541f96f19d40d3c03076cdf6908ad28ad241
size 18907167

3
gtk+-2.18.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c783919ec7967fc36ec440fc6871cbcf3b2626e817530e1e2f0a3fcbdae31ebc
size 19050508

12
gtk2-build-fix.patch Normal file
View File

@ -0,0 +1,12 @@
Index: gtk+-2.18.1/gdk/x11/gdkinput-xfree.c
===================================================================
--- gtk+-2.18.1.orig/gdk/x11/gdkinput-xfree.c
+++ gtk+-2.18.1/gdk/x11/gdkinput-xfree.c
@@ -18,6 +18,7 @@
*/
#include "config.h"
+#include <string.h>
#include "gdkinputprivate.h"
#include "gdkdisplay-x11.h"
#include "gdkalias.h"

View File

@ -1,46 +0,0 @@
commit afc19eb4a7e4ec4420dc202e0da0fe2c4d1ca7c2
Author: Alexander Larsson <alexl@redhat.com>
Date: Thu Sep 24 16:42:52 2009 +0200
Send expose events on foreign windows
F-Spot needs this as it draws on a foreign (screensaver) window, which
used to work.
I believe this is safe, because in all typical cases the expose
mask will not be set, so we won't do anything, and its what we used to
do.
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 500bf65..3231dea 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -5023,12 +5023,17 @@ _gdk_window_process_updates_recurse (GdkWindow *window,
g_object_unref (window);
}
- else if (private->bg_pixmap != GDK_NO_BG)
+ else if (private->bg_pixmap != GDK_NO_BG &&
+ private->window_type != GDK_WINDOW_FOREIGN)
{
/* No exposure mask set, so nothing will be drawn, the
* app relies on the background being what it specified
* for the window. So, we need to clear this manually.
*
+ * For foreign windows if expose is not set that generally
+ * means some other client paints them, so don't clear
+ * there.
+ *
* We use begin/end_paint around the clear so that we can
* piggyback on the implicit paint */
@@ -5066,8 +5071,7 @@ gdk_window_process_updates_internal (GdkWindow *window)
GdkRegion *update_area = private->update_area;
private->update_area = NULL;
- if (_gdk_event_func && gdk_window_is_viewable (window) &&
- private->window_type != GDK_WINDOW_FOREIGN)
+ if (_gdk_event_func && gdk_window_is_viewable (window))
{
GdkRegion *expose_region;
gboolean end_implicit;

View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Thu Oct 1 17:19:52 CEST 2009 - vuntz@opensuse.org
- Update to version 2.18.1:
+ Client-side Windows:
- Fix a problem with the F-Spot screensaver
- Request native events that are necessary for grab emulation
- Fixes for input device and extended input event handling
- Allow up to 255 buttons in extended input events
+ OS X:
- Improve handling of multi-monitor setups
- Basic DND works
- Other improvements
+ Filechooser:
- Support Tracker 0.7 in the search code
+ Bugs fixed:
- bgo#596423 Landscape pages are the wrong way around
- bgo#588449 DnD doesn't work on GDK/Quartz
- bgo#596080 Mention "gtk-tooltip" in
gtk_widget_set_tooltip_window
- bgo#596580 Blank rows in entry autocompletion
- bgo#588649 extended input events sent to widgets that
didn't...
- bgo#596081 Update tracker support for version 0.7
- bgo#596345 clicking empty space in backgrounds...
- bgo#596494 New property "cursor" in 2.18's GdkWindow with
wrong...
- bgo#596012 popup menu position is horribly off on gdk
quartz...
- bgo#596250 Gdkcursor-quartz.c doesn't implement
GDK_BLANK_CURSOR
- bgo#586207 Printing dialog with a CUPS printer connected...
+ Updated translations.
- Drop gtk2-expose-foreign.patch: fixed upstream.
- Add gtk2-build-fix.patch to fix a build warning.
-------------------------------------------------------------------
Wed Sep 30 10:27:09 CEST 2009 - vuntz@opensuse.org

View File

@ -1,5 +1,5 @@
#
# spec file for package gtk2 (Version 2.18.0)
# spec file for package gtk2 (Version 2.18.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -38,7 +38,7 @@ Obsoletes: gtk2-64bit
%endif
#
PreReq: /usr/bin/touch /bin/rm /bin/rmdir
Version: 2.18.0
Version: 2.18.1
Release: 1
Summary: Library for Creation of Graphical User Interfaces (version 2)
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.12/%{_name}-%{version}.tar.bz2
@ -57,8 +57,8 @@ 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-expose-foreign.patch vuntz@novell.com -- Taken from git, Send expose events on foreign windows
Patch25: gtk2-expose-foreign.patch
# PATCH-FIX-UPSTREAM gtk2-build-fix.patch bgo597026 vuntz@novell.com -- Add missing include
Patch25: gtk2-build-fix.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