lib32-qtwebkit update, build fix

lib32-qtwebkit/PKGBUILD

@@ -5,7 +5,7 @@
 
 _pkgbasename=qtwebkit
 pkgname="lib32-${_pkgbasename}"
-pkgver=2.2.1
+pkgver=2.2.2
 pkgrel=1
 pkgdesc="Standalone QtWebKit version. (ELF32)"
 arch=('i686' 'x86_64')
@@ -14,51 +14,35 @@ license=('GPL3' 'LGPL')
 depends=('lib32-qt' 'lib32-gstreamer0.10' 'lib32-gstreamer0.10-base'
          "${_pkgbasename}=${pkgver}")
 makedepends=('gperf' 'phonon' 'perl' 'python'
-             'lib32-sqlite3' 'lib32-fontconfig' 'lib32-mesa' 'lib32-libglapi' 'lib32-qt')
+             'lib32-sqlite3' 'lib32-fontconfig' 'lib32-mesa' 'lib32-libglapi')
 #source=("http://get.qt.nokia.com/qtwebkit/QtWebKit-${pkgver}.tar.gz")
-source=("http://chakra-linux.org/sources/${_pkgbasename}/QtWebKit-${pkgver}.tar.gz"
+source=("http://chakra-linux.org/sources/${_pkgbasename}/qtwebkit-${pkgver}-source.tar.gz"
         "http://chakra-linux.org/sources/${_pkgbasename}/qwebview-4.8.0.tar.bz2"
-        'gentoo-qt-webkit-4.8.1+glib-2.31.patch')
+        'glib.patch')
-md5sums=('1a77037379369ba151bb8a2d6bc6122a'
+md5sums=('86702e3a908e2968e87baa6600cbf31f'
          '13a4ac75d98452c2bf7ef710353e91d8'
-         '1258b22d53a3d0a217d316e91cadc236')
+         'dece50d952593e301007432962ba3000')
 
 build() {
-  cd "${srcdir}/QtWebKit-${pkgver}"
+  cd "${srcdir}/qtwebkit-${pkgver}-source"
+  
+  patch -p1 -i "${srcdir}"/glib.patch
 
-  unset MAKEFLAGS CXXFLAGS CFLAGS LDFLAGS
+  # move headers
+  mv include Source/
 
-  export CFLAGS="-m32" LDFLAGS="-m32" CXXFLAGS="-m32"
+  cd Source
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  qmake
+  cd ../
 
-  export QT4DIR="${srcdir}/${pkgname}"
+  make -C Source
-  export PATH="${QT4DIR}/bin:${PATH}"
-  export BUILD_WEBKIT_ARGS="DEFINES=QT_NO_UITOOLS"
 
-  # Make QtWebKit compile with a recent glib
-  patch -Np4 -i "${srcdir}/gentoo-qt-webkit-4.8.1+glib-2.31.patch"
-
-  # Remove -Werror from CXXFLAGS
-  sed -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror:-Wno-error=delete-non-virtual-dtor:g' \
-      -i Source/WebKit.pri
-
-  Tools/Scripts/build-webkit \
-    --qt \
-    --qmakearg="-platform linux-g++-32 -Wnone" \
-    --3d-canvas \
-  || return 1
- 
-  cd "${srcdir}/QtWebKit-${pkgver}/qwebview-4.8.0/plugins/qwebview"
-  qmake -platform "linux-g++-32"
-  make
 }
 
 package() {
-  cd "${srcdir}/QtWebKit-${pkgver}/WebKitBuild/Release"
+  cd "${srcdir}/qtwebkit-${pkgver}-source"
-  make install INSTALL_ROOT="${pkgdir}"
+  make INSTALL_ROOT="${pkgdir}" -C Source install
 
-  cd "${srcdir}/QtWebKit-${pkgver}/qwebview-4.8.0/plugins/qwebview"
-  make install INSTALL_ROOT="${pkgdir}"
 }
 
 # vim:set ts=2 sw=2 et:

lib32-qtwebkit/gentoo-qt-webkit-4.8.1+glib-2.31.patch

@@ -1,30 +0,0 @@
-diff -Naur qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h
---- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h	2012-04-01 19:32:46.621395314 +0200
-+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h	2012-04-01 19:34:23.693181749 +0200
-@@ -24,6 +24,7 @@
- 
- #if ENABLE(GLIB_SUPPORT)
- 
-+#include <glib.h>
- #include <algorithm>
- #include <wtf/Assertions.h>
- #include <wtf/Noncopyable.h>
-diff -Naur qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
---- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h	2012-04-01 19:32:46.624395278 +0200
-+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h	2012-04-01 19:34:09.420360184 +0200
-@@ -39,7 +39,6 @@
- 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 _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;

lib32-qtwebkit/glib.patch

@@ -0,0 +1,88 @@
+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<GList>(GL
+     g_list_free(ptr);
+ }
+
+-template <> void freeOwnedGPtr<GCond>(GCond* ptr)
+-{
+-    if (ptr)
+-        g_cond_free(ptr);
+-}
+-
+-template <> void freeOwnedGPtr<GMutex>(GMutex* ptr)
+-{
+-    if (ptr)
+-        g_mutex_free(ptr);
+-}
+-
+ template <> void freeOwnedGPtr<GPatternSpec>(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 <typename T> inline void freeOwnedGPtr(T* ptr);
+ template<> void freeOwnedGPtr<GError>(GError*);
+ template<> void freeOwnedGPtr<GList>(GList*);
+-template<> void freeOwnedGPtr<GCond>(GCond*);
+-template<> void freeOwnedGPtr<GMutex>(GMutex*);
+ template<> void freeOwnedGPtr<GPatternSpec>(GPatternSpec*);
+ template<> void freeOwnedGPtr<GDir>(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/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 <pthread.h>
+-#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<GMutex> PlatformMutex;
+-typedef void* PlatformReadWriteLock; // FIXME: Implement.
+-typedef GOwnPtr<GCond> PlatformCondition;
+ #elif PLATFORM(QT)
+ typedef QT_PREPEND_NAMESPACE(QMutex)* PlatformMutex;
+ typedef void* PlatformReadWriteLock; // FIXME: Implement.
+