Date: Sun, 18 Mar 2012 16:06:05 GMT From: Shane Ambler <FreeBSD@Shaneware.biz> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/166225: [patch] clang build for x11-toolkits/gdl Message-ID: <201203181606.q2IG652j049013@red.freebsd.org> Resent-Message-ID: <201203181610.q2IGAAen045905@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 166225
>Category: ports
>Synopsis: [patch] clang build for x11-toolkits/gdl
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 18 16:10:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Shane Ambler
>Release: 9.0-RELEASE
>Organization:
>Environment:
FreeBSD leader.local 9.0-RELEASE FreeBSD 9.0-RELEASE #1: Wed Feb 15 16:03:18 CST 2012 root@:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
The attached patch allows x11-toolkits/gdl to compile with clang.
Tested with tinderbox to compile with the following combinations -
10-CURRENT-amd64-clang
10-CURRENT-amd64-gcc
10-CURRENT-i386-clang
10-CURRENT-i386-gcc
9-STABLE-amd64-clang
9-STABLE-amd64-gcc
9-STABLE-i386-clang
9-STABLE-i386-gcc
8-STABLE-amd64-gcc
8-STABLE-i386-gcc
7-STABLE-amd64-gcc
7-STABLE-i386-gcc
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# files
# files/patch-gdl__gdl-dock-item.c
# files/patch-gdl__gdl-dock-item-button-image.c
#
echo c - files
mkdir -p files > /dev/null 2>&1
echo x - files/patch-gdl__gdl-dock-item.c
sed 's/^X//' >files/patch-gdl__gdl-dock-item.c << 'ae247d1e9c7522a4849a7a074a937a8b'
X--- ./gdl/gdl-dock-item.c.orig 2012-03-19 01:15:14.000000000 +1030
X+++ ./gdl/gdl-dock-item.c 2012-03-19 01:15:55.000000000 +1030
X@@ -1816,7 +1816,7 @@
X GtkWidget *
X gdl_dock_item_get_grip(GdlDockItem *item)
X {
X- g_return_if_fail (item != NULL);
X+ g_return_val_if_fail (item != NULL, NULL);
X g_return_val_if_fail (GDL_IS_DOCK_ITEM (item), NULL);
X
X return item->_priv->grip;
ae247d1e9c7522a4849a7a074a937a8b
echo x - files/patch-gdl__gdl-dock-item-button-image.c
sed 's/^X//' >files/patch-gdl__gdl-dock-item-button-image.c << '5106b7947a550d3990123d4046b7d5d3'
X--- ./gdl/gdl-dock-item-button-image.c.orig 2012-03-19 01:16:15.000000000 +1030
X+++ ./gdl/gdl-dock-item-button-image.c 2012-03-19 01:16:32.000000000 +1030
X@@ -49,7 +49,7 @@
X cairo_set_line_width(cr, 1.0);
X
X style = gtk_widget_get_style (widget);
X- g_return_if_fail (style != NULL);
X+ g_return_val_if_fail (style != NULL, 0);
X color = &style->fg[GTK_STATE_NORMAL];
X cairo_set_source_rgba(cr, color->red / 65535.0,
X color->green / 65535.0, color->blue / 65535.0, 0.55);
5106b7947a550d3990123d4046b7d5d3
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203181606.q2IG652j049013>