From 679f5f02890a1cb8b2c4075257fad16e055151fa Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 6 Jun 2012 17:58:03 +0200 Subject: [PATCH] webkit-gtk: rebuild against libpng-1.5. --- srcpkgs/webkit-gtk3/template | 9 ++++----- srcpkgs/webkit-gtk3/webkit-gtk-devel.template | 10 +++------- srcpkgs/webkit-gtk3/webkit-gtk.rshlibs | 2 +- srcpkgs/webkit-gtk3/webkit-gtk3-devel.template | 4 ++-- srcpkgs/webkit-gtk3/webkit-gtk3.rshlibs | 2 +- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/srcpkgs/webkit-gtk3/template b/srcpkgs/webkit-gtk3/template index 6d9a4b3e88..69358acf59 100644 --- a/srcpkgs/webkit-gtk3/template +++ b/srcpkgs/webkit-gtk3/template @@ -1,14 +1,14 @@ # Template file for 'webkit-gtk3' pkgname=webkit-gtk3 version=1.8.1 +revision=2 wrksrc=webkit-${version} +makedepends="perl pkg-config intltool which gperf flex jpeg-devel libpng-devel>=1.5.10 sqlite-devel gtk+-devel gtk+3-devel gst-plugins-base-devel libsoup-devel libxslt-devel icu-devel enchant-devel geoclue-devel gobject-introspection" +short_desc="GTK+3 port of the WebKit browser engine" +maintainer="Juan RP " homepage="http://webkitgtk.org/" license="LGPL-2.1, Simplified BSD (2 clause)" distfiles="${homepage}/releases/webkit-${version}.tar.xz" -makedepends="perl>=0 pkg-config intltool which gperf flex jpeg-devel sqlite-devel gtk+-devel gtk+3-devel gst-plugins-base-devel libsoup-devel libxslt-devel icu-devel enchant-devel geoclue-devel gobject-introspection" -revision=1 -short_desc="GTK+3 port of the WebKit browser engine" -maintainer="Juan RP " checksum=9a126a76b40ca61adb1f1626e1567f976740af2332948cc5189489dbd01e3b28 long_desc=" WebKit is an open source web browser engine. WebKit is also the name of @@ -22,7 +22,6 @@ long_desc=" disable_parallel_build=yes subpackages="webkit-gtk webkit-gtk-devel $pkgname-devel" - do_configure() { local args="--enable-video --enable-jit \ --with-font-backend=freetype --enable-introspection \ diff --git a/srcpkgs/webkit-gtk3/webkit-gtk-devel.template b/srcpkgs/webkit-gtk3/webkit-gtk-devel.template index 695c985657..f06132ff6c 100644 --- a/srcpkgs/webkit-gtk3/webkit-gtk-devel.template +++ b/srcpkgs/webkit-gtk3/webkit-gtk-devel.template @@ -1,6 +1,7 @@ # Template file for 'webkit-gtk-devel'. # -depends="gobject-introspection enchant-devel gtk+-devel gstreamer-devel gst-plugins-base-devel jpeg-devel libsoup-devel libxslt-devel zlib-devel libxml2-devel freetype-devel fontconfig-devel libpng-devel sqlite-devel icu-devel libXt-devel libX11-devel libXrender-devel webkit-gtk>=1.8.1" +noarch=yes +depends="webkit-gtk>=$version" short_desc="GTK+ port of the WebKit browser engine - development files" long_desc="${long_desc} WebKit is an open source web browser engine. WebKit is also the name of @@ -11,12 +12,7 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - -do_install() -{ - vmkdir usr/lib/pkgconfig - vmkdir usr/share/gir-1.0 - +do_install() { 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 f367974452..2fc59cfa28 100644 --- a/srcpkgs/webkit-gtk3/webkit-gtk.rshlibs +++ b/srcpkgs/webkit-gtk3/webkit-gtk.rshlibs @@ -27,7 +27,6 @@ libgmodule-2.0.so.0 libgthread-2.0.so.0 librt.so.1 libglib-2.0.so.0 -libpng14.so.14 libsqlite3.so.0 libicui18n.so.46 libicuuc.so.46 @@ -47,3 +46,4 @@ libgstaudio-0.10.so.0 libgstfft-0.10.so.0 libGL.so.1 libdl.so.2 +libpng15.so.15 diff --git a/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template b/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template index e9cff05d76..79ca67ea33 100644 --- a/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template +++ b/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template @@ -1,12 +1,12 @@ # Template file for 'webkit-gtk-devel'. # -depends="enchant-devel gdk-pixbuf-devel gtk+3-devel gst-plugins-base-devel gstreamer-devel glib-devel atk-devel pango-devel cairo-devel jpeg-devel libsoup-devel libxslt-devel zlib-devel libxml2-devel freetype-devel fontconfig-devel libpng-devel sqlite-devel icu-devel libXt-devel libX11-devel libSM-devel libICE-devel libXrender-devel webkit-gtk3>=1.8.1" +noarch=yes +depends="webkit-gtk3>=$version" short_desc="${sourcepkg} development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib diff --git a/srcpkgs/webkit-gtk3/webkit-gtk3.rshlibs b/srcpkgs/webkit-gtk3/webkit-gtk3.rshlibs index 0b2ef7966d..0369b4b0de 100644 --- a/srcpkgs/webkit-gtk3/webkit-gtk3.rshlibs +++ b/srcpkgs/webkit-gtk3/webkit-gtk3.rshlibs @@ -35,7 +35,6 @@ libgobject-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 librt.so.1 -libpng14.so.14 libsqlite3.so.0 libXrender.so.1 libXt.so.6 @@ -48,3 +47,4 @@ libgstaudio-0.10.so.0 libgstfft-0.10.so.0 libGL.so.1 libdl.so.2 +libpng15.so.15