sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (e76fdb55e3c8ff366ef02df2605c846cb48e01c6)
- From: Pavel Vinogradov <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (e76fdb55e3c8ff366ef02df2605c846cb48e01c6)
- Date: Sat, 25 Apr 2015 15:17:16 -0500
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:
http/webkitgtk/BUILD | 7
http/webkitgtk/HISTORY | 5
http/webkitgtk/PRE_BUILD | 6
http/webkitgtk/patches/unicode.patch | 11
http/webkitgtk/patches/webkitgtk-2.4.8-gcc5.patch | 21 +
http/webkitgtk/patches/webkitgtk-2.4.8-gmutexlocker.patch | 249
++++++++++++++
http/webkitgtk/webkitgtk-2.4.8-gcc5.patch | 20 -
7 files changed, 292 insertions(+), 27 deletions(-)
New commits:
commit e76fdb55e3c8ff366ef02df2605c846cb48e01c6
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
http/webkitgtk: reorginized fixes
diff --git a/http/webkitgtk/BUILD b/http/webkitgtk/BUILD
index a9a4f14..8bb959b 100755
--- a/http/webkitgtk/BUILD
+++ b/http/webkitgtk/BUILD
@@ -1,9 +1,2 @@
OPTS="--enable-webkit1 --disable-webkit2 $WEBKIT_OPTS $OPTS" &&
-cd ${SOURCE_DIRECTORY}/Source/WebCore/platform &&
-sed -i '30i#include <unicode/utf8.h>' text/TextCodecUTF8.h &&
-cd graphics/gstreamer &&
-sed -i 's/GMutexLocker /WebCore::&/' \
- VideoSinkGStreamer.cpp WebKitWebSourceGStreamer.cpp &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p0 < $SCRIPT_DIRECTORY/webkitgtk-2.4.8-gcc5.patch &&
default_build
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 2455eba..2e2360d 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,8 @@
+2015-04-25 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD: removed all seds and patches
+ * PRE_BUILD, patches/*: added for proper patching
+ * webkitgtk-2.4.8-gcc5.patch: replaced with ar's in patches/
+
2015-04-24 Pavel Vinogradov <public AT sourcemage.org>
* BUILD, webkitgtk-2.4.8-gcc5.patch: added patch to build with gcc
5.1,
based on ar's patch for Gentoo
diff --git a/http/webkitgtk/PRE_BUILD b/http/webkitgtk/PRE_BUILD
new file mode 100755
index 0000000..1f498a2
--- /dev/null
+++ b/http/webkitgtk/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+for fix in $SCRIPT_DIRECTORY/patches/*; do
+ patch -p1 < $fix
+done &&
+AT_M4DIR=Source/autotools autoreconf -vi
diff --git a/http/webkitgtk/patches/unicode.patch
b/http/webkitgtk/patches/unicode.patch
new file mode 100644
index 0000000..e09f4a9
--- /dev/null
+++ b/http/webkitgtk/patches/unicode.patch
@@ -0,0 +1,11 @@
+diff -Nuar webkitgtk-2.4.8.orig/Source/WebCore/platform/text/TextCodecUTF8.h
webkitgtk-2.4.8/Source/WebCore/platform/text/TextCodecUTF8.h
+--- webkitgtk-2.4.8.orig/Source/WebCore/platform/text/TextCodecUTF8.h
2015-04-25 15:26:50.930259771 -0400
++++ webkitgtk-2.4.8/Source/WebCore/platform/text/TextCodecUTF8.h
2015-04-25 15:29:27.546480274 -0400
+@@ -27,6 +27,7 @@
+ #define TextCodecUTF8_h
+
+ #include "TextCodec.h"
++#include <unicode/utf8.h>
+
+ namespace WebCore {
+
diff --git a/http/webkitgtk/patches/webkitgtk-2.4.8-gcc5.patch
b/http/webkitgtk/patches/webkitgtk-2.4.8-gcc5.patch
new file mode 100644
index 0000000..1101ae5
--- /dev/null
+++ b/http/webkitgtk/patches/webkitgtk-2.4.8-gcc5.patch
@@ -0,0 +1,21 @@
+diff -ur
webkitgtk-2.4.8.orig/Source/autotools/CheckSystemAndBasicDependencies.m4
webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4
+--- webkitgtk-2.4.8.orig/Source/autotools/CheckSystemAndBasicDependencies.m4
2015-01-07 10:45:43.000000000 +0100
++++ webkitgtk-2.4.8/Source/autotools/CheckSystemAndBasicDependencies.m4
2015-04-25 00:54:32.627749635 +0200
+@@ -87,7 +87,7 @@
+ c_compiler="unknown"
+ AC_LANG_PUSH([C])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+-#if !(defined(__GNUC__) && !defined(__clang__) &&
!defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
++#if !(defined(__GNUC__) && !defined(__clang__) &&
!defined(__INTEL_COMPILER) && (__GNUC__ >= 5 || __GNUC__ == 4 &&
__GNUC_MINOR__ >= 7))
+ #error Not a supported GCC compiler
+ #endif
+ ])], [c_compiler="gcc"], [])
+@@ -106,7 +106,7 @@
+ cxx_compiler="unknown"
+ AC_LANG_PUSH([C++])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+-#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) &&
!defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
++#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) &&
!defined(__INTEL_COMPILER) && (__GNUC__ >= 5 || __GNUC__ == 4 &&
__GNUC_MINOR__ >= 7))
+ #error Not a supported G++ compiler
+ #endif
+ ])], [cxx_compiler="g++"], [])
diff --git a/http/webkitgtk/patches/webkitgtk-2.4.8-gmutexlocker.patch
b/http/webkitgtk/patches/webkitgtk-2.4.8-gmutexlocker.patch
new file mode 100644
index 0000000..bfc33cf
--- /dev/null
+++ b/http/webkitgtk/patches/webkitgtk-2.4.8-gmutexlocker.patch
@@ -0,0 +1,249 @@
+diff -Nuar
webkitgtk-2.4.8.orig/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
+---
webkitgtk-2.4.8.orig/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
2015-04-25 15:26:50.912259746 -0400
++++
webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
2015-04-25 15:35:07.948959533 -0400
+@@ -118,7 +118,7 @@
+ WebKitVideoSink* sink = reinterpret_cast<WebKitVideoSink*>(data);
+ WebKitVideoSinkPrivate* priv = sink->priv;
+
+- GMutexLocker lock(priv->bufferMutex);
++ WebCore::GMutexLocker lock(priv->bufferMutex);
+ GstBuffer* buffer = priv->buffer;
+ priv->buffer = 0;
+ priv->timeoutId = 0;
+@@ -140,7 +140,7 @@
+ WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink);
+ WebKitVideoSinkPrivate* priv = sink->priv;
+
+- GMutexLocker lock(priv->bufferMutex);
++ WebCore::GMutexLocker lock(priv->bufferMutex);
+
+ if (priv->unlocked)
+ return GST_FLOW_OK;
+@@ -279,7 +279,7 @@
+
+ static void unlockBufferMutex(WebKitVideoSinkPrivate* priv)
+ {
+- GMutexLocker lock(priv->bufferMutex);
++ WebCore::GMutexLocker lock(priv->bufferMutex);
+
+ if (priv->buffer) {
+ gst_buffer_unref(priv->buffer);
+@@ -305,7 +305,7 @@
+ WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
+
+ {
+- GMutexLocker lock(priv->bufferMutex);
++ WebCore::GMutexLocker lock(priv->bufferMutex);
+ priv->unlocked = false;
+ }
+
+@@ -330,7 +330,7 @@
+ {
+ WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
+
+- GMutexLocker lock(priv->bufferMutex);
++ WebCore::GMutexLocker lock(priv->bufferMutex);
+ priv->unlocked = false;
+ return TRUE;
+ }
+diff -Nuar
webkitgtk-2.4.8.orig/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
+---
webkitgtk-2.4.8.orig/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
2015-04-25 15:26:50.913259747 -0400
++++
webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
2015-04-25 15:35:07.955959543 -0400
+@@ -346,7 +346,7 @@
+
+ switch (propID) {
+ case PROP_IRADIO_MODE: {
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ priv->iradioMode = g_value_get_boolean(value);
+ break;
+ }
+@@ -364,7 +364,7 @@
+ WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
+ WebKitWebSrcPrivate* priv = src->priv;
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ switch (propID) {
+ case PROP_IRADIO_MODE:
+ g_value_set_boolean(value, priv->iradioMode);
+@@ -417,7 +417,7 @@
+
+ ASSERT(isMainThread());
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+
+ bool seeking = priv->seekID;
+
+@@ -476,7 +476,7 @@
+
+ ASSERT(isMainThread());
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+
+ priv->startID = 0;
+ priv->corsAccessCheck = CORSNoCheck;
+@@ -573,7 +573,7 @@
+ return ret;
+ }
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ switch (transition) {
+ case GST_STATE_CHANGE_READY_TO_PAUSED:
+ GST_DEBUG_OBJECT(src, "READY->PAUSED");
+@@ -604,7 +604,7 @@
+ gst_query_parse_duration(query, &format, NULL);
+
+ GST_DEBUG_OBJECT(src, "duration query in format %s",
gst_format_get_name(format));
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
+ gst_query_set_duration(query, format, src->priv->size);
+ result = TRUE;
+@@ -612,7 +612,7 @@
+ break;
+ }
+ case GST_QUERY_URI: {
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ gst_query_set_uri(query, src->priv->uri);
+ result = TRUE;
+ break;
+@@ -653,7 +653,7 @@
+ WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
+ gchar* ret;
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ ret = g_strdup(src->priv->uri);
+ return ret;
+ }
+@@ -668,7 +668,7 @@
+ return FALSE;
+ }
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+
+ g_free(priv->uri);
+ priv->uri = 0;
+@@ -704,7 +704,7 @@
+
+ ASSERT(isMainThread());
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ // already stopped
+ if (!priv->needDataID)
+ return FALSE;
+@@ -725,7 +725,7 @@
+
+ GST_DEBUG_OBJECT(src, "Need more data: %u", length);
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ if (priv->needDataID || !priv->paused) {
+ return;
+ }
+@@ -739,7 +739,7 @@
+
+ ASSERT(isMainThread());
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ // already stopped
+ if (!priv->enoughDataID)
+ return FALSE;
+@@ -760,7 +760,7 @@
+
+ GST_DEBUG_OBJECT(src, "Have enough data");
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ if (priv->enoughDataID || priv->paused) {
+ return;
+ }
+@@ -774,7 +774,7 @@
+
+ ASSERT(isMainThread());
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ // already stopped
+ if (!priv->seekID)
+ return FALSE;
+@@ -792,7 +792,7 @@
+ WebKitWebSrcPrivate* priv = src->priv;
+
+ GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ if (offset == priv->offset && priv->requestedOffset == priv->offset)
+ return TRUE;
+
+@@ -811,7 +811,7 @@
+ void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer*
player)
+ {
+ ASSERT(player);
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ src->priv->player = player;
+ }
+
+@@ -841,7 +841,7 @@
+
+ mapGstBuffer(buffer);
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ priv->buffer = adoptGRef(buffer);
+ locker.unlock();
+
+@@ -867,7 +867,7 @@
+ return;
+ }
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+
+ priv->corsAccessCheck = corsAccessCheck;
+
+@@ -966,7 +966,7 @@
+ WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src);
+ WebKitWebSrcPrivate* priv = src->priv;
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+
+ GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ?
static_cast<long long>(gst_buffer_get_size(priv->buffer.get())) : length);
+
+@@ -1035,7 +1035,7 @@
+
+ GST_DEBUG_OBJECT(src, "Have EOS");
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ if (!priv->seekID) {
+ locker.unlock();
+ gst_app_src_end_of_stream(priv->appsrc);
+@@ -1194,7 +1194,7 @@
+
+ GST_ERROR_OBJECT(src, "Request was blocked");
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ uri.reset(g_strdup(src->priv->uri));
+ locker.unlock();
+
+@@ -1208,7 +1208,7 @@
+
+ GST_ERROR_OBJECT(src, "Cannot show URL");
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ uri.reset(g_strdup(src->priv->uri));
+ locker.unlock();
+
diff --git a/http/webkitgtk/webkitgtk-2.4.8-gcc5.patch
b/http/webkitgtk/webkitgtk-2.4.8-gcc5.patch
deleted file mode 100644
index 2cda54e..0000000
--- a/http/webkitgtk/webkitgtk-2.4.8-gcc5.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig 2015-04-24 22:46:14.948455952 -0400
-+++ configure 2015-04-24 23:03:37.934267065 -0400
-@@ -4890,7 +4890,7 @@
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
--#if !(defined(__GNUC__) && !defined(__clang__) &&
!defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
-+#if !(defined(__GNUC__) && !defined(__clang__) &&
!defined(__INTEL_COMPILER) && (__GNUC__ >= 5 || __GNUC__ == 4 &&
__GNUC_MINOR__ >= 7))
- #error Not a supported GCC compiler
- #endif
-
-@@ -4948,7 +4948,7 @@
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
--#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) &&
!defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
-+#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) &&
!defined(__INTEL_COMPILER) && (__GNUC__ >= 5 || __GNUC__ == 4 &&
__GNUC_MINOR__ >= 7))
- #error Not a supported G++ compiler
- #endif
-
- [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (e76fdb55e3c8ff366ef02df2605c846cb48e01c6), Pavel Vinogradov, 04/25/2015
Archive powered by MHonArc 2.6.24.