From d676fe3f153e1ef8cb3a270afa48b65cb918189b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 28 Mar 2012 10:11:38 +0200
Subject: [PATCH] webkit-gtk: update to 1.8.0.
---
srcpkgs/webkit-gtk3/template | 11 +++++++----
srcpkgs/webkit-gtk3/webkit-gtk-devel.template | 4 ++--
srcpkgs/webkit-gtk3/webkit-gtk.rshlibs | 7 +++++++
srcpkgs/webkit-gtk3/webkit-gtk.template | 2 --
srcpkgs/webkit-gtk3/webkit-gtk3-devel.template | 5 ++---
srcpkgs/webkit-gtk3/webkit-gtk3.rshlibs | 7 +++++++
6 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/webkit-gtk3/template b/srcpkgs/webkit-gtk3/template
index a0a5a86647..df0039a12d 100644
--- a/srcpkgs/webkit-gtk3/template
+++ b/srcpkgs/webkit-gtk3/template
@@ -1,13 +1,13 @@
# Template file for 'webkit-gtk3'
pkgname=webkit-gtk3
-version=1.6.3
+version=1.8.0
wrksrc=webkit-${version}
homepage="http://webkitgtk.org/"
license="LGPL-2.1, Simplified BSD (2 clause)"
-distfiles="${homepage}/webkit-${version}.tar.xz"
+distfiles="${homepage}/releases/webkit-${version}.tar.xz"
short_desc="GTK+3 port of the WebKit browser engine"
maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=12d0dbce6a895c7a8491a028e34a1dc55ae13ab76ac6202b2e489da9468077c3
+checksum=8cebd53b412ae9eb192493ad8e41fa8739a7b1a00f74c6b5a69d367709a801bc
long_desc="
WebKit is an open source web browser engine. WebKit is also the name of
the Mac OS X system framework version of the engine that's used by
@@ -17,6 +17,7 @@ long_desc="
This is the GTK3+ port of the engine."
+disable_parallel_build=yes
subpackages="webkit-gtk webkit-gtk-devel $pkgname-devel"
Add_dependency build perl ">=0"
@@ -34,12 +35,14 @@ Add_dependency build libsoup-devel
Add_dependency build libxslt-devel
Add_dependency build icu-devel
Add_dependency build enchant-devel
+Add_dependency build geoclue-devel
Add_dependency build gobject-introspection
do_configure() {
local args="--enable-video --enable-jit \
--with-font-backend=freetype --enable-introspection \
--with-unicode-backend=icu --disable-schemas-compile \
+ --with-accelerated-compositing=opengl \
${CONFIGURE_SHARED_ARGS}"
for ver in 2 3; do
@@ -54,7 +57,7 @@ do_build() {
for ver in 2 3; do
msg_normal "Building GTK+${ver} version...\n"
cd ${wrksrc}/build-gtk${ver}
- make ${makejobs}
+ make ${makejobs} || return 1
done
}
diff --git a/srcpkgs/webkit-gtk3/webkit-gtk-devel.template b/srcpkgs/webkit-gtk3/webkit-gtk-devel.template
index 14f7f8cbac..09ba89f531 100644
--- a/srcpkgs/webkit-gtk3/webkit-gtk-devel.template
+++ b/srcpkgs/webkit-gtk3/webkit-gtk-devel.template
@@ -28,14 +28,14 @@ Add_dependency run icu-devel
Add_dependency run libXt-devel
Add_dependency run libX11-devel
Add_dependency run libXrender-devel
-Add_dependency run webkit-gtk
+Add_dependency run webkit-gtk ">=${version}"
do_install()
{
vmkdir usr/lib/pkgconfig
vmkdir usr/share/gir-1.0
- vmove usr/include/webkit-1.0 usr/include
+ vmove usr/include/webkitgtk-1.0 usr/include
vmove "usr/lib/pkgconfig/*-1.0.pc" usr/lib/pkgconfig
vmove "usr/share/gir-1.0/*-1.0.gir" usr/share/gir-1.0
}
diff --git a/srcpkgs/webkit-gtk3/webkit-gtk.rshlibs b/srcpkgs/webkit-gtk3/webkit-gtk.rshlibs
index 614bc90923..f367974452 100644
--- a/srcpkgs/webkit-gtk3/webkit-gtk.rshlibs
+++ b/srcpkgs/webkit-gtk3/webkit-gtk.rshlibs
@@ -40,3 +40,10 @@ libstdc++.so.6
libm.so.6
libc.so.6
libgcc_s.so.1
+libgeoclue.so.0
+libdbus-glib-1.so.2
+libdbus-1.so.3
+libgstaudio-0.10.so.0
+libgstfft-0.10.so.0
+libGL.so.1
+libdl.so.2
diff --git a/srcpkgs/webkit-gtk3/webkit-gtk.template b/srcpkgs/webkit-gtk3/webkit-gtk.template
index e8de1f17a5..a0adfa0724 100644
--- a/srcpkgs/webkit-gtk3/webkit-gtk.template
+++ b/srcpkgs/webkit-gtk3/webkit-gtk.template
@@ -22,6 +22,4 @@ do_install() {
usr/share/locale/$(basename $f)/LC_MESSAGES
done
vmove usr/share/webkitgtk-1.0 usr/share
- vmove usr/share/glib-2.0/schemas/org.webkitgtk-1.0.gschema.xml \
- usr/share/glib-2.0/schemas
}
diff --git a/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template b/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template
index 6b78b43f46..34a9973846 100644
--- a/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template
+++ b/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template
@@ -29,10 +29,9 @@ Add_dependency run libX11-devel
Add_dependency run libSM-devel
Add_dependency run libICE-devel
Add_dependency run libXrender-devel
-Add_dependency run webkit-gtk3
+Add_dependency run webkit-gtk3 ">=${version}"
-do_install()
-{
+do_install() {
vmove usr/include usr
vmove usr/lib/pkgconfig usr/lib
vmove "usr/share/gir*" usr/share
diff --git a/srcpkgs/webkit-gtk3/webkit-gtk3.rshlibs b/srcpkgs/webkit-gtk3/webkit-gtk3.rshlibs
index d61299e190..0b2ef7966d 100644
--- a/srcpkgs/webkit-gtk3/webkit-gtk3.rshlibs
+++ b/srcpkgs/webkit-gtk3/webkit-gtk3.rshlibs
@@ -41,3 +41,10 @@ libXrender.so.1
libXt.so.6
libX11.so.6
libz.so.1
+libgeoclue.so.0
+libdbus-glib-1.so.2
+libdbus-1.so.3
+libgstaudio-0.10.so.0
+libgstfft-0.10.so.0
+libGL.so.1
+libdl.so.2