From d676fe3f153e1ef8cb3a270afa48b65cb918189b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 10:11:38 +0200 Subject: [PATCH 1/5] 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 a0a5a86647f..df0039a12d0 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 " -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 14f7f8cbac2..09ba89f531b 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 614bc909233..f367974452e 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 e8de1f17a5e..a0adfa07241 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 6b78b43f460..34a99738461 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 d61299e190f..0b2ef7966d1 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 From 3a16531f7f1304349921baf3c4f3df28c4c1a68e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 10:25:57 +0200 Subject: [PATCH 2/5] epiphany: update to 3.4.0.1. --- srcpkgs/epiphany/epiphany-devel.template | 7 ++++--- srcpkgs/epiphany/epiphany.rshlibs | 2 +- srcpkgs/epiphany/template | 21 +++++++++++---------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/srcpkgs/epiphany/epiphany-devel.template b/srcpkgs/epiphany/epiphany-devel.template index 0dae3429491..28f1bd1d0fb 100644 --- a/srcpkgs/epiphany/epiphany-devel.template +++ b/srcpkgs/epiphany/epiphany-devel.template @@ -15,10 +15,11 @@ Add_dependency run libseed-devel Add_dependency run libnotify-devel Add_dependency run avahi-libs-devel Add_dependency run avahi-glib-libs-devel -Add_dependency run epiphany +Add_dependency run epiphany ">=${version}" -do_install() -{ +noarch=yes + +do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib vmove usr/share/aclocal usr/share diff --git a/srcpkgs/epiphany/epiphany.rshlibs b/srcpkgs/epiphany/epiphany.rshlibs index 161f0e888d3..a37d07fcf2f 100644 --- a/srcpkgs/epiphany/epiphany.rshlibs +++ b/srcpkgs/epiphany/epiphany.rshlibs @@ -28,4 +28,4 @@ libgdk_pixbuf-2.0.so.0 libseed-gtk3.so.0 libgirepository-1.0.so.1 libgmodule-2.0.so.0 -libgthread-2.0.so.0 +libsqlite3.so.0 diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index 8cbdbae784c..1463325aba8 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,16 +1,15 @@ # Template file for 'epiphany' pkgname=epiphany -version=3.2.1 -distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz" +version=3.4.0.1 +distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--disable-schemas-compile --disable-scrollkeeper ---enable-network-manager --enable-seed ---with-ca-file=/etc/ssl/certs/ca-certificates.crt --disable-tests" +--disable-tests --enable-seed" short_desc="Intuitive GNOME web browser" maintainer="Juan RP " homepage="http://www.gnome.org/projects/epiphany/" license="GPL-2" -checksum=5ade10d9becce1ca43c30d755fda477c5595a1c0514047f07f7d4b817a2154fe +checksum=48acfa6efc806cc6b02f783dd92b36ba3bdf94d1e1ae02bed69886f45e400533 long_desc=" Epiphany is a simple yet powerful GNOME web browser targeted at non-technical users. Its principles are simplicity and standards compliance. Simplicity is @@ -21,13 +20,11 @@ long_desc=" by closely following the GNOME Human Interface Guidelines (HIG) and by close integration with the GNOME desktop." +shlib_depends="webkit-gtk3>=1.8.0" gtk_iconcache_dirs="/usr/share/icons/hicolor" subpackages="$pkgname-devel" -Add_dependency run ca-certificates -Add_dependency run hicolor-icon-theme -Add_dependency run desktop-file-utils - +Add_dependency build which Add_dependency build pkg-config Add_dependency build intltool Add_dependency build gnome-doc-utils @@ -35,7 +32,7 @@ Add_dependency build gobject-introspection Add_dependency build nss-devel Add_dependency build libgnome-keyring-devel Add_dependency build libsoup-gnome-devel -Add_dependency build webkit-gtk3-devel +Add_dependency build webkit-gtk3-devel ">=1.8.0" Add_dependency build startup-notification-devel Add_dependency build NetworkManager-devel Add_dependency build libseed-devel @@ -43,5 +40,9 @@ Add_dependency build libnotify-devel Add_dependency build avahi-libs-devel Add_dependency build avahi-glib-libs-devel +Add_dependency run ca-certificates +Add_dependency run hicolor-icon-theme +Add_dependency run desktop-file-utils + Add_dependency full iso-codes Add_dependency full gsettings-desktop-schemas From 65ed733438181ebcdd72cdd5e9badb6791607c67 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 10:29:42 +0200 Subject: [PATCH 3/5] epiphany-extensions: update to 3.4.0. --- .../epiphany-extensions/epiphany-extensions.rshlibs | 6 ------ srcpkgs/epiphany-extensions/template | 12 ++++++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/srcpkgs/epiphany-extensions/epiphany-extensions.rshlibs b/srcpkgs/epiphany-extensions/epiphany-extensions.rshlibs index 5299accf914..019d9dc76b2 100644 --- a/srcpkgs/epiphany-extensions/epiphany-extensions.rshlibs +++ b/srcpkgs/epiphany-extensions/epiphany-extensions.rshlibs @@ -5,18 +5,12 @@ libgtk-3.so.0 libsoup-2.4.so.1 libgdk-3.so.0 libatk-1.0.so.0 -libpangoft2-1.0.so.0 libpangocairo-1.0.so.0 libgdk_pixbuf-2.0.so.0 libcairo-gobject.so.2 libcairo.so.2 libpango-1.0.so.0 -libfreetype.so.6 -libfontconfig.so.1 libgio-2.0.so.0 libgobject-2.0.so.0 -libgmodule-2.0.so.0 -libgthread-2.0.so.0 -librt.so.1 libglib-2.0.so.0 libjavascriptcoregtk-3.0.so.0 diff --git a/srcpkgs/epiphany-extensions/template b/srcpkgs/epiphany-extensions/template index 96fef91a5a1..cbadda9f78f 100644 --- a/srcpkgs/epiphany-extensions/template +++ b/srcpkgs/epiphany-extensions/template @@ -1,16 +1,15 @@ # Template file for 'epiphany-extensions' pkgname=epiphany-extensions -version=3.2.0 -distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz" +version=3.4.0 +distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--disable-schemas-compile --disable-scrollkeeper --disable-debug" -revision=2 short_desc="Extensions for Epiphany - The GNOME web browser" maintainer="Juan RP " homepage="http://www.gnome.org/projects/epiphany/" license="GPL-2" -checksum=0707c9109bc6070f5f4e6ef3a9653e18ad5200eb57f396852b4c13cbac69baae +checksum=eaf1b466e316f4d6ed35437f8fdd4723a61ae57dd2744751e99109fd581f8fa5 long_desc=" Epiphany is a simple yet powerful GNOME web browser targeted at non-technical users. Its principles are simplicity and standards compliance. Simplicity is @@ -23,13 +22,14 @@ long_desc=" This package contains some extensions for use with Epiphany." -shlib_depends="webkit-gtk3>=1.6.3" +shlib_depends="webkit-gtk3>=1.8.0" Add_dependency run epiphany +Add_dependency build which Add_dependency build pkg-config Add_dependency build intltool Add_dependency build gnome-doc-utils Add_dependency build webkit-gtk3-devel -Add_dependency build epiphany-devel +Add_dependency build epiphany-devel ">=${version}" Add_dependency build opensp-devel From de2f2dbfa8c5e1a09ca06948b890a82f8c79c775 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 10:30:30 +0200 Subject: [PATCH 4/5] gnome: bump to 3.4.0: reenable epiphany{,-extensions}. --- srcpkgs/gnome/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index e13c80d6e55..3d438fdba68 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -1,7 +1,6 @@ # Template file for 'gnome' pkgname=gnome -version=3.3.92 -revision=5 +version=3.4.0 build_style=meta-template short_desc="GNOME meta-package" maintainer="Juan RP " @@ -28,7 +27,7 @@ Add_dependency run metacity ">=2.34.3" Add_dependency run nautilus ">=${version}" Add_dependency run notification-daemon ">=0.7.4" Add_dependency run yelp ">=${version}" -#Add_dependency run epiphany ">=${version}" +Add_dependency run epiphany ">=${version}" Add_dependency run at-spi2-atk ">=2.4.0" Add_dependency run baobab ">=${version}" @@ -69,7 +68,7 @@ Add_dependency run evolution ">=${version}" Add_dependency run rygel ">=0.14.0" Add_dependency run tracker ">=0.14.0" Add_dependency run eog-plugins ">=${version}" -#Add_dependency run epiphany-extensions ">=3.2.0" +Add_dependency run epiphany-extensions ">=${version}" Add_dependency run xdg-user-dirs Add_dependency run xdg-utils From 3975b5ce5a13ca398b4fcc65193a74c2059e09ca Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 10:32:57 +0200 Subject: [PATCH 5/5] gnome-contacts: update to 3.4.0. --- srcpkgs/gnome-contacts/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template index 344722474b8..a3a707cf0be 100644 --- a/srcpkgs/gnome-contacts/template +++ b/srcpkgs/gnome-contacts/template @@ -1,13 +1,13 @@ # Template file for 'gnome-contacts' pkgname=gnome-contacts -version=3.3.92 -distfiles="${GNOME_SITE}/$pkgname/3.3/$pkgname-$version.tar.xz" +version=3.4.0 +distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz" build_style=gnu-configure short_desc="GNOME contacts manager" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -checksum=5cd65ecc9da097453987a8aeff63e0619f53a1c7e436ab9a67e4ef590fbfbe90 +checksum=06d4d8fc22d72f67296ed98d35e3ee40f26d8344bcbd14affff4a720047ccd97 long_desc=" This packages the contacts manager for the GNOME desktop."