Accepting request 47764 from GNOME:Factory
Copy from GNOME:Factory/gtk2 based on submit request 47764 from user vuntz OBS-URL: https://build.opensuse.org/request/show/47764 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk2?expand=0&rev=92
This commit is contained in:
OBS User autobuild
Git OBS Bridge
commit
9d58e7b8dc
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8b04df957bed1621fbc09976e4fab38cfe68011825d481070db825adc7ba6467
|
||||
size 18071323
|
||||
3
gtk+-2.21.7.tar.bz2
Normal file
3
gtk+-2.21.7.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d55fdc6638d2b9df3867346da0afe142475fe8a1d9b6ef3910dacedb8af427d2
|
||||
size 18091169
|
||||
@ -1,140 +0,0 @@
|
||||
From 36f931f292cf05bb5c82b3381f134f214b44657e Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin Otte <otte@redhat.com>
|
||||
Date: Fri, 06 Aug 2010 18:33:57 +0000
|
||||
Subject: testdnd: Convert to use pixbufs as icons
|
||||
|
||||
Using Pixmaps is outdated.
|
||||
---
|
||||
diff --git a/tests/testdnd.c b/tests/testdnd.c
|
||||
index 2ed5803..0e59364 100644
|
||||
--- a/tests/testdnd.c
|
||||
+++ b/tests/testdnd.c
|
||||
@@ -24,7 +24,7 @@
|
||||
/* Target side drag signals */
|
||||
|
||||
/* XPM */
|
||||
-static char * drag_icon_xpm[] = {
|
||||
+static const char * drag_icon_xpm[] = {
|
||||
"36 48 9 1",
|
||||
" c None",
|
||||
". c #020204",
|
||||
@@ -85,7 +85,7 @@ static char * drag_icon_xpm[] = {
|
||||
"...................................."};
|
||||
|
||||
/* XPM */
|
||||
-static char * trashcan_closed_xpm[] = {
|
||||
+static const char * trashcan_closed_xpm[] = {
|
||||
"64 80 17 1",
|
||||
" c None",
|
||||
". c #030304",
|
||||
@@ -186,7 +186,7 @@ static char * trashcan_closed_xpm[] = {
|
||||
" "};
|
||||
|
||||
/* XPM */
|
||||
-static char * trashcan_open_xpm[] = {
|
||||
+static const char * trashcan_open_xpm[] = {
|
||||
"64 80 17 1",
|
||||
" c None",
|
||||
". c #030304",
|
||||
@@ -286,10 +286,8 @@ static char * trashcan_open_xpm[] = {
|
||||
" ",
|
||||
" "};
|
||||
|
||||
-GdkPixmap *trashcan_open;
|
||||
-GdkPixmap *trashcan_open_mask;
|
||||
-GdkPixmap *trashcan_closed;
|
||||
-GdkPixmap *trashcan_closed_mask;
|
||||
+GdkPixbuf *trashcan_open;
|
||||
+GdkPixbuf *trashcan_closed;
|
||||
|
||||
gboolean have_drag;
|
||||
|
||||
@@ -313,8 +311,7 @@ target_drag_leave (GtkWidget *widget,
|
||||
{
|
||||
g_print("leave\n");
|
||||
have_drag = FALSE;
|
||||
- gtk_image_set_from_pixmap (GTK_IMAGE (widget),
|
||||
- trashcan_closed, trashcan_closed_mask);
|
||||
+ gtk_image_set_from_pixbuf (GTK_IMAGE (widget), trashcan_closed);
|
||||
}
|
||||
|
||||
gboolean
|
||||
@@ -330,8 +327,7 @@ target_drag_motion (GtkWidget *widget,
|
||||
if (!have_drag)
|
||||
{
|
||||
have_drag = TRUE;
|
||||
- gtk_image_set_from_pixmap (GTK_IMAGE (widget),
|
||||
- trashcan_open, trashcan_open_mask);
|
||||
+ gtk_image_set_from_pixbuf (GTK_IMAGE (widget), trashcan_open);
|
||||
}
|
||||
|
||||
source_widget = gtk_drag_get_source_widget (context);
|
||||
@@ -363,8 +359,7 @@ target_drag_drop (GtkWidget *widget,
|
||||
g_print("drop\n");
|
||||
have_drag = FALSE;
|
||||
|
||||
- gtk_image_set_from_pixmap (GTK_IMAGE (widget),
|
||||
- trashcan_closed, trashcan_closed_mask);
|
||||
+ gtk_image_set_from_pixbuf (GTK_IMAGE (widget), trashcan_closed);
|
||||
|
||||
if (context->targets)
|
||||
{
|
||||
@@ -594,8 +589,7 @@ main (int argc, char **argv)
|
||||
GtkWidget *label;
|
||||
GtkWidget *pixmap;
|
||||
GtkWidget *button;
|
||||
- GdkPixmap *drag_icon;
|
||||
- GdkPixmap *drag_mask;
|
||||
+ GdkPixbuf *drag_icon;
|
||||
|
||||
test_init ();
|
||||
|
||||
@@ -609,19 +603,9 @@ main (int argc, char **argv)
|
||||
table = gtk_table_new (2, 2, FALSE);
|
||||
gtk_container_add (GTK_CONTAINER (window), table);
|
||||
|
||||
- drag_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL,
|
||||
- gtk_widget_get_colormap (window),
|
||||
- &drag_mask,
|
||||
- NULL, drag_icon_xpm);
|
||||
-
|
||||
- trashcan_open = gdk_pixmap_colormap_create_from_xpm_d (NULL,
|
||||
- gtk_widget_get_colormap (window),
|
||||
- &trashcan_open_mask,
|
||||
- NULL, trashcan_open_xpm);
|
||||
- trashcan_closed = gdk_pixmap_colormap_create_from_xpm_d (NULL,
|
||||
- gtk_widget_get_colormap (window),
|
||||
- &trashcan_closed_mask,
|
||||
- NULL, trashcan_closed_xpm);
|
||||
+ drag_icon = gdk_pixbuf_new_from_xpm_data (drag_icon_xpm);
|
||||
+ trashcan_open = gdk_pixbuf_new_from_xpm_data (trashcan_open_xpm);
|
||||
+ trashcan_closed = gdk_pixbuf_new_from_xpm_data (trashcan_closed_xpm);
|
||||
|
||||
label = gtk_label_new ("Drop Here\n");
|
||||
|
||||
@@ -653,7 +637,7 @@ main (int argc, char **argv)
|
||||
g_signal_connect (label, "drag_leave",
|
||||
G_CALLBACK (popsite_leave), NULL);
|
||||
|
||||
- pixmap = gtk_image_new_from_pixmap (trashcan_closed, trashcan_closed_mask);
|
||||
+ pixmap = gtk_image_new_from_pixbuf (trashcan_closed);
|
||||
gtk_drag_dest_set (pixmap, 0, NULL, 0, 0);
|
||||
gtk_table_attach (GTK_TABLE (table), pixmap, 1, 2, 0, 1,
|
||||
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
|
||||
@@ -678,12 +662,9 @@ main (int argc, char **argv)
|
||||
gtk_drag_source_set (button, GDK_BUTTON1_MASK | GDK_BUTTON3_MASK,
|
||||
target_table, n_targets,
|
||||
GDK_ACTION_COPY | GDK_ACTION_MOVE);
|
||||
- gtk_drag_source_set_icon (button,
|
||||
- gtk_widget_get_colormap (window),
|
||||
- drag_icon, drag_mask);
|
||||
+ gtk_drag_source_set_icon_pixbuf (button, drag_icon);
|
||||
|
||||
g_object_unref (drag_icon);
|
||||
- g_object_unref (drag_mask);
|
||||
|
||||
gtk_table_attach (GTK_TABLE (table), button, 0, 1, 1, 2,
|
||||
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
|
||||
--
|
||||
cgit v0.8.3.1
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
From 1f905a1c174a3f5de33390c3ff47c38f627536fa Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin Otte <otte@redhat.com>
|
||||
Date: Tue, 17 Aug 2010 17:10:51 +0000
|
||||
Subject: testgtk: undef GDK_DISABLE_DEPRECATED
|
||||
|
||||
We test ctree code here and that code uses pixmaps.
|
||||
---
|
||||
diff --git a/tests/testgtk.c b/tests/testgtk.c
|
||||
index 9da72cf..2720cbd 100644
|
||||
--- a/tests/testgtk.c
|
||||
+++ b/tests/testgtk.c
|
||||
@@ -26,6 +26,8 @@
|
||||
|
||||
#undef GTK_DISABLE_DEPRECATED
|
||||
|
||||
+#undef GDK_DISABLE_DEPRECATED
|
||||
+
|
||||
#include "config.h"
|
||||
|
||||
#undef G_LOG_DOMAIN
|
||||
--
|
||||
cgit v0.8.3.1
|
||||
|
||||
@ -1,69 +0,0 @@
|
||||
From d24a6727b866cc9f9393991f140f4c7347dcf809 Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin Otte <otte@redhat.com>
|
||||
Date: Wed, 21 Jul 2010 01:16:29 +0000
|
||||
Subject: gtk-demo: Adapt textview example for stipple removal
|
||||
|
||||
---
|
||||
diff --git a/demos/gtk-demo/textview.c b/demos/gtk-demo/textview.c
|
||||
index f17f880..cfac7fd 100644
|
||||
--- a/demos/gtk-demo/textview.c
|
||||
+++ b/demos/gtk-demo/textview.c
|
||||
@@ -14,17 +14,9 @@
|
||||
|
||||
static void easter_egg_callback (GtkWidget *button, gpointer data);
|
||||
|
||||
-#define gray50_width 2
|
||||
-#define gray50_height 2
|
||||
-static char gray50_bits[] = {
|
||||
- 0x02, 0x01
|
||||
-};
|
||||
-
|
||||
static void
|
||||
create_tags (GtkTextBuffer *buffer)
|
||||
{
|
||||
- GdkBitmap *stipple;
|
||||
-
|
||||
/* Create a bunch of tags. Note that it's also possible to
|
||||
* create tags with gtk_text_tag_new() then add them to the
|
||||
* tag table for the buffer, gtk_text_buffer_create_tag() is
|
||||
@@ -74,18 +66,6 @@ create_tags (GtkTextBuffer *buffer)
|
||||
gtk_text_buffer_create_tag (buffer, "red_background",
|
||||
"background", "red", NULL);
|
||||
|
||||
- stipple = gdk_bitmap_create_from_data (NULL,
|
||||
- gray50_bits, gray50_width,
|
||||
- gray50_height);
|
||||
-
|
||||
- gtk_text_buffer_create_tag (buffer, "background_stipple",
|
||||
- "background_stipple", stipple, NULL);
|
||||
-
|
||||
- gtk_text_buffer_create_tag (buffer, "foreground_stipple",
|
||||
- "foreground_stipple", stipple, NULL);
|
||||
-
|
||||
- g_object_unref (stipple);
|
||||
-
|
||||
gtk_text_buffer_create_tag (buffer, "big_gap_before_line",
|
||||
"pixels_above_lines", 30, NULL);
|
||||
|
||||
@@ -227,17 +207,9 @@ insert_text (GtkTextBuffer *buffer)
|
||||
"red_background", NULL);
|
||||
gtk_text_buffer_insert (buffer, &iter, " or even ", -1);
|
||||
gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
|
||||
- "a stippled red background", -1,
|
||||
- "red_background",
|
||||
- "background_stipple",
|
||||
- NULL);
|
||||
-
|
||||
- gtk_text_buffer_insert (buffer, &iter, " or ", -1);
|
||||
- gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
|
||||
- "a stippled blue foreground on solid red background", -1,
|
||||
+ "a blue foreground on red background", -1,
|
||||
"blue_foreground",
|
||||
"red_background",
|
||||
- "foreground_stipple",
|
||||
NULL);
|
||||
gtk_text_buffer_insert (buffer, &iter, " (select that to read it) can be used.\n\n", -1);
|
||||
|
||||
--
|
||||
cgit v0.8.3.1
|
||||
|
||||
23
gtk2.changes
23
gtk2.changes
@ -1,3 +1,26 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 30 23:18:26 CEST 2010 - vuntz@opensuse.org
|
||||
|
||||
- Update to version 2.21.7:
|
||||
+ Deprecations:
|
||||
- GtkWidget::draw-border has been deprecated
|
||||
+ The Windows backend has seen quite a bit of work towards fixing
|
||||
CSW regressions.
|
||||
+ Bugs fixed:
|
||||
- bgo#528257: File selector and stock string problems
|
||||
- bgo#614006: File chooser crashes when creating a new
|
||||
folder...
|
||||
- bgo#616401: Noneffective gdk_keymap_map_virtual_modifiers...
|
||||
- bgo#626537: Toggle button does not set indeterminate state
|
||||
- bgo#627139: gtkfilechooserentry shows completion progress
|
||||
tool...
|
||||
- bgo#627843: set_active_iter: remove restriction on path
|
||||
length
|
||||
- bgo#628049: Native windows don't work very well
|
||||
+ Updated translations.
|
||||
- Drop gtk2-testdnd.patch, gtk2-testgtk.patch, gtk2-testview.patch:
|
||||
fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 25 21:50:25 CEST 2010 - vuntz@opensuse.org
|
||||
|
||||
|
||||
13
gtk2.spec
13
gtk2.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package gtk2 (Version 2.21.6)
|
||||
# spec file for package gtk2 (Version 2.21.7)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
Name: gtk2
|
||||
%define _name gtk+
|
||||
Version: 2.21.6
|
||||
Version: 2.21.7
|
||||
Release: 1
|
||||
# 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)
|
||||
@ -48,12 +48,6 @@ Patch24: gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.d
|
||||
# be here instead.
|
||||
# PATCH-FIX-OPENSUSE gtk-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474
|
||||
Patch53: gtk-path-local.patch
|
||||
# PATCH-FIX-UPSTREAM gtk2-testview.patch bgo#627128 dimstar@opensuse.org -- fix build of testview: adapt for stripple remove. - Taken from upstream git, id d24a6727
|
||||
Patch54: gtk2-testview.patch
|
||||
# PATCH-FIX-UPSTREAM gtk2-testdnd.patch bgo#627129 dimstar@opensuse.org -- Fix build of testdnd: convert to use pixbufs as icons. Taken from upstream git, id 36f931f2
|
||||
Patch55: gtk2-testdnd.patch
|
||||
# PATCH-FIX-UPSTREAM gtk2-testgtk.patch bgo#627130 dimstar@opensuse.org -- fix build of testgtk: ctree is tested and it uses pixmaps. - Taken from upstream git, id 1f905a1c
|
||||
Patch56: gtk2-testgtk.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: atk-devel
|
||||
@ -167,9 +161,6 @@ cp -a %{S:2} .
|
||||
%patch23 -p1
|
||||
%patch24 -p1
|
||||
%patch53
|
||||
%patch54 -p1
|
||||
%patch55 -p1
|
||||
%patch56 -p1
|
||||
gnome-patch-translation-update
|
||||
|
||||
%build
|
||||
|
||||
Loading…
Reference in New Issue
Block a user