This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
cbac0cf1ac
commit
8abcf83076
@ -1,11 +0,0 @@
|
||||
--- gtk/Makefile.am
|
||||
+++ gtk/Makefile.am
|
||||
@@ -1104,7 +1104,7 @@
|
||||
&& $(LN_S) gtk-goto-first-ltr.png gtk-goto-last-rtl.png \
|
||||
&& $(RM) gtk-media-forward-rtl.png \
|
||||
&& $(LN_S) gtk-media-rewind-ltr.png gtk-media-forward-rtl.png \
|
||||
- && $(RM) gtk-mdedia-next-rtl.png \
|
||||
+ && $(RM) gtk-media-next-rtl.png \
|
||||
&& $(LN_S) gtk-media-previous-ltr.png gtk-media-next-rtl.png \
|
||||
&& $(RM) gtk-media-previous-rtl.png \
|
||||
&& $(LN_S) gtk-media-next-ltr.png gtk-media-previous-rtl.png \
|
||||
12
gtk2-systray-tooltips.patch
Normal file
12
gtk2-systray-tooltips.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -up gtk+-2.11.6/gtk/gtktooltip.c.systray-tooltips gtk+-2.11.6/gtk/gtktooltip.c
|
||||
--- gtk+-2.11.6/gtk/gtktooltip.c.systray-tooltips 2007-07-25 13:46:43.000000000 -0400
|
||||
+++ gtk+-2.11.6/gtk/gtktooltip.c 2007-07-25 13:47:05.000000000 -0400
|
||||
@@ -1116,7 +1116,7 @@ _gtk_tooltip_handle_event (GdkEvent *eve
|
||||
/* Hide the tooltip when there's no new tooltip widget */
|
||||
if (!has_tooltip_widget)
|
||||
{
|
||||
- if (current_tooltip && GTK_TOOLTIP_VISIBLE (current_tooltip))
|
||||
+ if (current_tooltip)
|
||||
gtk_tooltip_hide_tooltip (current_tooltip);
|
||||
|
||||
return;
|
||||
44
gtk2-tooltip-compat.patch
Normal file
44
gtk2-tooltip-compat.patch
Normal file
@ -0,0 +1,44 @@
|
||||
--- trunk/gtk/gtktooltips.c 2007/07/21 13:19:11 18520
|
||||
+++ trunk/gtk/gtktooltips.c 2007/08/07 13:32:19 18587
|
||||
@@ -103,6 +103,8 @@
|
||||
private->tips_data_table =
|
||||
g_hash_table_new_full (NULL, NULL, NULL,
|
||||
(GDestroyNotify) gtk_tooltips_destroy_data);
|
||||
+
|
||||
+ gtk_tooltips_force_window (tooltips);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -144,6 +146,12 @@
|
||||
|
||||
g_return_if_fail (tooltips != NULL);
|
||||
|
||||
+ if (tooltips->tip_window)
|
||||
+ {
|
||||
+ gtk_widget_destroy (tooltips->tip_window);
|
||||
+ tooltips->tip_window = NULL;
|
||||
+ }
|
||||
+
|
||||
g_hash_table_remove_all (private->tips_data_table);
|
||||
|
||||
GTK_OBJECT_CLASS (gtk_tooltips_parent_class)->destroy (object);
|
||||
@@ -154,7 +162,18 @@
|
||||
{
|
||||
g_return_if_fail (GTK_IS_TOOLTIPS (tooltips));
|
||||
|
||||
- /* nop */
|
||||
+ if (!tooltips->tip_window)
|
||||
+ {
|
||||
+ tooltips->tip_window = gtk_window_new (GTK_WINDOW_POPUP);
|
||||
+ g_signal_connect (tooltips->tip_window,
|
||||
+ "destroy",
|
||||
+ G_CALLBACK (gtk_widget_destroyed),
|
||||
+ &tooltips->tip_window);
|
||||
+
|
||||
+ tooltips->tip_label = gtk_label_new (NULL);
|
||||
+ gtk_container_add (GTK_CONTAINER (tooltips->tip_window),
|
||||
+ tooltips->tip_label);
|
||||
+ }
|
||||
}
|
||||
|
||||
void
|
||||
16
gtk2.changes
16
gtk2.changes
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 14 22:35:07 CEST 2007 - jpr@suse.de
|
||||
|
||||
- Enable xinput for wacom tablets, it needs a configure flag
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 14 16:21:35 CEST 2007 - jpr@suse.de
|
||||
|
||||
- Backport tooltip fixes from upstream svn (#298343, #297149)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 13 20:06:05 CEST 2007 - federico@novell.com
|
||||
|
||||
- Removed references to obsolete patches from the SPEC file. Fixes
|
||||
https://bugzilla.novell.com/show_bug.cgi?id=299262
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 6 23:38:12 CEST 2007 - maw@suse.de
|
||||
|
||||
|
||||
26
gtk2.spec
26
gtk2.spec
@ -28,7 +28,7 @@ Group: System/Libraries
|
||||
Autoreqprov: on
|
||||
PreReq: /usr/bin/touch /bin/rm /bin/rmdir
|
||||
Version: 2.11.6
|
||||
Release: 8
|
||||
Release: 11
|
||||
Summary: Library for Creation of Graphical User Interfaces (version 2)
|
||||
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.10/%{_name}-%{version}.tar.bz2
|
||||
Source1: SuSEconfig.gtk2
|
||||
@ -48,12 +48,8 @@ Patch23: bugzilla-131498-allow-xim-for-all-languages.patch
|
||||
Patch24: gtk+-2.8.6-fontsel.patch
|
||||
Patch31: gtk+-2.8.6-fontsel-fix.patch
|
||||
Patch32: gtk2-set-invisible-char-to-circle.patch
|
||||
# remove
|
||||
# Patch38: gtk2-po.patch
|
||||
Patch39: gtk2-makefile-typo.patch
|
||||
# Patch40: gdk-pixbuf-226710.patch
|
||||
# Patch41: gtk2-235661-pixbuf-loader-error-checking.diff
|
||||
# Patch42: gtk2-216883-filechooser-fix-invisible-shortcuts.diff
|
||||
Patch33: gtk2-tooltip-compat.patch
|
||||
Patch34: gtk2-systray-tooltips.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires: cairo >= 0.9.2 hicolor-icon-theme
|
||||
%if %suse_version > 1020
|
||||
@ -210,11 +206,8 @@ cp -a %{S:2} .
|
||||
%patch24
|
||||
%patch31
|
||||
%patch32 -p1
|
||||
# %patch38 -p1
|
||||
#%patch39
|
||||
# %patch40 -p1
|
||||
# %patch41 -p0
|
||||
# %patch42 -p1
|
||||
%patch33 -p1
|
||||
%patch34 -p1
|
||||
gnome-patch-translation-update
|
||||
|
||||
%build
|
||||
@ -245,7 +238,7 @@ export CFLAGS="$CFLAGS -fno-strict-aliasing"
|
||||
--with-gdktarget=directfb\
|
||||
--enable-fbmanager
|
||||
%else
|
||||
%configure
|
||||
%configure --with-xinput=xfree
|
||||
%endif
|
||||
make %{?jobs:-j%jobs}
|
||||
|
||||
@ -377,6 +370,13 @@ fi
|
||||
%{_datadir}/gtk-doc/html/*
|
||||
|
||||
%changelog
|
||||
* Tue Aug 14 2007 - jpr@suse.de
|
||||
- Enable xinput for wacom tablets, it needs a configure flag
|
||||
* Tue Aug 14 2007 - jpr@suse.de
|
||||
- Backport tooltip fixes from upstream svn (#298343, #297149)
|
||||
* Mon Aug 13 2007 - federico@novell.com
|
||||
- Removed references to obsolete patches from the SPEC file. Fixes
|
||||
https://bugzilla.novell.com/show_bug.cgi?id=299262
|
||||
* Mon Aug 06 2007 - maw@suse.de
|
||||
- Split out a -lang subpackage
|
||||
- Use %%fdupes.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user