The real fix is not to install the Clearlooks gtkrc in gtk-engines, but

to have gnome-themes do it (like Glider).  A bug has already been filed on this.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4494 df743ca5-7f9a-e211-a948-0013205c9059

10 files changed, 218 insertions, 13 deletions

diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 784cd8e9c..0ca24ed0b 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.69 2005/08/13 17:00:09 marcus Exp $
+#   $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.70 2005/08/14 03:52:26 marcus Exp $
 #
 
 PORTNAME=	gnome-themes
 PORTVERSION=	2.11.91
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.11
diff --git a/x11-themes/gnome-themes/files/patch-gtk-themes_Makefile.in b/x11-themes/gnome-themes/files/patch-gtk-themes_Makefile.in
deleted file mode 100644
index 24187dce6..000000000
--- a/x11-themes/gnome-themes/files/patch-gtk-themes_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk-themes/Makefile.in.orig	Sat Aug 13 23:47:47 2005
-+++ gtk-themes/Makefile.in	Sat Aug 13 23:47:57 2005
-@@ -187,7 +187,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = Clearlooks Glider Grand-Canyon Simple Smokey-Blue
-+SUBDIRS = Glider Grand-Canyon Simple Smokey-Blue
- subdir = gtk-themes
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist
index 0b5fbda41..cf8c1b29e 100644
--- a/x11-themes/gnome-themes/pkg-plist
+++ b/x11-themes/gnome-themes/pkg-plist
@@ -1279,6 +1279,7 @@ share/locale/wa/LC_MESSAGES/gnome-themes.mo
 share/locale/xh/LC_MESSAGES/gnome-themes.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-themes.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-themes.mo
+share/themes/Clearlooks/gtk-2.0/gtkrc
 share/themes/Clearlooks/index.theme
 share/themes/Crux/index.theme
 share/themes/Glider/gtk-2.0/gtkrc
@@ -1932,6 +1933,8 @@ share/themes/Traditional/index.theme
 @dirrm share/themes/Glider/gtk-2.0
 @dirrm share/themes/Glider
 @dirrm share/themes/Crux
+@dirrm share/themes/Clearlooks/gtk-2.0
+@dirrm share/themes/Clearlooks
 @unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/ug 2> /dev/null || true
 @dirrm share/icons/Smokey-Red/96x96/filesystems
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
new file mode 100644
index 000000000..84fd54a2f
--- /dev/null
+++ b/x11-themes/gtk-engines2/Makefile
@@ -0,0 +1,48 @@
+# New ports collection makefile for:	gtk-engines2
+# Date Created:				21 May 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom$
+#
+
+PORTNAME=	gtk-engines2
+PORTVERSION=	2.6.4
+PORTREVISION=	1
+CATEGORIES=	x11-themes
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.6
+DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Theme engine for the gtk+-2.0 toolkit
+
+CONFLICTS=	gtk-smooth-engine-[0-9]* clearlooks-[0-9]*
+
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
+USE_LIBTOOL_VER=15
+USE_GNOME=	gnomehack gtk20
+PLIST_SUB=	GTK_VERSION="2.4.0"
+
+.if defined(WITH_ANIMATION)
+CFLAGS+=	-DHAVE_ANIMATION=1
+.endif
+
+pre-everything::
+.if !defined(WITH_ANIMATION)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} " You can enable experimental animated progressbars"
+	@${ECHO_MSG} " with the clearlooks engine by defining"
+	@${ECHO_MSG} " WITH_ANIMATION"
+	@${ECHO_MSG} ""
+.endif
+
+# Disable the gtk1 theme.
+post-patch:
+	@${REINPLACE_CMD} -e 's|gtk gtk-2.0|gtk-2.0|g' \
+		${WRKSRC}/themes/Redmond/Makefile.in
+
+.include <bsd.port.mk>
diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo
new file mode 100644
index 000000000..de0989031
--- /dev/null
+++ b/x11-themes/gtk-engines2/distinfo
@@ -0,0 +1,2 @@
+MD5 (gnome2/gtk-engines-2.6.4.tar.bz2) = 3389a92b62b9c8b916fbb52c4529f072
+SIZE (gnome2/gtk-engines-2.6.4.tar.bz2) = 477425
diff --git a/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-gradient.c b/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-gradient.c
new file mode 100644
index 000000000..ec5a85340
--- /dev/null
+++ b/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-gradient.c
@@ -0,0 +1,31 @@
+--- engines/crux/src/crux-gradient.c.orig	Thu Oct 16 20:57:05 2003
++++ engines/crux/src/crux-gradient.c	Thu Oct 16 21:01:18 2003
+@@ -207,7 +207,7 @@
+ 			const eazel_engine_gradient *gradient)
+ {
+     int rgb_size = clip_rect->height;
+-    guchar *rgb = alloca (rgb_size * 3), *ptr;
++    guchar *rgb = g_malloc (rgb_size * 3), *ptr;
+ 
+     eazel_engine_fill_gradient_rgb_buffer (gradient, full_rect->height, rgb,
+ 					   clip_rect->y - full_rect->y,
+@@ -239,7 +239,7 @@
+     }
+     else
+     {
+-	guchar *xrgb = alloca (clip_rect->width * clip_rect->height * 3);
++	guchar *xrgb = g_malloc (clip_rect->width * clip_rect->height * 3);
+ 	int x, y;
+ 	guchar *ptr_in = rgb, *ptr_out = xrgb;
+ 	for (y = 0; y < clip_rect->height; y++)
+@@ -257,7 +257,10 @@
+ 	gdk_draw_rgb_image (drawable, gc, clip_rect->x, clip_rect->y,
+ 			    clip_rect->width, clip_rect->height,
+ 			    dither_mode, xrgb, clip_rect->width * 3);
++	g_free (xrgb);
+     }
++
++    g_free (rgb);
+ }
+ 
+ static void
diff --git a/x11-themes/gtk-engines2/files/patch-engines_industrial_src_industrial_style.c b/x11-themes/gtk-engines2/files/patch-engines_industrial_src_industrial_style.c
new file mode 100644
index 000000000..f545a6a65
--- /dev/null
+++ b/x11-themes/gtk-engines2/files/patch-engines_industrial_src_industrial_style.c
@@ -0,0 +1,10 @@
+--- engines/industrial/src/industrial_style.c.orig	Tue Mar 16 16:55:11 2004
++++ engines/industrial/src/industrial_style.c	Tue Mar 16 16:58:23 2004
+@@ -1801,6 +1801,7 @@
+ 	     gint             width,
+ 	     gint             height)
+ {
++	g_return_if_fail (widget != NULL);
+ #if DEBUG
+   printf ("draw_shadow: %p %p %s %i %i %i %i\n", widget, window, detail, x, y,
+ 	  width, height);
diff --git a/x11-themes/gtk-engines2/files/patch-themes_Clearlooks_Makefile.in b/x11-themes/gtk-engines2/files/patch-themes_Clearlooks_Makefile.in
new file mode 100644
index 000000000..1dde7e6ae
--- /dev/null
+++ b/x11-themes/gtk-engines2/files/patch-themes_Clearlooks_Makefile.in
@@ -0,0 +1,11 @@
+--- themes/Clearlooks/Makefile.in.orig	Sat Aug 13 23:57:37 2005
++++ themes/Clearlooks/Makefile.in	Sat Aug 13 23:57:47 2005
+@@ -168,7 +168,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = gtk-2.0
++SUBDIRS = 
+ all: all-recursive
+ 
+ .SUFFIXES:
diff --git a/x11-themes/gtk-engines2/pkg-descr b/x11-themes/gtk-engines2/pkg-descr
new file mode 100644
index 000000000..e787f789b
--- /dev/null
+++ b/x11-themes/gtk-engines2/pkg-descr
@@ -0,0 +1,3 @@
+Theme engine for the gtk+-2.0 toolkit.
+
+WWW: http://www.gtk.org/
diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist
new file mode 100644
index 000000000..7a4cddb24
--- /dev/null
+++ b/x11-themes/gtk-engines2/pkg-plist
@@ -0,0 +1,108 @@
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libclearlooks.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libcrux-engine.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libhcengine.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libindustrial.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/liblighthouseblue.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libmetal.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libmist.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libredmond95.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libsmooth.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libthinice.so
+libdata/pkgconfig/gtk-engines-2.pc
+share/themes/Crux/gtk-2.0/gtkrc
+share/themes/Crux/pixmaps/arrow_down-spinner.png
+share/themes/Crux/pixmaps/arrow_down.png
+share/themes/Crux/pixmaps/arrow_left.png
+share/themes/Crux/pixmaps/arrow_right.png
+share/themes/Crux/pixmaps/arrow_up-spinner.png
+share/themes/Crux/pixmaps/arrow_up.png
+share/themes/Crux/pixmaps/check-active-default-focus.png
+share/themes/Crux/pixmaps/check-active-default.png
+share/themes/Crux/pixmaps/check-active-hilight-focus.png
+share/themes/Crux/pixmaps/check-active-hilight.png
+share/themes/Crux/pixmaps/check-active-insensitive.png
+share/themes/Crux/pixmaps/check-active-pressed-focus.png
+share/themes/Crux/pixmaps/check-active-pressed.png
+share/themes/Crux/pixmaps/check-default-focus.png
+share/themes/Crux/pixmaps/check-default.png
+share/themes/Crux/pixmaps/check-hilight-focus.png
+share/themes/Crux/pixmaps/check-hilight.png
+share/themes/Crux/pixmaps/check-insensitive.png
+share/themes/Crux/pixmaps/check-pressed-focus.png
+share/themes/Crux/pixmaps/check-pressed.png
+share/themes/Crux/pixmaps/progressbar-left.png
+share/themes/Crux/pixmaps/progressbar-right.png
+share/themes/Crux/pixmaps/progressbar.png
+share/themes/Crux/pixmaps/progressbar_trough.png
+share/themes/Crux/pixmaps/radio-active-default-focus.png
+share/themes/Crux/pixmaps/radio-active-default.png
+share/themes/Crux/pixmaps/radio-active-hilight-focus.png
+share/themes/Crux/pixmaps/radio-active-hilight.png
+share/themes/Crux/pixmaps/radio-active-insensitive.png
+share/themes/Crux/pixmaps/radio-active-pressed-focus.png
+share/themes/Crux/pixmaps/radio-active-pressed.png
+share/themes/Crux/pixmaps/radio-default-focus.png
+share/themes/Crux/pixmaps/radio-default.png
+share/themes/Crux/pixmaps/radio-hilight-focus.png
+share/themes/Crux/pixmaps/radio-hilight.png
+share/themes/Crux/pixmaps/radio-insensitive.png
+share/themes/Crux/pixmaps/radio-pressed-focus.png
+share/themes/Crux/pixmaps/radio-pressed.png
+share/themes/Crux/pixmaps/scroller-arrow-down-hilight.png
+share/themes/Crux/pixmaps/scroller-arrow-down-pressed.png
+share/themes/Crux/pixmaps/scroller-arrow-down.png
+share/themes/Crux/pixmaps/scroller-arrow-left-hilight.png
+share/themes/Crux/pixmaps/scroller-arrow-left-pressed.png
+share/themes/Crux/pixmaps/scroller-arrow-left.png
+share/themes/Crux/pixmaps/scroller-arrow-right-hilight.png
+share/themes/Crux/pixmaps/scroller-arrow-right-pressed.png
+share/themes/Crux/pixmaps/scroller-arrow-right.png
+share/themes/Crux/pixmaps/scroller-arrow-up-hilight.png
+share/themes/Crux/pixmaps/scroller-arrow-up-pressed.png
+share/themes/Crux/pixmaps/scroller-arrow-up.png
+share/themes/Crux/pixmaps/scroller-h-hilight.png
+share/themes/Crux/pixmaps/scroller-h-thumb-hilight.png
+share/themes/Crux/pixmaps/scroller-h-thumb.png
+share/themes/Crux/pixmaps/scroller-h-trough.png
+share/themes/Crux/pixmaps/scroller-h.png
+share/themes/Crux/pixmaps/scroller-v-hilight.png
+share/themes/Crux/pixmaps/scroller-v-thumb-hilight.png
+share/themes/Crux/pixmaps/scroller-v-thumb.png
+share/themes/Crux/pixmaps/scroller-v-trough.png
+share/themes/Crux/pixmaps/scroller-v.png
+share/themes/Crux/pixmaps/slider_h_thumb.png
+share/themes/Crux/pixmaps/slider_h_trough.png
+share/themes/Crux/pixmaps/slider_h_trough_focus.png
+share/themes/Crux/pixmaps/slider_v_thumb.png
+share/themes/Crux/pixmaps/slider_v_trough.png
+share/themes/Crux/pixmaps/slider_v_trough_focus.png
+share/themes/Crux/pixmaps/tab_left-unsel.png
+share/themes/Crux/pixmaps/tab_left.png
+share/themes/Crux/pixmaps/tab_right.png
+share/themes/Crux/pixmaps/tab_sel-bottom.png
+share/themes/Crux/pixmaps/tab_sel.png
+share/themes/Crux/pixmaps/tab_usel-bottom-left.png
+share/themes/Crux/pixmaps/tab_usel-bottom.png
+share/themes/Crux/pixmaps/tab_usel-left.png
+share/themes/Crux/pixmaps/tab_usel.png
+share/themes/Industrial/gtk-2.0/gtkrc
+share/themes/LighthouseBlue/gtk-2.0/gtkrc
+share/themes/Metal/gtk-2.0/gtkrc
+share/themes/Mist/gtk-2.0/gtkrc
+share/themes/Redmond/gtk-2.0/gtkrc
+share/themes/ThinIce/gtk-2.0/gtkrc
+@dirrm share/themes/ThinIce/gtk-2.0
+@dirrm share/themes/Redmond/gtk-2.0
+@dirrm share/themes/Mist/gtk-2.0
+@dirrm share/themes/Metal/gtk-2.0
+@dirrm share/themes/LighthouseBlue/gtk-2.0
+@dirrm share/themes/Industrial/gtk-2.0
+@dirrm share/themes/Crux/pixmaps
+@dirrm share/themes/Crux/gtk-2.0
+@unexec /bin/rmdir %D/share/themes/ThinIce 2>/dev/null || true
+@unexec /bin/rmdir %D/share/themes/Redmond 2>/dev/null || true
+@unexec /bin/rmdir %D/share/themes/Mist 2>/dev/null || true
+@unexec /bin/rmdir %D/share/themes/Metal 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/themes/LighthouseBlue 2>/dev/null || true
+@unexec /bin/rmdir %D/share/themes/Industrial 2>/dev/null || true
+@unexec /bin/rmdir %D/share/themes/Crux 2>/dev/null || true