1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

- Fix build with gcc 4.2

PR:		118002
Submitted by:	Pietro Cerutti <gahr@gahr.ch>
Approved by:	portmgr (linimon)
This commit is contained in:
Martin Wilke 2007-11-14 08:23:32 +00:00
parent b605f3cf0a
commit 2860115acb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=202702
2 changed files with 76 additions and 7 deletions

View File

@ -20,17 +20,12 @@ COMMENT= A GTK theme engine looking like SGI enhanced Motif (aka Roxy)
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_GNOME= gtk12
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 700042
BROKEN= Broken with gcc 4.2
.endif
post-patch:
@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/ltconfig
.include <bsd.port.post.mk>
.include <bsd.port.mk>

View File

@ -0,0 +1,74 @@
--- gtk-engine/draw.c.orig 2007-11-12 14:41:47.000000000 +0100
+++ gtk-engine/draw.c 2007-11-12 14:43:43.000000000 +0100
@@ -97,7 +97,7 @@
};
-static void
+void
draw_shadow(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle * area, GtkWidget * widget, gchar * detail, gint x, gint y, gint width, gint height)
{
@@ -260,7 +260,7 @@
}
-static void
+void
draw_arrow(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle * area, GtkWidget * widget, gchar * detail, GtkArrowType arrow_type, gint fill, gint x, gint y, gint width, gint height)
{
@@ -351,7 +351,7 @@
gdk_draw_polygon(window, shadowGCs[1], TRUE, points, 3);
}
-static void
+void
draw_diamond(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle * area, GtkWidget * widget, gchar * detail, gint x, gint y, gint width, gint height)
{
gint half_width;
@@ -441,7 +441,7 @@
}
}
-static void
+void
draw_string(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GdkRectangle * area, GtkWidget * widget, gchar * detail, gint x, gint y, const gchar * string)
{
@@ -467,7 +467,7 @@
}
-static void
+void
draw_box(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle * area, GtkWidget * widget, gchar * detail, gint x, gint y, gint width, gint height)
{
g_return_if_fail(style != NULL);
@@ -764,7 +764,7 @@
-static void
+void
draw_check(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle * area, GtkWidget * widget, gchar * detail, gint x, gint y, gint width, gint height)
{
@@ -836,7 +836,7 @@
}
}
-static void
+void
draw_shadow_gap(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle * area, GtkWidget * widget, gchar * detail, gint x, gint y, gint width, gint height, GtkPositionType gap_side, gint gap_x, gint gap_width)
{
GdkRectangle rect;
@@ -889,7 +889,7 @@
gdk_gc_set_clip_rectangle(style->bg_gc[GTK_STATE_NORMAL], NULL);
}
-static void
+void
draw_box_gap(GtkStyle * style, GdkWindow * window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle * area, GtkWidget * widget, gchar * detail, gint x, gint y, gint width, gint height, GtkPositionType gap_side, gint gap_x, gint gap_width)
{
GdkRectangle rect;