[116756] trunk/dports/www/webkit-gtk-devel

6 Feb 2014

Revision: 116756
          https://trac.macports.org/changeset/116756
Author:   jeremyhu@macports.org
Date:     2014-02-05 19:35:38 -0800 (Wed, 05 Feb 2014)
Log Message:
-----------
webkit-gtk-devel: Version bump to 2.3.5

Modified Paths:
--------------
    trunk/dports/www/webkit-gtk-devel/Portfile
    trunk/dports/www/webkit-gtk-devel/files/clang-check.patch
    trunk/dports/www/webkit-gtk-devel/files/gstreamer.patch

Modified: trunk/dports/www/webkit-gtk-devel/Portfile
===================================================================

--- trunk/dports/www/webkit-gtk-devel/Portfile	2014-02-06 00:08:45 UTC (rev 116755)
+++ trunk/dports/www/webkit-gtk-devel/Portfile	2014-02-06 03:35:38 UTC (rev 116756)
@@ -12,7 +12,7 @@
 
 name        webkit-gtk-devel
 epoch       2
-version     2.3.4
+version     2.3.5
 description Apple's WebKit HTML rendering library for GTK+
 long_description ${description}
 maintainers jeremyhu devans
@@ -27,9 +27,9 @@
 
 dist_subdir webkit-gtk
 
-checksums           sha1    ef1aacb24bb9b41e4be10fd84cf4fe571b765313 \
-                    rmd160  283dd533d07d613ad08a962eee63353bbb3c1d13 \
-                    sha256  5e7d9daf4f87a25c4fee50d11d00e9b76879021e488a97827021b3ce7342a9a7
+checksums           sha1    4a4bb15ea68a107c0f24784d9208829f760de572 \
+                    rmd160  28f76e4ee7188afea25bb107180abc32b967bb29 \
+                    sha256  a598ba9bf6aeb8ffc721f3f59b9b8dce29a3ad56e681f5ad4a629a383c61b2b4
 
 depends_lib \
         path:lib/pkgconfig/glib-2.0.pc:glib2 \
@@ -59,7 +59,6 @@
 # clang-check.patch: https://bugs.webkit.org/show_bug.cgi?id=126324
 # gstreamer.patch: https://bugs.webkit.org/show_bug.cgi?id=126437
 # libedit.patch: https://bugs.webkit.org/show_bug.cgi?id=127059
-# leopard-python.patch: https://bugs.webkit.org/show_bug.cgi?id=126323
 
 patchfiles \
         clang-assertions.patch \
@@ -69,8 +68,7 @@
         quartz-webcore.patch \
         clang-check.patch \
         gstreamer.patch \
-        libedit.patch \
-        leopard-python.patch
+        libedit.patch
 
 conflicts_build     google-test
 
@@ -190,12 +188,6 @@
     reinplace "s/def __APPLE__/ 0/" \
         ${worksrcpath}/Source/JavaScriptCore/API/WebKitAvailability.h
 
-    # https://bugs.webkit.org/show_bug.cgi?id=99683
-    # Fixed in master, should be removed in 2.3.5
-    reinplace "s:PLATFORM(MAC):OS(DARWIN):g" \
-        ${worksrcpath}/Source/JavaScriptCore/jit/ThunkGenerators.cpp \
-        ${worksrcpath}/Source/JavaScriptCore/tools/CodeProfile.cpp
-
     # https://bugs.webkit.org/show_bug.cgi?id=58737
     reinplace "s:OS(MAC_OS_X):PLATFORM(MAC):" \
         ${worksrcpath}/Source/WTF/wtf/ThreadingPthreads.cpp

Modified: trunk/dports/www/webkit-gtk-devel/files/clang-check.patch
===================================================================
--- trunk/dports/www/webkit-gtk-devel/files/clang-check.patch	2014-02-06 00:08:45 UTC (rev 116755)
+++ trunk/dports/www/webkit-gtk-devel/files/clang-check.patch	2014-02-06 03:35:38 UTC (rev 116756)
@@ -1,20 +1,20 @@
---- Source/autotools/CheckSystemAndBasicDependencies.m4.orig	2013-11-10 17:44:57.000000000 -0800
-+++ Source/autotools/CheckSystemAndBasicDependencies.m4	2013-11-10 17:45:57.000000000 -0800
-@@ -87,7 +87,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+--- Source/autotools/CheckSystemAndBasicDependencies.m4.orig	2014-01-23 08:49:59.000000000 -0800
++++ Source/autotools/CheckSystemAndBasicDependencies.m4	2014-02-05 17:29:39.000000000 -0800
+@@ -92,7 +92,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
  #endif
  ])], [c_compiler="gcc"], [])
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
--#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 2)
-+#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 2)))))
+-#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3)
++#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3)))))
  #error Not a supported Clang compiler
  #endif
  ])], [c_compiler="clang"], [])
-@@ -106,7 +106,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+@@ -111,7 +111,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
  #endif
  ])], [cxx_compiler="g++"], [])
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
--#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 2)
-+#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 2)))))
+-#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3)
++#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3)))))
  #error Not a supported Clang++ compiler
  #endif
  ])], [cxx_compiler="clang++"], [])

Modified: trunk/dports/www/webkit-gtk-devel/files/gstreamer.patch
===================================================================
--- trunk/dports/www/webkit-gtk-devel/files/gstreamer.patch	2014-02-06 00:08:45 UTC (rev 116755)
+++ trunk/dports/www/webkit-gtk-devel/files/gstreamer.patch	2014-02-06 03:35:38 UTC (rev 116756)
@@ -1,21 +1,11 @@
---- Source/WebCore/platform/audio/FFTFrame.h.orig	2013-12-04 23:27:01.000000000 -0800
-+++ Source/WebCore/platform/audio/FFTFrame.h	2014-01-03 10:07:42.000000000 -0800
-@@ -39,31 +39,27 @@
- 
- #if USE_ACCELERATE_FFT
- #include <Accelerate/Accelerate.h>
--#endif
--
--#if !USE_ACCELERATE_FFT
--
-+#else
- #if USE(WEBAUDIO_MKL)
+--- Source/WebCore/platform/audio/FFTFrame.h.orig	2014-01-23 11:33:19.000000000 -0800
++++ Source/WebCore/platform/audio/FFTFrame.h	2014-02-05 17:36:33.000000000 -0800
+@@ -47,13 +47,6 @@
  #include "mkl_dfti.h"
  #endif // USE(WEBAUDIO_MKL)
  
 -#if USE(WEBAUDIO_GSTREAMER)
 -#include <glib.h>
--#include <memory>
 -G_BEGIN_DECLS
 -#include <gst/fft/gstfftf32.h>
 -G_END_DECLS
@@ -24,15 +14,12 @@
  #if USE(WEBAUDIO_OPENMAX_DL_FFT)
  #include "dl/sp/api/armSP.h"
  #include "dl/sp/api/omxSP.h"
- #elif USE(WEBAUDIO_FFMPEG)
- struct RDFTContext;
- #endif
--
+@@ -63,6 +56,13 @@ struct RDFTContext;
+ 
  #endif // !USE_ACCELERATE_FFT
  
 +#if USE(WEBAUDIO_GSTREAMER)
 +#include <glib.h>
-+#include <memory>
 +G_BEGIN_DECLS
 +#include <gst/fft/gstfftf32.h>
 +G_END_DECLS

    

jeremyhu＠macports.org

tags

participants (1)