diff options
| author |   Jason Huebel <jhuebel@gentoo.org> | 2004-03-12 07:57:16 +0000 |
|---|---|---|
| committer | Jason Huebel <jhuebel@gentoo.org> | 2004-03-12 07:57:16 +0000 |
| commit | e7ee7bfd2685de04a683b2fc40833414a6c028e7 (patch) | |
| tree | 3c357b1d473772a8a1d90ff709ad21ace0a39a0d /gnome-base/control-center | |
| parent | Add sparc patchball to 2.6.4. (Manifest recommit) (diff) | |
| download | gentoo-2-e7ee7bfd2685de04a683b2fc40833414a6c028e7.tar.gz gentoo-2-e7ee7bfd2685de04a683b2fc40833414a6c028e7.tar.bz2 gentoo-2-e7ee7bfd2685de04a683b2fc40833414a6c028e7.zip | |
added patch for gnome-font-properties segfault issues (#38088)
Diffstat (limited to 'gnome-base/control-center')
| -rw-r--r-- | gnome-base/control-center/control-center-2.4.0.ebuild | 3 | ||||
| -rw-r--r-- | gnome-base/control-center/files/control-center-2.4.0-64bit-fixes.patch | 36 |
2 files changed, 38 insertions, 1 deletions
diff --git a/gnome-base/control-center/control-center-2.4.0.ebuild b/gnome-base/control-center/control-center-2.4.0.ebuild index 0d9153c0168f..b2e870346ee7 100644 --- a/gnome-base/control-center/control-center-2.4.0.ebuild +++ b/gnome-base/control-center/control-center-2.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.4.0.ebuild,v 1.8 2003/12/13 00:23:15 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.4.0.ebuild,v 1.9 2004/03/12 07:57:16 jhuebel Exp $ inherit gnome2 eutils @@ -44,6 +44,7 @@ src_unpack() { # See http://gcc.gnu.org/cgi-bin/gnatsweb.pl problem #9700 for # what this is about. use alpha && epatch ${FILESDIR}/control-center-2.2.0.1-alpha_hack.patch + use amd64 && epatch ${FILESDIR}/control-center-2.4.0-64bit-fixes.patch # temporary fix for icon installation adapted by <link@sub_pop.net> (#16928) epatch ${FILESDIR}/${PN}-2.2-icons_install.patch diff --git a/gnome-base/control-center/files/control-center-2.4.0-64bit-fixes.patch b/gnome-base/control-center/files/control-center-2.4.0-64bit-fixes.patch new file mode 100644 index 000000000000..020f56cab04b --- /dev/null +++ b/gnome-base/control-center/files/control-center-2.4.0-64bit-fixes.patch @@ -0,0 +1,36 @@ +diff -ur control-center-2.4.0.orig/capplets/font/main.c control-center-2.4.0/capplets/font/main.c +--- control-center-2.4.0.orig/capplets/font/main.c 2004-01-12 20:03:32.860516011 +0100 ++++ control-center-2.4.0/capplets/font/main.c 2004-01-12 20:06:09.399260795 +0100 +@@ -85,7 +85,7 @@ + + static void + sample_expose (GtkWidget *darea, +- GdkEventExpose expose) ++ GdkEventExpose *expose) + { + GdkPixbuf *pixbuf = g_object_get_data (G_OBJECT (darea), "sample-pixbuf"); + int width = gdk_pixbuf_get_width (pixbuf); +diff -ur control-center-2.4.0.orig/gnome-settings-daemon/gnome-settings-gtk1theme.c control-center-2.4.0/gnome-settings-daemon/gnome-settings-gtk1theme.c +--- control-center-2.4.0.orig/gnome-settings-daemon/gnome-settings-gtk1theme.c 2004-01-12 20:03:17.865618679 +0100 ++++ control-center-2.4.0/gnome-settings-daemon/gnome-settings-gtk1theme.c 2004-01-12 20:04:36.964003364 +0100 +@@ -151,7 +151,7 @@ + gchar *theme_filename; + gchar *rc_filename; + gchar *current_contents; +- gint current_length; ++ gsize current_length; + gchar *new_contents; + GError *err = NULL; + +diff -ur control-center-2.4.0.orig/vfs-methods/themus/theme-method.c control-center-2.4.0/vfs-methods/themus/theme-method.c +--- control-center-2.4.0.orig/vfs-methods/themus/theme-method.c 2004-01-12 20:03:19.535607241 +0100 ++++ control-center-2.4.0/vfs-methods/themus/theme-method.c 2004-01-12 20:06:54.772898040 +0100 +@@ -21,7 +21,7 @@ + #include <errno.h> + #include <sys/stat.h> + #include <sys/types.h> +- ++#include <libintl.h> + #include <libgnomevfs/gnome-vfs.h> + #include <libgnomevfs/gnome-vfs-cancellable-ops.h> + #include <libgnomevfs/gnome-vfs-module.h> |