Date: Monday, February 14, 2011 @ 20:18:32 Author: heftig Revision: 110041
upgpkg: libwebkit 1.3.11-1 Update for gnome-unstable Added: libwebkit/trunk/libwebkit.install Modified: libwebkit/trunk/PKGBUILD Deleted: libwebkit/trunk/introspection.patch ---------------------+ PKGBUILD | 78 ++++++++++++++++++++++++++++++++++---------------- introspection.patch | 22 -------------- libwebkit.install | 11 +++++++ 3 files changed, 65 insertions(+), 46 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-02-15 00:43:44 UTC (rev 110040) +++ PKGBUILD 2011-02-15 01:18:32 UTC (rev 110041) @@ -1,39 +1,69 @@ # $Id$ # Maintainer: Andreas Radke <[email protected]> -pkgname=libwebkit -pkgver=1.2.7 +pkgbase=libwebkit +pkgname=(libwebkit libwebkit3) +pkgver=1.3.11 pkgrel=1 -pkgdesc="an opensource web content engine, derived from KHTML and KJS from KDE" +pkgdesc="An opensource web content engine" arch=('i686' 'x86_64') url="http://webkitgtk.org/"; license=('custom') -depends=('libxt' 'libxslt' 'sqlite3' 'gtk2' 'icu>=4.6' 'gstreamer0.10-base' 'libsoup' 'enchant') -makedepends=('gperf' 'gtk-doc' 'gobject-introspection') -provides=('webkitgtk-svn') -conflicts=('webkitgtk-svn') -replaces=('webkitgtk-svn') +depends=('libxt' 'libxslt' 'sqlite3' 'icu>=4.6' 'gstreamer0.10-base' 'libsoup' 'enchant') +makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3') options=('!libtool') -source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz - introspection.patch) -md5sums=('25c7e548b65aeb6d83c0182c32ef0927' - 'e7e83312618cb30cc9a1567a21cd0e06') +install=libwebkit.install +source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz) +md5sums=('6d4506086fb0d274d1a2c871fcaf851e') - build() { - cd "${srcdir}/webkit-${pkgver}" - patch -Np0 -i "${srcdir}/introspection.patch" + cd "${srcdir}" - ./configure --prefix=/usr \ - --enable-video --enable-introspection \ - --with-font-backend=freetype --enable-gtk-doc \ - --enable-jit --with-unicode-backend=icu - #disable makeflags if parallel building fails - make ${MAKEFLAGS} + export PYTHON=/usr/bin/python2 + + rm -rf gtk3-build + cp -a webkit-${pkgver} gtk3-build + + ( + cd webkit-$pkgver + ./configure --prefix=/usr \ + --enable-video --enable-introspection \ + --with-font-backend=freetype --enable-gtk-doc \ + --enable-jit --with-unicode-backend=icu \ + --enable-3D-transforms --enable-mathml \ + --with-gtk=2.0 + make + ) + + ( + cd gtk3-build + ./configure --prefix=/usr \ + --enable-video --enable-introspection \ + --with-font-backend=freetype --enable-gtk-doc \ + --enable-jit --with-unicode-backend=icu \ + --enable-3D-transforms --enable-mathml \ + --with-gtk=3.0 + make + ) } -package() { - cd "${srcdir}/webkit-${pkgver}" +package_libwebkit() { + pkgdesc+=" (for GTK2)" + depends+=(gtk2) + provides=('webkitgtk-svn') + conflicts=('webkitgtk-svn') + replaces=('webkitgtk-svn') + + cd "$srcdir/webkit-$pkgver" make DESTDIR="${pkgdir}" install - install -Dm644 WebKit/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit/LICENSE" } + +package_libwebkit3() { + pkgdesc+=" (for GTK3)" + depends+=(gtk3) + + cd "${srcdir}/gtk3-build" + make DESTDIR="${pkgdir}" install + install -Dm644 Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit3/LICENSE" +} Deleted: introspection.patch =================================================================== --- introspection.patch 2011-02-15 00:43:44 UTC (rev 110040) +++ introspection.patch 2011-02-15 01:18:32 UTC (rev 110041) @@ -1,22 +0,0 @@ ---- WebKit/gtk/JSCore-1.0.gir 2010-09-29 14:54:07.000000000 +0200 -+++ WebKit/gtk/JSCore-1.0.gir 2010-09-29 15:57:06.000000000 +0200 -@@ -1,12 +1,14 @@ - <?xml version="1.0"?> --<repository version="1.0" -+<repository version="1.2" - xmlns="http://www.gtk.org/introspection/core/1.0"; - xmlns:c="http://www.gtk.org/introspection/c/1.0";> - <namespace name="JSCore" version="1.0" shared-library="webkit-1.0"> -- <alias name="GlobalContextRef" -- target="none" -- c:type="JSGlobalContextRef"/> -- <alias name="ObjectRef" target="none" c:type="JSObjectRef"/> -+ <alias name="GlobalContextRef" target="none"> -+ <type name="JSGlobalContextRef" c:type="JSGlobalContextRef"/> -+ </alias> -+ <alias name="ObjectRef" target="none"> -+ <type name="JSObjectRef" c:type="JSObjectRef"/> -+ </alias> - <function name="EvaluateScript" c:identifier="JSEvaluateScript"> - <return-value transfer-ownership="none"> - <type name="none" c:type="void"/> Added: libwebkit.install =================================================================== --- libwebkit.install (rev 0) +++ libwebkit.install 2011-02-15 01:18:32 UTC (rev 110041) @@ -0,0 +1,11 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
