[Midnightbsd-cvs] mports [20131] trunk/www/webkit-gtk2/pkg-plist: webkit gtk2 2.4.9

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Aug 30 10:56:39 EDT 2015


Revision: 20131
          http://svnweb.midnightbsd.org/mports/?rev=20131
Author:   laffer1
Date:     2015-08-30 10:56:39 -0400 (Sun, 30 Aug 2015)
Log Message:
-----------
webkit gtk2 2.4.9

Modified Paths:
--------------
    trunk/www/webkit-gtk2/Makefile
    trunk/www/webkit-gtk2/distinfo
    trunk/www/webkit-gtk2/pkg-descr
    trunk/www/webkit-gtk2/pkg-plist

Removed Paths:
-------------
    trunk/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase.cpp
    trunk/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_VideoSinkGStreamer.cpp
    trunk/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_WebKitWebSourceGStreamer.cpp
    trunk/www/webkit-gtk2/files/patch-configure

Property Changed:
----------------
    trunk/www/webkit-gtk2/pkg-descr

Modified: trunk/www/webkit-gtk2/Makefile
===================================================================
--- trunk/www/webkit-gtk2/Makefile	2015-08-29 23:07:45 UTC (rev 20130)
+++ trunk/www/webkit-gtk2/Makefile	2015-08-30 14:56:39 UTC (rev 20131)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	webkit
-PORTVERSION=	2.4.8
+PORTVERSION=	2.4.9
 PORTREVISION=	0
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
@@ -14,6 +14,7 @@
 LICENSE=	lgpl
 
 BUILD_DEPENDS=	gtkdoc-rebase:${PORTSDIR}/textproc/gtk-doc \
+		p5-Switch>0:${PORTSDIR}/lang/p5-Switch \
 		geoclue>=0:${PORTSDIR}/net/geoclue
 LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant \
 		libsecret-1.so:${PORTSDIR}/security/libsecret \
@@ -24,7 +25,7 @@
 		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 RUN_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue
 
-USE_GSTREAMER=	yes
+USE_GSTREAMER1=	yes
 USE_XORG=	xt xdamage xcomposite
 USES=		bison compiler:c++11-lib gettext gmake gperf libtool \
 		perl5 pkgconfig shebangfix tar:xz

Modified: trunk/www/webkit-gtk2/distinfo
===================================================================
--- trunk/www/webkit-gtk2/distinfo	2015-08-29 23:07:45 UTC (rev 20130)
+++ trunk/www/webkit-gtk2/distinfo	2015-08-30 14:56:39 UTC (rev 20131)
@@ -1,2 +1,2 @@
-SHA256 (webkitgtk-2.4.8.tar.xz) = 68f11559cb178679ca92acc9e3a3d7febede7acb7b98afd7fb761875bbc6bd23
-SIZE (webkitgtk-2.4.8.tar.xz) = 9827632
+SHA256 (webkitgtk-2.4.9.tar.xz) = afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564
+SIZE (webkitgtk-2.4.9.tar.xz) = 9840740

Deleted: trunk/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase.cpp
===================================================================
--- trunk/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase.cpp	2015-08-29 23:07:45 UTC (rev 20130)
+++ trunk/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase.cpp	2015-08-30 14:56:39 UTC (rev 20131)
@@ -1,29 +0,0 @@
---- Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.orig	2015-02-12 01:22:34.449468000 +0100
-+++ Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp	2015-02-12 01:24:42.777620000 +0100
-@@ -316,7 +316,7 @@ void MediaPlayerPrivateGStreamerBase::mu
- #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
- PassRefPtr<BitmapTexture> MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper)
- {
--    GMutexLocker lock(m_bufferMutex);
-+    WebCore::GMutexLocker lock(m_bufferMutex);
-     if (!m_buffer)
-         return nullptr;
- 
-@@ -366,7 +366,7 @@ void MediaPlayerPrivateGStreamerBase::tr
-     g_return_if_fail(GST_IS_BUFFER(buffer));
- 
-     {
--        GMutexLocker lock(m_bufferMutex);
-+        WebCore::GMutexLocker lock(m_bufferMutex);
-         gst_buffer_replace(&m_buffer, buffer);
-     }
- 
-@@ -398,7 +398,7 @@ void MediaPlayerPrivateGStreamerBase::pa
-     if (!m_player->visible())
-         return;
- 
--    GMutexLocker lock(m_bufferMutex);
-+    WebCore::GMutexLocker lock(m_bufferMutex);
-     if (!m_buffer)
-         return;
- 

Deleted: trunk/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_VideoSinkGStreamer.cpp
===================================================================
--- trunk/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_VideoSinkGStreamer.cpp	2015-08-29 23:07:45 UTC (rev 20130)
+++ trunk/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_VideoSinkGStreamer.cpp	2015-08-30 14:56:39 UTC (rev 20131)
@@ -1,47 +0,0 @@
---- Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.orig	2015-02-12 01:22:25.261692000 +0100
-+++ Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp	2015-02-12 01:24:34.127107000 +0100
-@@ -118,7 +118,7 @@ static gboolean webkitVideoSinkTimeoutCa
-     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 @@ static GstFlowReturn webkitVideoSinkRend
-     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 webkitVideoSinkGetProperty(G
- 
- 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 @@ static gboolean webkitVideoSinkUnlockSto
-     WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
- 
-     {
--        GMutexLocker lock(priv->bufferMutex);
-+        WebCore::GMutexLocker lock(priv->bufferMutex);
-         priv->unlocked = false;
-     }
- 
-@@ -330,7 +330,7 @@ static gboolean webkitVideoSinkStart(Gst
- {
-     WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
- 
--    GMutexLocker lock(priv->bufferMutex);
-+    WebCore::GMutexLocker lock(priv->bufferMutex);
-     priv->unlocked = false;
-     return TRUE;
- }

Deleted: trunk/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_WebKitWebSourceGStreamer.cpp
===================================================================
--- trunk/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_WebKitWebSourceGStreamer.cpp	2015-08-29 23:07:45 UTC (rev 20130)
+++ trunk/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_WebKitWebSourceGStreamer.cpp	2015-08-30 14:56:39 UTC (rev 20131)
@@ -1,200 +0,0 @@
---- Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig	2015-02-12 01:22:42.081133000 +0100
-+++ Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp	2015-02-12 01:25:08.298076000 +0100
-@@ -346,7 +346,7 @@ static void webKitWebSrcSetProperty(GObj
- 
-     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 @@ static void webKitWebSrcGetProperty(GObj
-     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 @@ static gboolean webKitWebSrcStop(WebKitW
- 
-     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 @@ static gboolean webKitWebSrcStart(WebKit
- 
-     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 @@ static GstStateChangeReturn webKitWebSrc
-         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 @@ static gboolean webKitWebSrcQueryWithPar
-         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 @@ static gboolean webKitWebSrcQueryWithPar
-         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 @@ static gchar* webKitWebSrcGetUri(GstURIH
-     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 @@ static gboolean webKitWebSrcSetUri(GstUR
-         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 @@ static gboolean webKitWebSrcNeedDataMain
- 
-     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 @@ static void webKitWebSrcNeedDataCb(GstAp
- 
-     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 @@ static gboolean webKitWebSrcEnoughDataMa
- 
-     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 @@ static void webKitWebSrcEnoughDataCb(Gst
- 
-     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 @@ static gboolean webKitWebSrcSeekMainCb(W
- 
-     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 @@ static gboolean webKitWebSrcSeekDataCb(G
-     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 @@ static gboolean webKitWebSrcSeekDataCb(G
- 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 @@ char* StreamingClient::createReadBuffer(
- 
-     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 @@ void StreamingClient::handleResponseRece
-         return;
-     }
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- 
-     priv->corsAccessCheck = corsAccessCheck;
- 
-@@ -966,7 +966,7 @@ void StreamingClient::handleDataReceived
-     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 @@ void StreamingClient::handleNotifyFinish
- 
-     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 @@ void ResourceHandleStreamingClient::wasB
- 
-     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 @@ void ResourceHandleStreamingClient::cann
- 
-     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();
- 

Deleted: trunk/www/webkit-gtk2/files/patch-configure
===================================================================
--- trunk/www/webkit-gtk2/files/patch-configure	2015-08-29 23:07:45 UTC (rev 20130)
+++ trunk/www/webkit-gtk2/files/patch-configure	2015-08-30 14:56:39 UTC (rev 20131)
@@ -1,20 +0,0 @@
---- configure.orig	2015-01-07 09:47:51 UTC
-+++ configure
-@@ -4890,7 +4890,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 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__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
- #error Not a supported GCC compiler
- #endif
- 
-@@ -4948,7 +4948,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 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__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))
- #error Not a supported G++ compiler
- #endif
- 

Modified: trunk/www/webkit-gtk2/pkg-descr
===================================================================
--- trunk/www/webkit-gtk2/pkg-descr	2015-08-29 23:07:45 UTC (rev 20130)
+++ trunk/www/webkit-gtk2/pkg-descr	2015-08-30 14:56:39 UTC (rev 20131)
@@ -1,5 +1,12 @@
-WebKit is an open source web browser engine. It is able to display content
-such as HTML, SVG, XML, and others. It also supports DOM, XMLHttpRequest,
-XSLT, CSS, Javascript/ECMAscript and more.
+WebKitGTK+ is a full-featured port of the WebKit rendering engine, suitable
+for projects requiring any kind of web integration, from hybrid HTML/CSS
+applications to full-fledged web browsers. It offers WebKit's full
+functionality and is useful in a wide range of systems from desktop
+computers to embedded systems like phones, tablets, and televisions.
 
-WWW: http://webkit.org/
+WebKitGTK+ is made by a lively community of developers and designers,
+who hope to bring the web platform to everyone. It's the official web
+engine of the GNOME platform and is used in browsers such as Epiphany
+and Midori.
+
+WWW: http://webkitgtk.org/


Property changes on: trunk/www/webkit-gtk2/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/webkit-gtk2/pkg-plist
===================================================================
--- trunk/www/webkit-gtk2/pkg-plist	2015-08-29 23:07:45 UTC (rev 20130)
+++ trunk/www/webkit-gtk2/pkg-plist	2015-08-30 14:56:39 UTC (rev 20131)
@@ -255,10 +255,10 @@
 lib/girepository-1.0/WebKit-1.0.typelib
 lib/libjavascriptcoregtk-1.0.so
 lib/libjavascriptcoregtk-1.0.so.0
-lib/libjavascriptcoregtk-1.0.so.0.16.16
+lib/libjavascriptcoregtk-1.0.so.0.16.17
 lib/libwebkitgtk-1.0.so
 lib/libwebkitgtk-1.0.so.0
-lib/libwebkitgtk-1.0.so.0.22.14
+lib/libwebkitgtk-1.0.so.0.22.15
 libdata/pkgconfig/javascriptcoregtk-1.0.pc
 libdata/pkgconfig/webkit-1.0.pc
 share/gir-1.0/JavaScriptCore-1.0.gir



More information about the Midnightbsd-cvs mailing list