From 2986d0040d47f1f87e441693fe9c538ae1c4f657 Mon Sep 17 00:00:00 2001 From: piernov Date: Thu, 31 May 2012 19:46:23 +0000 Subject: qtwebkit 2.2.2-1 ajout port --- qtwebkit/.footprint.i686 | 56 ++++++++ qtwebkit/.footprint.x86_64 | 56 ++++++++ qtwebkit/.md5sum.i686 | 3 + qtwebkit/.md5sum.x86_64 | 3 + qtwebkit/Pkgfile | 35 +++++ qtwebkit/glibc.patch | 339 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 492 insertions(+) create mode 100644 qtwebkit/.footprint.i686 create mode 100644 qtwebkit/.footprint.x86_64 create mode 100644 qtwebkit/.md5sum.i686 create mode 100644 qtwebkit/.md5sum.x86_64 create mode 100644 qtwebkit/Pkgfile create mode 100644 qtwebkit/glibc.patch (limited to 'qtwebkit') diff --git a/qtwebkit/.footprint.i686 b/qtwebkit/.footprint.i686 new file mode 100644 index 000000000..18a24097f --- /dev/null +++ b/qtwebkit/.footprint.i686 @@ -0,0 +1,56 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/imports/ +drwxr-xr-x root/root usr/imports/QtWebKit/ +-rwxr-xr-x root/root usr/imports/QtWebKit/libqmlwebkitplugin.so +-rw-r--r-- root/root usr/imports/QtWebKit/qmldir +drwxr-xr-x root/root usr/include/ +drwxr-xr-x root/root usr/include/QtWebKit/ +-rw-r--r-- root/root usr/include/QtWebKit/QGraphicsWebView +-rw-r--r-- root/root usr/include/QtWebKit/QWebDatabase +-rw-r--r-- root/root usr/include/QtWebKit/QWebElement +-rw-r--r-- root/root usr/include/QtWebKit/QWebElementCollection +-rw-r--r-- root/root usr/include/QtWebKit/QWebFrame +-rw-r--r-- root/root usr/include/QtWebKit/QWebHistory +-rw-r--r-- root/root usr/include/QtWebKit/QWebHistoryInterface +-rw-r--r-- root/root usr/include/QtWebKit/QWebHistoryItem +-rw-r--r-- root/root usr/include/QtWebKit/QWebHitTestResult +-rw-r--r-- root/root usr/include/QtWebKit/QWebInspector +-rw-r--r-- root/root usr/include/QtWebKit/QWebPage +-rw-r--r-- root/root usr/include/QtWebKit/QWebPluginFactory +-rw-r--r-- root/root usr/include/QtWebKit/QWebSecurityOrigin +-rw-r--r-- root/root usr/include/QtWebKit/QWebSettings +-rw-r--r-- root/root usr/include/QtWebKit/QWebView +-rw-r--r-- root/root usr/include/QtWebKit/QtWebKit +-rw-r--r-- root/root usr/include/QtWebKit/ViewportAttributes +-rw-r--r-- root/root usr/include/QtWebKit/qgraphicswebview.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebdatabase.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebelement.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebframe.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebhistory.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebhistoryinterface.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebinspector.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebkitglobal.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebkitplatformplugin.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebkitversion.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebpage.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebpluginfactory.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebsecurityorigin.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebsettings.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebview.h +drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/libQtWebKit.prl +lrwxrwxrwx root/root usr/lib/libQtWebKit.so -> libQtWebKit.so.4.9.2 +lrwxrwxrwx root/root usr/lib/libQtWebKit.so.4 -> libQtWebKit.so.4.9.2 +lrwxrwxrwx root/root usr/lib/libQtWebKit.so.4.9 -> libQtWebKit.so.4.9.2 +-rwxr-xr-x root/root usr/lib/libQtWebKit.so.4.9.2 +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/QtWebKit.pc +drwxr-xr-x root/root usr/lib/qt/ +drwxr-xr-x root/root usr/lib/qt/plugins/ +drwxr-xr-x root/root usr/lib/qt/plugins/designer/ +-rwxr-xr-x root/root usr/lib/qt/plugins/designer/libqwebview.so +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/qt/ +drwxr-xr-x root/root usr/share/qt/mkspecs/ +drwxr-xr-x root/root usr/share/qt/mkspecs/modules/ +-rw-r--r-- root/root usr/share/qt/mkspecs/modules/qt_webkit_version.pri diff --git a/qtwebkit/.footprint.x86_64 b/qtwebkit/.footprint.x86_64 new file mode 100644 index 000000000..18a24097f --- /dev/null +++ b/qtwebkit/.footprint.x86_64 @@ -0,0 +1,56 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/imports/ +drwxr-xr-x root/root usr/imports/QtWebKit/ +-rwxr-xr-x root/root usr/imports/QtWebKit/libqmlwebkitplugin.so +-rw-r--r-- root/root usr/imports/QtWebKit/qmldir +drwxr-xr-x root/root usr/include/ +drwxr-xr-x root/root usr/include/QtWebKit/ +-rw-r--r-- root/root usr/include/QtWebKit/QGraphicsWebView +-rw-r--r-- root/root usr/include/QtWebKit/QWebDatabase +-rw-r--r-- root/root usr/include/QtWebKit/QWebElement +-rw-r--r-- root/root usr/include/QtWebKit/QWebElementCollection +-rw-r--r-- root/root usr/include/QtWebKit/QWebFrame +-rw-r--r-- root/root usr/include/QtWebKit/QWebHistory +-rw-r--r-- root/root usr/include/QtWebKit/QWebHistoryInterface +-rw-r--r-- root/root usr/include/QtWebKit/QWebHistoryItem +-rw-r--r-- root/root usr/include/QtWebKit/QWebHitTestResult +-rw-r--r-- root/root usr/include/QtWebKit/QWebInspector +-rw-r--r-- root/root usr/include/QtWebKit/QWebPage +-rw-r--r-- root/root usr/include/QtWebKit/QWebPluginFactory +-rw-r--r-- root/root usr/include/QtWebKit/QWebSecurityOrigin +-rw-r--r-- root/root usr/include/QtWebKit/QWebSettings +-rw-r--r-- root/root usr/include/QtWebKit/QWebView +-rw-r--r-- root/root usr/include/QtWebKit/QtWebKit +-rw-r--r-- root/root usr/include/QtWebKit/ViewportAttributes +-rw-r--r-- root/root usr/include/QtWebKit/qgraphicswebview.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebdatabase.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebelement.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebframe.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebhistory.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebhistoryinterface.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebinspector.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebkitglobal.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebkitplatformplugin.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebkitversion.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebpage.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebpluginfactory.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebsecurityorigin.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebsettings.h +-rw-r--r-- root/root usr/include/QtWebKit/qwebview.h +drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/libQtWebKit.prl +lrwxrwxrwx root/root usr/lib/libQtWebKit.so -> libQtWebKit.so.4.9.2 +lrwxrwxrwx root/root usr/lib/libQtWebKit.so.4 -> libQtWebKit.so.4.9.2 +lrwxrwxrwx root/root usr/lib/libQtWebKit.so.4.9 -> libQtWebKit.so.4.9.2 +-rwxr-xr-x root/root usr/lib/libQtWebKit.so.4.9.2 +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/QtWebKit.pc +drwxr-xr-x root/root usr/lib/qt/ +drwxr-xr-x root/root usr/lib/qt/plugins/ +drwxr-xr-x root/root usr/lib/qt/plugins/designer/ +-rwxr-xr-x root/root usr/lib/qt/plugins/designer/libqwebview.so +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/qt/ +drwxr-xr-x root/root usr/share/qt/mkspecs/ +drwxr-xr-x root/root usr/share/qt/mkspecs/modules/ +-rw-r--r-- root/root usr/share/qt/mkspecs/modules/qt_webkit_version.pri diff --git a/qtwebkit/.md5sum.i686 b/qtwebkit/.md5sum.i686 new file mode 100644 index 000000000..14ec91b4c --- /dev/null +++ b/qtwebkit/.md5sum.i686 @@ -0,0 +1,3 @@ +147e3e0eae2abb075c66aaa5167d52dd glibc.patch +86702e3a908e2968e87baa6600cbf31f qtwebkit-2.2.2-source.tar.gz +24e7a7cc0f6046cb0736c1039f64361e qwebview-4.8.2.tar.xz diff --git a/qtwebkit/.md5sum.x86_64 b/qtwebkit/.md5sum.x86_64 new file mode 100644 index 000000000..14ec91b4c --- /dev/null +++ b/qtwebkit/.md5sum.x86_64 @@ -0,0 +1,3 @@ +147e3e0eae2abb075c66aaa5167d52dd glibc.patch +86702e3a908e2968e87baa6600cbf31f qtwebkit-2.2.2-source.tar.gz +24e7a7cc0f6046cb0736c1039f64361e qwebview-4.8.2.tar.xz diff --git a/qtwebkit/Pkgfile b/qtwebkit/Pkgfile new file mode 100644 index 000000000..610a71d68 --- /dev/null +++ b/qtwebkit/Pkgfile @@ -0,0 +1,35 @@ +# Description: Implémentation Qt du moteur de rendu WebKit. +# URL: http://trac.webkit.org/wiki/QtWebKit +# Maintainer: http://trac.webkit.org/wiki/QtWebKit +# Packager: piernov +# Depends on: qt +# Run on: qt + +name=qtwebkit +version=2.2.2 +release=1 +qtversion=4.8.2 +source=(ftp://ftp.archlinux.org/other/$name/$name-$version-source.tar.gz + ftp://ftp.archlinux.org/other/$name/qwebview-$qtversion.tar.xz + glibc.patch) + +build() { + cd $name-$version-source + patch -p1 < ../glibc.patch + + # move headers + mv include Source/ + + cd Source + qmake + cd ../ + + make -C Source + make INSTALL_ROOT=$PKG -C Source install + + # Build the QWebView plugin (FS#27914) + cd $SRC/$name-$version-source/qwebview-$qtversion/plugins/qwebview + qmake + make + make INSTALL_ROOT=$PKG install +} diff --git a/qtwebkit/glibc.patch b/qtwebkit/glibc.patch new file mode 100644 index 000000000..f85ba2908 --- /dev/null +++ b/qtwebkit/glibc.patch @@ -0,0 +1,339 @@ +diff -up webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am.glib231 webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am +--- webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am.glib231 2011-11-09 16:32:47.000000000 +0100 ++++ webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am 2011-12-21 12:50:19.000000000 +0100 +@@ -438,7 +438,6 @@ javascriptcore_sources += \ + Source/JavaScriptCore/wtf/gobject/GRefPtr.h \ + Source/JavaScriptCore/wtf/gobject/GTypedefs.h \ + Source/JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \ +- Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \ + Source/JavaScriptCore/wtf/HashCountedSet.h \ + Source/JavaScriptCore/wtf/HashFunctions.h \ + Source/JavaScriptCore/wtf/HashIterators.h \ +diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp +--- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp.glib231 2011-11-09 16:32:47.000000000 +0100 ++++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp 2011-12-21 12:50:19.000000000 +0100 +@@ -37,18 +37,6 @@ template <> void freeOwnedGPtr(GL + g_list_free(ptr); + } + +-template <> void freeOwnedGPtr(GCond* ptr) +-{ +- if (ptr) +- g_cond_free(ptr); +-} +- +-template <> void freeOwnedGPtr(GMutex* ptr) +-{ +- if (ptr) +- g_mutex_free(ptr); +-} +- + template <> void freeOwnedGPtr(GPatternSpec* ptr) + { + if (ptr) +diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h +--- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h.glib231 2011-11-09 16:32:47.000000000 +0100 ++++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h 2011-12-21 12:50:19.000000000 +0100 +@@ -35,8 +35,6 @@ namespace WTF { + template inline void freeOwnedGPtr(T* ptr); + template<> void freeOwnedGPtr(GError*); + template<> void freeOwnedGPtr(GList*); +-template<> void freeOwnedGPtr(GCond*); +-template<> void freeOwnedGPtr(GMutex*); + template<> void freeOwnedGPtr(GPatternSpec*); + template<> void freeOwnedGPtr(GDir*); + +diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h +--- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.glib231 2011-11-09 16:32:47.000000000 +0100 ++++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2011-12-21 12:50:19.000000000 +0100 +@@ -39,7 +39,6 @@ typedef void* gpointer; + typedef struct _GAsyncResult GAsyncResult; + typedef struct _GCancellable GCancellable; + typedef struct _GCharsetConverter GCharsetConverter; +-typedef struct _GCond GCond; + typedef struct _GDir GDir; + typedef struct _GdkAtom* GdkAtom; + typedef struct _GdkCursor GdkCursor; +@@ -52,7 +51,6 @@ typedef struct _GFile GFile; + typedef struct _GHashTable GHashTable; + typedef struct _GInputStream GInputStream; + typedef struct _GList GList; +-typedef struct _GMutex GMutex; + typedef struct _GPatternSpec GPatternSpec; + typedef struct _GPollableOutputStream GPollableOutputStream; + typedef struct _GSocketClient GSocketClient; +diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp +--- webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp.glib231 2011-12-21 12:52:25.000000000 +0100 ++++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp 2011-12-21 12:52:28.000000000 +0100 +@@ -1,248 +0,0 @@ +-/* +- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. +- * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com) +- * +- * Redistribution and use in source and binary forms, with or without +- * modification, are permitted provided that the following conditions +- * are met: +- * +- * 1. Redistributions of source code must retain the above copyright +- * notice, this list of conditions and the following disclaimer. +- * 2. Redistributions in binary form must reproduce the above copyright +- * notice, this list of conditions and the following disclaimer in the +- * documentation and/or other materials provided with the distribution. +- * 3. Neither the name of Apple Inc. ("Apple") nor the names of +- * its contributors may be used to endorse or promote products derived +- * from this software without specific prior written permission. +- * +- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY +- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY +- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +- */ +- +-#include "config.h" +-#include "Threading.h" +- +-#if !USE(PTHREADS) +- +-#include "CurrentTime.h" +-#include "HashMap.h" +-#include "MainThread.h" +-#include "RandomNumberSeed.h" +-#include +- +-#include +-#include +- +-namespace WTF { +- +-typedef HashMap ThreadMap; +- +-static Mutex* atomicallyInitializedStaticMutex; +- +-static Mutex& threadMapMutex() +-{ +- DEFINE_STATIC_LOCAL(Mutex, mutex, ()); +- return mutex; +-} +- +-void initializeThreading() +-{ +- if (!g_thread_supported()) +- g_thread_init(NULL); +- ASSERT(g_thread_supported()); +- +- if (!atomicallyInitializedStaticMutex) { +- atomicallyInitializedStaticMutex = new Mutex; +- threadMapMutex(); +- initializeRandomNumberGenerator(); +- } +-} +- +-void lockAtomicallyInitializedStaticMutex() +-{ +- ASSERT(atomicallyInitializedStaticMutex); +- atomicallyInitializedStaticMutex->lock(); +-} +- +-void unlockAtomicallyInitializedStaticMutex() +-{ +- atomicallyInitializedStaticMutex->unlock(); +-} +- +-static ThreadMap& threadMap() +-{ +- DEFINE_STATIC_LOCAL(ThreadMap, map, ()); +- return map; +-} +- +-static ThreadIdentifier identifierByGthreadHandle(GThread*& thread) +-{ +- MutexLocker locker(threadMapMutex()); +- +- ThreadMap::iterator i = threadMap().begin(); +- for (; i != threadMap().end(); ++i) { +- if (i->second == thread) +- return i->first; +- } +- +- return 0; +-} +- +-static ThreadIdentifier establishIdentifierForThread(GThread*& thread) +-{ +- ASSERT(!identifierByGthreadHandle(thread)); +- +- MutexLocker locker(threadMapMutex()); +- +- static ThreadIdentifier identifierCount = 1; +- +- threadMap().add(identifierCount, thread); +- +- return identifierCount++; +-} +- +-static GThread* threadForIdentifier(ThreadIdentifier id) +-{ +- MutexLocker locker(threadMapMutex()); +- +- return threadMap().get(id); +-} +- +-static void clearThreadForIdentifier(ThreadIdentifier id) +-{ +- MutexLocker locker(threadMapMutex()); +- +- ASSERT(threadMap().contains(id)); +- +- threadMap().remove(id); +-} +- +-ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, const char*) +-{ +- GThread* thread; +- if (!(thread = g_thread_create(entryPoint, data, TRUE, 0))) { +- LOG_ERROR("Failed to create thread at entry point %p with data %p", entryPoint, data); +- return 0; +- } +- +- ThreadIdentifier threadID = establishIdentifierForThread(thread); +- return threadID; +-} +- +-void initializeCurrentThreadInternal(const char*) +-{ +-} +- +-int waitForThreadCompletion(ThreadIdentifier threadID, void** result) +-{ +- ASSERT(threadID); +- +- GThread* thread = threadForIdentifier(threadID); +- +- void* joinResult = g_thread_join(thread); +- if (result) +- *result = joinResult; +- +- clearThreadForIdentifier(threadID); +- return 0; +-} +- +-void detachThread(ThreadIdentifier) +-{ +-} +- +-ThreadIdentifier currentThread() +-{ +- GThread* currentThread = g_thread_self(); +- if (ThreadIdentifier id = identifierByGthreadHandle(currentThread)) +- return id; +- return establishIdentifierForThread(currentThread); +-} +- +-void yield() +-{ +- g_thread_yield(); +-} +- +-Mutex::Mutex() +- : m_mutex(g_mutex_new()) +-{ +-} +- +-Mutex::~Mutex() +-{ +-} +- +-void Mutex::lock() +-{ +- g_mutex_lock(m_mutex.get()); +-} +- +-bool Mutex::tryLock() +-{ +- return g_mutex_trylock(m_mutex.get()); +-} +- +-void Mutex::unlock() +-{ +- g_mutex_unlock(m_mutex.get()); +-} +- +-ThreadCondition::ThreadCondition() +- : m_condition(g_cond_new()) +-{ +-} +- +-ThreadCondition::~ThreadCondition() +-{ +-} +- +-void ThreadCondition::wait(Mutex& mutex) +-{ +- g_cond_wait(m_condition.get(), mutex.impl().get()); +-} +- +-bool ThreadCondition::timedWait(Mutex& mutex, double absoluteTime) +-{ +- // Time is in the past - return right away. +- if (absoluteTime < currentTime()) +- return false; +- +- // Time is too far in the future for g_cond_timed_wait - wait forever. +- if (absoluteTime > INT_MAX) { +- wait(mutex); +- return true; +- } +- +- int timeSeconds = static_cast(absoluteTime); +- int timeMicroseconds = static_cast((absoluteTime - timeSeconds) * 1000000.0); +- +- GTimeVal targetTime; +- targetTime.tv_sec = timeSeconds; +- targetTime.tv_usec = timeMicroseconds; +- +- return g_cond_timed_wait(m_condition.get(), mutex.impl().get(), &targetTime); +-} +- +-void ThreadCondition::signal() +-{ +- g_cond_signal(m_condition.get()); +-} +- +-void ThreadCondition::broadcast() +-{ +- g_cond_broadcast(m_condition.get()); +-} +- +- +-} +- +-#endif // !USE(PTHREADS) +diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h +--- webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h.glib231 2011-11-09 16:32:47.000000000 +0100 ++++ webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h 2011-12-21 12:50:19.000000000 +0100 +@@ -44,8 +44,6 @@ + + #if USE(PTHREADS) + #include +-#elif PLATFORM(GTK) +-#include "GOwnPtr.h" + #endif + + #if PLATFORM(QT) +@@ -66,10 +64,6 @@ typedef pthread_rwlock_t PlatformReadWri + typedef void* PlatformReadWriteLock; + #endif + typedef pthread_cond_t PlatformCondition; +-#elif PLATFORM(GTK) +-typedef GOwnPtr PlatformMutex; +-typedef void* PlatformReadWriteLock; // FIXME: Implement. +-typedef GOwnPtr PlatformCondition; + #elif PLATFORM(QT) + typedef QT_PREPEND_NAMESPACE(QMutex)* PlatformMutex; + typedef void* PlatformReadWriteLock; // FIXME: Implement. -- cgit v1.2.3-54-g00ecf