From a8fb01efcc0c0548aca1128bb8ee5975ad3926ab Mon Sep 17 00:00:00 2001 From: ahze Date: Sun, 20 Mar 2005 21:53:07 +0000 Subject: - Update to 0.5 - Add new option, WITHOUT_METACITY, depeneds on x11-themes/clearlooks-metacity by default. (metacity theme was split out of clearlooks) - Remove all c89 patches =) --- x11-themes/clearlooks/Makefile | 20 ++++-- x11-themes/clearlooks/distinfo | 4 +- .../clearlooks/files/patch-src_clearlooks_draw.c | 73 ---------------------- .../clearlooks/files/patch-src_clearlooks_style.c | 53 ---------------- x11-themes/clearlooks/files/patch-src_support.c | 35 ----------- .../patch-themes_Clearlooks_metacity-1_Makefile.in | 11 ---- x11-themes/clearlooks/pkg-plist | 66 ++++++++++--------- 7 files changed, 53 insertions(+), 209 deletions(-) delete mode 100644 x11-themes/clearlooks/files/patch-src_clearlooks_draw.c delete mode 100644 x11-themes/clearlooks/files/patch-src_clearlooks_style.c delete mode 100644 x11-themes/clearlooks/files/patch-src_support.c delete mode 100644 x11-themes/clearlooks/files/patch-themes_Clearlooks_metacity-1_Makefile.in (limited to 'x11-themes') diff --git a/x11-themes/clearlooks/Makefile b/x11-themes/clearlooks/Makefile index 2f0fb4e09411..7445d1e64bbf 100644 --- a/x11-themes/clearlooks/Makefile +++ b/x11-themes/clearlooks/Makefile @@ -6,8 +6,7 @@ # PORTNAME= clearlooks -PORTVERSION= 0.4 -PORTREVISION= 1 +PORTVERSION= 0.5 CATEGORIES= x11-themes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= clearlooks @@ -20,11 +19,20 @@ USE_LIBTOOL_VER=15 USE_GNOME= gtk20 gnomehier USE_X_PREFIX= yes -.if defined(WITH_ANIMATION) -CONFIGURE_ARGS+= --enable-animation -.endif CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ LDFLAGS="-L${X11BASE}/lib" -.include +OPTIONS= METACITY "Depend on MetaCity Theme" On + +.include + +.if !defined(WITHOUT_METACITY) +RUN_DEPENDS+= ${X11BASE}/share/gnome/themes/Clearlooks/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/clearlooks-metacity +.endif + +.if defined(WITH_ANIMATION) +CONFIGURE_ARGS+= --enable-animation +.endif + +.include diff --git a/x11-themes/clearlooks/distinfo b/x11-themes/clearlooks/distinfo index 154091a4d563..85b052e1f006 100644 --- a/x11-themes/clearlooks/distinfo +++ b/x11-themes/clearlooks/distinfo @@ -1,2 +1,2 @@ -MD5 (clearlooks-0.4.tar.bz2) = d714197da50c4eb3c2278f3c786fa996 -SIZE (clearlooks-0.4.tar.bz2) = 384636 +MD5 (clearlooks-0.5.tar.bz2) = 16ad9981ebbd816d7adfe05aadb0503b +SIZE (clearlooks-0.5.tar.bz2) = 262549 diff --git a/x11-themes/clearlooks/files/patch-src_clearlooks_draw.c b/x11-themes/clearlooks/files/patch-src_clearlooks_draw.c deleted file mode 100644 index 3ad9feffa9cd..000000000000 --- a/x11-themes/clearlooks/files/patch-src_clearlooks_draw.c +++ /dev/null @@ -1,73 +0,0 @@ ---- 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; -+ - if (r->bordergc == NULL) - return; - -- int x1, y1, x2, y2, i; - for ( i=0; i<4; i++) // draw all four borders + corners - { - cl_get_coords (i, x, y, width, height, r, &x1, &y1, &x2, &y2); -@@ -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 -@@ -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_clearlooks_style.c b/x11-themes/clearlooks/files/patch-src_clearlooks_style.c deleted file mode 100644 index 87d703f198a8..000000000000 --- a/x11-themes/clearlooks/files/patch-src_clearlooks_style.c +++ /dev/null @@ -1,53 +0,0 @@ ---- src/clearlooks_style.c.orig Sun Feb 27 01:45:14 2005 -+++ src/clearlooks_style.c Sun Feb 27 01:46:52 2005 -@@ -487,14 +487,14 @@ - - if (DETAIL ("tab")) - { -+ GdkColor tmp_color; - GdkRectangle new_area; - - cl_rectangle_set_button (&r, style, state_type, FALSE, - CL_CORNER_ROUND, CL_CORNER_ROUND, - CL_CORNER_ROUND, CL_CORNER_ROUND); -- -- GdkColor tmp_color; - -+ - if (state_type == GTK_STATE_ACTIVE) - shade (&style->bg[state_type], &tmp_color, 1.08); - else -@@ -754,6 +754,7 @@ - if (widget && DETAIL ("button") && widget->parent && - (GTK_IS_TREE_VIEW(widget->parent) || GTK_IS_CLIST (widget->parent))) // headers - { -+ int nwidth; - gint columns = 0, column_index = 0; - - if ( width < 2 || height < 2 ) -@@ -762,7 +763,7 @@ - if (GTK_IS_TREE_VIEW (widget->parent)) - gtk_treeview_get_header_index (widget->parent, widget, &column_index, &columns); - -- int nwidth = (column_index == columns-1) ? width : width+1; -+ nwidth = (column_index == columns-1) ? width : width+1; - - cl_rectangle_set_button (&r, style, state_type, FALSE, - CL_CORNER_NONE, CL_CORNER_NONE, -@@ -1074,6 +1075,7 @@ - } - else if (DETAIL ("menuitem")) - { -+ int corner; - gboolean menubar = (widget->parent && GTK_IS_MENU_BAR(widget->parent)) ? TRUE : FALSE; - gboolean flatmenu = FALSE; - -@@ -1081,7 +1083,7 @@ - - shade (clearlooks_get_spot_color (CLEARLOOKS_RC_STYLE (style->rc_style)), &inner_lower, 1.3); - -- int corner = CL_CORNER_NARROW; -+ corner = CL_CORNER_NARROW; - - if (menubar) - { diff --git a/x11-themes/clearlooks/files/patch-src_support.c b/x11-themes/clearlooks/files/patch-src_support.c deleted file mode 100644 index 1081bf805f6f..000000000000 --- a/x11-themes/clearlooks/files/patch-src_support.c +++ /dev/null @@ -1,35 +0,0 @@ ---- 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; - *column_index = *columns = 0; -- GList *list = gtk_tree_view_get_columns (GTK_TREE_VIEW (tv)); -+ list = gtk_tree_view_get_columns (GTK_TREE_VIEW (tv)); - - 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/files/patch-themes_Clearlooks_metacity-1_Makefile.in b/x11-themes/clearlooks/files/patch-themes_Clearlooks_metacity-1_Makefile.in deleted file mode 100644 index 12ccb8da61cf..000000000000 --- a/x11-themes/clearlooks/files/patch-themes_Clearlooks_metacity-1_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- themes/Clearlooks/metacity-1/Makefile.in.orig Thu Feb 24 14:17:48 2005 -+++ themes/Clearlooks/metacity-1/Makefile.in Sun Feb 27 03:36:18 2005 -@@ -171,7 +171,7 @@ - target_alias = @target_alias@ - gnome_data = @gnome_prefix@/share - dummy = --themedir = $(gnome_data)/themes/Clearlooks/metacity-1 -+themedir = @prefix@/share/gnome/themes/Clearlooks/metacity-1 - theme_DATA = metacity-theme-1.xml - EXTRA_DIST = metacity-theme-1.xml - all: all-am diff --git a/x11-themes/clearlooks/pkg-plist b/x11-themes/clearlooks/pkg-plist index d3107d0777c6..88cc03344af3 100644 --- a/x11-themes/clearlooks/pkg-plist +++ b/x11-themes/clearlooks/pkg-plist @@ -1,34 +1,39 @@ lib/gtk-2.0/2.4.0/engines/libclearlooks.so -share/gnome/themes/Clearlooks/metacity-1/metacity-theme-1.xml +share/icons/Clearlooks/16x16/gtk/gtk-apply.png +share/icons/Clearlooks/16x16/gtk/gtk-cancel.png +share/icons/Clearlooks/16x16/gtk/gtk-go-back-ltr.png +share/icons/Clearlooks/16x16/gtk/gtk-go-back-rtl.png +share/icons/Clearlooks/16x16/gtk/gtk-go-down.png +share/icons/Clearlooks/16x16/gtk/gtk-go-forward-ltr.png +share/icons/Clearlooks/16x16/gtk/gtk-go-forward-rtl.png +share/icons/Clearlooks/16x16/gtk/gtk-go-up.png +share/icons/Clearlooks/16x16/gtk/gtk-goto-bottom.png +share/icons/Clearlooks/16x16/gtk/gtk-goto-first-ltr.png +share/icons/Clearlooks/16x16/gtk/gtk-goto-first-rtl.png +share/icons/Clearlooks/16x16/gtk/gtk-goto-last-ltr.png +share/icons/Clearlooks/16x16/gtk/gtk-goto-last-rtl.png +share/icons/Clearlooks/16x16/gtk/gtk-goto-top.png +share/icons/Clearlooks/16x16/gtk/gtk-refresh.png +share/icons/Clearlooks/24x24/gtk/gtk-apply.png +share/icons/Clearlooks/24x24/gtk/gtk-cancel.png +share/icons/Clearlooks/24x24/gtk/gtk-go-back-ltr.png +share/icons/Clearlooks/24x24/gtk/gtk-go-back-rtl.png +share/icons/Clearlooks/24x24/gtk/gtk-go-down.png +share/icons/Clearlooks/24x24/gtk/gtk-go-forward-ltr.png +share/icons/Clearlooks/24x24/gtk/gtk-go-forward-rtl.png +share/icons/Clearlooks/24x24/gtk/gtk-go-up.png +share/icons/Clearlooks/24x24/gtk/gtk-goto-bottom.png +share/icons/Clearlooks/24x24/gtk/gtk-goto-first-ltr.png +share/icons/Clearlooks/24x24/gtk/gtk-goto-first-rtl.png +share/icons/Clearlooks/24x24/gtk/gtk-goto-last-ltr.png +share/icons/Clearlooks/24x24/gtk/gtk-goto-last-rtl.png +share/icons/Clearlooks/24x24/gtk/gtk-goto-top.png +share/icons/Clearlooks/24x24/gtk/gtk-ok.png +share/icons/Clearlooks/24x24/gtk/gtk-refresh.png +share/icons/Clearlooks/index.theme 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 @dirrm share/themes/Clearlooks/gtk-2.0 @dirrm share/themes/Clearlooks-Olive/gtk-2.0 @@ -36,5 +41,8 @@ share/themes/Clearlooks/index.theme @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 +@dirrm share/icons/Clearlooks/24x24/gtk +@dirrm share/icons/Clearlooks/24x24 +@dirrm share/icons/Clearlooks/16x16/gtk +@dirrm share/icons/Clearlooks/16x16 +@dirrm share/icons/Clearlooks -- cgit