- Update to 0.4

5 files changed, 108 insertions, 43 deletions

diff --git a/x11-themes/clearlooks/Makefile b/x11-themes/clearlooks/Makefile
index df56467d8bf4..6058b0c8955f 100644
--- a/x11-themes/clearlooks/Makefile
+++ b/x11-themes/clearlooks/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clearlooks
-PORTVERSION=	0.3
+PORTVERSION=	0.4
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	clearlooks
diff --git a/x11-themes/clearlooks/distinfo b/x11-themes/clearlooks/distinfo
index 734772940c63..154091a4d563 100644
--- a/x11-themes/clearlooks/distinfo
+++ b/x11-themes/clearlooks/distinfo
@@ -1,2 +1,2 @@
-MD5 (clearlooks-0.3.tar.bz2) = 516402d838b965130bd1cb439c294313
-SIZE (clearlooks-0.3.tar.bz2) = 250513
+MD5 (clearlooks-0.4.tar.bz2) = d714197da50c4eb3c2278f3c786fa996
+SIZE (clearlooks-0.4.tar.bz2) = 384636
diff --git a/x11-themes/clearlooks/files/patch-src_clearlooks_draw.c b/x11-themes/clearlooks/files/patch-src_clearlooks_draw.c
index 86ad6ee38dff..3ad9feffa9cd 100644
--- a/x11-themes/clearlooks/files/patch-src_clearlooks_draw.c
+++ b/x11-themes/clearlooks/files/patch-src_clearlooks_draw.c
@@ -1,32 +1,11 @@
---- src/clearlooks_draw.c.orig	Thu Feb 24 09:15:18 2005
-+++ src/clearlooks_draw.c	Sun Feb 27 01:51:30 2005
-@@ -57,16 +57,16 @@
-                 int x, int y, int width, int height,
-                 GdkColor *left_color, GdkColor *right_color)
- {
--	if ( left_color == NULL || right_color == NULL )
--	{
--		gdk_draw_rectangle (drawable, gc, TRUE, x, y, width, height);
--		return;
--	}
- 
- 	int i;
- 	GdkColor col;
- 	int dr, dg, db;
- 	GdkGCValues old_values;
-+	if ( left_color == NULL || right_color == NULL )
-+	{
-+		gdk_draw_rectangle (drawable, gc, TRUE, x, y, width, height);
-+		return;
-+	}
- 
- 	gdk_gc_get_values (gc, &old_values);
- 	
-@@ -179,10 +179,10 @@
+--- src/clearlooks_draw.c.orig	Wed Mar  2 17:41:35 2005
++++ src/clearlooks_draw.c	Thu Mar  3 20:20:39 2005
+@@ -67,10 +67,11 @@
  void cl_draw_borders (GdkWindow *window, GtkWidget *widget, GtkStyle *style,
                        int x, int y, int width, int height, CLRectangle *r)
  {
-+	int x1, y1, x2, y2, i;
++        int x1, y1, x2, y2, i;
++
  	if (r->bordergc == NULL)
  		return;
  
@@ -34,23 +13,61 @@
  	for ( i=0; i<4; i++) // draw all four borders + corners
  	{
  		cl_get_coords (i, x, y, width, height, r, &x1, &y1, &x2, &y2);
-@@ -261,9 +261,6 @@
+@@ -149,8 +150,6 @@
                       int x, int y, int width, int height,
                       CLRectangle *r, CLCornerSide corner)
  {
 -	if (r->corners[corner] == CL_CORNER_NONE)
 -		return;
--	
+ 	
  	GdkColor    *color;
  	GdkColor     aacolor; // anti-aliasing color
- 	GdkGCValues  values;
-@@ -271,6 +268,9 @@
- 	
+@@ -160,6 +159,9 @@
  	int x1;
  	int y1;
-+
+ 
 +        if (r->corners[corner] == CL_CORNER_NONE)
 +                return;
- 
++
  	color = cl_get_gradient_corner_color (r, corner);
  	gdk_gc_get_values (r->bordergc, &values);
+ 	
+@@ -477,7 +479,8 @@
+ 	int width = height;
+ 	int line = 0;
+ 	int center = width/2;
+-	int xdir = 1;
++	int xdir = 1, trans;
++        double shift;
+ 
+ 	int stripe_width = height/2;
+ 	int topright = height + stripe_width;	
+@@ -490,6 +493,7 @@
+ 	                                 width,
+ 	                                 height, -1);
+ 
++        GdkPoint points[4];
+ 	GdkColor tmp_color;
+ 	shade (&clearlooks_style->spot2, &tmp_color, 0.90);
+ 	
+@@ -510,7 +514,6 @@
+ 	if (get_direction (widget) == GTK_TEXT_DIR_RTL)
+ 		offset = -offset;
+ 	
+-	GdkPoint points[4];
+ 	if (is_horizontal)
+ 	{
+ 		points[0] = (GdkPoint){xdir*(topright - stripe_width - topright_div_2), 0};  // topleft
+@@ -527,10 +530,10 @@
+ 	}
+ 						 
+ 	
+-	double shift = (stripe_width*2)/(double)10;
++        shift = (stripe_width*2)/(double)10;
+ 	cl_progressbar_points_transform (points, 4, (offset*shift), is_horizontal);
+ 		
+-	int trans = (width/2)-1-(stripe_width*2);
++        trans = (width/2)-1-(stripe_width*2);
+ 	cl_progressbar_points_transform (points, 4, trans, is_horizontal);
+ 	gdk_draw_polygon (tmp, clearlooks_style->spot2_gc, TRUE, points, 4);
+ 	cl_progressbar_points_transform (points, 4, -trans, is_horizontal);
diff --git a/x11-themes/clearlooks/files/patch-src_support.c b/x11-themes/clearlooks/files/patch-src_support.c
index f56141ff8e73..1081bf805f6f 100644
--- a/x11-themes/clearlooks/files/patch-src_support.c
+++ b/x11-themes/clearlooks/files/patch-src_support.c
@@ -1,7 +1,7 @@
---- src/support.c.orig	Sat Feb 19 06:50:22 2005
-+++ src/support.c	Sun Feb 27 01:44:57 2005
-@@ -503,8 +503,9 @@
- static void gtk_treeview_get_header_index (GtkWidget *tv, GtkWidget *header,
+--- src/support.c.orig	Wed Mar  2 13:09:43 2005
++++ src/support.c	Thu Mar  3 20:05:51 2005
+@@ -507,8 +507,9 @@
+ void gtk_treeview_get_header_index (GtkWidget *tv, GtkWidget *header,
                                             gint *column_index, gint *columns)
  {
 +	GList *list;
@@ -11,3 +11,25 @@
  
  	do
  	{
+@@ -627,16 +628,17 @@
+                 int x, int y, int width, int height,
+                 GdkColor *left_color, GdkColor *right_color)
+ {
++	int i;
++        GdkColor col;
++        int dr, dg, db;
++        GdkGCValues old_values;
++
+ 	if ( left_color == NULL || right_color == NULL )
+ 	{
+ 		gdk_draw_rectangle (drawable, gc, TRUE, x, y, width, height);
+ 		return;
+ 	}
+ 
+-	int i;
+-	GdkColor col;
+-	int dr, dg, db;
+-	GdkGCValues old_values;
+ 
+ 	gdk_gc_get_values (gc, &old_values);
+ 	
diff --git a/x11-themes/clearlooks/pkg-plist b/x11-themes/clearlooks/pkg-plist
index 9bd1ec84d3c7..d3107d0777c6 100644
--- a/x11-themes/clearlooks/pkg-plist
+++ b/x11-themes/clearlooks/pkg-plist
@@ -1,14 +1,40 @@
 lib/gtk-2.0/2.4.0/engines/libclearlooks.so
+share/gnome/themes/Clearlooks/metacity-1/metacity-theme-1.xml
 share/themes/Clearlooks-DeepSky/gtk-2.0/gtkrc
+share/themes/Clearlooks-DeepSky/gtk-2.0/iconrc
+share/themes/Clearlooks-DeepSky/gtk-2.0/stock_apply.png
+share/themes/Clearlooks-DeepSky/gtk-2.0/stock_bottom.png
+share/themes/Clearlooks-DeepSky/gtk-2.0/stock_cancel.png
+share/themes/Clearlooks-DeepSky/gtk-2.0/stock_down.png
+share/themes/Clearlooks-DeepSky/gtk-2.0/stock_first.png
+share/themes/Clearlooks-DeepSky/gtk-2.0/stock_last.png
+share/themes/Clearlooks-DeepSky/gtk-2.0/stock_left.png
+share/themes/Clearlooks-DeepSky/gtk-2.0/stock_ok.png
+share/themes/Clearlooks-DeepSky/gtk-2.0/stock_refresh.png
+share/themes/Clearlooks-DeepSky/gtk-2.0/stock_right.png
+share/themes/Clearlooks-DeepSky/gtk-2.0/stock_top.png
+share/themes/Clearlooks-DeepSky/gtk-2.0/stock_up.png
 share/themes/Clearlooks-Olive/gtk-2.0/gtkrc
 share/themes/Clearlooks/gtk-2.0/gtkrc
+share/themes/Clearlooks/gtk-2.0/iconrc
+share/themes/Clearlooks/gtk-2.0/stock_apply.png
+share/themes/Clearlooks/gtk-2.0/stock_bottom.png
+share/themes/Clearlooks/gtk-2.0/stock_cancel.png
+share/themes/Clearlooks/gtk-2.0/stock_down.png
+share/themes/Clearlooks/gtk-2.0/stock_first.png
+share/themes/Clearlooks/gtk-2.0/stock_last.png
+share/themes/Clearlooks/gtk-2.0/stock_left.png
+share/themes/Clearlooks/gtk-2.0/stock_ok.png
+share/themes/Clearlooks/gtk-2.0/stock_refresh.png
+share/themes/Clearlooks/gtk-2.0/stock_right.png
+share/themes/Clearlooks/gtk-2.0/stock_top.png
+share/themes/Clearlooks/gtk-2.0/stock_up.png
 share/themes/Clearlooks/index.theme
-share/gnome/themes/Clearlooks/metacity-1/metacity-theme-1.xml
-@dirrm share/gnome/themes/Clearlooks/metacity-1
-@dirrm share/gnome/themes/Clearlooks
 @dirrm share/themes/Clearlooks/gtk-2.0
 @dirrm share/themes/Clearlooks-Olive/gtk-2.0
 @dirrm share/themes/Clearlooks-Olive
 @dirrm share/themes/Clearlooks-DeepSky/gtk-2.0
 @dirrm share/themes/Clearlooks-DeepSky
 @dirrm share/themes/Clearlooks
+@dirrm share/gnome/themes/Clearlooks/metacity-1
+@dirrm share/gnome/themes/Clearlooks