diff options
author | rillig <rillig@pkgsrc.org> | 2005-03-16 15:30:21 +0000 |
---|---|---|
committer | rillig <rillig@pkgsrc.org> | 2005-03-16 15:30:21 +0000 |
commit | 4573cb2dc10915ed70557a17253af5de2f76e3e2 (patch) | |
tree | c089a6946b35429c9cbe03609dd43c36ac663c83 /x11 | |
parent | 3538e1146e886358ae26127c0001c0635784065b (diff) | |
download | pkgsrc-4573cb2dc10915ed70557a17253af5de2f76e3e2.tar.gz |
Added some patches for building with gcc-2.95.3. Approved by wiz.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/gtk2-engines-clearlooks/distinfo | 5 | ||||
-rw-r--r-- | x11/gtk2-engines-clearlooks/patches/patch-ab | 76 | ||||
-rw-r--r-- | x11/gtk2-engines-clearlooks/patches/patch-ac | 54 | ||||
-rw-r--r-- | x11/gtk2-engines-clearlooks/patches/patch-ad | 39 |
4 files changed, 173 insertions, 1 deletions
diff --git a/x11/gtk2-engines-clearlooks/distinfo b/x11/gtk2-engines-clearlooks/distinfo index 8473564a05d..1c4f65d6ba9 100644 --- a/x11/gtk2-engines-clearlooks/distinfo +++ b/x11/gtk2-engines-clearlooks/distinfo @@ -1,6 +1,9 @@ -$NetBSD: distinfo,v 1.1.1.1 2005/03/05 09:42:05 jmmv Exp $ +$NetBSD: distinfo,v 1.2 2005/03/16 15:30:21 rillig Exp $ SHA1 (clearlooks-0.4.tar.bz2) = b1b41424d15e891a984c50d88c3cff24fc997806 RMD160 (clearlooks-0.4.tar.bz2) = 20de05bdb51273db4961d754990b1040e185600a Size (clearlooks-0.4.tar.bz2) = 384636 bytes SHA1 (patch-aa) = f92b5647e15c26eda4dd48dfb712462390dd4882 +SHA1 (patch-ab) = 19981e462ece9da902020dc18270842b8fde0624 +SHA1 (patch-ac) = ca9cd31109aab8db16ae9d8c625af932be877081 +SHA1 (patch-ad) = 792af7aa63cb1a062fe52cfc638efb3f7067b799 diff --git a/x11/gtk2-engines-clearlooks/patches/patch-ab b/x11/gtk2-engines-clearlooks/patches/patch-ab new file mode 100644 index 00000000000..7c49c2af3d0 --- /dev/null +++ b/x11/gtk2-engines-clearlooks/patches/patch-ab @@ -0,0 +1,76 @@ +$NetBSD: patch-ab,v 1.1 2005/03/16 15:30:21 rillig Exp $ + +gcc-2.95.3 cannot handle declarations intermixed with code. + +--- src/clearlooks_draw.c.orig Wed Mar 2 23:41:35 2005 ++++ src/clearlooks_draw.c Wed Mar 16 14:36:37 2005 +@@ -67,10 +67,10 @@ static void cl_get_coords ( CLBorderType + 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,9 +149,6 @@ static void cl_draw_corner (GdkWindow *w + 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; +@@ -160,6 +157,9 @@ static void cl_draw_corner (GdkWindow *w + 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); + +@@ -482,6 +482,8 @@ GdkPixmap* cl_progressbar_tile_new (GdkD + int stripe_width = height/2; + int topright = height + stripe_width; + int topright_div_2 = topright/2; ++ double shift; ++ int trans; + + GtkProgressBarOrientation orientation = gtk_progress_bar_get_orientation (GTK_PROGRESS_BAR (widget)); + gboolean is_horizontal = (orientation == GTK_PROGRESS_LEFT_TO_RIGHT || orientation == GTK_PROGRESS_RIGHT_TO_LEFT) ? 1 : 0; +@@ -490,6 +492,7 @@ GdkPixmap* cl_progressbar_tile_new (GdkD + width, + height, -1); + ++ GdkPoint points[4]; + GdkColor tmp_color; + shade (&clearlooks_style->spot2, &tmp_color, 0.90); + +@@ -510,7 +513,6 @@ GdkPixmap* cl_progressbar_tile_new (GdkD + 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 +529,10 @@ GdkPixmap* cl_progressbar_tile_new (GdkD + } + + +- 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/gtk2-engines-clearlooks/patches/patch-ac b/x11/gtk2-engines-clearlooks/patches/patch-ac new file mode 100644 index 00000000000..0dcce2a67b1 --- /dev/null +++ b/x11/gtk2-engines-clearlooks/patches/patch-ac @@ -0,0 +1,54 @@ +$NetBSD: patch-ac,v 1.1 2005/03/16 15:30:21 rillig Exp $ + +gcc-2.95.3 cannot handle declarations intermixed with code. + +--- src/clearlooks_style.c.orig Thu Mar 3 22:43:15 2005 ++++ src/clearlooks_style.c Wed Mar 16 14:33:40 2005 +@@ -548,13 +548,12 @@ draw_extension (DRAW_ARGS, GtkPositionTy + if (DETAIL ("tab")) + { + GdkRectangle new_area; ++ GdkColor tmp_color; + + 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 +@@ -866,7 +865,7 @@ draw_box (DRAW_ARGS) + if (widget && DETAIL ("button") && widget->parent && + (GTK_IS_TREE_VIEW(widget->parent) || GTK_IS_CLIST (widget->parent))) // headers + { +- gint columns = 0, column_index = 0; ++ gint columns = 0, column_index = 0, nwidth; + + if ( width < 2 || height < 2 ) + return; +@@ -874,7 +873,7 @@ draw_box (DRAW_ARGS) + 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, +@@ -1189,12 +1188,13 @@ draw_box (DRAW_ARGS) + { + gboolean menubar = (widget->parent && GTK_IS_MENU_BAR(widget->parent)) ? TRUE : FALSE; + gboolean flatmenu = FALSE; ++ int corner; + + GdkColor inner_lower; + + 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/gtk2-engines-clearlooks/patches/patch-ad b/x11/gtk2-engines-clearlooks/patches/patch-ad new file mode 100644 index 00000000000..fe95a007ede --- /dev/null +++ b/x11/gtk2-engines-clearlooks/patches/patch-ad @@ -0,0 +1,39 @@ +$NetBSD: patch-ad,v 1.1 2005/03/16 15:30:21 rillig Exp $ + +gcc-2.95.3 cannot handle declarations intermixed with code. + +--- src/support.c.orig Wed Mar 2 19:09:43 2005 ++++ src/support.c Wed Mar 16 14:34:41 2005 +@@ -507,8 +507,9 @@ calculate_arrow_geometry (GtkArrowType + 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,16 @@ draw_vgradient (GdkDrawable *drawable, G + 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); + |