From nobody@FreeBSD.org  Sun Mar 18 16:06:06 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 291D81065670
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 18 Mar 2012 16:06:06 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id F39108FC14
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 18 Mar 2012 16:06:05 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q2IG6533049014
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 18 Mar 2012 16:06:05 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q2IG652j049013;
	Sun, 18 Mar 2012 16:06:05 GMT
	(envelope-from nobody)
Message-Id: <201203181606.q2IG652j049013@red.freebsd.org>
Date: Sun, 18 Mar 2012 16:06:05 GMT
From: Shane Ambler <FreeBSD@Shaneware.biz>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] clang build for x11-toolkits/gdl
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         166225
>Category:       ports
>Synopsis:       [patch] clang build for x11-toolkits/gdl
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gnome
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 18 16:10:10 UTC 2012
>Closed-Date:    Sun Mar 25 02:15:16 UTC 2012
>Last-Modified:  Sun Mar 25 02:20:13 UTC 2012
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->gnome 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Mar 18 16:10:21 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166225 
State-Changed-From-To: open->closed 
State-Changed-By: mezz 
State-Changed-When: Sun Mar 25 02:15:05 UTC 2012 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166225 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/166225: commit references a PR
Date: Sun, 25 Mar 2012 02:15:17 +0000 (UTC)

 mezz        2012-03-25 02:14:55 UTC
 
   FreeBSD ports repository
 
   Added files:
     x11-toolkits/gdl/files patch-gdl__gdl-dock-item-button-image.c 
                            patch-gdl__gdl-dock-item.c 
   Log:
   Fix the build with clang.
   
   PR:             ports/166225
   Submitted by:   Shane Ambler <FreeBSD@Shaneware.biz>
   Reviewed by:    marcus
   Feature safe:   yes
   
   Revision  Changes    Path
   1.1       +11 -0     ports/x11-toolkits/gdl/files/patch-gdl__gdl-dock-item-button-image.c (new)
   1.1       +11 -0     ports/x11-toolkits/gdl/files/patch-gdl__gdl-dock-item.c (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
