rpms/gtk2/F-13 fresh-tooltips.patch, 1.2, 1.3 gtk2.spec, 1.424, 1.425 icon-padding.patch, 1.1, 1.2 sources, 1.133, 1.134 tooltip-positioning.patch, 1.2, 1.3
Matthias Clasen
mclasen at fedoraproject.org
Wed Mar 10 06:15:30 UTC 2010
Author: mclasen
Update of /cvs/pkgs/rpms/gtk2/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32202
Modified Files:
fresh-tooltips.patch gtk2.spec icon-padding.patch sources
tooltip-positioning.patch
Log Message:
2.19.7
fresh-tooltips.patch:
gtktooltip.c | 264 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
gtkwidget.c | 8 +
2 files changed, 260 insertions(+), 12 deletions(-)
Index: fresh-tooltips.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-13/fresh-tooltips.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fresh-tooltips.patch 1 Dec 2009 01:13:45 -0000 1.2
+++ fresh-tooltips.patch 10 Mar 2010 06:15:28 -0000 1.3
@@ -228,7 +228,7 @@ diff -up gtk+-2.19.1/gtk/gtktooltip.c.fr
+ /* This is a hack to keep the Metacity compositor from slapping a
+ * non-shaped shadow around the shaped tooltip
+ */
-+ if (!GTK_WIDGET_MAPPED (tooltip->window))
++ if (!gtk_widget_get_mapped (tooltip->window))
+ {
+ wm = gdk_x11_screen_get_window_manager_name (screen);
+ if (g_strcmp0 (wm, "Metacity") == 0)
Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-13/gtk2.spec,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -p -r1.424 -r1.425
--- gtk2.spec 23 Feb 2010 21:44:12 -0000 1.424
+++ gtk2.spec 10 Mar 2010 06:15:29 -0000 1.425
@@ -13,7 +13,7 @@
%define gobject_introspection_version 0.6.7
%define gir_repository_version 0.6.5-5
-%define base_version 2.19.6
+%define base_version 2.19.7
%define bin_version 2.10.0
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
@@ -22,6 +22,7 @@ Version: %{base_version}
Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
+#VCS: git:git://git.gnome.org/gtk+
Source: http://download.gnome.org/sources/gtk+/2.19/gtk+-%{version}.tar.bz2
Source1: update-gdk-pixbuf-loaders
Source2: update-gtk-immodules
@@ -40,8 +41,6 @@ Patch8: tooltip-positioning.patch
Patch11: gtk2-remove-connecting-reason.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=592582
#Patch14: gtk2-landscape-pdf-print.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=600992
-Patch15: filesystemref.patch
BuildRequires: atk-devel >= %{atk_version}
BuildRequires: pango-devel >= %{pango_version}
@@ -161,17 +160,8 @@ This package contains developer document
%patch8 -p1 -b .tooltip-positioning
%patch11 -p1 -b .remove-connecting-reason
#%patch14 -p1 -b .landscape-pdf-print
-%patch15 -p1 -b .filesystemref
%build
-
-# needed for Patch16, remove it when rebasing to 2.19.3
-gtkdocize || :
-libtoolize --force || :
-aclocal || :
-autoheader || :
-automake || :
-autoconf || :
%configure --with-xinput=xfree \
--enable-debug \
--disable-gtk-doc \
@@ -187,21 +177,12 @@ make %{?_smp_mflags}
# turn off for now, since floatingtest needs a display
#make check
-# create a dummy binary for /usr/lib/gtk-2.0/immodules to work around
-# problems in our ia64 multilib infrastructure
-# See https://bugzilla.redhat.com/show_bug.cgi?id=253726 for more details
-%if 0
-echo 'int main (void) { return 0; }' > relocation-tag.c
-gcc -Os relocation-tag.c -o relocation-tag
-%endif
-
# truncate NEWS
awk '/^Overview of Changes/ { seen+=1 }
{ if (seen < 2) print }
{ if (seen == 2) { print "For older news, see http://git.gnome.org/cgit/gtk+/plain/NEWS"; exit } }' NEWS > tmp; mv tmp NEWS
%install
-rm -rf $RPM_BUILD_ROOT
# Deriving /etc/gtk-2.0/$host location
# NOTE: Duplicated below
#
@@ -286,13 +267,6 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2
mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/immodules
mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{bin_version}/filesystems
-%if 0
-# we need to install a binary in the immodules directory to make sure
-# that it gets properly relocated to /emul for ia64 emulation of x86
-# See https://bugzilla.redhat.com/show_bug.cgi?id=253726
-install -m 0755 relocation-tag $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/immodules
-%endif
-
#
# We need the substitution of $host so we use an external
# file list
@@ -399,6 +373,11 @@ fi
%doc tmpdocs/examples
%changelog
+* Wed Mar 10 2010 Matthias Clasen <mclasen at redhat.com> - 2.19.7-1
+- Update to 2.19.7
+- Add a VCS tag
+- Minor packaging cleanups
+
* Tue Feb 23 2010 Matthias Clasen <mclasen at redhat.com> - 2.19.6-1
- Update to 2.19.6
icon-padding.patch:
gtkstatusicon.c | 25 ++++++++++++++
gtktrayicon-x11.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++---
gtktrayicon.h | 3 +
3 files changed, 114 insertions(+), 6 deletions(-)
Index: icon-padding.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-13/icon-padding.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- icon-padding.patch 2 Nov 2009 04:22:13 -0000 1.1
+++ icon-padding.patch 10 Mar 2010 06:15:29 -0000 1.2
@@ -1,8 +1,7 @@
-diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
-index 1cdb0c1..62b3913 100644
---- a/gtk/gtkstatusicon.c
-+++ b/gtk/gtkstatusicon.c
-@@ -170,6 +170,7 @@ static void gtk_status_icon_screen_changed (GtkStatusIcon *status_icon,
+diff -up gtk+-2.19.7/gtk/gtkstatusicon.c.icon-padding gtk+-2.19.7/gtk/gtkstatusicon.c
+--- gtk+-2.19.7/gtk/gtkstatusicon.c.icon-padding 2010-03-08 08:42:22.000000000 -0500
++++ gtk+-2.19.7/gtk/gtkstatusicon.c 2010-03-10 00:40:11.165527903 -0500
+@@ -170,6 +170,7 @@ static void gtk_status_icon_screen_c
GdkScreen *old_screen);
static void gtk_status_icon_embedded_changed (GtkStatusIcon *status_icon);
static void gtk_status_icon_orientation_changed (GtkStatusIcon *status_icon);
@@ -10,7 +9,7 @@ index 1cdb0c1..62b3913 100644
static gboolean gtk_status_icon_scroll (GtkStatusIcon *status_icon,
GdkEventScroll *event);
static gboolean gtk_status_icon_query_tooltip (GtkStatusIcon *status_icon,
-@@ -850,6 +851,8 @@ gtk_status_icon_init (GtkStatusIcon *status_icon)
+@@ -850,6 +851,8 @@ gtk_status_icon_init (GtkStatusIcon *sta
G_CALLBACK (gtk_status_icon_embedded_changed), status_icon);
g_signal_connect_swapped (priv->tray_icon, "notify::orientation",
G_CALLBACK (gtk_status_icon_orientation_changed), status_icon);
@@ -19,7 +18,7 @@ index 1cdb0c1..62b3913 100644
g_signal_connect_swapped (priv->tray_icon, "button-press-event",
G_CALLBACK (gtk_status_icon_button_press), status_icon);
g_signal_connect_swapped (priv->tray_icon, "button-release-event",
-@@ -975,6 +978,8 @@ gtk_status_icon_finalize (GObject *object)
+@@ -975,6 +978,8 @@ gtk_status_icon_finalize (GObject *objec
g_signal_handlers_disconnect_by_func (priv->tray_icon,
gtk_status_icon_orientation_changed, status_icon);
g_signal_handlers_disconnect_by_func (priv->tray_icon,
@@ -28,7 +27,7 @@ index 1cdb0c1..62b3913 100644
gtk_status_icon_button_press, status_icon);
g_signal_handlers_disconnect_by_func (priv->tray_icon,
gtk_status_icon_button_release, status_icon);
-@@ -1679,14 +1684,32 @@ gtk_status_icon_screen_changed (GtkStatusIcon *status_icon,
+@@ -1679,14 +1684,32 @@ gtk_status_icon_screen_changed (GtkStatu
#ifdef GDK_WINDOWING_X11
static void
@@ -61,7 +60,7 @@ index 1cdb0c1..62b3913 100644
g_object_notify (G_OBJECT (status_icon), "orientation");
}
-@@ -1804,7 +1827,7 @@ gtk_status_icon_reset_image_data (GtkStatusIcon *status_icon)
+@@ -1804,7 +1827,7 @@ gtk_status_icon_reset_image_data (GtkSta
g_object_notify (G_OBJECT (status_icon), "stock");
break;
@@ -70,10 +69,22 @@ index 1cdb0c1..62b3913 100644
case GTK_IMAGE_ICON_NAME:
g_free (priv->image_data.icon_name);
priv->image_data.icon_name = NULL;
-diff --git a/gtk/gtktrayicon-x11.c b/gtk/gtktrayicon-x11.c
-index 32c3140..74413df 100644
---- a/gtk/gtktrayicon-x11.c
-+++ b/gtk/gtktrayicon-x11.c
+diff -up gtk+-2.19.7/gtk/gtktrayicon.h.icon-padding gtk+-2.19.7/gtk/gtktrayicon.h
+--- gtk+-2.19.7/gtk/gtktrayicon.h.icon-padding 2009-10-18 01:35:45.000000000 -0400
++++ gtk+-2.19.7/gtk/gtktrayicon.h 2010-03-10 00:40:11.169528392 -0500
+@@ -69,7 +69,8 @@ void _gtk_tray_icon_cancel_mes
+ guint id);
+
+ GtkOrientation _gtk_tray_icon_get_orientation (GtkTrayIcon *icon);
+-
++gint _gtk_tray_icon_get_padding (GtkTrayIcon *icon);
++
+ G_END_DECLS
+
+ #endif /* __GTK_TRAY_ICON_H__ */
+diff -up gtk+-2.19.7/gtk/gtktrayicon-x11.c.icon-padding gtk+-2.19.7/gtk/gtktrayicon-x11.c
+--- gtk+-2.19.7/gtk/gtktrayicon-x11.c.icon-padding 2010-03-08 21:01:28.000000000 -0500
++++ gtk+-2.19.7/gtk/gtktrayicon-x11.c 2010-03-10 00:49:48.229509604 -0500
@@ -43,23 +43,26 @@
enum {
@@ -103,7 +114,7 @@ index 32c3140..74413df 100644
};
static void gtk_tray_icon_constructed (GObject *object);
-@@ -113,6 +116,16 @@ gtk_tray_icon_class_init (GtkTrayIconClass *class)
+@@ -113,6 +116,16 @@ gtk_tray_icon_class_init (GtkTrayIconCla
GTK_ORIENTATION_HORIZONTAL,
GTK_PARAM_READABLE));
@@ -128,7 +139,7 @@ index 32c3140..74413df 100644
gtk_widget_set_app_paintable (GTK_WIDGET (icon), TRUE);
gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
-@@ -161,6 +175,10 @@ gtk_tray_icon_constructed (GObject *object)
+@@ -161,6 +175,10 @@ gtk_tray_icon_constructed (GObject *obje
"_NET_SYSTEM_TRAY_VISUAL",
False);
@@ -139,7 +150,7 @@ index 32c3140..74413df 100644
/* Add a root window filter so that we get changes on MANAGER */
gdk_window_add_filter (root_window,
gtk_tray_icon_manager_filter, icon);
-@@ -212,6 +230,9 @@ gtk_tray_icon_get_property (GObject *object,
+@@ -212,6 +230,9 @@ gtk_tray_icon_get_property (GObject *
case PROP_ORIENTATION:
g_value_set_enum (value, icon->priv->orientation);
break;
@@ -149,7 +160,7 @@ index 32c3140..74413df 100644
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
-@@ -372,9 +393,58 @@ gtk_tray_icon_get_visual_property (GtkTrayIcon *icon)
+@@ -372,9 +393,58 @@ gtk_tray_icon_get_visual_property (GtkTr
XFree (prop.prop);
}
@@ -210,7 +221,7 @@ index 32c3140..74413df 100644
gpointer user_data)
{
GtkTrayIcon *icon = user_data;
-@@ -399,6 +469,11 @@ gtk_tray_icon_manager_filter (GdkXEvent *xevent,
+@@ -399,6 +469,11 @@ gtk_tray_icon_manager_filter (GdkXEvent
gtk_tray_icon_get_orientation_property (icon);
}
@@ -222,15 +233,15 @@ index 32c3140..74413df 100644
else if (xev->xany.type == DestroyNotify)
{
GTK_NOTE (PLUGSOCKET,
-@@ -504,6 +579,7 @@ gtk_tray_icon_update_manager_window (GtkTrayIcon *icon)
+@@ -504,6 +579,7 @@ gtk_tray_icon_update_manager_window (Gtk
gtk_tray_icon_get_orientation_property (icon);
gtk_tray_icon_get_visual_property (icon);
+ gtk_tray_icon_get_padding_property (icon);
- if (GTK_WIDGET_REALIZED (icon))
+ if (gtk_widget_get_realized (GTK_WIDGET (icon)))
{
-@@ -740,6 +816,14 @@ _gtk_tray_icon_get_orientation (GtkTrayIcon *icon)
+@@ -740,6 +816,14 @@ _gtk_tray_icon_get_orientation (GtkTrayI
return icon->priv->orientation;
}
@@ -245,17 +256,3 @@ index 32c3140..74413df 100644
#define __GTK_TRAY_ICON_X11_C__
#include "gtkaliasdef.c"
-diff --git a/gtk/gtktrayicon.h b/gtk/gtktrayicon.h
-index 4c1e184..6dc9852 100644
---- a/gtk/gtktrayicon.h
-+++ b/gtk/gtktrayicon.h
-@@ -69,7 +69,8 @@ void _gtk_tray_icon_cancel_message (GtkTrayIcon *icon,
- guint id);
-
- GtkOrientation _gtk_tray_icon_get_orientation (GtkTrayIcon *icon);
--
-+gint _gtk_tray_icon_get_padding (GtkTrayIcon *icon);
-+
- G_END_DECLS
-
- #endif /* __GTK_TRAY_ICON_H__ */
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-13/sources,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- sources 23 Feb 2010 21:44:12 -0000 1.133
+++ sources 10 Mar 2010 06:15:29 -0000 1.134
@@ -1 +1 @@
-524021c965a0e1a4ebadd58c576926a5 gtk+-2.19.6.tar.bz2
+d28d3857bc9a668e928714d8413f8b70 gtk+-2.19.7.tar.bz2
tooltip-positioning.patch:
gtktooltip.c | 147 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 113 insertions(+), 34 deletions(-)
Index: tooltip-positioning.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-13/tooltip-positioning.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tooltip-positioning.patch 11 Jan 2010 21:45:36 -0000 1.2
+++ tooltip-positioning.patch 10 Mar 2010 06:15:29 -0000 1.3
@@ -26,7 +26,7 @@ diff -up gtk+-2.18.3/gtk/gtktooltip.c.po
+ gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+
+ gdk_window_get_origin (new_tooltip_widget->window, &wx, &wy);
-+ if (GTK_WIDGET_NO_WINDOW (new_tooltip_widget))
++ if (!gtk_widget_get_has_window (new_tooltip_widget))
+ {
+ wx += new_tooltip_widget->allocation.x;
+ wy += new_tooltip_widget->allocation.y;
More information about the scm-commits
mailing list