[143224] trunk/dports/www/webkit-gtk

devans at macports.org devans at macports.org
Sat Dec 12 09:04:55 PST 2015


Revision: 143224
          https://trac.macports.org/changeset/143224
Author:   devans at macports.org
Date:     2015-12-08 01:03:06 -0800 (Tue, 08 Dec 2015)
Log Message:
-----------
webkit-gtk: don't use system availability macros in webkit-gtk headers (#49849).

Modified Paths:
--------------
    trunk/dports/www/webkit-gtk/Portfile

Added Paths:
-----------
    trunk/dports/www/webkit-gtk/files/remove-cf-available.patch

Property Changed:
----------------
    trunk/dports/www/webkit-gtk/


Property changes on: trunk/dports/www/webkit-gtk
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/devans/GNOME-3/stable/dports/www/webkit-gtk:127294-136669
   + /users/devans/GNOME-3/stable/dports/www/webkit-gtk:127294-143223

Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile	2015-12-08 08:57:52 UTC (rev 143223)
+++ trunk/dports/www/webkit-gtk/Portfile	2015-12-08 09:03:06 UTC (rev 143224)
@@ -13,6 +13,7 @@
 name                webkit-gtk
 epoch               2
 version             2.4.9
+revision            1
 description         Apple's WebKit HTML rendering library for GTK+
 long_description    ${description}
 maintainers         jeremyhu devans
@@ -60,6 +61,7 @@
 # libedit.patch: https://bugs.webkit.org/show_bug.cgi?id=127059
 # leopard-malloc.patch: https://bugs.webkit.org/show_bug.cgi?id=140143
 # leopard-platform.patch: https://bugs.webkit.org/show_bug.cgi?id=140143
+# remove-cf-available.patch: https://trac.macports.org/ticket/49849
 
 patchfiles          clang-assertions.patch \
                     case-insensitive.patch \
@@ -69,7 +71,8 @@
                     gstreamer.patch \
                     leopard-platform.patch \
                     leopard-malloc.patch \
-                    libedit.patch
+                    libedit.patch \
+                    remove-cf-available.patch
 
 conflicts_build     google-test
 

Copied: trunk/dports/www/webkit-gtk/files/remove-cf-available.patch (from rev 143223, users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/remove-cf-available.patch)
===================================================================
--- trunk/dports/www/webkit-gtk/files/remove-cf-available.patch	                        (rev 0)
+++ trunk/dports/www/webkit-gtk/files/remove-cf-available.patch	2015-12-08 09:03:06 UTC (rev 143224)
@@ -0,0 +1,166 @@
+diff -ur Source/JavaScriptCore/API.orig/JSBasePrivate.h Source/JavaScriptCore/API/JSBasePrivate.h
+--- Source/JavaScriptCore/API.orig/JSBasePrivate.h	2015-12-07 15:46:53.000000000 -0800
++++ Source/JavaScriptCore/API/JSBasePrivate.h	2015-12-07 15:50:37.000000000 -0800
+@@ -43,7 +43,7 @@
+ garbage collector to collect soon, hoping to reclaim that large non-GC memory
+ region.
+ */
+-JS_EXPORT void JSReportExtraMemoryCost(JSContextRef ctx, size_t size) CF_AVAILABLE(10_6, 7_0);
++JS_EXPORT void JSReportExtraMemoryCost(JSContextRef ctx, size_t size);
+ 
+ JS_EXPORT void JSDisableGCTimer(void);
+ 
+diff -ur Source/JavaScriptCore/API.orig/JSContextRef.h Source/JavaScriptCore/API/JSContextRef.h
+--- Source/JavaScriptCore/API.orig/JSContextRef.h	2015-12-07 15:46:53.000000000 -0800
++++ Source/JavaScriptCore/API/JSContextRef.h	2015-12-07 15:52:46.000000000 -0800
+@@ -48,7 +48,7 @@
+  synchronization is required.
+ @result The created JSContextGroup.
+ */
+-JS_EXPORT JSContextGroupRef JSContextGroupCreate() CF_AVAILABLE(10_6, 7_0);
++JS_EXPORT JSContextGroupRef JSContextGroupCreate();
+ 
+ /*!
+ @function
+@@ -56,14 +56,14 @@
+ @param group The JSContextGroup to retain.
+ @result A JSContextGroup that is the same as group.
+ */
+-JS_EXPORT JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group) CF_AVAILABLE(10_6, 7_0);
++JS_EXPORT JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group);
+ 
+ /*!
+ @function
+ @abstract Releases a JavaScript context group.
+ @param group The JSContextGroup to release.
+ */
+-JS_EXPORT void JSContextGroupRelease(JSContextGroupRef group) CF_AVAILABLE(10_6, 7_0);
++JS_EXPORT void JSContextGroupRelease(JSContextGroupRef group);
+ 
+ /*!
+ @function
+@@ -78,7 +78,7 @@
+  NULL to use the default object class.
+ @result A JSGlobalContext with a global object of class globalObjectClass.
+ */
+-JS_EXPORT JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass) CF_AVAILABLE(10_5, 7_0);
++JS_EXPORT JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass);
+ 
+ /*!
+ @function
+@@ -92,7 +92,7 @@
+ @result A JSGlobalContext with a global object of class globalObjectClass and a context
+  group equal to group.
+ */
+-JS_EXPORT JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClassRef globalObjectClass) CF_AVAILABLE(10_6, 7_0);
++JS_EXPORT JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClassRef globalObjectClass);
+ 
+ /*!
+ @function
+@@ -123,7 +123,7 @@
+ @param ctx The JSContext whose group you want to get.
+ @result ctx's group.
+ */
+-JS_EXPORT JSContextGroupRef JSContextGetGroup(JSContextRef ctx) CF_AVAILABLE(10_6, 7_0);
++JS_EXPORT JSContextGroupRef JSContextGetGroup(JSContextRef ctx);
+ 
+ /*!
+ @function
+@@ -131,7 +131,7 @@
+ @param ctx The JSContext whose global context you want to get.
+ @result ctx's global context.
+ */
+-JS_EXPORT JSGlobalContextRef JSContextGetGlobalContext(JSContextRef ctx) CF_AVAILABLE(10_7, 7_0);
++JS_EXPORT JSGlobalContextRef JSContextGetGlobalContext(JSContextRef ctx);
+ 
+ /*!
+ @function
+diff -ur Source/JavaScriptCore/API.orig/JSContextRefPrivate.h Source/JavaScriptCore/API/JSContextRefPrivate.h
+--- Source/JavaScriptCore/API.orig/JSContextRefPrivate.h	2015-12-07 15:46:53.000000000 -0800
++++ Source/JavaScriptCore/API/JSContextRefPrivate.h	2015-12-07 15:53:30.000000000 -0800
+@@ -44,7 +44,7 @@
+ @param ctx The JSContext whose backtrace you want to get
+ @result A string containing the backtrace
+ */
+-JS_EXPORT JSStringRef JSContextCreateBacktrace(JSContextRef ctx, unsigned maxStackSize) CF_AVAILABLE(10_6, 7_0);
++JS_EXPORT JSStringRef JSContextCreateBacktrace(JSContextRef ctx, unsigned maxStackSize);
+     
+ 
+ /*! 
+@@ -85,14 +85,14 @@
+  need to call JSContextGroupSetExecutionTimeLimit before you start executing
+  any scripts.
+ */
+-JS_EXPORT void JSContextGroupSetExecutionTimeLimit(JSContextGroupRef, double limit, JSShouldTerminateCallback, void* context) CF_AVAILABLE(10_6, 7_0);
++JS_EXPORT void JSContextGroupSetExecutionTimeLimit(JSContextGroupRef, double limit, JSShouldTerminateCallback, void* context);
+ 
+ /*!
+ @function
+ @abstract Clears the script execution time limit.
+ @param group The JavaScript context group that the time limit is cleared on.
+ */
+-JS_EXPORT void JSContextGroupClearExecutionTimeLimit(JSContextGroupRef) CF_AVAILABLE(10_6, 7_0);
++JS_EXPORT void JSContextGroupClearExecutionTimeLimit(JSContextGroupRef);
+ 
+ #ifdef __cplusplus
+ }
+diff -ur Source/JavaScriptCore/API.orig/JSObjectRef.h Source/JavaScriptCore/API/JSObjectRef.h
+--- Source/JavaScriptCore/API.orig/JSObjectRef.h	2015-12-07 15:46:53.000000000 -0800
++++ Source/JavaScriptCore/API/JSObjectRef.h	2015-12-07 15:54:25.000000000 -0800
+@@ -441,7 +441,7 @@
+  @discussion The behavior of this function does not exactly match the behavior of the built-in Array constructor. Specifically, if one argument 
+  is supplied, this function returns an array with one element.
+  */
+-JS_EXPORT JSObjectRef JSObjectMakeArray(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) CF_AVAILABLE(10_6, 7_0);
++JS_EXPORT JSObjectRef JSObjectMakeArray(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
+ 
+ /*!
+  @function
+@@ -452,7 +452,7 @@
+  @param exception A pointer to a JSValueRef in which to store an exception, if any. Pass NULL if you do not care to store an exception.
+  @result A JSObject that is a Date.
+  */
+-JS_EXPORT JSObjectRef JSObjectMakeDate(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) CF_AVAILABLE(10_6, 7_0);
++JS_EXPORT JSObjectRef JSObjectMakeDate(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
+ 
+ /*!
+  @function
+@@ -463,7 +463,7 @@
+  @param exception A pointer to a JSValueRef in which to store an exception, if any. Pass NULL if you do not care to store an exception.
+  @result A JSObject that is a Error.
+  */
+-JS_EXPORT JSObjectRef JSObjectMakeError(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) CF_AVAILABLE(10_6, 7_0);
++JS_EXPORT JSObjectRef JSObjectMakeError(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
+ 
+ /*!
+  @function
+@@ -474,7 +474,7 @@
+  @param exception A pointer to a JSValueRef in which to store an exception, if any. Pass NULL if you do not care to store an exception.
+  @result A JSObject that is a RegExp.
+  */
+-JS_EXPORT JSObjectRef JSObjectMakeRegExp(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) CF_AVAILABLE(10_6, 7_0);
++JS_EXPORT JSObjectRef JSObjectMakeRegExp(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
+ 
+ /*!
+ @function
+diff -ur Source/JavaScriptCore/API.orig/JSValueRef.h Source/JavaScriptCore/API/JSValueRef.h
+--- Source/JavaScriptCore/API.orig/JSValueRef.h	2015-12-07 15:46:53.000000000 -0800
++++ Source/JavaScriptCore/API/JSValueRef.h	2015-12-07 15:55:30.000000000 -0800
+@@ -218,7 +218,7 @@
+  @param string   The JSString containing the JSON string to be parsed.
+  @result         A JSValue containing the parsed value, or NULL if the input is invalid.
+  */
+-JS_EXPORT JSValueRef JSValueMakeFromJSONString(JSContextRef ctx, JSStringRef string) CF_AVAILABLE(10_7, 7_0);
++JS_EXPORT JSValueRef JSValueMakeFromJSONString(JSContextRef ctx, JSStringRef string);
+ 
+ /*!
+  @function
+@@ -229,7 +229,7 @@
+  @param exception A pointer to a JSValueRef in which to store an exception, if any. Pass NULL if you do not care to store an exception.
+  @result         A JSString with the result of serialization, or NULL if an exception is thrown.
+  */
+-JS_EXPORT JSStringRef JSValueCreateJSONString(JSContextRef ctx, JSValueRef value, unsigned indent, JSValueRef* exception) CF_AVAILABLE(10_7, 7_0);
++JS_EXPORT JSStringRef JSValueCreateJSONString(JSContextRef ctx, JSValueRef value, unsigned indent, JSValueRef* exception);
+ 
+ /* Converting to primitive values */
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/93365cd1/attachment-0001.html>


More information about the macports-changes mailing list