From owner-freebsd-gnome@FreeBSD.ORG  Wed Sep 11 09:13:44 2013
Return-Path: <owner-freebsd-gnome@FreeBSD.ORG>
Delivered-To: gnome@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id E96C526D
 for <gnome@freebsd.org>; Wed, 11 Sep 2013 09:13:44 +0000 (UTC)
 (envelope-from stefan@fafoe.narf.at)
Received: from fep11.mx.upcmail.net (fep11.mx.upcmail.net [62.179.121.31])
 by mx1.freebsd.org (Postfix) with ESMTP id 361B52EDD
 for <gnome@freebsd.org>; Wed, 11 Sep 2013 09:13:43 +0000 (UTC)
Received: from edge01.upcmail.net ([192.168.13.236]) by viefep11-int.chello.at
 (InterMail vM.8.01.05.05 201-2260-151-110-20120111) with ESMTP
 id <20130911091342.YPQF18435.viefep11-int.chello.at@edge01.upcmail.net>
 for <gnome@freebsd.org>; Wed, 11 Sep 2013 11:13:42 +0200
Received: from mole.fafoe.narf.at ([80.109.55.137])
 by edge01.upcmail.net with edge
 id PlDi1m00M2xdvHc01lDiNK; Wed, 11 Sep 2013 11:13:42 +0200
X-SourceIP: 80.109.55.137
Received: by mole.fafoe.narf.at (Postfix, from userid 1001)
 id E2EB26D449; Wed, 11 Sep 2013 11:13:41 +0200 (CEST)
Date: Wed, 11 Sep 2013 11:13:41 +0200
From: Stefan Farfeleder <stefanf@FreeBSD.org>
To: gnome@FreeBSD.org
Subject: Re: webkit-gtk2 patches for clang/libc++
Message-ID: <20130911091341.GC1608@mole.fafoe.narf.at>
References: <20130911090147.GB1608@mole.fafoe.narf.at>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20130911090147.GB1608@mole.fafoe.narf.at>
User-Agent: Mutt/1.5.21 (2010-09-15)
X-BeenThere: freebsd-gnome@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: GNOME for FreeBSD -- porting and maintaining
 <freebsd-gnome.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-gnome>,
 <mailto:freebsd-gnome-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gnome>
List-Post: <mailto:freebsd-gnome@freebsd.org>
List-Help: <mailto:freebsd-gnome-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
 <mailto:freebsd-gnome-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Sep 2013 09:13:45 -0000

It seems my attached patches were eaten. Here they are again, this time
inline.

patch-Source_JavaScriptCore_wtf_Atomics.h:
--- Source/JavaScriptCore/wtf/Atomics.h.orig	2012-08-20 18:26:04.000000000 +0200
+++ Source/JavaScriptCore/wtf/Atomics.h	2013-09-10 12:03:55.000000000 +0200
@@ -65,18 +65,10 @@
 
 #if OS(WINDOWS)
 #include <windows.h>
-#elif OS(DARWIN)
-#include <libkern/OSAtomic.h>
 #elif OS(QNX)
 #include <atomic.h>
 #elif OS(ANDROID)
 #include <sys/atomics.h>
-#elif COMPILER(GCC)
-#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
-#include <ext/atomicity.h>
-#else
-#include <bits/atomicity.h>
-#endif
 #endif
 
 namespace WTF {
@@ -113,8 +105,8 @@
 #elif COMPILER(GCC) && !CPU(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
 #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
 
-inline int atomicIncrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, 1) + 1; }
-inline int atomicDecrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; }
+inline int atomicIncrement(int volatile* addend) { return __sync_add_and_fetch(addend, 1); } 
+inline int atomicDecrement(int volatile* addend) { return __sync_sub_and_fetch(addend, 1); }
 
 #endif
 

patch-Source_JavaScriptCore_wtf_DisallowCType.h:
--- Source/JavaScriptCore/wtf/DisallowCType.h.orig	2013-09-10 12:27:15.000000000 +0200
+++ Source/JavaScriptCore/wtf/DisallowCType.h	2013-09-10 12:28:32.000000000 +0200
@@ -35,6 +35,13 @@
 // ASCII-specific functions instead. This header makes sure we get a compile-time
 // error if we use one of the <ctype.h> functions by accident.
 
+// Include inlined functions using <ctype.h> first to avoid compilation errors
+#ifdef __cplusplus
+#include <cwchar>
+#include <cwctype>
+#include <string>
+#endif
+
 #include <ctype.h>
 
 #undef isalnum

patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp:
--- Tools/DumpRenderTree/gtk/DumpRenderTree.cpp.orig	2013-09-10 13:19:16.000000000 +0200
+++ Tools/DumpRenderTree/gtk/DumpRenderTree.cpp	2013-09-10 13:19:47.000000000 +0200
@@ -48,6 +48,7 @@
 #include "WorkQueueItem.h"
 #include <JavaScriptCore/JavaScript.h>
 #include <cassert>
+#include <clocale>
 #include <cstdlib>
 #include <cstring>
 #include <getopt.h>

patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp:
--- Tools/DumpRenderTree/gtk/ImageDiff.cpp.orig	2013-09-10 13:16:33.000000000 +0200
+++ Tools/DumpRenderTree/gtk/ImageDiff.cpp	2013-09-10 13:16:39.000000000 +0200
@@ -30,6 +30,7 @@
 #include <algorithm>
 #include <cmath>
 #include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <gdk/gdk.h>