OBS User unknown 2007-01-05 15:49:44 +00:00 committed by Git OBS Bridge
commit 9204fa8569
25 changed files with 4543 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

38
README.SuSE Normal file
View File

@ -0,0 +1,38 @@
README for bi-architecture 64 bit platforms users
=================================================
Current version of GTK+ has a problem running 32 and 64 version on
single machine. See http://bugzilla.gnome.org/show_bug.cgi?id=129540 and
http://bugzilla.gnome.org/show_bug.cgi?id=153848 for more information.
To work around this problem, 64 bit version for SuSE Linux uses special
names for following files:
/usr/bin/gtk-query-immodules-2.0: /usr/bin/gtk-query-immodules-2.0-64
/usr/bin/gdk-pixbuf-query-loaders: /usr/bin/gdk-pixbuf-query-loaders-64
/etc/gtk-2.0/gtk.immodules: /usr/gtk-2.0/gtk.immodules64
/etc/gtk-2.0/gdk-pixbuf.loaders: /usr/gtk-2.0/gdk-pixbuf.loaders64
And following variable:
$GTK_PATH: $GTK_PATH64
This can cause problems during self-compilation of packages.
To work-around these problems (introduced by this work-around), you
should:
Either:
- Make a patch of package (please do not send it to package
developers, it's temporary solution).
Or:
- Install 32 bit version of GTK+.
- After installation, you must run following commands:
touch /var/adm/SuSEconfig/run-gtk
SuSEconfig
These problems should be correctly solved in GTK+ sometimes in future.

81
SuSEconfig.gtk2 Normal file
View File

@ -0,0 +1,81 @@
#! /bin/sh
# Copyright (c) 2002 SuSE Gmbh Nuernberg, Germany. All rights reserved.
#
# Author: Holger Hetterich <hhetter@suse.de>, 2002
#
# SuSEconfig.gtk: this script will generate a /etc/gtk-2.0/gtk.immodules file
# based on the gtk-2.0 modules installed on the system
#
#
# check if we are started as root
# only one of UID and USER must be set correctly
if test "$UID" != 0 -a "$USER" != root; then
echo "You must be root to start $0."
exit 1
fi
test -n "$ROOT" && exit 0
# do we need to check for loaders? only on RPM Update or new installation
if test -f /var/adm/SuSEconfig/run-gtk ; then
test -d /etc/gtk-2.0 || mkdir /etc/gtk-2.0
if [ -x $r/usr/bin/gtk-query-immodules-2.0 ] ; then
/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
fi
if [ -x $r/usr/bin/gdk-pixbuf-query-loaders ] ; then
/usr/bin/gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
fi
if [ -x $r/usr/bin/gtk-query-immodules-2.0-64 ] ; then
/usr/bin/gtk-query-immodules-2.0-64 > /etc/gtk-2.0/gtk64.immodules
fi
if [ -x $r/usr/bin/gdk-pixbuf-query-loaders-64 ] ; then
/usr/bin/gdk-pixbuf-query-loaders-64 > /etc/gtk-2.0/gdk-pixbuf64.loaders
fi
rm /var/adm/SuSEconfig/run-gtk
fi
# Remove all old icon cache files to prevent keeping of empty
# directories with icon-theme.cache after removing themes.
if test -f $r/var/cache/gtk-2.0/icon-theme.cache-list ; then
for DIR in $(<$r/var/cache/gtk-2.0/icon-theme.cache-list) ; do
if test $(ls -1 "$DIR" | wc --lines) -le 1 -a -f $DIR/icon-theme.cache; then
rm -f $DIR/icon-theme.cache
rmdir --ignore-fail-on-non-empty "$DIR"
else
if test -f $DIR/icon-theme.cache -a "$(find $DIR -type d -newer $DIR/icon-theme.cache)" ; then
rm -f $DIR/icon-theme.cache
fi
fi
done
rm /var/cache/gtk-2.0/icon-theme.cache-list
fi
# Update icon cache.
(
# Be sure, that environment is set properly.
if test -z "$XDG_DATA_DIRS" ; then
if test -f $r/etc/profile.d/xdg-enviroment.sh ; then
. $r/etc/profile.d/xdg-enviroment.sh
fi
fi
IFS="$IFS:"
for DIR in ${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/} ; do
for SUBDIR in $DIR/icons/* ; do
if test ! -L "$SUBDIR" -a -d "$SUBDIR" ; then
/usr/bin/gtk-update-icon-cache --quiet --ignore-theme-index --remove-empty-cache "$SUBDIR"
if test -f $SUBDIR/icon-theme.cache ; then
echo $SUBDIR >>$r/var/cache/gtk-2.0/icon-theme.cache-list
fi
fi
done
done
)
exit 0

View File

@ -0,0 +1,44 @@
--- gtk+-2.10.1/gtk/gtkfontbutton.c
+++ gtk+-2.10.1/gtk/gtkfontbutton.c
@@ -888,7 +888,7 @@
if (style == NULL || !g_ascii_strcasecmp (style, "Regular"))
family_style = g_strdup (family);
else
- family_style = g_strdup_printf ("%s %s", family, style);
+ family_style = g_strdup_printf ("%s %s", family, _(style));
gtk_label_set_text (GTK_LABEL (font_button->priv->font_label), family_style);
--- gtk+-2.10.1/gtk/gtkfontsel.c
+++ gtk+-2.10.1/gtk/gtkfontsel.c
@@ -73,6 +73,21 @@
can set it. Remember that some fonts only have capital letters. */
#define PREVIEW_TEXT N_("abcdefghijk ABCDEFGHIJK")
+/* These are the commonly used font styles, listed here only for
+ translations. */
+#define FONT_STYLE_ULTRA_LIGHT N_("Ultra-Light")
+#define FONT_STYLE_LIGHT N_("Light")
+#define FONT_STYLE_MEDIUM N_("Medium")
+#define FONT_STYLE_NORMAL N_("Normal")
+#define FONT_STYLE_REGULAR N_("Regular")
+#define FONT_STYLE_ITALIC N_("Italic")
+#define FONT_STYLE_OBLIQUE N_("Oblique")
+#define FONT_STYLE_SEMI_BOLD N_("Semi-Bold")
+#define FONT_STYLE_BOLD N_("Bold")
+#define FONT_STYLE_ULTRA_BOLD N_("Ultra-Bold")
+#define FONT_STYLE_HEAVY N_("Heavy")
+#define FONT_STYLE_BOLD_ITALIC N_("Bold Italic")
+
/* 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. */
#define INITIAL_PREVIEW_HEIGHT 44
@@ -801,7 +816,7 @@
gtk_list_store_append (model, &iter);
gtk_list_store_set (model, &iter,
FACE_COLUMN, faces[i],
- FACE_NAME_COLUMN, str,
+ FACE_NAME_COLUMN, _(str),
-1);
if (i == 0)

View File

@ -0,0 +1,11 @@
--- gtk+-2.10.1/modules/input/imxim.c
+++ gtk+-2.10.1/modules/input/imxim.c
@@ -28,7 +28,7 @@
N_("X Input Method"), /* Human readable name */
GETTEXT_PACKAGE, /* Translation domain */
GTK_LOCALEDIR, /* Dir for bindtextdomain (not strictly needed for "gtk+") */
- "ko:ja:th:zh" /* Languages for which this module is the default */
+ "*" /* Languages for which this module is the default */
};
static const GtkIMContextInfo *info_list[] = {

View File

@ -0,0 +1,15 @@
--- gtk+-2.10.1/gdk-pixbuf/queryloaders.c
+++ gtk+-2.10.1/gdk-pixbuf/queryloaders.c
@@ -263,6 +263,12 @@
g_printf ("# GdkPixbuf Image Loader Modules file\n"
"# Automatically generated file, do not edit\n"
"# Created by %s from gtk+-%s\n"
+ "#\n"
+ "# If you need to regenerate the Module Loader\n"
+ "# file, either run\n"
+ "# gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders\n"
+ "# or \n"
+ "# touch /var/adm/SuSEconfig/run-gtk ; SuSEconfig\n"
"#\n",
(prgname ? prgname : "gdk-pixbuf-query-loaders"),
GDK_PIXBUF_VERSION);

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

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

View File

@ -0,0 +1,119 @@
--- gtk/gtkfontsel.c
+++ gtk/gtkfontsel.c
@@ -595,9 +595,15 @@
if (gtk_widget_has_screen (GTK_WIDGET (fontsel)))
{
+ /* Disable selection timeout */
+ g_object_set_data (G_OBJECT (fontsel), "immediate-selection", GUINT_TO_POINTER (1));
+
gtk_font_selection_show_available_fonts (fontsel);
gtk_font_selection_show_available_sizes (fontsel, TRUE);
gtk_font_selection_show_available_styles (fontsel);
+
+ /* Enable selection timeout */
+ g_object_set_data (G_OBJECT (fontsel), "immediate-selection", GUINT_TO_POINTER (0));
}
}
@@ -712,15 +718,24 @@
{
GtkFontSelection *fontsel;
guint selection_timeout = 0;
+ guint immediate_selection = 0;
fontsel = GTK_FONT_SELECTION (data);
selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "font-selection-timeout"));
+ immediate_selection = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "immediate-selection"));
if (selection_timeout)
g_source_remove (selection_timeout);
- selection_timeout = g_timeout_add (200, gtk_font_selection_real_select_font, data);
- g_object_set_data (G_OBJECT (fontsel), "font-selection-timeout", GUINT_TO_POINTER (selection_timeout));
+ if (immediate_selection)
+ {
+ gtk_font_selection_real_select_font (data);
+ }
+ else
+ {
+ selection_timeout = g_timeout_add (200, gtk_font_selection_real_select_font, data);
+ g_object_set_data (G_OBJECT (fontsel), "font-selection-timeout", GUINT_TO_POINTER (selection_timeout));
+ }
}
static int
@@ -965,15 +980,24 @@
{
GtkFontSelection *fontsel;
guint selection_timeout = 0;
+ guint immediate_selection = 0;
fontsel = GTK_FONT_SELECTION (data);
selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "style-selection-timeout"));
+ immediate_selection = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "immediate-selection"));
if (selection_timeout)
g_source_remove (selection_timeout);
- selection_timeout = g_timeout_add (200, gtk_font_selection_real_select_style, data);
- g_object_set_data (G_OBJECT (fontsel), "style-selection-timeout", GUINT_TO_POINTER (selection_timeout));
+ if (immediate_selection)
+ {
+ gtk_font_selection_real_select_style (data);
+ }
+ else
+ {
+ selection_timeout = g_timeout_add (200, gtk_font_selection_real_select_style, data);
+ g_object_set_data (G_OBJECT (fontsel), "style-selection-timeout", GUINT_TO_POINTER (selection_timeout));
+ }
}
static void
@@ -1142,15 +1166,24 @@
{
GtkFontSelection *fontsel;
guint selection_timeout = 0;
+ guint immediate_selection = 0;
fontsel = GTK_FONT_SELECTION (data);
selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "size-selection-timeout"));
+ immediate_selection = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "immediate-selection"));
if (selection_timeout)
g_source_remove (selection_timeout);
- selection_timeout = g_timeout_add (200, gtk_font_selection_real_select_size, data);
- g_object_set_data (G_OBJECT (fontsel), "size-selection-timeout", GUINT_TO_POINTER (selection_timeout));
+ if (immediate_selection)
+ {
+ gtk_font_selection_real_select_size (data);
+ }
+ else
+ {
+ selection_timeout = g_timeout_add (200, gtk_font_selection_real_select_size, data);
+ g_object_set_data (G_OBJECT (fontsel), "size-selection-timeout", GUINT_TO_POINTER (selection_timeout));
+ }
}
static void
@@ -1334,6 +1367,9 @@
if (!new_family)
return FALSE;
+ /* Disable selection timeout */
+ g_object_set_data (G_OBJECT (fontsel), "immediate-selection", GUINT_TO_POINTER (1));
+
fontsel->family = new_family;
set_cursor_to_iter (GTK_TREE_VIEW (fontsel->family_list), &iter);
gtk_font_selection_show_available_styles (fontsel);
@@ -1383,6 +1419,9 @@
pango_font_description_free (new_desc);
+ /* Enable selection timeout */
+ g_object_set_data (G_OBJECT (fontsel), "immediate-selection", GUINT_TO_POINTER (0));
+
return TRUE;
}

201
gtk+-2.8.6-fontsel.patch Normal file
View File

@ -0,0 +1,201 @@
Patch updated on 17 May 2006 with this changelog:
================================================================================
--- gtk/gtkfontsel.c
+++ gtk/gtkfontsel.c
@@ -563,11 +563,24 @@
gtk_font_selection_finalize (GObject *object)
{
GtkFontSelection *fontsel;
+ guint selection_timeout;
g_return_if_fail (GTK_IS_FONT_SELECTION (object));
fontsel = GTK_FONT_SELECTION (object);
+ selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "font-selection-timeout"));
+ if (selection_timeout)
+ g_source_remove (selection_timeout);
+
+ selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "style-selection-timeout"));
+ if (selection_timeout)
+ g_source_remove (selection_timeout);
+
+ selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "size-selection-timeout"));
+ if (selection_timeout)
+ g_source_remove (selection_timeout);
+
if (fontsel->font)
gdk_font_unref (fontsel->font);
@@ -646,10 +659,10 @@
}
/* This is called when a family is selected in the list. */
-static void
-gtk_font_selection_select_font (GtkTreeSelection *selection,
- gpointer data)
+static gboolean
+gtk_font_selection_real_select_font (gpointer data)
{
+ GtkTreeSelection *selection;
GtkFontSelection *fontsel;
GtkTreeModel *model;
GtkTreeIter iter;
@@ -657,7 +670,11 @@
const gchar *family_name;
#endif
+ if (!g_object_get_data (G_OBJECT (data), "immediate-selection"))
+ GDK_THREADS_ENTER ();
+
fontsel = GTK_FONT_SELECTION (data);
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (fontsel->family_list));
if (gtk_tree_selection_get_selected (selection, &model, &iter))
{
@@ -679,6 +696,31 @@
g_object_unref (family);
}
+
+ g_object_set_data (G_OBJECT (fontsel), "font-selection-timeout", GUINT_TO_POINTER (0));
+
+ if (!g_object_get_data (G_OBJECT (fontsel), "immediate-selection"))
+ GDK_THREADS_LEAVE ();
+
+ /* Remove ourselves */
+ return FALSE;
+}
+
+static void
+gtk_font_selection_select_font (GtkTreeSelection *selection,
+ gpointer data)
+{
+ GtkFontSelection *fontsel;
+ guint selection_timeout = 0;
+
+ fontsel = GTK_FONT_SELECTION (data);
+ selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "font-selection-timeout"));
+
+ if (selection_timeout)
+ g_source_remove (selection_timeout);
+
+ selection_timeout = g_timeout_add (200, gtk_font_selection_real_select_font, data);
+ g_object_set_data (G_OBJECT (fontsel), "font-selection-timeout", GUINT_TO_POINTER (selection_timeout));
}
static int
@@ -881,14 +923,20 @@
/* This is called when a style is selected in the list. */
-static void
-gtk_font_selection_select_style (GtkTreeSelection *selection,
- gpointer data)
+static gboolean
+gtk_font_selection_real_select_style (gpointer data)
{
- GtkFontSelection *fontsel = GTK_FONT_SELECTION (data);
+ GtkTreeSelection *selection;
+ GtkFontSelection *fontsel;
GtkTreeModel *model;
GtkTreeIter iter;
+ if (!g_object_get_data (G_OBJECT (data), "immediate-selection"))
+ GDK_THREADS_ENTER ();
+
+ fontsel = GTK_FONT_SELECTION (data);
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (fontsel->face_list));
+
if (gtk_tree_selection_get_selected (selection, &model, &iter))
{
PangoFontFace *face;
@@ -901,6 +949,31 @@
gtk_font_selection_show_available_sizes (fontsel, FALSE);
gtk_font_selection_select_best_size (fontsel);
+
+ g_object_set_data (G_OBJECT (fontsel), "style-selection-timeout", GUINT_TO_POINTER (0));
+
+ if (!g_object_get_data (G_OBJECT (fontsel), "immediate-selection"))
+ GDK_THREADS_LEAVE ();
+
+ /* Remove ourselves */
+ return FALSE;
+}
+
+static void
+gtk_font_selection_select_style (GtkTreeSelection *selection,
+ gpointer data)
+{
+ GtkFontSelection *fontsel;
+ guint selection_timeout = 0;
+
+ fontsel = GTK_FONT_SELECTION (data);
+ selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "style-selection-timeout"));
+
+ if (selection_timeout)
+ g_source_remove (selection_timeout);
+
+ selection_timeout = g_timeout_add (200, gtk_font_selection_real_select_style, data);
+ g_object_set_data (G_OBJECT (fontsel), "style-selection-timeout", GUINT_TO_POINTER (selection_timeout));
}
static void
@@ -1033,22 +1106,51 @@
}
/* This is called when a size is selected in the list. */
-static void
-gtk_font_selection_select_size (GtkTreeSelection *selection,
- gpointer data)
+static gboolean
+gtk_font_selection_real_select_size (gpointer data)
{
+ GtkTreeSelection *selection;
GtkFontSelection *fontsel;
GtkTreeModel *model;
GtkTreeIter iter;
gint new_size;
+ if (!g_object_get_data (G_OBJECT (data), "immediate-selection"))
+ GDK_THREADS_ENTER ();
+
fontsel = GTK_FONT_SELECTION (data);
-
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (fontsel->size_list));
+
if (gtk_tree_selection_get_selected (selection, &model, &iter))
{
gtk_tree_model_get (model, &iter, SIZE_COLUMN, &new_size, -1);
gtk_font_selection_set_size (fontsel, new_size * PANGO_SCALE);
}
+
+ g_object_set_data (G_OBJECT (fontsel), "size-selection-timeout", GUINT_TO_POINTER (0));
+
+ if (!g_object_get_data (G_OBJECT (fontsel), "immediate-selection"))
+ GDK_THREADS_LEAVE ();
+
+ /* Remove ourselves */
+ return FALSE;
+}
+
+static void
+gtk_font_selection_select_size (GtkTreeSelection *selection,
+ gpointer data)
+{
+ GtkFontSelection *fontsel;
+ guint selection_timeout = 0;
+
+ fontsel = GTK_FONT_SELECTION (data);
+ selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "size-selection-timeout"));
+
+ if (selection_timeout)
+ g_source_remove (selection_timeout);
+
+ selection_timeout = g_timeout_add (200, gtk_font_selection_real_select_size, data);
+ g_object_set_data (G_OBJECT (fontsel), "size-selection-timeout", GUINT_TO_POINTER (selection_timeout));
}
static void

13
gtk+-mac_ctree.patch Normal file
View File

@ -0,0 +1,13 @@
--- gtk+-2.4.0/gtk/gtkctree.c
+++ gtk+-2.4.0/gtk/gtkctree.c
@@ -654,8 +654,8 @@
ctree->tree_indent = 20;
ctree->tree_spacing = 5;
ctree->tree_column = 0;
- ctree->line_style = GTK_CTREE_LINES_SOLID;
- ctree->expander_style = GTK_CTREE_EXPANDER_SQUARE;
+ ctree->line_style = GTK_CTREE_LINES_NONE;
+ ctree->expander_style = GTK_CTREE_EXPANDER_TRIANGLE;
ctree->drag_compare = NULL;
ctree->show_stub = TRUE;

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

@ -0,0 +1,413 @@
Index: gtk+-2.8.4/demos/gtk-demo/changedisplay.c
===================================================================
--- gtk+-2.8.4.orig/demos/gtk-demo/changedisplay.c
+++ gtk+-2.8.4/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);
@@ -81,7 +81,7 @@ find_toplevel_at_pointer (GdkDisplay *di
* to the widget that created it.
*/
if (pointer_window)
- gdk_window_get_user_data (pointer_window, (gpointer*) &widget);
+ gdk_window_get_user_data (pointer_window, &widget);
return widget ? gtk_widget_get_toplevel (widget) : NULL;
}
Index: gtk+-2.8.4/demos/gtk-demo/textview.c
===================================================================
--- gtk+-2.8.4.orig/demos/gtk-demo/textview.c
+++ gtk+-2.8.4/demos/gtk-demo/textview.c
@@ -548,7 +548,7 @@ static void
easter_egg_callback (GtkWidget *button,
gpointer data)
{
- static GtkWidget *window = NULL;
+ static gpointer window = NULL;
GtkTextBuffer *buffer;
GtkWidget *view;
GtkTextIter iter;
@@ -587,7 +587,7 @@ easter_egg_callback (GtkWidget *button,
gtk_container_add (GTK_CONTAINER (sw), view);
g_object_add_weak_pointer (G_OBJECT (window),
- (gpointer *) &window);
+ &window);
gtk_window_set_default_size (GTK_WINDOW (window), 300, 400);
Index: gtk+-2.8.4/gdk-pixbuf/queryloaders.c
===================================================================
--- gtk+-2.8.4.orig/gdk-pixbuf/queryloaders.c
+++ gtk+-2.8.4/gdk-pixbuf/queryloaders.c
@@ -153,6 +153,7 @@ query_module (const char *dir, const cha
GModule *module;
void (*fill_info) (GdkPixbufFormat *info);
void (*fill_vtable) (GdkPixbufModule *module);
+ gpointer pfi, pfv;
if (g_path_is_absolute (file))
path = g_strdup (file);
@@ -161,8 +162,8 @@ query_module (const char *dir, const cha
module = g_module_open (path, 0);
if (module &&
- g_module_symbol (module, "fill_info", (gpointer *) &fill_info) &&
- g_module_symbol (module, "fill_vtable", (gpointer *) &fill_vtable)) {
+ g_module_symbol (module, "fill_info", &pfi) &&
+ g_module_symbol (module, "fill_vtable", &pfv)) {
GdkPixbufFormat *info;
GdkPixbufModule *vtable;
@@ -184,6 +185,9 @@ query_module (const char *dir, const cha
vtable->module = module;
+ fill_info = pfi;
+ fill_vtable = pfv;
+
(*fill_info) (info);
(*fill_vtable) (vtable);
Index: gtk+-2.8.4/gdk/x11/gdkdnd-x11.c
===================================================================
--- gtk+-2.8.4.orig/gdk/x11/gdkdnd-x11.c
+++ gtk+-2.8.4/gdk/x11/gdkdnd-x11.c
@@ -915,6 +915,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;
@@ -1269,6 +1270,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;
@@ -1468,6 +1470,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);
@@ -2402,7 +2405,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.8.4/gdk/x11/gdkevents-x11.c
===================================================================
--- gtk+-2.8.4.orig/gdk/x11/gdkevents-x11.c
+++ gtk+-2.8.4/gdk/x11/gdkevents-x11.c
@@ -496,6 +496,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;
@@ -2540,6 +2541,7 @@ fetch_net_wm_check_window (GdkScreen *sc
gulong bytes_after;
guchar *data;
Window *xwindow;
+ gpointer vp_xwindow = &xwindow;
/* This function is very slow on every call if you are not running a
* spec-supporting WM. For now not optimized, because it isn't in
Index: gtk+-2.8.4/gdk/x11/gdkim-x11.c
===================================================================
--- gtk+-2.8.4.orig/gdk/x11/gdkim-x11.c
+++ gtk+-2.8.4/gdk/x11/gdkim-x11.c
@@ -134,6 +134,7 @@ find_a_display (void)
gchar *
gdk_wcstombs (const GdkWChar *src)
{
+ gpointer vp_src = &src;
gchar *mbstr;
if (gdk_use_mb)
Index: gtk+-2.8.4/gdk/x11/gdkwindow-x11.c
===================================================================
--- gtk+-2.8.4.orig/gdk/x11/gdkwindow-x11.c
+++ gtk+-2.8.4/gdk/x11/gdkwindow-x11.c
@@ -4729,6 +4729,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.8.4/gtk/gtkmain.c
===================================================================
--- gtk+-2.8.4.orig/gtk/gtkmain.c
+++ gtk+-2.8.4/gtk/gtkmain.c
@@ -1156,7 +1156,8 @@ static GdkEvent *
rewrite_event_for_grabs (GdkEvent *event)
{
GdkWindow *grab_window;
- GtkWidget *event_widget, *grab_widget;
+ GtkWidget *event_widget;
+ gpointer grab_widget;
gboolean owner_events;
GdkDisplay *display;
@@ -2040,12 +2041,12 @@ gtk_get_current_event_state (GdkModifier
GtkWidget*
gtk_get_event_widget (GdkEvent *event)
{
- GtkWidget *widget;
+ gpointer widget;
widget = NULL;
if (event && event->any.window &&
(event->type == GDK_DESTROY || !GDK_WINDOW_DESTROYED (event->any.window)))
- gdk_window_get_user_data (event->any.window, (void**) &widget);
+ gdk_window_get_user_data (event->any.window, &widget);
return widget;
}
Index: gtk+-2.8.4/gtk/gtkmodules.c
===================================================================
--- gtk+-2.8.4.orig/gtk/gtkmodules.c
+++ gtk+-2.8.4/gtk/gtkmodules.c
@@ -252,7 +252,7 @@ static GSList *
load_module (GSList *module_list,
const gchar *name)
{
- GtkModuleInitFunc modinit_func;
+ gpointer modinit_func;
GtkModuleInfo *info = NULL;
GModule *module = NULL;
GSList *l;
@@ -278,7 +278,7 @@ load_module (GSList *module_list,
if (module)
{
- if (!g_module_symbol (module, "gtk_module_init", (gpointer *) &modinit_func) ||
+ if (!g_module_symbol (module, "gtk_module_init", &modinit_func) ||
!modinit_func)
g_module_close (module);
else
Index: gtk+-2.8.4/gtk/gtkselection.c
===================================================================
--- gtk+-2.8.4.orig/gtk/gtkselection.c
+++ gtk+-2.8.4/gtk/gtkselection.c
@@ -945,7 +945,7 @@ gtk_selection_convert (GtkWidget *widget
if (owner_window != NULL)
{
- GtkWidget *owner_widget;
+ void *owner_widget;
GtkSelectionData selection_data;
selection_data.selection = selection;
@@ -954,7 +954,7 @@ gtk_selection_convert (GtkWidget *widget
selection_data.length = -1;
selection_data.display = display;
- gdk_window_get_user_data (owner_window, (gpointer *)&owner_widget);
+ gdk_window_get_user_data (owner_window, &owner_widget);
if (owner_widget != NULL)
{
Index: gtk+-2.8.4/gtk/gtktipsquery.c
===================================================================
--- gtk+-2.8.4.orig/gtk/gtktipsquery.c
+++ gtk+-2.8.4/gtk/gtktipsquery.c
@@ -444,7 +444,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);
@@ -467,12 +467,12 @@ 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;
if (pointer_window)
- gdk_window_get_user_data (pointer_window, (gpointer*) &event_widget);
+ gdk_window_get_user_data (pointer_window, &event_widget);
gtk_tips_query_emit_widget_entered (tips_query, event_widget);
event_handled = TRUE;
break;
Index: gtk+-2.8.4/gtk/gtkwidget.c
===================================================================
--- gtk+-2.8.4.orig/gtk/gtkwidget.c
+++ gtk+-2.8.4/gtk/gtkwidget.c
@@ -3819,12 +3819,12 @@ gtk_widget_reparent_subwindows (GtkWidge
for (tmp_list = children; tmp_list; tmp_list = tmp_list->next)
{
- GtkWidget *child;
+ gpointer child;
GdkWindow *window = tmp_list->data;
- gdk_window_get_user_data (window, (void **)&child);
+ gdk_window_get_user_data (window, &child);
while (child && child != widget)
- child = child->parent;
+ child = ((GtkWidget*)child)->parent;
if (child)
gdk_window_reparent (window, new_window, 0, 0);
@@ -3847,10 +3847,10 @@ gtk_widget_reparent_subwindows (GtkWidge
for (tmp_list = children; tmp_list; tmp_list = tmp_list->next)
{
- GtkWidget *child;
+ gpointer child;
GdkWindow *window = tmp_list->data;
- gdk_window_get_user_data (window, (void **)&child);
+ gdk_window_get_user_data (window, &child);
if (child == widget)
gdk_window_reparent (window, new_window, 0, 0);
}
Index: gtk+-2.8.4/gtk/queryimmodules.c
===================================================================
--- gtk+-2.8.4.orig/gtk/queryimmodules.c
+++ gtk+-2.8.4/gtk/queryimmodules.c
@@ -89,11 +89,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;
GModule *module;
gchar *path;
@@ -113,10 +112,10 @@ query_module (const char *dir, const cha
}
if (module &&
- g_module_symbol (module, "im_module_list", (gpointer *) &list) &&
- g_module_symbol (module, "im_module_init", (gpointer *) &init) &&
- g_module_symbol (module, "im_module_exit", (gpointer *) &exit) &&
- g_module_symbol (module, "im_module_create", (gpointer *) &create))
+ g_module_symbol (module, "im_module_list", &list) &&
+ g_module_symbol (module, "im_module_init", &init) &&
+ g_module_symbol (module, "im_module_exit", &exit) &&
+ g_module_symbol (module, "im_module_create", &create))
{
const GtkIMContextInfo **contexts;
guint n_contexts;
@@ -125,7 +124,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.8.4/tests/testcalendar.c
===================================================================
--- gtk+-2.8.4.orig/tests/testcalendar.c
+++ gtk+-2.8.4/tests/testcalendar.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+/* gtk_calendar_display_options is deprecated */
+#undef GTK_DISABLE_DEPRECATED
#include <config.h>
#include <stdio.h>
#include <string.h>
Index: gtk+-2.8.4/tests/testgtk.c
===================================================================
--- gtk+-2.8.4.orig/tests/testgtk.c
+++ gtk+-2.8.4/tests/testgtk.c
@@ -2231,7 +2231,7 @@ gridded_geometry_response (GtkDialog *di
static void
create_gridded_geometry (GtkWidget *widget)
{
- static GtkWidget *window = NULL;
+ static gpointer window = NULL;
GtkWidget *entry;
GtkWidget *label;
@@ -2255,7 +2255,7 @@ create_gridded_geometry (GtkWidget *widg
g_signal_connect (window, "response",
G_CALLBACK (gridded_geometry_response), entry);
- g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+ g_object_add_weak_pointer (G_OBJECT (window), &window);
gtk_widget_show_all (window);
}
@@ -4607,7 +4607,7 @@ accel_button_new (GtkAccelGroup *accel_g
static void
create_key_lookup (GtkWidget *widget)
{
- static GtkWidget *window = NULL;
+ static gpointer window = NULL;
if (!window)
{
@@ -4648,7 +4648,7 @@ create_key_lookup (GtkWidget *widget)
button = gtk_button_new_with_mnemonic ("Button 11 (_!)");
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
- g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+ g_object_add_weak_pointer (G_OBJECT (window), &window);
g_signal_connect (window, "response", G_CALLBACK (gtk_object_destroy), NULL);
gtk_widget_show_all (window);
@@ -11784,7 +11784,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;
@@ -11792,11 +11792,11 @@ find_widget_at_pointer (GdkDisplay *disp
pointer_window = gdk_display_get_window_at_pointer (display, NULL, NULL);
if (pointer_window)
- gdk_window_get_user_data (pointer_window, (gpointer*) &widget);
+ gdk_window_get_user_data (pointer_window, &widget);
if (widget)
{
- gdk_window_get_pointer (widget->window,
+ gdk_window_get_pointer (((GtkWidget *)widget)->window,
&x, &y, NULL);
data.x = x;

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,64 @@
? gtk2-gtkicontheme-autoupdate.patch
================================================================================
--- gtk/gtkicontheme.c
+++ gtk/gtkicontheme.c
@@ -230,6 +230,9 @@
static GHashTable *icon_theme_builtin_icons;
+static int update_themes_callback_id;
+static GSList *update_themes_list;
+
/* also used in gtkiconfactory.c */
GtkIconCache *_builtin_cache = NULL;
static GList *builtin_dirs = NULL;
@@ -255,6 +258,23 @@
return g_object_new (GTK_TYPE_ICON_THEME, NULL);
}
+static gboolean
+update_themes_callback (gpointer user_data)
+{
+ GSList *iterator;
+ for (iterator = update_themes_list; iterator; iterator = iterator->next)
+ {
+ GtkIconTheme *icon_theme = iterator->data;
+ GtkIconThemePrivate *priv = icon_theme->priv;
+
+ if (priv->themes_valid)
+ {
+ gtk_icon_theme_rescan_if_needed (icon_theme);
+ }
+ }
+ return TRUE;
+}
+
/**
* gtk_icon_theme_get_default:
*
@@ -569,6 +589,11 @@
priv->unthemed_icons = NULL;
priv->pixbuf_supports_svg = pixbuf_supports_svg ();
+
+ update_themes_list = g_slist_prepend (update_themes_list, icon_theme);
+ if (update_themes_callback_id == 0) {
+ update_themes_callback_id = g_timeout_add (30 * 1000, update_themes_callback, NULL);
+ }
}
static void
@@ -652,6 +677,13 @@
icon_theme = GTK_ICON_THEME (object);
priv = icon_theme->priv;
+ update_themes_list = g_slist_remove (update_themes_list, icon_theme);
+ if (update_themes_list == NULL)
+ {
+ g_source_remove (update_themes_callback_id);
+ update_themes_callback_id = 0;
+ }
+
if (priv->reset_styles_idle)
{
g_source_remove (priv->reset_styles_idle);

11
gtk2-makefile-typo.patch Normal file
View File

@ -0,0 +1,11 @@
--- 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 \

22
gtk2-po.patch Normal file
View File

@ -0,0 +1,22 @@
--- gtk+-2.10.5/po/hy.po
+++ gtk+-2.10.5/po/hy.po
@@ -158,7 +158,7 @@
msgid "failed to allocate image buffer of %u byte"
msgid_plural "failed to allocate image buffer of %u bytes"
msgstr[0] "Չհաջողվեց հատկացնել պատկերի %u բայթանոց բուֆեր"
-msgstr[1] ""
+msgstr[1] "Չհաջողվեց հատկացնել պատկերի %u բայթանոց բուֆեր"
#: gdk-pixbuf/io-ani.c:244
#, fuzzy, c-format
--- gtk+-2.10.5/po/ka.po
+++ gtk+-2.10.5/po/ka.po
@@ -17,7 +17,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=2; plural=0\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Generator: KBabel 1.11.4\n"

View File

@ -0,0 +1,85 @@
Index: gtk/updateiconcache.c
================================================================================
--- gtk/updateiconcache.c
+++ gtk/updateiconcache.c
@@ -44,6 +44,7 @@
static gboolean quiet = FALSE;
static gboolean index_only = FALSE;
static gchar *var_name = "-";
+static gboolean remove_empty_cache = FALSE;
#define CACHE_NAME "icon-theme.cache"
@@ -1168,12 +1169,17 @@
directories = scan_directory (path, NULL, files, NULL, 0);
+ cache_path = g_build_filename (path, CACHE_NAME, NULL);
+
if (g_hash_table_size (files) == 0)
{
/* Empty table, just close and remove the file */
fclose (cache);
g_unlink (tmp_cache_path);
+ if (remove_empty_cache)
+ g_unlink (cache_path);
+ g_free (cache_path);
exit (0);
}
@@ -1187,10 +1193,10 @@
if (!retval)
{
g_unlink (tmp_cache_path);
+ g_free (cache_path);
exit (1);
}
- cache_path = g_build_filename (path, CACHE_NAME, NULL);
#ifdef G_OS_WIN32
if (g_file_test (cache_path, G_FILE_TEST_EXISTS))
@@ -1204,6 +1210,7 @@
g_strerror (errno),
cache_path);
g_unlink (cache_path);
+ g_free (cache_path);
bak_cache_path = NULL;
}
}
@@ -1215,6 +1222,7 @@
tmp_cache_path, cache_path,
g_strerror (errno));
g_unlink (tmp_cache_path);
+ g_free (cache_path);
#ifdef G_OS_WIN32
if (bak_cache_path != NULL)
if (g_rename (bak_cache_path, cache_path) == -1)
@@ -1233,12 +1241,17 @@
/* FIXME: What do do if an error occurs here? */
if (g_stat (path, &path_stat) < 0 ||
g_stat (cache_path, &cache_stat))
- exit (1);
+ {
+ g_free (cache_path);
+ exit (1);
+ }
utime_buf.actime = path_stat.st_atime;
utime_buf.modtime = cache_stat.st_mtime;
utime (path, &utime_buf);
+ g_free (cache_path);
+
if (!quiet)
g_printerr (_("Cache file created successfully.\n"));
}
@@ -1282,6 +1295,7 @@
{ "force", 'f', 0, G_OPTION_ARG_NONE, &force_update, N_("Overwrite an existing cache, even if uptodate"), NULL },
{ "ignore-theme-index", 't', 0, G_OPTION_ARG_NONE, &ignore_theme_index, N_("Don't check for the existence of index.theme"), NULL },
{ "index-only", 'i', 0, G_OPTION_ARG_NONE, &index_only, N_("Don't include image data in the cache"), NULL },
+ { "remove-empty-cache", 'r', 0, G_OPTION_ARG_NONE, &remove_empty_cache, "Remove the cache file if there is nothing to cache", NULL },
{ "source", 'c', 0, G_OPTION_ARG_STRING, &var_name, N_("Output a C header file"), "NAME" },
{ "quiet", 'q', 0, G_OPTION_ARG_NONE, &quiet, N_("Turn off verbose output"), NULL },
{ NULL }

View File

@ -0,0 +1,33 @@
--- gtk+-2.10.1/gtk/gtkentry.c
+++ gtk+-2.10.1/gtk/gtkentry.c
@@ -524,7 +524,7 @@
g_param_spec_unichar ("invisible-char",
P_("Invisible character"),
P_("The character to use when masking entry contents (in \"password mode\")"),
- '*',
+ (gunichar) 0x25CF,
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
@@ -1062,7 +1062,7 @@
entry->editable = TRUE;
entry->visible = TRUE;
- entry->invisible_char = '*';
+ entry->invisible_char = (gunichar) 0x25CF;
entry->dnd_position = -1;
entry->width_chars = -1;
entry->is_cell_renderer = FALSE;
@@ -4231,9 +4231,9 @@
* gtk_entry_set_visibility() has been called to set text visibility
* to %FALSE. i.e. this is the character used in "password mode" to
* show the user how many characters have been typed. The default
- * invisible char is an asterisk ('*'). If you set the invisible char
- * to 0, then the user will get no feedback at all; there will be
- * no text on the screen as they type.
+ * invisible char is a bullet (Unicode character 25CF; see also 2022). If
+ * you set the invisible char to 0, then the user will get no feedback at
+ * all; there will be no text on the screen as they type.
*
**/
void

49
gtk2-uninitialized.patch Normal file
View File

@ -0,0 +1,49 @@
--- gtk/gtkcolorsel.c
+++ gtk/gtkcolorsel.c
@@ -795,6 +795,7 @@
gdk_color.red = UNSCALE (color[0]);
gdk_color.green = UNSCALE (color[1]);
gdk_color.blue = UNSCALE (color[2]);
+ gdk_color.pixel = 0; /* Quiet GCC */
x = 0;
y = 0; /* Quiet GCC */
--- tests/testgtk.c
+++ tests/testgtk.c
@@ -6548,9 +6548,12 @@
col1.red = 0;
col1.green = 56000;
col1.blue = 0;
+ col1.pixel = 0; /* Quiet GCC */
+
col2.red = 32000;
col2.green = 0;
col2.blue = 56000;
+ col2.pixel = 0; /* Quiet GCC */
style1 = gtk_style_copy (GTK_WIDGET (data)->style);
style1->base[GTK_STATE_NORMAL] = col1;
@@ -6803,9 +6806,11 @@
col1.red = 56000;
col1.green = 0;
col1.blue = 0;
+ col1.pixel = 0; /* Quiet GCC */
col2.red = 0;
col2.green = 56000;
col2.blue = 32000;
+ col2.pixel = 0; /* Quiet GCC */
style = gtk_style_new ();
style->fg[GTK_STATE_NORMAL] = col1;
@@ -7002,9 +7007,11 @@
col1.red = 0;
col1.green = 56000;
col1.blue = 0;
+ col1.pixel = 0; /* Quiet GCC */
col2.red = 32000;
col2.green = 0;
col2.blue = 56000;
+ col2.pixel = 0; /* Quiet GCC */
style1 = gtk_style_new ();
style1->base[GTK_STATE_NORMAL] = col1;

1033
gtk2.changes Normal file

File diff suppressed because it is too large Load Diff

875
gtk2.spec Normal file
View File

@ -0,0 +1,875 @@
#
# spec file for package gtk2 (Version 2.10.6)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: gtk2
%define _name gtk+
BuildRequires: atk-devel cairo-devel cups-devel gcc-c++ gnome-patch-translation gtk-doc libtiff-devel pango-devel
%if %suse_version <= 1020
# Missing in cups-devel:
BuildRequires: openssl-devel
%endif
URL: http://www.gtk.org/
License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/Libraries
Autoreqprov: on
PreReq: /usr/bin/touch /bin/rm /bin/rmdir
Version: 2.10.6
Release: 21
Summary: Library for Creation of Graphical User Interfaces
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.10/%{_name}-%{version}.tar.bz2
Source1: SuSEconfig.gtk2
Source2: README.SuSE
Source3: gtkrc
Patch: gtk+-strict-aliasing.patch
Patch1: gtk2-uninitialized.patch
Patch4: gtk2-filesel-navbuttons.patch
Patch6: gtk+-mac_ctree.patch
Patch8: gtk64.patch
Patch12: gdk-modules-information.diff
Patch14: gtktextview.c.diff
Patch15: gtk2-gtkicontheme-autoupdate.patch
Patch17: gtk2-remove-empty-cache.patch
Patch22: bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff
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
Patch38: gtk2-po.patch
Patch39: gtk2-makefile-typo.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: cairo >= 0.9.2
%description
This fast and versatile library is used all over the world for all
GNOME applications, the GIMP, and several others. Originally it was
written for the GIMP and hence has the name GIMP ToolKit. Many people
like it because it is small, efficient, and very configurable.
Authors:
--------
Peter Mattis <petm@xcf.berkeley.edu>
Spencer Kimball <spencer@xcf.berkeley.edu>
Josh MacDonald <jmacd@xcf.berkeley.edu>
Shawn T. Amundson <amundson@gtk.org>
Jerome Bolliet <bolliet@gtk.org>
Damon Chaplin <damon@gtk.org>
Tony Gale <gale@gtk.org>
Jeff Garzik <jgarzik@gtk.org>
Lars Hamann <lars@gtk.org>
Raja R Harinath <harinath@gtk.org>
Carsten Haitzler <raster@gtk.org>
Tim Janik <timj@gtk.org>
Stefan Jeske <stefan@gtk.org>
Elliot Lee <sopwith@gtk.org>
Raph Levien <raph@gtk.org>
Ian Main <imain@gtk.org>
Federico Mena <quartic@gtk.org>
Paolo Molaro <lupus@gtk.org>
Jay Painter <jpaint@gtk.org>
Manish Singh <manish@gtk.org>
Owen Taylor <otaylor@gtk.org>
%package devel
Summary: Include Files and Libraries mandatory for Development.
Group: Development/Libraries/X11
Autoreqprov: on
Requires: %{name} = %{version} atk-devel cairo-devel glibc-devel glib2-devel pango-devel %(rpm -q --whatprovides XFree86-devel --queryformat '%{NAME}')
%description devel
This fast and versatile library is used all over the world for all
GNOME applications, the GIMP, and several other applications.
Originally it was written for the GIMP and hence has the name Gimp
ToolKit. Many people like it because it is small, efficient, and very
configurable.
Authors:
--------
Peter Mattis <petm@xcf.berkeley.edu>
Spencer Kimball <spencer@xcf.berkeley.edu>
Josh MacDonald <jmacd@xcf.berkeley.edu>
Shawn T. Amundson <amundson@gtk.org>
Jerome Bolliet <bolliet@gtk.org>
Damon Chaplin <damon@gtk.org>
Tony Gale <gale@gtk.org>
Jeff Garzik <jgarzik@gtk.org>
Lars Hamann <lars@gtk.org>
Raja R Harinath <harinath@gtk.org>
Carsten Haitzler <raster@gtk.org>
Tim Janik <timj@gtk.org>
Stefan Jeske <stefan@gtk.org>
Elliot Lee <sopwith@gtk.org>
Raph Levien <raph@gtk.org>
Ian Main <imain@gtk.org>
Federico Mena <quartic@gtk.org>
Paolo Molaro <lupus@gtk.org>
Jay Painter <jpaint@gtk.org>
Manish Singh <manish@gtk.org>
Owen Taylor <otaylor@gtk.org>
%package doc
Summary: Additional Package Documentation.
Group: Development/Libraries/X11
Requires: %{name} = %{version}
%description doc
This fast and versatile library is used all over the world for all
GNOME applications, the GIMP, and several other applications.
Originally it was written for the GIMP and hence has the name Gimp
ToolKit. Many people like it because it is small, efficient, and very
configurable.
Authors:
--------
Peter Mattis <petm@xcf.berkeley.edu>
Spencer Kimball <spencer@xcf.berkeley.edu>
Josh MacDonald <jmacd@xcf.berkeley.edu>
Shawn T. Amundson <amundson@gtk.org>
Jerome Bolliet <bolliet@gtk.org>
Damon Chaplin <damon@gtk.org>
Tony Gale <gale@gtk.org>
Jeff Garzik <jgarzik@gtk.org>
Lars Hamann <lars@gtk.org>
Raja R Harinath <harinath@gtk.org>
Carsten Haitzler <raster@gtk.org>
Tim Janik <timj@gtk.org>
Stefan Jeske <stefan@gtk.org>
Elliot Lee <sopwith@gtk.org>
Raph Levien <raph@gtk.org>
Ian Main <imain@gtk.org>
Federico Mena <quartic@gtk.org>
Paolo Molaro <lupus@gtk.org>
Jay Painter <jpaint@gtk.org>
Manish Singh <manish@gtk.org>
Owen Taylor <otaylor@gtk.org>
%prep
%setup -q -n %{_name}-%{version}
gnome-patch-translation-prepare
%patch -p1
%patch1
%patch4 -p1
%patch6 -p1
cp -a %{S:1} .
%if "%_lib" == "lib64"
cp -a %{S:2} .
# WARNING: This patch does not patch not installed demos and tests.
%patch8 -p1
%endif
%patch12 -p1
%patch14 -p0
%patch15 -p0
%patch17 -p0
%patch22 -p1
%patch23 -p1
%patch24
%patch31
%patch32 -p1
%patch38 -p1
#%patch39
gnome-patch-translation-update
%build
ACLOCAL="aclocal -I m4macros" autoreconf -f -i
## HACK ALERT BEGIN
# work around 9.2 deficiency
if test -f /usr/X11R6/%_lib/libXfixes.a -a ! -f /usr/X11R6/%_lib/libXfixes.so ; then
ln -sf /usr/X11R6/%_lib/libXfixes.so.? gdk/libXfixes.so
export LDFLAGS="-L."
fi
## HACK ALERT END
export CFLAGS="$RPM_OPT_FLAGS"
%if %suse_version > 1000
export CFLAGS="$CFLAGS -fstack-protector"
%endif
%ifarch ppc64
export CFLAGS="$CFLAGS -mminimal-toc"
%endif
# Do not believe glibc first weekday:
# 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
# needed for gtk+-2.10.6:
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure\
--enable-fbmanager
make %{?jobs:-j%jobs}
%install
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/sbin/conf.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0
install -m 755 SuSEconfig.gtk2 $RPM_BUILD_ROOT/sbin/conf.d
touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gtk.immodules $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gtk-2.0
touch $RPM_BUILD_ROOT%{_localstatedir}/cache/gtk-2.0/icon-theme.cache-list
mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/{,2.10.0/}{engines,filesystems,immodules,loaders,modules,printbackends}
%find_lang gtk20
%find_lang gtk20-properties gtk20.lang
%if "%_lib" == "lib64"
mv $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders\
$RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders-64
mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0\
$RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0-64
mv $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gtk.immodules\
$RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gtk64.immodules
mv $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders\
$RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gdk-pixbuf64.loaders
%endif
mkdir -p $RPM_BUILD_ROOT/etc/profile.d
echo 'if test -z "$GTK_PATH" ; then
export GTK_PATH="/usr/local/lib/gtk-2.0:/usr/lib/gtk-2.0"
else
export GTK_PATH="/usr/local/lib/gtk-2.0:/usr/lib/gtk-2.0:$GTK_PATH"
fi' > $RPM_BUILD_ROOT/etc/profile.d/%{name}.sh
echo 'if ( ${?GTK_PATH} ) then
setenv GTK_PATH /usr/local/lib/gtk-2.0:/usr/lib/gtk-2.0:${GTK_PATH}
else
setenv GTK_PATH /usr/local/lib/gtk-2.0:/usr/lib/gtk-2.0
endif' > $RPM_BUILD_ROOT/etc/profile.d/%{name}.csh
%if "%_lib" == "lib64"
echo 'if test -z "$GTK_PATH64" ; then
export GTK_PATH64="/usr/local/%_lib/gtk-2.0:/usr/%_lib/gtk-2.0"
else
export GTK_PATH64="/usr/local/%_lib/gtk-2.0:/usr/%_lib/gtk-2.0:$GTK_PATH64"
fi' >> $RPM_BUILD_ROOT/etc/profile.d/%{name}.sh
echo 'if ( ${?GTK_PATH64} ) then
setenv GTK_PATH64 /usr/local/%_lib/gtk-2.0:/usr/%_lib/gtk-2.0:${GTK_PATH64}
else
setenv GTK_PATH64 /usr/local/%_lib/gtk-2.0:/usr/%_lib/gtk-2.0
endif' >> $RPM_BUILD_ROOT/etc/profile.d/%{name}.csh
%endif
rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2*/*/*.la
%clean
rm -rf $RPM_BUILD_ROOT
%post
%run_ldconfig
touch var/adm/SuSEconfig/run-gtk
%preun
# Remove all old icon cache files created by SuSEconfig.gtk2.
# If it is an update, files will be re-created.
if test -f var/cache/gtk-2.0/icon-theme.cache-list ; then
for DIR in $(<var/cache/gtk-2.0/icon-theme.cache-list) ; do
rm -f $DIR/icon-theme.cache
rmdir --ignore-fail-on-non-empty $DIR
done
rm var/cache/gtk-2.0/icon-theme.cache-list
fi
%postun
%run_ldconfig
%files -f %files -f gtk20.lang
%defattr(-,root,root)
%if "%_lib" == "lib64"
%doc AUTHORS COPYING README README.SuSE NEWS ChangeLog
%else
%doc AUTHORS COPYING README NEWS ChangeLog
%endif
%{_bindir}/*query*
%{_bindir}/gtk-update-icon-cache
%{_datadir}/themes/*
%{_libdir}/lib*.so.*
%dir %{_libdir}/gtk-2.0
%dir %{_libdir}/gtk-2.0/[2me]*
%dir %{_libdir}/gtk-2.0/immodules
%dir %{_libdir}/gtk-2.0/2*/*
%{_libdir}/gtk-2.0/2*/*/*.so
%dir %{_sysconfdir}/gtk-2.0
%dir %{_localstatedir}/cache/gtk-2.0
%ghost %{_localstatedir}/cache/gtk-2.0/icon-theme.cache-list
%if "%_lib" == "lib64"
%ghost %{_sysconfdir}/gtk-2.0/gtk64.immodules
%ghost %{_sysconfdir}/gtk-2.0/gdk-pixbuf64.loaders
%else
%ghost %{_sysconfdir}/gtk-2.0/gtk.immodules
%ghost %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
%endif
%{_sysconfdir}/gtk-2.0/gtkrc
/etc/profile.d/*
/sbin/conf.d/SuSEconfig.gtk2
%files devel
%defattr(-,root,root)
%{_bindir}/*-demo
%{_bindir}/*-csource
%{_datadir}/gtk-2.0
%{_datadir}/aclocal/*.m4
%{_includedir}/gtk-2.0
%{_includedir}/gtk-unix-print-2.0
%{_libdir}/lib*.so
%{_libdir}/lib*a
#%{_libdir}/gtk-2.0/2*/*/*.la
%{_libdir}/gtk-2.0/include
%{_libdir}/pkgconfig/*.pc
%doc %{_mandir}/man*/*
%files doc
%defattr(-,root,root)
%{_datadir}/gtk-doc/html/*
%changelog -n gtk2
* Fri Jan 05 2007 - sbrabec@suse.cz
- Build cups print backend.
* Thu Jan 04 2007 - sbrabec@suse.cz
- No more depend on gnome-filesystem in SuSEconfig.gtk2.
* Mon Dec 11 2006 - sbrabec@suse.cz
- Prefix changed to /usr.
- Spec file cleanup.
* Sat Nov 11 2006 - danw@suse.de
- Update gtk64.patch to fix stock icon cache on x86_64 (213922)
* Wed Nov 08 2006 - jhargadon@suse.de
- removed the execute bit from /etc/opt/gnome/gtk-2.0/gtkrc
* Tue Oct 17 2006 - jhargadon@suse.de
- update to version 2.10.6
- Bugs fixed:
- 358931 2.10.5 build issue due to a typo
- 357280 Compile crashes
- 359053 Reduce relocations
- 359052 gtk_print_settings_get_duplex() return wrong
value for one of vertical setting
* Sat Oct 14 2006 - danw@suse.de
- Remove dead patches
- Remove gtk2-179040-file-chooser-location-entry-folder.diff, which
never actually worked, but was effectively reverted in CODE10 by
gtk2-184875-filechooser-location-entry-set-path.diff, the rest of
which is now upstream.
* Mon Oct 02 2006 - jhargadon@suse.de
- update to version 2.10.5
- many bugs fixes
- Updated translations
- Windows theme engine improvements
- GtkFileChooser works better with remote bookmarks
* Fri Sep 15 2006 - sbrabec@suse.cz
- Fixed module directories ownership.
* Thu Sep 14 2006 - jhargadon@suse.de
- update to version 2.10.3
* GtkFileChooser:
- Fix several Win32-specific problems
- Add automated tests for GtkFileSystem
- Make overwrite confirmation work again
* Printing support:
- Fix confusion between names and values in combo boxes
- Poll for printer list updates in the cups backend
* Add an automatic scrolling example to gtk-demo
* Bugs fixed:
354004 Use of g_warning("%%s", NULL) after failing to
open a display
346751 symbolic colors can't be use in properties
352264 gtk_status_icon_set_from_pixbuf leaks the old
pixbuf
352391 small link button leak
353449 A break is missing in
gtk_recent_chooser_menu_set_current_uri
329604 do not scroll on copy to clipboard
354035 Typo in the GtkWidget::drag-drop doc blurb
- translation updates
* Fri Aug 18 2006 - jhargadon@suse.de
- update to version 2.10.2
- Revert to using gtk modules with global binding
- Poll for changes to the XBEL file
- Fix initial bad placement of recent files menu
- Show nonexisting resources by default, and do
not mark them as insensitive
- Allow adding a filter to GtkRecentChooserMenu
- many bug fixes
* Thu Aug 17 2006 - sbrabec@suse.cz
- Typo fix in gtk64.patch.
* Wed Aug 09 2006 - aj@suse.de
- Fix lib64 patch to apply.
- Fix po files to pass new gettext checks.
* Fri Jul 28 2006 - gekker@suse.de
- Update to version 2.10.1
- Remove upstream patchesa
- lots of updates in the printing area
- various fixes in many other places
- countless bugfixes
* Wed Jun 21 2006 - federico@novell.com
- Added gtk2-184875-filechooser-location-entry-set-path.diff to fix
https://bugzilla.novell.com/show_bug.cgi?id=184875. This makes the
location entry in the file chooser preserve the filename from
gtk_file_chooser_set_filename() and set_uri(). It was incorrectly
using just the directory name instead of the file name.
* Wed Jun 07 2006 - federico@novell.com
- Added gtk2-179040-file-chooser-location-entry-folder.diff to fix
https://bugzilla.novell.com/show_bug.cgi?id=179040. This makes the
location entry in GtkFileChooser update correctly when you switch
folders.
- Added gtk2-161043-calendar-sane-timer.diff to fix
https://bugzilla.novell.com/show_bug.cgi?id=161043. This makes
GtkCalendar use a more forgiving timeout value when going through
months or years.
* Thu Jun 01 2006 - sbrabec@suse.cz
- Fixed I18N of file selector navigation buttons (#180696).
* Sun May 28 2006 - joeshaw@suse.de
- Add gtk2-filechooserbutton-signal-disconnect-fix.patch to fix
a crash when a GtkFileChooserButton is destroyed but not
finalized and bookmarks or volumes change. (bnc #178122)
* Wed May 24 2006 - federico@novell.com
- Updated gtk+-2.8.6-fontsel-fix.patch to fix bug
https://bugzilla.novell.com/show_bug.cgi?id=177997. The previous
patch caused crashes in all font selectors.
* Wed May 17 2006 - bk@suse.de
- GtkFontSelection: Fix deadlock when used by GtkFontButton (153099)
* Thu May 04 2006 - dobey@suse.de
- Add in default gtkrc file to set theme/icon theme under KDE/etc
Fixes https://bugzilla.novell.com/show_bug.cgi?id=172779
* Mon Apr 17 2006 - federico@novell.com
- Updated gtk2-filechooser-new-features.diff to fix these bugs:
https://bugzilla.novell.com/show_bug.cgi?id=163234 - The file
chooser now sorts the list of Beagle hits by modification date.
https://bugzilla.novell.com/show_bug.cgi?id=166906 - The file
chooser in SAVE mode will now give the right filename if the user
just switched folders.
* Mon Apr 03 2006 - sbrabec@suse.cz
- Fixed context translation bugs (GNOME#336645).
* Thu Mar 30 2006 - federico@novell.com
- Removed gtk2-151580-filechooser-beagle.diff.
- Added gtk2-filechooser-new-features.diff. This fixes bug #160605,
so the file chooser now has an optional text entry for the file
name. Also, it integrates the functionality for Beagle searching
into the same patch.
* Fri Mar 24 2006 - rml@suse.de
- Set default invisible char to something stetic (bug #160688)
* Fri Mar 24 2006 - federico@novell.com
- Updated gtk2-151580-filechooser-beagle.diff to fix bug #156843.
With this, the file chooser will no longer show a "Search" item in
the "Save in folder" combo box.
* Mon Mar 13 2006 - sbrabec@suse.cz
- Do not believe glibc first weekday (#130787, #104417).
* Tue Mar 07 2006 - zsu@suse.de
- Fixed gtkvts crash bug introduced by gtk+-2.8.6-fontsel.patch [#153099].
* Thu Feb 23 2006 - federico@novell.com
- Updated gtk2-151580-filechooser-beagle.diff; now we hide the search
results that correspond to the system documentation. This produces
less clutter.
* Fri Feb 17 2006 - federico@novell.com
- Added gtk2-151580-filechooser-beagle.diff to integrate Beagle
searching into the file chooser. This fixes
https://bugzilla.novell.com/show_bug.cgi?id=151580 (about Beagle
support) and https://bugzilla.novell.com/show_bug.cgi?id=148896
(about not having a highlighted shortcut at startup).
* Fri Feb 03 2006 - federico@novell.com
- Added gtk2-117163-cairo-repeat-pattern-workaround.diff as a fix for bug #117163.
In this bug, the desktop gets repainted very slowly due to bugs in Cairo and XRENDER.
The workaround uses a faster code path in GTK+.
* Thu Feb 02 2006 - gekker@suse.de
- Backport critical fixes from 2.8.11 (#153213,326806,327751)
* Wed Feb 01 2006 - sbrabec@suse.cz
- Translations from localize-font-style-name moved
to translation compendium gnome-patch-translation.
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Wed Jan 18 2006 - gekker@suse.de
- Add patch to improve scrolling speed in font selection (#130159)
* Mon Jan 16 2006 - meissner@suse.de
- use -fstack-protector.
* Fri Jan 13 2006 - sbrabec@suse.cz
- Updated to version 2.8.10.
* Wed Jan 11 2006 - sbrabec@suse.cz
- Removed libpixman from neededforbuild.
* Wed Jan 11 2006 - meissner@suse.de
- Added -fno-strict-aliasing.
* Mon Jan 09 2006 - mfabian@suse.de
- Bugzilla #131498: don't limit the default for the GTK2 xim module
to "ko:ja:th:zh", use "*" (all languages) instead.
* Fri Dec 30 2005 - mfabian@suse.de
- Bugzilla #129753: Localize font style name in gtk font selection
dialog and font button (add patch by Zhe Su <zsu@novell.com>).
Patch updated for gtk+-2.8.9 and German translations of the
style names added.
* Tue Dec 20 2005 - ro@suse.de
- also pack translations for gtk20-properties
* Wed Dec 14 2005 - sbrabec@suse.cz
- Updated to version 2.8.9.
- Added related old version cleanups (feature #2852).
* Wed Nov 30 2005 - sbrabec@suse.cz
- Updated to version 2.8.8.
* Fri Nov 18 2005 - sbrabec@suse.cz
- Updated to version 2.8.7.
- Removed obsolete build hacks.
- Try to build with ELF visibility.
* Tue Nov 15 2005 - sbrabec@suse.cz
- Fixed XPM buffer overflow vulnerability (#129642).
- More XPM fixes: CVE-2005-2975 xpm too many colors DoS (#129642)
- Removed xrender work-around.
* Fri Oct 28 2005 - federico@novell.com
- Added gtk2-127646-dnd-cursor-offset.diff to fix the position of the default
cursor for drag and drop.
* Tue Oct 11 2005 - gekker@suse.de
- Update to version 2.8.6
- Fix return of random data
* Wed Oct 05 2005 - federico@novell.com
- Added gtk2-file-chooser-consistent-home-folder-name.diff so that
$HOME will not appear as "Home", but rather as its actual name.
This avoids having [/][home][Home] on the path bar.
- This patch also adds an Alt-D shortcut to the file chooser, to make
it go to your Desktop folder.
* Mon Oct 03 2005 - gekker@suse.de
- Update to version 2.8.4
- Remove upstream patches
* Fri Sep 30 2005 - federico@novell.com
- Added gtk2-file-chooser-create-save-widgets-only-if-needed.diff and
gtk2-file-chooser-no-reload.diff as optimizations for the file
chooser's startup time.
* Thu Sep 15 2005 - gekker@suse.de
- Fix quoting in SuSEconfig.gtk2 (113511)
* Thu Sep 08 2005 - sbrabec@suse.cz
- Fixed outdated cache files heuristics in SuSEconfig (#113261).
* Wed Sep 07 2005 - sbrabec@suse.cz
- Fixed first weekday bug with latest glibc localedata (#104417).
* Thu Sep 01 2005 - gekker@suse.de
- Update to version 2.8.3
- Remove upstreamed patch
* Fri Aug 26 2005 - jpr@suse.de
- Patch gtk-update-icon-cache to be a little smarter and alter the
SuSEconfig.gtk2 script to be smarter about removing dead cache files.
* Wed Aug 24 2005 - gekker@suse.de
- Update to version 2.8.2
* Wed Aug 24 2005 - rodrigo@suse.de
- Update to version 2.8.1
- Updated gtk+-strict-aliasing.patch.
* Thu Aug 18 2005 - gekker@suse.de
- Update version to 2.8.0 (GNOME2.12)
* Fri Aug 12 2005 - gekker@suse.de
- Fix crash in file chooser b.g.o (310270).
* Thu Aug 11 2005 - gekker@suse.de
- Update to version 2.7.5
- Remove upstreamed patch
* Wed Aug 10 2005 - clahey@suse.de
- Patch to check for updated icon theme (especially cache) every
30 seconds.
* Fri Aug 05 2005 - sbrabec@suse.cz
- Create loaders before icon cache to avoid error mesages during
first SuSEconfig run.
* Thu Aug 04 2005 - sbrabec@suse.cz
- Removed pixmaps and icons directories from SuSEconfig (#85839).
* Tue Aug 02 2005 - ro@suse.de
- fix and re-enable gtk64.patch
* Mon Aug 01 2005 - gekker@suse.de
- Update to version 2.7.4
- Add cairo, libpixman, and glitz to nfb
- Remove upstreamed patch
* Fri Jun 24 2005 - sbrabec@suse.cz
- Fixed devel dependencies.
- Removed .la files for modules.
- Fixed uninitialized variable warnings.
* Mon Jun 20 2005 - sbrabec@suse.cz
- Create icon-cache files by SuSEconfig (#88599).
* Fri Jun 17 2005 - gekker@suse.de
- Fix gtk64.patch and build on x86_64.
* Fri Jun 17 2005 - gekker@suse.de
- Update to version 2.6.8.
- Fix sentinel patch to work with new version of glib2.
* Wed Jun 01 2005 - sbrabec@suse.cz
- Use current name for XFree86-devel in Requires (#54136).
* Mon May 02 2005 - gekker@suse.de
- Fix crasher in gtktextview (380).
* Mon Apr 04 2005 - aj@suse.de
- Disable visibility to build with GCC4. This should be
enabled again once gtk is fixed.
* Fri Mar 18 2005 - gekker@suse.de
- Add gtk-esc-closes.diff
* Wed Mar 02 2005 - gekker@suse.de
- Updated to version 2.6.4
* Mon Feb 07 2005 - sbrabec@suse.cz
- Updated to version 2.6.2.
* Sun Jan 30 2005 - meissner@suse.de
- fixed XIM valist usage 0->NULL.
* Fri Jan 21 2005 - meissner@suse.de
- specify valist functions with NULL termination
with sentinel attribute for gcc4.
- parallel make
- fixed one strict aliasing problem
- removed -fno-strict-aliasing, -mminimal-toc
* Mon Jan 17 2005 - ro@suse.de
- added c++ to neededforbuild (for libtiff)
* Mon Jan 17 2005 - clahey@suse.de
- Updated to version 2.6.1.
* Wed Jan 12 2005 - gekker@suse.de
- Update to version 2.6.0
* Tue Nov 23 2004 - hhetter@suse.de
- add some information on how to manually regenerate
gdk-pixbuf-modules if needed
* Mon Nov 22 2004 - ro@suse.de
- fix build on 9.2 (missing so links for libXfixes)
* Fri Nov 19 2004 - ro@suse.de
- updated gtk64 patch
* Wed Nov 17 2004 - gekker@suse.de
- Update version to 2.5.5.
* Tue Oct 26 2004 - mmj@suse.de
- locale rename no to nb
* Wed Oct 20 2004 - ro@suse.de
- make specfile rpm3-save
* Mon Sep 27 2004 - sbrabec@suse.cz
- Added work-around for GTK_PATH bi-arch problems (#45386).
* Mon Sep 06 2004 - meissner@suse.de
- Added ico overflow security patch, CAN-2004-0788.
* Tue Aug 31 2004 - dave@suse.de
- Added gtk2-cancel-rename.patch, ximian #59669
* Fri Aug 27 2004 - federico@ximian.com
- Removed stray g_print() from gtk-xpm-secfix.dif; normalized the patch
* Thu Aug 26 2004 - federico@ximian.com
- Updated to gtk+-2.4.9
- Normalized gtk+-strict-aliasing.patch
* Tue Aug 24 2004 - hhetter@suse.de
- added security patch for XPM decoder (#44100)
CAN-2004-0782, CAN-2004-0783.
* Wed Aug 04 2004 - clahey@suse.de
- Added gtk2-esc-closes.patch from Federico.
* Fri Jun 04 2004 - clahey@suse.de
- Fixed filesel patch to just go directly to Desktop.
* Tue Apr 27 2004 - sbrabec@suse.cz
- Fixed gtk64.patch.
* Mon Apr 26 2004 - sbrabec@suse.cz
- Added empty /opt/gnome/%%_lib/gtk-2.0/2.4.0/filesystems to filelist.
* Wed Apr 21 2004 - sbrabec@suse.cz
- Fixed strict aliasing, undefined reference and incompatible type
warnings.
* Thu Apr 15 2004 - sbrabec@suse.cz
- Updated to version 2.4.0 (GNOME 2.6).
- Removed obsolete patches.
* Thu Apr 01 2004 - sbrabec@suse.cz
- Set GTK_PATH to simplify integration of /usr/local binaries.
* Mon Mar 15 2004 - sbrabec@suse.cz
- FHS 2.3 fix (mandir, infodir, #35821).
* Thu Mar 11 2004 - sbrabec@suse.cz
- Use SuSEconfig biarch wrapper and identical filename for all
platforms.
- Include README.SuSE about biarch problems.
* Fri Mar 05 2004 - hhetter@suse.de
- apply reworked patch gtk2-filesel-navbuttons.patch:
Default to ~/Desktop
* Tue Mar 02 2004 - sbrabec@suse.cz
- Bi-arch work-arounds to prevent 32/64 bit conflicts (bug #33705).
For more see http://bugzilla.gnome.org/show_bug.cgi?id=129540
* Mon Mar 01 2004 - sbrabec@suse.cz
- Fixed focus loop in gtk_socket_focus() (#33810).
Fixes 100%% CPU load problem in Notification Area Applet.
http://bugzilla.gnome.org/show_bug.cgi?id=122327
- Build with -fno-strict-aliasing.
* Thu Feb 26 2004 - hhetter@suse.de
- applied ximian patches
* Mon Feb 23 2004 - sbrabec@suse.cz
- Fixed AC_DEFUN underquoting.
* Sat Jan 10 2004 - adrian@suse.de
- add %%run_ldconfig and %%defattr
* Thu Jan 08 2004 - ro@suse.de
- fix build with current freetype
* Wed Nov 05 2003 - hhetter@suse.de
- added xfree86-devel to Requires for the devel subpackage
* Fri Oct 10 2003 - sbrabec@suse.cz
- Updated to version 2.2.4.
* Thu Aug 28 2003 - sbrabec@suse.cz
- Updated to version 2.2.3.
* Thu Jul 24 2003 - hhetter@suse.de
- fix SuSEconfig.gtk2 query paths
* Wed Jul 16 2003 - sbrabec@suse.cz
- SuSEconfig.gtk2: Fixed paths to query binaries.
- Added empty directory for immodules.
* Mon Jul 14 2003 - sbrabec@suse.cz
- GNOME prefix change to /opt/gnome.
* Thu Jul 10 2003 - sbrabec@suse.cz
- Worked around linking problems on ppc64 (#27837).
* Tue Jun 24 2003 - sbrabec@suse.cz
- Created empty directory for engines and modules.
* Thu Jun 12 2003 - sbrabec@suse.cz
- Updated to version 2.2.2.
- Fixed directory packaging.
* Wed May 28 2003 - sbrabec@suse.cz
- Include manpage to devel package.
* Wed May 28 2003 - ro@suse.de
- remove unpackaged files from buildroot
* Thu May 22 2003 - sbrabec@suse.cz
- Fixed typo in Requires for -devel package (#27025).
* Wed May 14 2003 - sbrabec@suse.cz
- Sync -devel Requires with pkgconfig (bug #26876).
* Tue Mar 18 2003 - sbrabec@suse.cz
- Moved devel files to devel package (fixes bug #25163).
* Wed Mar 12 2003 - sbrabec@suse.cz
- Added gnome2 profile.d files containing required variables (fixes
theme problems for all session types).
* Wed Mar 12 2003 - sbrabec@suse.cz
- Fixed prefix clash for keyboard themes (fixes bug 25086).
* Mon Feb 10 2003 - ro@suse.de
- create /etc/gtk-2.0 in SuSEconfig.gtk2 if needed
* Thu Feb 06 2003 - sbrabec@suse.cz
- Updated to version 2.2.1.
- Include generated config files to %%files (with %%ghost).
* Wed Feb 05 2003 - sbrabec@suse.cz
- Removed -mminimal-toc from spec file, since it is now RPM default.
* Tue Jan 14 2003 - sbrabec@suse.cz
- Update SuSEconfig.gtk2 to create gdk-pixbuf.loaders.
* Mon Jan 13 2003 - sbrabec@suse.cz
- Added expat to neededforbuild (for new xft2).
* Thu Jan 09 2003 - sbrabec@suse.cz
- Updated to version 2.2.0.
- Updated automake patch.
* Mon Nov 25 2002 - hhetter@suse.de
- updated to version 2.0.9
* Fix colormap refcounting, which caused
frequent metacity crashes
* GtkTreeView bug fixes
- Make TreeView reordering work on FreeBSD/Solaris
* Updated translations (be, ru, nl, fr)
* Mon Nov 11 2002 - hhetter@suse.de
- updated to version 2.0.8
* Typo in io-gif.c that caused GIFs not to be loadable
by gdk-pixbuf.
* Incompatibility between the libtool used for generating
the tarball and older versions of binutils on Linux.
* Tue Nov 05 2002 - hhetter@suse.de
- updated to 2.0.7 bugfix release
- removed x86_64 patch as it's upstream, from Changelog:
* Fix some memory leaks in gdk-pixbuf
* Pixbuf loader fixes
* Support depth 8 StaticColor in GdkRGB
* Win32 fixes and improvements
* Improve tracking of toplevel focus state
* XIM input method fixes
* Fix the longstanding problem with <,> keys and XIM
* Fix GtkIMContextSimple for us-intl keyboards
* GtkIMContextSimple updates for Eastern Europe
* Fix the "key bindings randomly stop working" problem
* GtkTextView fixes
* GtkTreeView bugfixes
* GtkCombo fixes
* Fix 64-bit problem with GtkFundamentalType
* New and updated translations
* Many miscellaneous bug fixes
* Tue Oct 22 2002 - sbrabec@suse.cz
- Move /var/adm/SuSEconfig/run-gtk to %%post (fixes #20029).
* Wed Oct 09 2002 - sbrabec@suse.cz
- Added support for dead keyed Hungarian characters in iso88592.dif
characters.
* Tue Oct 01 2002 - sbrabec@suse.cz
- Added ISO-8859-2 supporting patch from CVS.
* Fri Sep 06 2002 - sf@suse.de
- added patch to avoid wrong va_arg handling
which leads to almost any GTK-Widget segfaulting
* Wed Aug 21 2002 - kukuk@suse.de
- Fix Requires entry
* Thu Aug 15 2002 - hhetter@suse.de
- branch gtk2-doc package
* Tue Aug 13 2002 - hhetter@suse.de
- added fbmanager and gdktarget build options (#17640)
- devel package requires main package
* Thu Aug 08 2002 - hhetter@suse.de
- use %%{version} tag in LIBRARY_PATH
- enable xim and shm
* Mon Aug 05 2002 - hhetter@suse.de
- updated to version 2.0.6
* GtkTreeView bug fixes
* Fix problem with keynav and insensitive menu items
* Fix pixbuf_from_drawable() for LSB -> MSB
* Use GTK2_RC_FILES envvar instead of GTK_RC_FILES
* Focus check/radio buttons when activating with a mnemonic
* Cycle between multiple menubars with F10, not control-tab
* Misc bug fixes
* Build fixes for cross-compiling and portability
* Updated translations (bg,ca,da,fr,ja,ko,lv,no,pl,ru,sk,sv,vi)
* Tue Jul 30 2002 - jordi@suse.de
- added missing documentation for gtk2-devel
* Wed Jul 10 2002 - hhetter@suse.de
- fix requires of devel package, still pointed to GTK 1.x packages
* Mon Jun 17 2002 - jordi@suse.de
- Updated to version 2.0.5
* Fix a wrong assertion that broke gtk_file_selection_set_filename();
also another fix from testing this function with non-UTF-8 filenames.
* Fix incorrect property notification in GtkTextView.
Overview of Changes in GTK+ 2.0.4
* Fix a number of types which were registered with the
type system with the wrong names
* Support missing data types in GtkList/TreeStore
* Misc GtkTreeView bug fixes
* Drag and drop fixes, including a stuck grab.
* Calculate screen size on win32 from the "logical DPI"
* Misc Win32 bug fixes.
* Fix theme changes for GtkMenu
* Fix gdk_pixbuf_from_drawable() for big endian.
* Fix encoding handling for gtk_file_selection_set_filename()
* Fix crash with DND, Qt and Metacity
* Fixes for DirectColor visuals
* Memory leak and UMR fixes
* Misc bug fixes
* Updated translations
* Thu Jun 13 2002 - ro@suse.de
- use libpng-devel-packages in nededforbuild
* Mon Jun 10 2002 - meissner@suse.de
- Need to use -mminimal-toc for ppc64.
* Tue Jun 04 2002 - ro@suse.de
- re-add libdir fixes
* Tue Jun 04 2002 - hhetter@suse.de
- updated to stable version 2.0.3:
* GtkTreeView fixes
* Improve GdkRGB support for low color depths
* Tweak F10 behavior to focus GtkMenuBar
* Include internal children when focusing
* Allow use of a pixmap as the drawable in gdk_pixmap_new().
* GdkPixbuf fixes
* GtkMenu fixes.
* Misc input-method related fixes
* Fix stuck grab during DND.
* Remove in-bevel from scrolled-offscreen menus.
* Various plug/socket fixes
* Handle Xlib internal connections
* Many miscellaneous bug fixes.
* Tue Apr 09 2002 - hhetter@suse.de
- update to stable version 2.0.2
* Tue Apr 09 2002 - ro@suse.de
- build with "atk-1.0" (was "atk")
* Fri Feb 01 2002 - hhetter@suse.de
- updated to 1.1.13 [gnome desktop alpha2]
- build with libpng-devel
* Fri Jan 25 2002 - hhetter@suse.de
- rename SuSEconfig.gtk to SuSEconfig.gtk2
* Thu Jan 17 2002 - hhetter@suse.de
- new SuSEconfig.gtk script ensures that all input-method modules
are registered
* Fri Jan 11 2002 - hhetter@suse.de
- use version tag in patch filename
- updated to version 1.3.12:
* Fix problems with PNG saving
* Cleanups of deprecated usages
* Frame buffer port fixes
* GtkTextView bug fixes
* Menu behavior improvements
* Make focus line width configurable, focus color work on
dark themes.
* Add state argument to gtk_paint_focus()
* Added incremental revalidation to tree view, for better apparent speed
* Remove useless gtk_tree_view_column_cell_event()
* Display XIM status in a separate window
* Add menu of Unicode control characters to GtkEntry, GtkTextView
* Pass key releases along to input methods [Owen]
- specfile cleanup
* Thu Jan 10 2002 - hhetter@suse.de
- no longer require glib (1.x)
* Thu Jan 10 2002 - hhetter@suse.de
- include gdk-pixbuf's tools
- build with freetype2 support
* Tue Jan 08 2002 - hhetter@suse.de
- include links for default library names
* Wed Dec 12 2001 - hhetter@suse.de
- initial SuSE release for GNOME 2.0 platform
- added LIBRARY_PATH for broken libtool
- build with automake 1.5

175
gtk64.patch Normal file
View File

@ -0,0 +1,175 @@
--- gtk+-2.10.6/demos/Makefile.am
+++ gtk+-2.10.6/demos/Makefile.am
@@ -38,8 +38,8 @@
pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
pixbuf_csource_deps=
else
-pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
-pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders
+pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf64.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
+pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf64.loaders
endif
test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png
--- gtk+-2.10.6/gdk-pixbuf/Makefile.am
+++ gtk+-2.10.6/gdk-pixbuf/Makefile.am
@@ -359,7 +359,7 @@
gdk-pixbuf-enum-types.c \
gdk-pixbuf-marshal.h \
gdk-pixbuf-marshal.c \
- gdk-pixbuf.loaders
+ gdk-pixbuf64.loaders
#
# gdk-pixbuf-enum-types.h
@@ -467,10 +467,10 @@
install-data-hook: install-ms-lib install-def-file
@if $(RUN_QUERY_LOADER_TEST) ; then \
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
- $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
+ $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf64.loaders ; \
else \
echo "***" ; \
- echo "*** Warning: gdk-pixbuf.loaders not built" ; \
+ echo "*** Warning: gdk-pixbuf64.loaders not built" ; \
echo "***" ; \
echo "*** Generate this file manually on host" ; \
echo "*** system using gdk-pixbuf-query-loaders" ; \
@@ -478,25 +478,25 @@
fi
uninstall-local: uninstall-ms-lib uninstall-def-file
- rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders
+ rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf64.loaders
if CROSS_COMPILING
else
-all-local: gdk-pixbuf.loaders
+all-local: gdk-pixbuf64.loaders
endif
if BUILD_DYNAMIC_MODULES
-gdk-pixbuf.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders$(EXEEXT)
+gdk-pixbuf64.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders$(EXEEXT)
LOADERS=`echo libpixbufloader-*.la` ; \
if test "x$$LOADERS" != 'xlibpixbufloader-*.la' ; then \
echo "Writing a gdk-pixbuf.loader file to use when running examples before installing gdk-pixbuf."; \
- $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders $$LOADERS > ./gdk-pixbuf.loaders ;\
+ $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders $$LOADERS > ./gdk-pixbuf64.loaders ;\
else \
echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
- touch gdk-pixbuf.loaders; \
+ touch gdk-pixbuf64.loaders; \
fi
else
-gdk-pixbuf.loaders:
+gdk-pixbuf64.loaders:
echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
- touch gdk-pixbuf.loaders;
+ touch gdk-pixbuf64.loaders;
endif
--- gtk+-2.10.6/gdk-pixbuf/gdk-pixbuf-io.c
+++ gtk+-2.10.6/gdk-pixbuf/gdk-pixbuf-io.c
@@ -258,7 +258,7 @@
{
/* This is an entry put there by gdk-pixbuf-query-loaders on the
* 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-pixbuf64.loaders file
* distributed in such a package contains paths from the package
* builder's machine. Replace the build-time prefix with the
* installation prefix on this machine.
@@ -277,7 +277,7 @@
gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
if (!result)
- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf64.loaders", NULL);
return result;
}
--- gtk+-2.10.6/gtk/Makefile.am
+++ gtk+-2.10.6/gtk/Makefile.am
@@ -842,7 +842,7 @@
DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib)
-TEST_DEPS = $(DEPS) gtk.immodules
+TEST_DEPS = $(DEPS) gtk64.immodules
LDADDS = \
$(gtktargetlib) \
@@ -1117,7 +1117,7 @@
gtkbuiltincache.h: @REBUILD@ stamp-icons
$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
- GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \
+ GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf64.loaders \
./gtk-update-icon-cache --force --ignore-theme-index \
--source builtin_icons stock-icons > gtkbuiltincache.h
--- gtk+-2.10.6/gtk/gtkmodules.c
+++ gtk+-2.10.6/gtk/gtkmodules.c
@@ -69,7 +69,7 @@
if (home_dir)
home_gtk_dir = g_build_filename (home_dir, ".gtk-2.0", NULL);
- module_path_env = g_getenv ("GTK_PATH");
+ module_path_env = g_getenv ("GTK_PATH64");
exe_prefix = g_getenv ("GTK_EXE_PREFIX");
if (exe_prefix)
--- gtk+-2.10.6/gtk/gtkrc.c
+++ gtk+-2.10.6/gtk/gtkrc.c
@@ -447,7 +447,7 @@
if (im_module_file)
result = g_strdup (im_module_file);
else
- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk64.immodules", NULL);
}
return result;
--- gtk+-2.10.6/modules/input/Makefile.am
+++ gtk+-2.10.6/modules/input/Makefile.am
@@ -102,11 +102,11 @@
@if $(RUN_QUERY_IMMODULES_TEST) ; then \
echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
- echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \
- $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
+ echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk64.immodules" ; \
+ $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk64.immodules ; \
else \
echo "***" ; \
- echo "*** Warning: gtk.immodules not built" ; \
+ echo "*** Warning: gtk64.immodules not built" ; \
echo "***" ; \
echo "*** Generate this file manually on host" ; \
echo "*** system using gtk-query-immodules-2.0" ; \
@@ -114,7 +114,7 @@
fi
uninstall-local:
- rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
+ rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk64.immodules
module_LTLIBRARIES = \
$(IM_XIM_MODULE) \
@@ -129,12 +129,12 @@
im-viqr.la \
$(IM_IME_MODULE)
-gtk.immodules: Makefile.am $(module_LTLIBRARIES)
- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
+gtk64.immodules: Makefile.am $(module_LTLIBRARIES)
+ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk64.immodules
-CLEANFILES = gtk.immodules
+CLEANFILES = gtk64.immodules
if CROSS_COMPILING
else
-all-local: gtk.immodules
+all-local: gtk64.immodules
endif

4
gtkrc Normal file
View File

@ -0,0 +1,4 @@
gtk-theme-name = "Gilouche"
gtk-icon-theme-name = "Tango"
gtk-fallback-icon-theme = "gnome"

56
gtktextview.c.diff Normal file
View File

@ -0,0 +1,56 @@
--- gtk/gtktextview.c
+++ gtk/gtktextview.c
@@ -5827,26 +5827,6 @@
"allocate_child",
G_CALLBACK (gtk_text_view_child_allocated),
text_view);
-
- if (get_buffer (text_view))
- gtk_text_layout_set_buffer (text_view->layout, get_buffer (text_view));
-
- if ((GTK_WIDGET_HAS_FOCUS (text_view) && text_view->cursor_visible))
- gtk_text_view_pend_cursor_blink (text_view);
- else
- gtk_text_layout_set_cursor_visible (text_view->layout, FALSE);
-
- ltr_context = gtk_widget_create_pango_context (GTK_WIDGET (text_view));
- pango_context_set_base_dir (ltr_context, PANGO_DIRECTION_LTR);
- rtl_context = gtk_widget_create_pango_context (GTK_WIDGET (text_view));
- pango_context_set_base_dir (rtl_context, PANGO_DIRECTION_RTL);
-
- gtk_text_layout_set_contexts (text_view->layout, ltr_context, rtl_context);
-
- g_object_unref (ltr_context);
- g_object_unref (rtl_context);
-
- gtk_text_view_check_keymap_direction (text_view);
style = gtk_text_attributes_new ();
@@ -5870,6 +5850,26 @@
gtk_text_attributes_unref (style);
+ if (get_buffer (text_view))
+ gtk_text_layout_set_buffer (text_view->layout, get_buffer (text_view));
+
+ if ((GTK_WIDGET_HAS_FOCUS (text_view) && text_view->cursor_visible))
+ gtk_text_view_pend_cursor_blink (text_view);
+ else
+ gtk_text_layout_set_cursor_visible (text_view->layout, FALSE);
+
+ ltr_context = gtk_widget_create_pango_context (GTK_WIDGET (text_view));
+ pango_context_set_base_dir (ltr_context, PANGO_DIRECTION_LTR);
+ rtl_context = gtk_widget_create_pango_context (GTK_WIDGET (text_view));
+ pango_context_set_base_dir (rtl_context, PANGO_DIRECTION_RTL);
+
+ gtk_text_layout_set_contexts (text_view->layout, ltr_context, rtl_context);
+
+ g_object_unref (ltr_context);
+ g_object_unref (rtl_context);
+
+ gtk_text_view_check_keymap_direction (text_view);
+
/* Set layout for all anchored children */
tmp_list = text_view->children;

0
ready Normal file
View File