pool/gtk2
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

checked in

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=83
This commit is contained in:
OBS User autobuild 2009-12-08 10:33:40 +00:00 committed by Git OBS Bridge
parent 46b2f53c3b
commit 42bbb24ba1
9 changed files with 477 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff
View File

@ -1,8 +1,6 @@
Index: gtk+-2.19.0/gtk/gtkfontbutton.c --- gtk+-2.10.1/gtk/gtkfontbutton.c
=================================================================== +++ gtk+-2.10.1/gtk/gtkfontbutton.c
--- gtk+-2.19.0.orig/gtk/gtkfontbutton.c @@ -888,7 +888,7 @@
+++ gtk+-2.19.0/gtk/gtkfontbutton.c
@@ -893,7 +893,7 @@ gtk_font_button_update_font_info (GtkFon
if (style == NULL || !g_ascii_strcasecmp (style, "Regular")) if (style == NULL || !g_ascii_strcasecmp (style, "Regular"))
family_style = g_strdup (family); family_style = g_strdup (family);
else else
@ -11,13 +9,11 @@ Index: gtk+-2.19.0/gtk/gtkfontbutton.c
gtk_label_set_text (GTK_LABEL (font_button->priv->font_label), family_style); gtk_label_set_text (GTK_LABEL (font_button->priv->font_label), family_style);
Index: gtk+-2.19.0/gtk/gtkfontsel.c --- gtk+-2.10.1/gtk/gtkfontsel.c
=================================================================== +++ gtk+-2.10.1/gtk/gtkfontsel.c
--- gtk+-2.19.0.orig/gtk/gtkfontsel.c @@ -73,6 +73,21 @@
+++ gtk+-2.19.0/gtk/gtkfontsel.c can set it. Remember that some fonts only have capital letters. */
@@ -76,6 +76,21 @@ #define PREVIEW_TEXT N_("abcdefghijk ABCDEFGHIJK")
#define DEFAULT_FONT_NAME "Sans 10"
+/* These are the commonly used font styles, listed here only for +/* These are the commonly used font styles, listed here only for
+ translations. */ + translations. */
@ -37,7 +33,7 @@ Index: gtk+-2.19.0/gtk/gtkfontsel.c
/* This is the initial and maximum height of the preview entry (it expands /* This is the initial and maximum height of the preview entry (it expands
when large font sizes are selected). Initial height is also the minimum. */ when large font sizes are selected). Initial height is also the minimum. */
#define INITIAL_PREVIEW_HEIGHT 44 #define INITIAL_PREVIEW_HEIGHT 44
@@ -869,7 +884,7 @@ gtk_font_selection_show_available_styles @@ -801,7 +816,7 @@
gtk_list_store_append (model, &iter); gtk_list_store_append (model, &iter);
gtk_list_store_set (model, &iter, gtk_list_store_set (model, &iter,
FACE_COLUMN, faces[i], FACE_COLUMN, faces[i],

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

3
gtk+-2.19.1.tar.bz2
View File

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

208
gtk+-strict-aliasing.patch Normal file
View File

@ -0,0 +1,208 @@
From 9e474aed8bedead6b2a962a9ee3c6559fd412676 Mon Sep 17 00:00:00 2001
From: Michael Wolf <maw@novell.com>
Date: Tue, 22 Jul 2008 16:35:51 -0500
Subject: [PATCH] gtk+-strict-aliasing.patch
---
demos/gtk-demo/changedisplay.c | 2 +-
demos/gtk-demo/textview.c | 5 +++++
gdk/x11/gdkdnd-x11.c | 5 +++++
gdk/x11/gdkevents-x11.c | 2 ++
gdk/x11/gdkim-x11.c | 1 +
gdk/x11/gdkwindow-x11.c | 1 +
gtk/gtkmodules.c | 4 ++--
gtk/gtktipsquery.c | 4 ++--
gtk/queryimmodules.c | 11 +++++------
tests/testgtk.c | 6 +++---
10 files changed, 27 insertions(+), 14 deletions(-)
Index: gtk+-2.13.6/demos/gtk-demo/changedisplay.c
===================================================================
--- gtk+-2.13.6.orig/demos/gtk-demo/changedisplay.c
+++ gtk+-2.13.6/demos/gtk-demo/changedisplay.c
@@ -73,7 +73,7 @@ static GtkWidget *
find_toplevel_at_pointer (GdkDisplay *display)
{
GdkWindow *pointer_window;
- GtkWidget *widget = NULL;
+ gpointer widget = NULL;
pointer_window = gdk_display_get_window_at_pointer (display, NULL, NULL);
Index: gtk+-2.13.6/gdk/x11/gdkdnd-x11.c
===================================================================
--- gtk+-2.13.6.orig/gdk/x11/gdkdnd-x11.c
+++ gtk+-2.13.6/gdk/x11/gdkdnd-x11.c
@@ -905,6 +905,7 @@ motif_read_target_table (GdkDisplay *dis
{
guchar *data;
MotifTargetTableHeader *header = NULL;
+ gpointer vp_header = &header;
guchar *target_bytes = NULL;
guchar *p;
gboolean success = FALSE;
@@ -1259,6 +1260,7 @@ motif_check_dest (GdkDisplay *display,
gboolean retval = FALSE;
guchar *data;
MotifDragReceiverInfo *info;
+ gpointer vp_info = &info;
Atom type = None;
int format;
unsigned long nitems, after;
@@ -1461,6 +1463,7 @@ motif_read_initiator_info (GdkDisplay *d
gulong bytes_after;
guchar *data;
MotifDragInitiatorInfo *initiator_info;
+ gpointer vp_initiator_info = &initiator_info;
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
@@ -2395,7 +2398,9 @@ xdnd_check_dest (GdkDisplay *display,
unsigned long nitems, after;
guchar *data;
Atom *version;
+ gpointer vp_version = &version;
Window *proxy_data;
+ gpointer vp_proxy_data = &proxy_data;
Window proxy;
Atom xdnd_proxy_atom = gdk_x11_get_xatom_by_name_for_display (display, "XdndProxy");
Atom xdnd_aware_atom = gdk_x11_get_xatom_by_name_for_display (display, "XdndAware");
Index: gtk+-2.13.6/gdk/x11/gdkevents-x11.c
===================================================================
--- gtk+-2.13.6.orig/gdk/x11/gdkevents-x11.c
+++ gtk+-2.13.6/gdk/x11/gdkevents-x11.c
@@ -519,6 +519,7 @@ gdk_check_wm_state_changed (GdkWindow *w
gulong bytes_after;
guchar *data;
Atom *atoms = NULL;
+ gpointer vp_atoms = &atoms;
gulong i;
gboolean had_sticky = toplevel->have_sticky;
Index: gtk+-2.13.6/gdk/x11/gdkim-x11.c
===================================================================
--- gtk+-2.13.6.orig/gdk/x11/gdkim-x11.c
+++ gtk+-2.13.6/gdk/x11/gdkim-x11.c
@@ -130,6 +130,7 @@ find_a_display (void)
gchar *
gdk_wcstombs (const GdkWChar *src)
{
+ gpointer vp_src = &src;
gchar *mbstr;
if (gdk_use_mb)
Index: gtk+-2.13.6/gdk/x11/gdkwindow-x11.c
===================================================================
--- gtk+-2.13.6.orig/gdk/x11/gdkwindow-x11.c
+++ gtk+-2.13.6/gdk/x11/gdkwindow-x11.c
@@ -4732,6 +4732,7 @@ gdk_window_set_mwm_hints (GdkWindow *win
Atom hints_atom = None;
guchar *data;
MotifWmHints *hints;
+ gpointer vp_hints = &hints;
Atom type;
gint format;
gulong nitems;
Index: gtk+-2.13.6/gtk/gtkmodules.c
===================================================================
--- gtk+-2.13.6.orig/gtk/gtkmodules.c
+++ gtk+-2.13.6/gtk/gtkmodules.c
@@ -281,9 +281,9 @@ load_module (GSList *module_list,
if (module)
{
if (g_module_symbol (module, "gtk_module_init", &modinit_func_ptr))
- modinit_func = modinit_func_ptr;
+ modinit_func = modinit_func_ptr;
else
- modinit_func = NULL;
+ modinit_func = NULL;
if (!modinit_func)
g_module_close (module);
Index: gtk+-2.13.6/gtk/gtktipsquery.c
===================================================================
--- gtk+-2.13.6.orig/gtk/gtktipsquery.c
+++ gtk+-2.13.6/gtk/gtktipsquery.c
@@ -442,7 +442,7 @@ gtk_tips_query_event (GtkWidget *
GdkEvent *event)
{
GtkTipsQuery *tips_query;
- GtkWidget *event_widget;
+ gpointer event_widget;
gboolean event_handled;
g_return_val_if_fail (GTK_IS_TIPS_QUERY (widget), FALSE);
@@ -465,7 +465,7 @@ gtk_tips_query_event (GtkWidget *
case GDK_LEAVE_NOTIFY:
if (event_widget)
- pointer_window = gdk_window_get_pointer (event_widget->window, NULL, NULL, NULL);
+ pointer_window = gdk_window_get_pointer (((GtkWidget*)event_widget)->window, NULL, NULL, NULL);
else
pointer_window = NULL;
event_widget = NULL;
Index: gtk+-2.13.6/gtk/queryimmodules.c
===================================================================
--- gtk+-2.13.6.orig/gtk/queryimmodules.c
+++ gtk+-2.13.6/gtk/queryimmodules.c
@@ -88,11 +88,10 @@ print_escaped (const char *str)
static gboolean
query_module (const char *dir, const char *name)
{
- void (*list) (const GtkIMContextInfo ***contexts,
- guint *n_contexts);
- void (*init) (GTypeModule *type_module);
- void (*exit) (void);
- GtkIMContext *(*create) (const gchar *context_id);
+ gpointer list;
+ gpointer init;
+ gpointer exit;
+ gpointer create;
gpointer list_ptr;
gpointer init_ptr;
@@ -134,7 +133,7 @@ query_module (const char *dir, const cha
print_escaped (path);
fputs ("\n", stdout);
- (*list) (&contexts, &n_contexts);
+ ((void(*)(const GtkIMContextInfo ***, guint *)) list) (&contexts, &n_contexts);
for (i=0; i<n_contexts; i++)
{
Index: gtk+-2.13.6/tests/testgtk.c
===================================================================
--- gtk+-2.13.6.orig/tests/testgtk.c
+++ gtk+-2.13.6/tests/testgtk.c
@@ -12026,7 +12026,7 @@ find_widget (GtkWidget *widget, FindWidg
static GtkWidget *
find_widget_at_pointer (GdkDisplay *display)
{
- GtkWidget *widget = NULL;
+ gpointer widget = NULL;
GdkWindow *pointer_window;
gint x, y;
FindWidgetData data;
@@ -12043,8 +12043,8 @@ find_widget_at_pointer (GdkDisplay *disp
if (widget)
{
- gdk_window_get_pointer (widget->window,
- &x, &y, NULL);
+ gdk_window_get_pointer (((GtkWidget *) widget)->window,
+ &x, &y, NULL);
data.x = x;
data.y = y;
Index: gtk+-2.13.6/tests/testfilechooserbutton.c
===================================================================
--- gtk+-2.13.6.orig/tests/testfilechooserbutton.c
+++ gtk+-2.13.6/tests/testfilechooserbutton.c
@@ -31,6 +31,7 @@
#include <string.h>
+#undef GTK_DISABLE_DEPRECATED
#include <gtk/gtk.h>
#ifdef G_OS_WIN32

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"

167
gtk2-git-c5d08611.patch Normal file
View File

@ -0,0 +1,167 @@
diff --git a/README b/README
index bc2f857..84d6329 100644
--- a/README
+++ b/README
@@ -44,6 +44,11 @@ Release notes for 2.18
GDK_NATIVE_WINDOWS makes GDK create a native X11 window for each
GDK window, which might make problematic applications work better.
+* GTK+ calls signal (SIGPIPE, SIG_IGN) during initialization, to ignore
+ SIGPIPE signals, since these are almost never wanted in graphical
+ applications. If you do need to handle SIGPIPE for some reason, reset
+ the handler after gtk_init(), but notice that other libraries (e.g.
+ libdbus or gvfs) might do similar things.
Release notes for 2.16
======================
diff --git a/gdk/directfb/gdkwindow-directfb.c b/gdk/directfb/gdkwindow-directfb.c
index c0ff8e1..30ec834 100644
--- a/gdk/directfb/gdkwindow-directfb.c
+++ b/gdk/directfb/gdkwindow-directfb.c
@@ -2077,7 +2077,8 @@ GdkWindow *
_gdk_windowing_window_at_pointer (GdkDisplay *display,
gint *win_x,
gint *win_y,
- GdkModifierType *mask)
+ GdkModifierType *mask,
+ gboolean get_toplevel)
{
GdkWindow *retval;
gint wx, wy;
@@ -2137,7 +2138,8 @@ _gdk_windowing_get_pointer (GdkDisplay *display,
gdk_directfb_window_get_pointer (_gdk_windowing_window_at_pointer (display,
NULL,
NULL,
- NULL),
+ NULL,
+ FALSE),
x, y, mask);
}
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 7f3572f..2bb5551 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -2624,6 +2624,8 @@ gdk_window_end_implicit_paint (GdkWindow *window)
/* Reset clip region of the cached GdkGC */
gdk_gc_set_clip_region (tmp_gc, NULL);
}
+ else
+ gdk_region_destroy (paint->region);
g_object_unref (paint->pixmap);
g_free (paint);
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index f98290b..a8dd83b 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -1726,7 +1726,7 @@ gdk_window_x11_restack_toplevel (GdkWindow *window,
changes.stack_mode = above ? Above : Below;
XReconfigureWMWindow (GDK_WINDOW_XDISPLAY (window),
GDK_WINDOW_XID (window),
- GDK_WINDOW_SCREEN (window),
+ gdk_screen_get_number (GDK_WINDOW_SCREEN (window)),
CWStackMode | CWSibling, &changes);
}
@@ -3252,12 +3252,15 @@ _gdk_windowing_window_at_pointer (GdkDisplay *display,
while (xwindow)
{
xwindow_last = xwindow;
- if (get_toplevel &&
- (window = gdk_window_lookup_for_display (display, xwindow)) != NULL &&
- GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN)
- break;
XQueryPointer (xdisplay, xwindow,
&root, &xwindow, &rootx, &rooty, &winx, &winy, &xmask);
+ if (get_toplevel &&
+ (window = gdk_window_lookup_for_display (display, xwindow_last)) != NULL &&
+ GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN)
+ {
+ xwindow = xwindow_last;
+ break;
+ }
}
}
else
@@ -3315,16 +3318,16 @@ _gdk_windowing_window_at_pointer (GdkDisplay *display,
while (xwindow)
{
xwindow_last = xwindow;
- if (get_toplevel &&
- (window = gdk_window_lookup_for_display (display, xwindow)) != NULL &&
- GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN)
- break;
gdk_error_trap_push ();
XQueryPointer (xdisplay, xwindow,
&root, &xwindow, &rootx, &rooty, &winx, &winy, &xmask);
gdk_flush ();
if (gdk_error_trap_pop ())
break;
+ if (get_toplevel &&
+ (window = gdk_window_lookup_for_display (display, xwindow_last)) != NULL &&
+ GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN)
+ break;
}
}
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index e47e1be..2bbc96d 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -686,6 +686,8 @@ do_post_parse_initialization (int *argc,
gettext_initialization ();
+ signal (SIGPIPE, SIG_IGN);
+
if (g_fatal_warnings)
{
GLogLevelFlags fatal_mask;
@@ -985,6 +987,15 @@ gtk_init_check (int *argc,
* the GUI for some reason. If you want your program to fall back to a
* textual interface you want to call gtk_init_check() instead.
* </para></note>
+ *
+ * <note><para>
+ * Since 2.18, GTK+ calls <literal>signal (SIGPIPE, SIG_IGN)</literal>
+ * during initialization, to ignore SIGPIPE signals, since these are
+ * almost never wanted in graphical applications. If you do need to
+ * handle SIGPIPE for some reason, reset the handler after gtk_init(),
+ * but notice that other libraries (e.g. libdbus or gvfs) might do
+ * similar things.
+ * </para></note>
**/
void
gtk_init (int *argc, char ***argv)
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index c0815a9..36c5a65 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -5648,6 +5648,13 @@ gtk_window_compute_configure_request_size (GtkWindow *window,
if (info->resize_height > 0)
*height = info->resize_height;
}
+
+ /* Don't ever request zero width or height, its not supported by
+ gdk. The size allocation code will round it to 1 anyway but if
+ we do it then the value returned from this function will is
+ not comparable to the size allocation read from the GtkWindow. */
+ *width = MAX (*width, 1);
+ *height = MAX (*height, 1);
}
static GtkWindowPosition
diff --git a/modules/printbackends/lpr/gtkprintbackendlpr.c b/modules/printbackends/lpr/gtkprintbackendlpr.c
index eeaaa99..72d9c33 100644
--- a/modules/printbackends/lpr/gtkprintbackendlpr.c
+++ b/modules/printbackends/lpr/gtkprintbackendlpr.c
@@ -278,8 +278,6 @@ lpr_write (GIOChannel *source,
{
gsize bytes_written;
- signal (SIGPIPE, SIG_IGN);
-
g_io_channel_write_chars (ps->in,
buf,
bytes_read,

150
gtk2.changes
View File

@ -1,153 +1,3 @@
-------------------------------------------------------------------
Wed Dec 2 12:32:25 CET 2009 - vuntz@opensuse.org
- Update to version 2.19.1:
+ Client-side windows:
- Avoid some unnecessary exposes
- Avoid unnecessary redraws related to clearing windows
+ GtkNotebook gained an 'action area'
+ GtkStatusbar gained a 'message area'
+ GtkToolPalette is a new container to show tool items in
collapsible groups in a grid
+ gdk-pixbuf can now handle compressed TIFF images
+ GSEAL work:
- New accessor: gtk_window_get_window_type()
+ Bugs fixed:
- bgo#590017: Does not compile under MinGW32 + Wine
- bgo#569430: Gail should include a reciprocal relationship for
NODE_CHILD_OF
- bgo#598758: Need context for a propper translation
- bgo#594535: No accesor for GtkStatusbar->label and ->frame
- bgo#602725: fix setting icon-size on GICON images
- bgo#599402: Landscape and Reverse Landscape icons need to be
swapped
- bgo#588740: JPEG images open with blur effect?
- bgo#601337: Only use gdk_input_select_events() if XINPUT_NONE
is defined
- bgo#598050: Flickering in a gtk_socket
- bgo#600158: Do not use static GTypeInfo and GInterfaceInfo
- bgo#561973: Problem dragging images from Firefox to GTK+ app
on Windows
- bgo#601512: Remove unnecessary check in GtkTreeModelFilter
- bgo#600222: Check for existence of cairo-svg.h in
configure.in
- bgo#600150: GtkColorSelection tooltip issues
- bgo#480065: wrong tree collapsed (or expanded) after having
scrolled
- bgo#596473: Second double-click of GtkTreeView row doesn't
emit...
- bgo#601869: GtkUIManager assumes too much about popup menus
- bgo#581145: Wrong positioning for fullscreen gedit toolbar
animation
- bgo#602724: gailimage doesn't handle
GTK_IMAGE_{GICON,ICON_NAME}...
- bgo#561130: get_monitor_geometry segfaults if called with
non-existant...
- bgo#597026: Missing include for memset()
- bgo#585383: Segfault in gdk_pixbuf__ico_image_save
- bgo#597865: Move documentation from templates to inline
comments
- bgo#123569: Catch contents being reparented out of socket
- bgo#561334: Incorrect named constant in documentation of two
GtkButton...
- bgo#601611: gtk_selection_data_get_targets() reads X Atom
data as GdkAtoms
- bgo#601409: action area presence modifies notebook behaviour
- bgo#603268: wrong Since: markers in toolpalette merge
- bgo#603271: wrong toolbar style
- bgo#601959: must release compose key before continuing
compose sequence
- bgo#603302: Incorrectly warn about links on text with color
and underline
- bgo#603201: gtk_about_dialog_set_url_hook has no effect
anymore
- bgo#591438: dfb_events_dispatch is not thread safe
- bgo#589842: GtkAction API to have its menu item proxies have
always-show...
- bgo#603128: Adding new UI that was recently removed may cause
wrong order
- bgo#601682: Print preview should use gtk_show_uri by default
- bgo#596083: Deprecate notebook label packing functionality
- bgo#116650, bgo#584700, bgo#595498
+ Updated translations.
- Drop gtk2-build-fix.patch: fixed upstream.
- Remove workarounds for openSUSE 10.3 and earlier.
- Add gnome-common BuildRequires, and use gnome-autogen.sh instead
of autoreconf, since it'll do a better work.
- Remove gtk-doc BuildRequires
- Remove AutoReqPrev: it's default now.
-------------------------------------------------------------------
Fri Nov 13 17:45:53 CET 2009 - vuntz@opensuse.org
- Update to version 2.19.0:
+ A throbber widget and cell renderer have been added: GtkSpinner
and GtkCellRendererSpinner
+ GtkFileSystemModel has been reimplemented, for major speedups
and other improvements
+ Synchronize compose sequences with the current X.org Compose
file
+ Win32:
- The GDI+ image loader works again
- XP themes have been disabled since they don't work currently
+ OS X:
- Fix crashes due to unimplemented GdkWindowImplIface methods
- Use standard Mac keyboard shortcuts (Cmx-X, Cmd-C instead of
Ctrl-X, Ctrl-C, etc)
- Add a pixbuf loader for the QTIF format
- Improve multi-monitor handling
+ GSEAL work:
- New accessor for GtkDialog buttons:
gtk_dialog_get_widget_for_response
- New accessor for GtkViewport bin_window:
gtk_viewport_get_bin_window
- Add a GtkCellEditable::editing-canceled property
+ Deprecations:
- GtkInputDialog has been deprecated
- GtkCurve and GtkGammaCurve have been deprecated
- The tab-packing feature in GtkNotebook has been deprecated
+ Bugs fixed:
- bgo#594644: Cannot compile GTK+ with MinGW 4.4.0
- bgo#581150: GtkIconView tries to paint items with invalid
sizes
- bgo#598218: Substitute deprecated gtk_*_ref/unref calls
- bgo#381371: Print margins not correct in WIN32 - not allowing
for...
- bgo#597596: Toolbar button accessible objects don't have
label name
- bgo#599118: Translators comment for "Finishing" labels
- bgo#598261: Add support to GtkTooltip to handle GIcons
- bgo#597865: Move documentation from templates to inline
comments
- bgo#599403: Avoid using accel group internals in GtkSocket
- bgo#590800: The window content is not updated correctly when
scrolling
- bgo#598217: Substitute deprecated gdk_*_ref/unref calls
- bgo#599446: atk_object_set_name () assertion in
gtk_tool_button_set_label
- bgo#592582: Print preview doesn't reflect the printout
- bgo#563010: GtkFileChooserButton cannot have none file
selected again
- bgo#598881, bgo#596083, bgo#594903, bgo#598515, bgo#530351,
bgo#552678, bgo#596238, bgo#596019, bgo#366217, bgo#594962
+ Updated translations.
- Changes from version 2.18.2:
+ GTK+ now ignores SIGPIPE in gtk_init(). Previously this was
done deep in the lpr printbackend.
+ Fix compilation of the DirectFB backend.
+ Bugs fixed:
- bgo#597386: Cannot click buttons more than once...
- bgo#588059: sometimes notification icons are not visible with
csw
+ Updated translations.
- Drop gtk2-git-c5d08611.patch: was taken from upstream.
- Respin bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff
to apply without fuzz.
- Respin gtk64.patch to apply without fuzz.
- Drop gtk+-strict-aliasing.patch: it's all fixed upstream already.
- Fix rpmlint warnings about self-obsoletion for gail and gtk2-doc.
- Fix order of packageand() arguments to fix rpmlint warning.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 27 15:47:08 CET 2009 - sbrabec@suse.cz Tue Oct 27 15:47:08 CET 2009 - sbrabec@suse.cz

76
gtk2.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package gtk2 (Version 2.19.1) # spec file for package gtk2 (Version 2.18.1)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -19,17 +19,36 @@
Name: gtk2 Name: gtk2
%define _name gtk+ %define _name gtk+
Version: 2.19.1 BuildRequires: fdupes
# FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer) BuildRequires: gcc-c++
Release: 1 BuildRequires: atk-devel
License: LGPL v2.1 or later BuildRequires: cairo-devel
Summary: Library for Creation of Graphical User Interfaces (version 2) BuildRequires: cups-devel
BuildRequires: gnome-patch-translation
BuildRequires: gtk-doc
BuildRequires: libjasper-devel
BuildRequires: libtiff-devel
BuildRequires: pango-devel
BuildRequires: translation-update-upstream
Url: http://www.gtk.org/ Url: http://www.gtk.org/
License: LGPL v2.1 or later
Group: System/Libraries Group: System/Libraries
# bug437293
%ifarch ppc64
Obsoletes: gtk2-64bit
%endif
#
PreReq: /usr/bin/touch /bin/rm /bin/rmdir
Version: 2.18.1
Release: 3
# FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer)
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 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.12/%{_name}-%{version}.tar.bz2
Source1: SuSEconfig.gtk2 Source1: SuSEconfig.gtk2
Source2: README.SuSE Source2: README.SuSE
Source3: gtkrc Source3: gtkrc
# PATCH-FIX-UPSTREAM gtk+-strict-aliasing.patch federico@novell.com - Fix compiler warnings. This is already in SVN trunk as of 2008/07/18
Patch: gtk+-strict-aliasing.patch
# PATCH-FIX-UPSTREAM gtk2-potfiles.patch bgo599774 sbrabec@suse.cz - Fix POTFILES.in referring to missing file. # PATCH-FIX-UPSTREAM gtk2-potfiles.patch bgo599774 sbrabec@suse.cz - Fix POTFILES.in referring to missing file.
Patch1: gtk2-potfiles.patch Patch1: gtk2-potfiles.patch
# PATCH-FIX-OPENSUSE gtk64.patch sbrabec@novell.com - 64-bit dual install. See also the Fedora patch for a simpler way of doing this. # PATCH-FIX-OPENSUSE gtk64.patch sbrabec@novell.com - 64-bit dual install. See also the Fedora patch for a simpler way of doing this.
@ -42,6 +61,10 @@ Patch22: bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff
Patch23: bugzilla-131498-allow-xim-for-all-languages.patch 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 # 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 Patch24: gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff
# PATCH-FIX-UPSTREAM gtk2-build-fix.patch bgo597026 vuntz@novell.com -- Add missing include
Patch25: gtk2-build-fix.patch
# PATCH-FIX-UPSTREAM gtk2-git-c5d08611.patch vuntz@opensuse.org -- Various fixes taken from git (this is nearly the diff between 2.18.1 and what will be 2.18.2)
Patch26: gtk2-git-c5d08611.patch
# Patches taken from upstream or slated to go upstream. We can expect these to become obsolete # Patches taken from upstream or slated to go upstream. We can expect these to become obsolete
# in future releases. # in future releases.
# Please don't delete this comment even if this section is empty -- "# empty" should # Please don't delete this comment even if this section is empty -- "# empty" should
@ -50,33 +73,15 @@ Patch24: gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.d
# be here instead. # be here instead.
# PATCH-FIX-OPENSUSE gtk-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474 # PATCH-FIX-OPENSUSE gtk-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474
Patch53: gtk-path-local.patch Patch53: gtk-path-local.patch
BuildRequires: fdupes BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
BuildRequires: atk-devel
BuildRequires: cairo-devel
BuildRequires: cups-devel
# Needed for patches touching the build system
BuildRequires: gnome-common
BuildRequires: gnome-patch-translation
BuildRequires: libjasper-devel
BuildRequires: libtiff-devel
BuildRequires: pango-devel
BuildRequires: translation-update-upstream
PreReq: /usr/bin/touch /bin/rm /bin/rmdir
Requires: %{name}-lang = %{version} Requires: %{name}-lang = %{version}
Requires: hicolor-icon-theme Requires: hicolor-icon-theme
# gtk2 can exist without branding. Built in defaults will be used then. # gtk2 can exist without branding. Built in defaults will be used then.
Recommends: %{name}-branding Recommends: %{name}-branding
Recommends: gvfs Recommends: gvfs
# bug437293
%ifarch ppc64
Obsoletes: gtk2-64bit
%endif
#
# gail is part of gtk+ as of 2.13.x # gail is part of gtk+ as of 2.13.x
Provides: gail = 1.22.1 Provides: gail = 1.22.1
Obsoletes: gail < 1.22.1 Obsoletes: gail <= 1.22.1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
This fast and versatile library is used all over the world for all This fast and versatile library is used all over the world for all
@ -98,7 +103,7 @@ Summary: Library for Creation of Graphical User Interfaces (version 2)
Group: System/Libraries Group: System/Libraries
Provides: %{name}-branding = %{version} Provides: %{name}-branding = %{version}
Conflicts: otherproviders(%{name}-branding) Conflicts: otherproviders(%{name}-branding)
Supplements: packageand(%{name}:branding-upstream) Supplements: packageand(branding-upstream:%{name})
%description branding-upstream %description branding-upstream
This fast and versatile library is used all over the world for all This fast and versatile library is used all over the world for all
@ -118,6 +123,7 @@ To develop applications with gtk, you need the package gtk2-devel.
License: LGPL v2.1 or later License: LGPL v2.1 or later
Summary: Development environment for the Gtk2 GUI library Summary: Development environment for the Gtk2 GUI library
Group: Development/Libraries/X11 Group: Development/Libraries/X11
AutoReqProv: on
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
Obsoletes: gtk2-devel-64bit Obsoletes: gtk2-devel-64bit
@ -128,9 +134,9 @@ Requires: %{name} = %{version} atk-devel cairo-devel glibc-devel glib2-dev
Requires: pyxml Requires: pyxml
# gail is part of gtk+ as of 2.13.x # gail is part of gtk+ as of 2.13.x
Provides: gail-devel = 1.22.1 Provides: gail-devel = 1.22.1
Obsoletes: gail-devel < 1.22.1 Obsoletes: gail-devel <= 1.22.1
Obsoletes: gtk2-doc <= %{version}
Provides: gtk2-doc = %{version} Provides: gtk2-doc = %{version}
Obsoletes: gtk2-doc < %{version}
%description devel %description devel
This package contains all necessary include files, libraries, This package contains all necessary include files, libraries,
@ -153,6 +159,7 @@ configurable.
translation-update-upstream translation-update-upstream
translation-update-upstream po-properties gtk20-properties translation-update-upstream po-properties gtk20-properties
gnome-patch-translation-prepare gnome-patch-translation-prepare
%patch -p1
cp -a %{S:1} . cp -a %{S:1} .
%if "%_lib" == "lib64" %if "%_lib" == "lib64"
cp -a %{S:2} . cp -a %{S:2} .
@ -163,11 +170,13 @@ cp -a %{S:2} .
%patch22 -p1 %patch22 -p1
%patch23 -p1 %patch23 -p1
%patch24 -p1 %patch24 -p1
%patch25 -p1
%patch26 -p1
%patch53 %patch53
gnome-patch-translation-update gnome-patch-translation-update
%build %build
NOCONFIGURE=1 gnome-autogen.sh ACLOCAL="aclocal -I m4macros" autoreconf -f -i
export CFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$RPM_OPT_FLAGS"
export CFLAGS="$CFLAGS -fstack-protector" export CFLAGS="$CFLAGS -fstack-protector"
%ifarch ppc64 %ifarch ppc64
@ -175,6 +184,13 @@ export CFLAGS="$CFLAGS -mminimal-toc"
%endif %endif
# fix crash in gdm, nautilus, etc. (bgo#596977) # fix crash in gdm, nautilus, etc. (bgo#596977)
export CFLAGS=`echo $CFLAGS | sed -e 's/-fomit-frame-pointer//g'` export CFLAGS=`echo $CFLAGS | sed -e 's/-fomit-frame-pointer//g'`
%if %suse_version <= 1030
# Do not believe glibc first weekday for glibc < 2.7:
# https://bugzilla.novell.com/show_bug.cgi?id=130787
# https://bugzilla.novell.com/show_bug.cgi?id=104417
# http://sources.redhat.com/bugzilla/show_bug.cgi?id=2388
sed -i /HAVE__NL_TIME_FIRST_WEEKDAY/d config.h.in
%endif
%configure \ %configure \
--enable-man \ --enable-man \
--with-xinput=xfree --with-xinput=xfree

82
gtk64.patch
View File

@ -1,8 +1,6 @@
Index: gtk+-2.19.0/demos/Makefile.am --- gtk+-2.10.9/demos/Makefile.am
=================================================================== +++ gtk+-2.10.9/demos/Makefile.am
--- gtk+-2.19.0.orig/demos/Makefile.am @@ -38,8 +38,8 @@
+++ gtk+-2.19.0/demos/Makefile.am
@@ -38,8 +38,8 @@ if CROSS_COMPILING
pixbuf_csource=$(GDK_PIXBUF_CSOURCE) pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
pixbuf_csource_deps= pixbuf_csource_deps=
else else
@ -13,11 +11,9 @@ Index: gtk+-2.19.0/demos/Makefile.am
endif endif
test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png
Index: gtk+-2.19.0/gdk-pixbuf/Makefile.am --- gtk+-2.10.9/gdk-pixbuf/Makefile.am
=================================================================== +++ gtk+-2.10.9/gdk-pixbuf/Makefile.am
--- gtk+-2.19.0.orig/gdk-pixbuf/Makefile.am @@ -359,7 +359,7 @@
+++ gtk+-2.19.0/gdk-pixbuf/Makefile.am
@@ -612,7 +612,7 @@ MAINTAINERCLEANFILES = \
gdk-pixbuf-enum-types.c \ gdk-pixbuf-enum-types.c \
gdk-pixbuf-marshal.h \ gdk-pixbuf-marshal.h \
gdk-pixbuf-marshal.c \ gdk-pixbuf-marshal.c \
@ -26,7 +22,7 @@ Index: gtk+-2.19.0/gdk-pixbuf/Makefile.am
# #
# gdk-pixbuf-enum-types.h # gdk-pixbuf-enum-types.h
@@ -701,10 +701,10 @@ endif @@ -454,10 +454,10 @@
install-data-hook: install-ms-lib install-def-file install-data-hook: install-ms-lib install-def-file
@if $(RUN_QUERY_LOADER_TEST) ; then \ @if $(RUN_QUERY_LOADER_TEST) ; then \
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
@ -39,7 +35,7 @@ Index: gtk+-2.19.0/gdk-pixbuf/Makefile.am
echo "***" ; \ echo "***" ; \
echo "*** Generate this file manually on host" ; \ echo "*** Generate this file manually on host" ; \
echo "*** system using gdk-pixbuf-query-loaders" ; \ echo "*** system using gdk-pixbuf-query-loaders" ; \
@@ -712,27 +712,27 @@ install-data-hook: install-ms-lib instal @@ -465,25 +465,25 @@
fi fi
uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-local: uninstall-ms-lib uninstall-def-file
@ -72,14 +68,10 @@ Index: gtk+-2.19.0/gdk-pixbuf/Makefile.am
- touch gdk-pixbuf.loaders; - touch gdk-pixbuf.loaders;
+ touch gdk-pixbuf64.loaders; + touch gdk-pixbuf64.loaders;
endif endif
--- gtk+-2.10.9/gdk-pixbuf/gdk-pixbuf-io.c
-include $(top_srcdir)/git.mk +++ gtk+-2.10.9/gdk-pixbuf/gdk-pixbuf-io.c
Index: gtk+-2.19.0/gdk-pixbuf/gdk-pixbuf-io.c @@ -258,7 +258,7 @@
=================================================================== {
--- gtk+-2.19.0.orig/gdk-pixbuf/gdk-pixbuf-io.c
+++ gtk+-2.19.0/gdk-pixbuf/gdk-pixbuf-io.c
@@ -286,7 +286,7 @@ correct_prefix (gchar **path)
/* This is an entry put there by gdk-pixbuf-query-loaders on the /* This is an entry put there by gdk-pixbuf-query-loaders on the
* packager's system. On Windows a prebuilt GTK+ package can be * packager's system. On Windows a prebuilt GTK+ package can be
- * installed in a random location. The gdk-pixbuf.loaders file - * installed in a random location. The gdk-pixbuf.loaders file
@ -87,7 +79,7 @@ Index: gtk+-2.19.0/gdk-pixbuf/gdk-pixbuf-io.c
* distributed in such a package contains paths from the package * distributed in such a package contains paths from the package
* builder's machine. Replace the build-time prefix with the * builder's machine. Replace the build-time prefix with the
* installation prefix on this machine. * installation prefix on this machine.
@@ -305,7 +305,7 @@ gdk_pixbuf_get_module_file (void) @@ -277,7 +277,7 @@
gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE")); gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
if (!result) if (!result)
@ -96,11 +88,9 @@ Index: gtk+-2.19.0/gdk-pixbuf/gdk-pixbuf-io.c
return result; return result;
} }
Index: gtk+-2.19.0/gtk/Makefile.am --- gtk+-2.10.9/gtk/Makefile.am
=================================================================== +++ gtk+-2.10.9/gtk/Makefile.am
--- gtk+-2.19.0.orig/gtk/Makefile.am @@ -842,7 +842,7 @@
+++ gtk+-2.19.0/gtk/Makefile.am
@@ -949,7 +949,7 @@ distclean-local:
DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib) DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib)
@ -109,7 +99,7 @@ Index: gtk+-2.19.0/gtk/Makefile.am
LDADDS = \ LDADDS = \
$(gtktargetlib) \ $(gtktargetlib) \
@@ -1311,7 +1311,7 @@ if CROSS_COMPILING @@ -1119,7 +1119,7 @@
gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE) gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
else else
gtk_update_icon_cache_program = \ gtk_update_icon_cache_program = \
@ -118,11 +108,9 @@ Index: gtk+-2.19.0/gtk/Makefile.am
./gtk-update-icon-cache ./gtk-update-icon-cache
endif endif
Index: gtk+-2.19.0/gtk/gtkmodules.c --- gtk+-2.10.9/gtk/gtkmodules.c
=================================================================== +++ gtk+-2.10.9/gtk/gtkmodules.c
--- gtk+-2.19.0.orig/gtk/gtkmodules.c @@ -69,7 +69,7 @@
+++ gtk+-2.19.0/gtk/gtkmodules.c
@@ -68,7 +68,7 @@ get_module_path (void)
if (home_dir) if (home_dir)
home_gtk_dir = g_build_filename (home_dir, ".gtk-2.0", NULL); home_gtk_dir = g_build_filename (home_dir, ".gtk-2.0", NULL);
@ -131,11 +119,9 @@ Index: gtk+-2.19.0/gtk/gtkmodules.c
exe_prefix = g_getenv ("GTK_EXE_PREFIX"); exe_prefix = g_getenv ("GTK_EXE_PREFIX");
if (exe_prefix) if (exe_prefix)
Index: gtk+-2.19.0/gtk/gtkrc.c --- gtk+-2.10.9/gtk/gtkrc.c
=================================================================== +++ gtk+-2.10.9/gtk/gtkrc.c
--- gtk+-2.19.0.orig/gtk/gtkrc.c @@ -447,7 +447,7 @@
+++ gtk+-2.19.0/gtk/gtkrc.c
@@ -450,7 +450,7 @@ gtk_rc_get_im_module_file (void)
if (im_module_file) if (im_module_file)
result = g_strdup (im_module_file); result = g_strdup (im_module_file);
else else
@ -144,11 +130,9 @@ Index: gtk+-2.19.0/gtk/gtkrc.c
} }
return result; return result;
Index: gtk+-2.19.0/modules/input/Makefile.am --- gtk+-2.10.9/modules/input/Makefile.am
=================================================================== +++ gtk+-2.10.9/modules/input/Makefile.am
--- gtk+-2.19.0.orig/modules/input/Makefile.am @@ -107,11 +107,11 @@
+++ gtk+-2.19.0/modules/input/Makefile.am
@@ -191,11 +191,11 @@ install-data-hook:
@if $(RUN_QUERY_IMMODULES_TEST) ; then \ @if $(RUN_QUERY_IMMODULES_TEST) ; then \
echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
@ -163,18 +147,18 @@ Index: gtk+-2.19.0/modules/input/Makefile.am
echo "***" ; \ echo "***" ; \
echo "*** Generate this file manually on host" ; \ echo "*** Generate this file manually on host" ; \
echo "*** system using gtk-query-immodules-2.0" ; \ echo "*** system using gtk-query-immodules-2.0" ; \
@@ -203,7 +203,7 @@ install-data-hook: @@ -119,7 +119,7 @@
fi fi
uninstall-local: uninstall-local:
- rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules - rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
+ rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk64.immodules + rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk64.immodules
if BUILD_DYNAMIC_MODULES module_LTLIBRARIES = \
$(IM_XIM_MODULE) \
@@ -239,14 +239,14 @@ noinst_LTLIBRARIES = \ @@ -134,12 +134,12 @@
im-viqr.la \
included-modules: $(noinst_LTLIBRARIES) $(IM_IME_MODULE)
-gtk.immodules: Makefile.am $(module_LTLIBRARIES) -gtk.immodules: Makefile.am $(module_LTLIBRARIES)
- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules - $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
@ -189,5 +173,3 @@ Index: gtk+-2.19.0/modules/input/Makefile.am
-all-local: gtk.immodules -all-local: gtk.immodules
+all-local: gtk64.immodules +all-local: gtk64.immodules
endif endif
-include $(top_srcdir)/git.mk