From 054509664b2fe3c67da4b6154d6571417939619d Mon Sep 17 00:00:00 2001 From: Daniele Date: Wed, 31 Oct 2012 01:02:30 +0100 Subject: [PATCH] First attempt at writing a lib32-qtwebkit package. This PKGBUILD is not building yet. :-\ --- lib32-qtwebkit/PKGBUILD | 64 +++++++++++++++++++ .../gentoo-qt-webkit-4.8.1+glib-2.31.patch | 30 +++++++++ 2 files changed, 94 insertions(+) create mode 100644 lib32-qtwebkit/PKGBUILD create mode 100644 lib32-qtwebkit/gentoo-qt-webkit-4.8.1+glib-2.31.patch diff --git a/lib32-qtwebkit/PKGBUILD b/lib32-qtwebkit/PKGBUILD new file mode 100644 index 0000000..00405b5 --- /dev/null +++ b/lib32-qtwebkit/PKGBUILD @@ -0,0 +1,64 @@ +# Lib32 Packages for Chakra, part of chakra-project.org +# +# maintainer (x86_64): Daniele Cocca +# maintainer (x86_64): Anke Boersma + +_pkgbasename=qtwebkit +pkgname="lib32-${_pkgbasename}" +pkgver=2.2.1 +pkgrel=1 +pkgdesc="Standalone QtWebKit version. (ELF32)" +arch=('i686' 'x86_64') +url="http://trac.webkit.org/wiki/QtWebKit" +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') +#source=("http://get.qt.nokia.com/qtwebkit/QtWebKit-${pkgver}.tar.gz") +source=("http://chakra-linux.org/sources/${_pkgbasename}/QtWebKit-${pkgver}.tar.gz" + "http://chakra-linux.org/sources/${_pkgbasename}/qwebview-4.8.0.tar.bz2" + 'gentoo-qt-webkit-4.8.1+glib-2.31.patch') +md5sums=('1a77037379369ba151bb8a2d6bc6122a' + '13a4ac75d98452c2bf7ef710353e91d8' + '1258b22d53a3d0a217d316e91cadc236') + +build() { + cd "${srcdir}/QtWebKit-${pkgver}" + + unset MAKEFLAGS CXXFLAGS CFLAGS LDFLAGS + + export CFLAGS="-m32" LDFLAGS="-m32" CXXFLAGS="-m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + export QT4DIR="${srcdir}/${pkgname}" + 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" + make install INSTALL_ROOT="${pkgdir}" + + cd "${srcdir}/QtWebKit-${pkgver}/qwebview-4.8.0/plugins/qwebview" + make install INSTALL_ROOT="${pkgdir}" +} + +# vim:set ts=2 sw=2 et: diff --git a/lib32-qtwebkit/gentoo-qt-webkit-4.8.1+glib-2.31.patch b/lib32-qtwebkit/gentoo-qt-webkit-4.8.1+glib-2.31.patch new file mode 100644 index 0000000..ced3794 --- /dev/null +++ b/lib32-qtwebkit/gentoo-qt-webkit-4.8.1+glib-2.31.patch @@ -0,0 +1,30 @@ +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 + #include + #include + #include +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;