[Midnightbsd-cvs] mports [16069] U trunk/www/webkit-gtk2/files/patch-configure: patch up webkit
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Mar 18 00:19:56 EDT 2014
Revision: 16069
http://svnweb.midnightbsd.org/mports/?rev=16069
Author: laffer1
Date: 2014-03-18 00:19:56 -0400 (Tue, 18 Mar 2014)
Log Message:
-----------
patch up webkit
Modified Paths:
--------------
trunk/www/webkit-gtk2/Makefile
trunk/www/webkit-gtk2/files/patch-GNUmakefile.in
Added Paths:
-----------
trunk/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_Atomics.h
trunk/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_DisallowCType.h
trunk/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp
trunk/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp
Property Changed:
----------------
trunk/www/webkit-gtk2/files/patch-GNUmakefile.in
trunk/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_NumberOfCores.cpp
trunk/www/webkit-gtk2/files/patch-Source_WebCore_css_CSSGrammar.y
trunk/www/webkit-gtk2/files/patch-Source_WebCore_css_CSSParser.cpp
trunk/www/webkit-gtk2/files/patch-Source_WebCore_editing_Editor.h
trunk/www/webkit-gtk2/files/patch-Source_WebCore_plugins_PluginDatabase.cpp
trunk/www/webkit-gtk2/files/patch-Source_WebCore_plugins_gtk_PluginViewGtk.cpp
trunk/www/webkit-gtk2/files/patch-Source_WebCore_xml_XPathGrammer.y
trunk/www/webkit-gtk2/files/patch-Source_WebCore_xml_XPathParser.cpp
trunk/www/webkit-gtk2/files/patch-Source_WebKit_gtk_resources_error.html
trunk/www/webkit-gtk2/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp
trunk/www/webkit-gtk2/files/patch-cairo
trunk/www/webkit-gtk2/files/patch-configure
Modified: trunk/www/webkit-gtk2/Makefile
===================================================================
--- trunk/www/webkit-gtk2/Makefile 2014-03-18 04:17:27 UTC (rev 16068)
+++ trunk/www/webkit-gtk2/Makefile 2014-03-18 04:19:56 UTC (rev 16069)
@@ -2,7 +2,7 @@
PORTNAME= webkit
PORTVERSION= 1.8.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://webkitgtk.org/releases/
PKGNAMESUFFIX= -gtk2
@@ -23,13 +23,10 @@
USE_XZ= yes
USE_GSTREAMER= yes
-MAKE_JOBS_SAFE= yes
USE_XORG= xt
-USES= pkgconfig gettext
-USE_BISON= build
-USE_GMAKE= yes
+USES= bison gmake pkgconfig gettext
USE_AUTOTOOLS= libtool
-USE_GNOME= gtk20 libxslt ltverhack
+USE_GNOME= gtk20 introspection:build libxslt ltverhack
USE_SQLITE= yes
USE_PERL5= yes
USE_LDCONFIG= yes
Modified: trunk/www/webkit-gtk2/files/patch-GNUmakefile.in
===================================================================
--- trunk/www/webkit-gtk2/files/patch-GNUmakefile.in 2014-03-18 04:17:27 UTC (rev 16068)
+++ trunk/www/webkit-gtk2/files/patch-GNUmakefile.in 2014-03-18 04:19:56 UTC (rev 16069)
@@ -1,7 +1,17 @@
---- GNUmakefile.in.orig 2013-03-21 23:46:15.000000000 -0500
-+++ GNUmakefile.in 2013-03-21 23:49:07.000000000 -0500
-@@ -70033,7 +70033,7 @@
+--- GNUmakefile.in.orig 2013-10-03 09:22:02.000000000 +0000
++++ GNUmakefile.in 2013-10-03 09:23:50.000000000 +0000
+@@ -19060,8 +19060,7 @@
+ libjavascriptcoregtk- at WEBKITGTK_API_MAJOR_VERSION@. at WEBKITGTK_API_MINOR_VERSION@.la \
+ $(WINMM_LIBS) \
+ -lm \
+- -lpthread \
+- -lstdc++
++ -lpthread
+ Programs_minidom_LDFLAGS = \
+ -no-install \
+@@ -70033,7 +70032,7 @@
+
info-am:
-install-data-am: install-audioDATA install-data-local \
@@ -9,7 +19,7 @@
install-dist_audioDATA install-dist_resourcesDATA \
install-dist_webinspectorDATA \
install-dist_webinspectorimagesDATA \
-@@ -70388,7 +70388,7 @@
+@@ -70388,7 +70387,7 @@
@ENABLE_INTROSPECTION_TRUE@ --pkg=gobject-2.0 \
@ENABLE_INTROSPECTION_TRUE@ --pkg=gtk+- at GTK_API_VERSION@ \
@ENABLE_INTROSPECTION_TRUE@ --pkg=libsoup-2.4 \
@@ -18,7 +28,7 @@
@ENABLE_INTROSPECTION_TRUE@ --output=$@ \
@ENABLE_INTROSPECTION_TRUE@ --add-include-path=$(WebKit) \
@ENABLE_INTROSPECTION_TRUE@ --add-include-path=$(top_builddir) \
-@@ -70680,7 +70680,7 @@
+@@ -70680,7 +70679,7 @@
echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
exit 1
Property changes on: trunk/www/webkit-gtk2/files/patch-GNUmakefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_Atomics.h
===================================================================
--- trunk/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_Atomics.h (rev 0)
+++ trunk/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_Atomics.h 2014-03-18 04:19:56 UTC (rev 16069)
@@ -0,0 +1,45 @@
+--- Source/JavaScriptCore/wtf/Atomics.h.orig 2013-09-06 13:54:07.000000000 +0200
++++ Source/JavaScriptCore/wtf/Atomics.h 2013-09-06 13:55:58.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 {
+@@ -92,12 +84,6 @@ inline int atomicIncrement(int volatile*
+ inline int atomicDecrement(int volatile* addend) { return InterlockedDecrement(reinterpret_cast<long volatile*>(addend)); }
+ #endif
+
+-#elif OS(DARWIN)
+-#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
+-
+-inline int atomicIncrement(int volatile* addend) { return OSAtomicIncrement32Barrier(const_cast<int*>(addend)); }
+-inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Barrier(const_cast<int*>(addend)); }
+-
+ #elif OS(QNX)
+ #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
+
+@@ -113,8 +99,8 @@ inline int atomicDecrement(int volatile*
+ #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
+
Added: trunk/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_DisallowCType.h
===================================================================
--- trunk/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_DisallowCType.h (rev 0)
+++ trunk/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_DisallowCType.h 2014-03-18 04:19:56 UTC (rev 16069)
@@ -0,0 +1,16 @@
+--- Source/JavaScriptCore/wtf/DisallowCType.h.orig 2012-08-20 18:26:04.000000000 +0200
++++ Source/JavaScriptCore/wtf/DisallowCType.h 2013-09-11 12:41:07.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
Index: trunk/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_NumberOfCores.cpp
===================================================================
--- trunk/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_NumberOfCores.cpp 2014-03-18 04:17:27 UTC (rev 16068)
+++ trunk/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_NumberOfCores.cpp 2014-03-18 04:19:56 UTC (rev 16069)
Property changes on: trunk/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_NumberOfCores.cpp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/webkit-gtk2/files/patch-Source_WebCore_css_CSSGrammar.y
===================================================================
--- trunk/www/webkit-gtk2/files/patch-Source_WebCore_css_CSSGrammar.y 2014-03-18 04:17:27 UTC (rev 16068)
+++ trunk/www/webkit-gtk2/files/patch-Source_WebCore_css_CSSGrammar.y 2014-03-18 04:19:56 UTC (rev 16069)
Property changes on: trunk/www/webkit-gtk2/files/patch-Source_WebCore_css_CSSGrammar.y
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/webkit-gtk2/files/patch-Source_WebCore_css_CSSParser.cpp
===================================================================
--- trunk/www/webkit-gtk2/files/patch-Source_WebCore_css_CSSParser.cpp 2014-03-18 04:17:27 UTC (rev 16068)
+++ trunk/www/webkit-gtk2/files/patch-Source_WebCore_css_CSSParser.cpp 2014-03-18 04:19:56 UTC (rev 16069)
Property changes on: trunk/www/webkit-gtk2/files/patch-Source_WebCore_css_CSSParser.cpp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/webkit-gtk2/files/patch-Source_WebCore_editing_Editor.h
===================================================================
--- trunk/www/webkit-gtk2/files/patch-Source_WebCore_editing_Editor.h 2014-03-18 04:17:27 UTC (rev 16068)
+++ trunk/www/webkit-gtk2/files/patch-Source_WebCore_editing_Editor.h 2014-03-18 04:19:56 UTC (rev 16069)
Property changes on: trunk/www/webkit-gtk2/files/patch-Source_WebCore_editing_Editor.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/webkit-gtk2/files/patch-Source_WebCore_plugins_PluginDatabase.cpp
===================================================================
--- trunk/www/webkit-gtk2/files/patch-Source_WebCore_plugins_PluginDatabase.cpp 2014-03-18 04:17:27 UTC (rev 16068)
+++ trunk/www/webkit-gtk2/files/patch-Source_WebCore_plugins_PluginDatabase.cpp 2014-03-18 04:19:56 UTC (rev 16069)
Property changes on: trunk/www/webkit-gtk2/files/patch-Source_WebCore_plugins_PluginDatabase.cpp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/webkit-gtk2/files/patch-Source_WebCore_plugins_gtk_PluginViewGtk.cpp
===================================================================
--- trunk/www/webkit-gtk2/files/patch-Source_WebCore_plugins_gtk_PluginViewGtk.cpp 2014-03-18 04:17:27 UTC (rev 16068)
+++ trunk/www/webkit-gtk2/files/patch-Source_WebCore_plugins_gtk_PluginViewGtk.cpp 2014-03-18 04:19:56 UTC (rev 16069)
Property changes on: trunk/www/webkit-gtk2/files/patch-Source_WebCore_plugins_gtk_PluginViewGtk.cpp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/webkit-gtk2/files/patch-Source_WebCore_xml_XPathGrammer.y
===================================================================
--- trunk/www/webkit-gtk2/files/patch-Source_WebCore_xml_XPathGrammer.y 2014-03-18 04:17:27 UTC (rev 16068)
+++ trunk/www/webkit-gtk2/files/patch-Source_WebCore_xml_XPathGrammer.y 2014-03-18 04:19:56 UTC (rev 16069)
Property changes on: trunk/www/webkit-gtk2/files/patch-Source_WebCore_xml_XPathGrammer.y
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/webkit-gtk2/files/patch-Source_WebCore_xml_XPathParser.cpp
===================================================================
--- trunk/www/webkit-gtk2/files/patch-Source_WebCore_xml_XPathParser.cpp 2014-03-18 04:17:27 UTC (rev 16068)
+++ trunk/www/webkit-gtk2/files/patch-Source_WebCore_xml_XPathParser.cpp 2014-03-18 04:19:56 UTC (rev 16069)
Property changes on: trunk/www/webkit-gtk2/files/patch-Source_WebCore_xml_XPathParser.cpp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/webkit-gtk2/files/patch-Source_WebKit_gtk_resources_error.html
===================================================================
--- trunk/www/webkit-gtk2/files/patch-Source_WebKit_gtk_resources_error.html 2014-03-18 04:17:27 UTC (rev 16068)
+++ trunk/www/webkit-gtk2/files/patch-Source_WebKit_gtk_resources_error.html 2014-03-18 04:19:56 UTC (rev 16069)
Property changes on: trunk/www/webkit-gtk2/files/patch-Source_WebKit_gtk_resources_error.html
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/www/webkit-gtk2/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp
===================================================================
--- trunk/www/webkit-gtk2/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp 2014-03-18 04:17:27 UTC (rev 16068)
+++ trunk/www/webkit-gtk2/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp 2014-03-18 04:19:56 UTC (rev 16069)
Property changes on: trunk/www/webkit-gtk2/files/patch-Source_WebKit_gtk_webkit_webkitwebview.cpp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp
===================================================================
--- trunk/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp (rev 0)
+++ trunk/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp 2014-03-18 04:19:56 UTC (rev 16069)
@@ -0,0 +1,10 @@
+--- Tools/DumpRenderTree/gtk/DumpRenderTree.cpp.orig 2012-08-20 18:26:18.000000000 +0200
++++ Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2013-09-11 12:28:29.000000000 +0200
+@@ -48,6 +48,7 @@
+ #include "WorkQueueItem.h"
+ #include <JavaScriptCore/JavaScript.h>
+ #include <cassert>
++#include <clocale>
+ #include <cstdlib>
+ #include <cstring>
+ #include <getopt.h>
Added: trunk/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp
===================================================================
--- trunk/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp (rev 0)
+++ trunk/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp 2014-03-18 04:19:56 UTC (rev 16069)
@@ -0,0 +1,10 @@
+--- Tools/DumpRenderTree/gtk/ImageDiff.cpp.orig 2013-09-11 12:29:19.000000000 +0200
++++ Tools/DumpRenderTree/gtk/ImageDiff.cpp 2013-09-11 12:29:38.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <algorithm>
+ #include <cmath>
+ #include <cstdio>
++#include <cstdlib>
+ #include <cstring>
+ #include <gdk/gdk.h>
+
Index: trunk/www/webkit-gtk2/files/patch-cairo
===================================================================
--- trunk/www/webkit-gtk2/files/patch-cairo 2014-03-18 04:17:27 UTC (rev 16068)
+++ trunk/www/webkit-gtk2/files/patch-cairo 2014-03-18 04:19:56 UTC (rev 16069)
Property changes on: trunk/www/webkit-gtk2/files/patch-cairo
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/www/webkit-gtk2/files/patch-configure
===================================================================
--- trunk/www/webkit-gtk2/files/patch-configure 2014-03-18 04:17:27 UTC (rev 16068)
+++ trunk/www/webkit-gtk2/files/patch-configure 2014-03-18 04:19:56 UTC (rev 16069)
Property changes on: trunk/www/webkit-gtk2/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list