From 19be36d8009fab959cedda63ab47f1e8b5915031 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 1 Mar 2011 13:48:35 +0100 Subject: [PATCH] epiphany: update to 2.91.90. --HG-- branch : gnome3 --- srcpkgs/epiphany/depends | 2 +- srcpkgs/epiphany/epiphany-devel.template | 38 +++++----- srcpkgs/epiphany/template | 96 +++++++++--------------- 3 files changed, 56 insertions(+), 80 deletions(-) diff --git a/srcpkgs/epiphany/depends b/srcpkgs/epiphany/depends index 071d27b792a..6e8d7e9a547 100644 --- a/srcpkgs/epiphany/depends +++ b/srcpkgs/epiphany/depends @@ -1,2 +1,2 @@ -abi_depends=">=2.30.0" +abi_depends=">=2.91.90" api_depends="${abi_depends}" diff --git a/srcpkgs/epiphany/epiphany-devel.template b/srcpkgs/epiphany/epiphany-devel.template index 0091e768b16..01dcd3df8f9 100644 --- a/srcpkgs/epiphany/epiphany-devel.template +++ b/srcpkgs/epiphany/epiphany-devel.template @@ -8,37 +8,35 @@ long_desc="${long_desc} Add_dependency run pkg-config Add_dependency run intltool Add_dependency run gnome-doc-utils -Add_dependency run avahi-glib-libs-devel +Add_dependency run gobject-introspection +Add_dependency run glib-devel +Add_dependency run dbus-devel +Add_dependency run dbus-glib-devel +Add_dependency run nspr-devel +Add_dependency run nss-devel Add_dependency run avahi-libs-devel -Add_dependency run libX11-devel +Add_dependency run avahi-glib-libs-devel Add_dependency run libSM-devel Add_dependency run libICE-devel +Add_dependency run libX11-devel Add_dependency run libxslt-devel -Add_dependency run zlib-devel -Add_dependency run libxml2-devel -Add_dependency run GConf-devel -Add_dependency run startup-notification-devel -Add_dependency run libnotify-devel -Add_dependency run webkit-gtk-devel -Add_dependency run gtk+-devel -Add_dependency run atk-devel Add_dependency run pango-devel +Add_dependency run gdk-pixbuf-devel Add_dependency run cairo-devel -Add_dependency run freetype-devel -Add_dependency run fontconfig-devel -Add_dependency run libsoup-gnome-devel -Add_dependency run libsoup-devel -Add_dependency run glib-devel +Add_dependency run gtk+3-devel +Add_dependency run libxml2-devel Add_dependency run libgnome-keyring-devel -Add_dependency run dbus-glib-devel -Add_dependency run dbus-devel -Add_dependency run nss-devel -Add_dependency run nspr-devel +Add_dependency run libsoup-devel +Add_dependency run libsoup-gnome-devel +Add_dependency run libgirepository-devel +Add_dependency run webkit-gtk3-devel +Add_dependency run glade3-devel do_install() { mkdir -p ${DESTDIR}/usr/{lib,share} mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/{aclocal,gtk-doc} ${DESTDIR}/usr/share + mv ${SRCPKGDESTDIR}/usr/share/{aclocal,gir*,gtk-doc} \ + ${DESTDIR}/usr/share } diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index 93f473e3926..47ea4c7ae4d 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,14 +1,13 @@ # Template file for 'epiphany' pkgname=epiphany -version=2.30.6 -distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2" +version=2.91.90 +distfiles="${GNOME_SITE}/$pkgname/2.91/$pkgname-$version.tar.bz2" build_style=gnu_configure -configure_args="--disable-schemas-install --disable-scrollkeeper ---with-gconf-schema-file-dir=/usr/share/gconf/schemas --disable-introspection +configure_args="--disable-schemas-compile --disable-scrollkeeper --localstatedir=/var --enable-network-manager --without-ca-file" short_desc="Intuitive GNOME web browser" maintainer="Juan RP " -checksum=278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc +checksum=f2baa20a1e30c21a56f12a2b525210d82300fc07902ea11319717d5f571dd287 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 @@ -19,83 +18,62 @@ long_desc=" by closely following the GNOME Human Interface Guidelines (HIG) and by close integration with the GNOME desktop." -gconf_schemas="epiphany.schemas epiphany-lockdown.schemas" +triggers="gsettings-schemas" gtk_iconcache_dirs="/usr/share/icons/hicolor" -subpackages="$pkgname-devel" +subpackages="gir-$pkgname $pkgname-devel" -# XXX: enable introspection support when it's fixed. # XXX: enable --with-ca-file. Add_dependency run glibc -Add_dependency run avahi-glib-libs +Add_dependency run glib +Add_dependency run dbus-libs +Add_dependency run dbus-glib +Add_dependency run nspr +Add_dependency run nss Add_dependency run avahi-libs -Add_dependency run libX11 +Add_dependency run avahi-glib-libs Add_dependency run libSM Add_dependency run libICE +Add_dependency run libX11 Add_dependency run libxslt -Add_dependency run zlib -Add_dependency run libxml2 -Add_dependency run GConf -Add_dependency run startup-notification -Add_dependency run libnotify -Add_dependency run webkit-gtk -Add_dependency run libpng -Add_dependency run gdk-pixbuf -Add_dependency run gtk+ -Add_dependency run atk Add_dependency run pango +Add_dependency run gdk-pixbuf Add_dependency run cairo -Add_dependency run freetype -Add_dependency run fontconfig -Add_dependency run libsoup-gnome -Add_dependency run libsoup -Add_dependency run glib +Add_dependency run gtk+3 +Add_dependency run libxml2 Add_dependency run libgnome-keyring -Add_dependency run dbus-glib -Add_dependency run dbus-libs -Add_dependency run nss -Add_dependency run nspr -Add_dependency run NetworkManager +Add_dependency run libsoup +Add_dependency run libsoup-gnome +Add_dependency run libgirepository +Add_dependency run webkit-gtk3 Add_dependency build pkg-config Add_dependency build intltool Add_dependency build gnome-doc-utils -Add_dependency build avahi-glib-libs-devel +Add_dependency build gobject-introspection +Add_dependency build glib-devel +Add_dependency build dbus-devel +Add_dependency build dbus-glib-devel +Add_dependency build nspr-devel +Add_dependency build nss-devel Add_dependency build avahi-libs-devel -Add_dependency build libX11-devel +Add_dependency build avahi-glib-libs-devel Add_dependency build libSM-devel Add_dependency build libICE-devel +Add_dependency build libX11-devel Add_dependency build libxslt-devel -Add_dependency build zlib-devel -Add_dependency build libxml2-devel -Add_dependency build GConf-devel -Add_dependency build startup-notification-devel -Add_dependency build libnotify-devel -Add_dependency build webkit-gtk-devel ">=1.2.5" -Add_dependency build gtk+-devel -Add_dependency build atk-devel Add_dependency build pango-devel +Add_dependency build gdk-pixbuf-devel Add_dependency build cairo-devel -Add_dependency build freetype-devel -Add_dependency build fontconfig-devel -Add_dependency build libsoup-gnome-devel -Add_dependency build libsoup-devel -Add_dependency build glib-devel +Add_dependency build gtk+3-devel +Add_dependency build libxml2-devel Add_dependency build libgnome-keyring-devel -Add_dependency build dbus-glib-devel -Add_dependency build dbus-devel -Add_dependency build nss-devel -Add_dependency build nspr-devel -Add_dependency build NetworkManager-devel -#Add_dependency build gobject-introspection +Add_dependency build libsoup-devel +Add_dependency build libsoup-gnome-devel +Add_dependency build libgirepository-devel +Add_dependency build webkit-gtk3-devel +Add_dependency build glade3-devel +Add_dependency full NetworkManager Add_dependency full hicolor-icon-theme Add_dependency full desktop-file-utils - -pre_configure() -{ - # Don't use cmp from busybox. - for f in $(find ${wrksrc} -type f -name Makefile.in); do - sed -i "s|cmp -s|/usr/bin/cmp -s|g" ${f} || return 1 - done -}