From 08c04c8428384b77056560d3f81633176da1c4c7 Mon Sep 17 00:00:00 2001 From: marcus Date: Wed, 7 Sep 2005 05:44:23 +0000 Subject: Fix a symbol conflict between metal, redmond, and smooth and the clearlooks theme engine. This can result in a crash on some systems when viewing the thumbnails for these themes together. Reported by: Caelian on #freebsd-gnome git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4764 df743ca5-7f9a-e211-a948-0013205c9059 --- x11-themes/gtk-engines2/Makefile | 4 +- .../files/patch-clearlooks-symbol-conflict | 54 ++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 x11-themes/gtk-engines2/files/patch-clearlooks-symbol-conflict diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile index fa194f6ae..c2991d7e3 100644 --- a/x11-themes/gtk-engines2/Makefile +++ b/x11-themes/gtk-engines2/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.8 2005/08/23 20:13:28 ahze Exp $ +# $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.9 2005/08/26 04:03:56 marcus Exp $ # PORTNAME= gtk-engines2 PORTVERSION= 2.6.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-themes MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6 diff --git a/x11-themes/gtk-engines2/files/patch-clearlooks-symbol-conflict b/x11-themes/gtk-engines2/files/patch-clearlooks-symbol-conflict new file mode 100644 index 000000000..0d742c2ec --- /dev/null +++ b/x11-themes/gtk-engines2/files/patch-clearlooks-symbol-conflict @@ -0,0 +1,54 @@ +--- engines/clearlooks/src/clearlooks_style.c.orig Wed Sep 7 01:41:42 2005 ++++ engines/clearlooks/src/clearlooks_style.c Wed Sep 7 01:41:49 2005 +@@ -178,7 +178,7 @@ clearlooks_draw_arrow (GtkStyle *st + + sanitize_size (window, &width, &height); + +- if (is_combo_box (widget)) ++ if (is_combo_box_cl (widget)) + { + width = 7; + height = 5; +--- engines/clearlooks/src/support.c.orig Wed Sep 7 01:40:25 2005 ++++ engines/clearlooks/src/support.c Wed Sep 7 01:40:59 2005 +@@ -959,7 +959,7 @@ GdkColor *get_parent_bgcolor (GtkWidget + } + + GtkWidget * +-find_combo_box_widget (GtkWidget * widget) ++find_combo_box_widget_cl (GtkWidget * widget) + { + GtkWidget *result = NULL; + +@@ -968,14 +968,14 @@ find_combo_box_widget (GtkWidget * widge + if (GTK_IS_COMBO_BOX (widget)) + result = widget; + else +- result = find_combo_box_widget(widget->parent); ++ result = find_combo_box_widget_cl(widget->parent); + } + + return result; + } + + gboolean +-is_combo_box (GtkWidget * widget) ++is_combo_box_cl (GtkWidget * widget) + { +- return (find_combo_box_widget(widget) != NULL); ++ return (find_combo_box_widget_cl(widget) != NULL); + } +--- engines/clearlooks/src/support.h.orig Wed Sep 7 01:41:03 2005 ++++ engines/clearlooks/src/support.h Wed Sep 7 01:41:17 2005 +@@ -102,9 +102,9 @@ GtkWidget *get_parent_window (GtkWidget + + GdkColor *get_parent_bgcolor (GtkWidget *widget); + +-gboolean is_combo_box (GtkWidget * widget); ++gboolean is_combo_box_cl (GtkWidget * widget); + +-GtkWidget *find_combo_box_widget (GtkWidget * widget); ++GtkWidget *find_combo_box_widget_cl (GtkWidget * widget); + + void gtk_clist_get_header_index (GtkCList *clist, GtkWidget *button, + gint *column_index, gint *columns); -- cgit v1.2.3