diff --git a/srcpkgs/gnome-panel/depends b/srcpkgs/gnome-panel/depends index 22be011a74..d6ddca4b41 100644 --- a/srcpkgs/gnome-panel/depends +++ b/srcpkgs/gnome-panel/depends @@ -1,2 +1,2 @@ -abi_depends=">=2.91.91" +abi_depends=">=3.2.0" api_depends="${abi_depends}" diff --git a/srcpkgs/gnome-panel/gnome-panel-devel.template b/srcpkgs/gnome-panel/gnome-panel-devel.template index 11d3a0cb5c..31df15c715 100644 --- a/srcpkgs/gnome-panel/gnome-panel-devel.template +++ b/srcpkgs/gnome-panel/gnome-panel-devel.template @@ -5,40 +5,20 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -Add_dependency run pkg-config -Add_dependency run intltool -Add_dependency run gnome-doc-utils -Add_dependency run libSM-devel -Add_dependency run libICE-devel Add_dependency run gnome-desktop-devel -Add_dependency run GConf-devel Add_dependency run gnome-menus-devel -Add_dependency run gtk+3-devel -Add_dependency run atk-devel -Add_dependency run glib-devel -Add_dependency run gdk-pixbuf-devel -Add_dependency run cairo-devel -Add_dependency run pango-devel -Add_dependency run dbus-glib-devel -Add_dependency run libXrandr-devel -Add_dependency run libX11-devel Add_dependency run evolution-data-server-devel -Add_dependency run libical-devel Add_dependency run librsvg-devel -Add_dependency run dbus-devel -Add_dependency run libgweather-devel Add_dependency run libwnck-devel -Add_dependency run libpng-devel -Add_dependency run freetype-devel -Add_dependency run fontconfig-devel -Add_dependency run libXau-devel +Add_dependency run telepathy-glib-devel +Add_dependency run dconf-devel +Add_dependency run NetworkManager-devel +Add_dependency run gnome-panel do_install() { - install -d ${DESTDIR}/usr/{lib,share} - - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/lib*.a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc} ${DESTDIR}/usr/share + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove usr/share/gir-1.0 usr/share + vmove usr/share/gtk-doc usr/share } diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template index 3285b6733b..6737b78d05 100644 --- a/srcpkgs/gnome-panel/template +++ b/srcpkgs/gnome-panel/template @@ -1,100 +1,68 @@ # Template file for 'gnome-panel' pkgname=gnome-panel -version=3.0.2 -distfiles="${GNOME_SITE}/$pkgname/3.0/$pkgname-$version.tar.bz2" +version=3.2.0 +distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz" build_style=gnu_configure configure_args="--disable-schemas-install --disable-scrollkeeper --with-gconf-schema-file-dir=/usr/share/gconf/schemas ---localstatedir=/var --enable-eds=auto" +--localstatedir=/var --disable-schemas-compile" short_desc="GNOME Panel" maintainer="Juan RP " -checksum=25db8ec026c4bf47f0ef5cc7e2712f2aad175bd7fb8e4952ef5f8b200f17f196 +homepage="http://www.gnome.org" +license="GPL-2" +checksum=83daffb85db57609330da488c5344e3121ed74cd809701a11109ecd7c97bde0f long_desc=" This packages the GNOME panel." -gconf_schemas=" -panel-compatibility.schemas -panel-global.schemas -panel-general.schemas -panel-toplevel.schemas -panel-object.schemas -clock.schemas -fish.schemas -workspace-switcher.schemas -window-list.schemas" - +gconf_schemas="${pkgname}.schemas" triggers="gsettings-schemas" gtk_iconcache_dirs="/usr/share/icons/hicolor" subpackages="$pkgname-devel" Add_dependency run glibc -Add_dependency run dbus-libs -Add_dependency run dbus-glib -Add_dependency run glib -Add_dependency run atk -Add_dependency run pango -Add_dependency run cairo -Add_dependency run libpng -Add_dependency run gdk-pixbuf -Add_dependency run freetype -Add_dependency run fontconfig Add_dependency run libSM Add_dependency run libICE -Add_dependency run libX11 -Add_dependency run libXau -Add_dependency run libXrandr -Add_dependency run librsvg +Add_dependency run gnome-desktop Add_dependency run gtk+3 -Add_dependency run dconf -Add_dependency run libical +Add_dependency run atk +Add_dependency run gdk-pixbuf +Add_dependency run cairo +Add_dependency run pango Add_dependency run GConf +Add_dependency run gnome-menus +Add_dependency run dconf +Add_dependency run glib +Add_dependency run telepathy-glib +Add_dependency run libXrandr +Add_dependency run libX11 +Add_dependency run evolution-data-server +Add_dependency run libical +Add_dependency run librsvg Add_dependency run libgweather Add_dependency run libwnck -Add_dependency run evolution-data-server -Add_dependency run gnome-menus -Add_dependency run gnome-desktop -Add_dependency run telepathy-glib +Add_dependency run freetype +Add_dependency run fontconfig +Add_dependency run libXau + +Add_dependency run hicolor-icon-theme +Add_dependency run desktop-file-utils Add_dependency build pkg-config Add_dependency build intltool Add_dependency build gnome-doc-utils -Add_dependency build libSM-devel -Add_dependency build libICE-devel +Add_dependency build gobject-introspection Add_dependency build gnome-desktop-devel -Add_dependency build GConf-devel -Add_dependency build dconf-devel Add_dependency build gnome-menus-devel -Add_dependency build gtk+3-devel -Add_dependency build atk-devel -Add_dependency build glib-devel -Add_dependency build gdk-pixbuf-devel -Add_dependency build cairo-devel -Add_dependency build pango-devel -Add_dependency build dbus-glib-devel -Add_dependency build libXrandr-devel -Add_dependency build libX11-devel Add_dependency build evolution-data-server-devel -Add_dependency build libical-devel Add_dependency build librsvg-devel -Add_dependency build dbus-devel -Add_dependency build libgweather-devel Add_dependency build libwnck-devel -Add_dependency build libpng-devel -Add_dependency build freetype-devel -Add_dependency build fontconfig-devel -Add_dependency build libXau-devel Add_dependency build telepathy-glib-devel - -Add_dependency full hicolor-icon-theme -Add_dependency full desktop-file-utils +Add_dependency build dconf-devel +Add_dependency build NetworkManager-devel post_install() { - local f - mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc} - for f in ${gconf_schemas}; do - gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${f} \ - --domain ${pkgname}-3.0 ${wrksrc}/${f} - done + gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \ + --domain ${pkgname}-3.0 ${wrksrc}/${gconf_schemas} }