Date: Wednesday, February 23, 2011 @ 15:13:58 Author: jgc Revision: 111070
Update to 2.91.90 Remove bonobo applet support, upstream does not support this yet for GNOME 3.0 Modified: gnome-panel/trunk/PKGBUILD Deleted: gnome-panel/trunk/evolution-appointments.patch gnome-panel/trunk/gnome-panel-bonobo.install ------------------------------+ PKGBUILD | 47 ++++++++++------------------------------- evolution-appointments.patch | 13 ----------- gnome-panel-bonobo.install | 11 --------- 3 files changed, 12 insertions(+), 59 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-02-23 20:01:27 UTC (rev 111069) +++ PKGBUILD 2011-02-23 20:13:58 UTC (rev 111070) @@ -1,54 +1,31 @@ # $Id$ # Maintainer: Jan de Groot <[email protected]> -pkgbase=gnome-panel -pkgname=('gnome-panel' 'gnome-panel-bonobo') -pkgver=2.32.1 -pkgrel=2 +pkgname=gnome-panel +pkgver=2.91.90 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') +pkgdesc="The GNOME Panel" url="http://www.gnome.org"; -makedepends=('libwnck' 'gnome-menus' 'evolution-data-server' 'gnome-desktop' 'libgweather' 'librsvg' 'hicolor-icon-theme' 'libcanberra' 'libbonoboui' 'gnome-doc-utils' 'intltool' 'networkmanager' 'gobject-introspection') +depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm') +makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra') +install=gnome-panel.install +groups=('gnome') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2 - evolution-appointments.patch) -sha256sums=('8f7828eb7a21c817a73b697844a4e20256059b32386414a10f97d51e7d9fca5f' - 'c42168cc1377f9dfb2e02ed0b47ee89bdb89d46e82551b9582801fdc375294bb') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.91/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('3aad694e08a5ffe37245e20b9f901ac9f42321852ab2e96f8514240838124bdb') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - #https://bugzilla.gnome.org/show_bug.cgi?id=633566 - patch -Np1 -i "${srcdir}/evolution-appointments.patch" - + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-panel \ --disable-scrollkeeper make - sed -e 's/$(am__append_1)//' -i Makefile -} - -package_gnome-panel() { - pkgdesc="The GNOME Panel" - depends=('gnome-menus>=2.30.5' 'gnome-desktop>=2.32.1' 'evolution-data-server>=2.32.1' 'librsvg>=2.32.1' 'libcanberra>=0.25' 'libwnck>=2.30.6' 'hicolor-icon-theme') - optdepends=('gnome-panel-bonobo: libbonoboui-based applet support') - groups=('gnome') - install=gnome-panel.install - cd "${srcdir}/${pkgbase}-${pkgver}" make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-panel-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-panel-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas rm -f ${pkgdir}/etc/gconf/schemas/*.schemas } - -package_gnome-panel-bonobo() { - pkgdesc="Modules for libbonoboui-based applet support for the GNOME Panel" - depends=('libbonoboui>=2.24.3' "gnome-panel=${pkgver}") - conflicts=('gnome-panel<2.31.92') - install=gnome-panel-bonobo.install - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C bonobo "${pkgdir}" DESTDIR="${pkgdir}" install -} Deleted: evolution-appointments.patch =================================================================== --- evolution-appointments.patch 2011-02-23 20:01:27 UTC (rev 111069) +++ evolution-appointments.patch 2011-02-23 20:13:58 UTC (rev 111070) @@ -1,13 +0,0 @@ -diff --git a/applets/clock/calendar-window.c b/applets/clock/calendar-window.c -index 932ebda..bfad14e 100644 ---- a/applets/clock/calendar-window.c -+++ b/applets/clock/calendar-window.c -@@ -450,6 +450,8 @@ is_appointment (GtkTreeModel *model, - gtk_tree_model_get (model, iter, APPOINTMENT_COLUMN_URI, &uri, -1); - if (uri) - return (g_ascii_strcasecmp (uri, "file") == 0 || -+ g_ascii_strcasecmp (uri, "local") == 0 || -+ g_ascii_strcasecmp (uri, "mapi") == 0 || - g_ascii_strcasecmp (uri, "webcal") == 0 || - g_ascii_strcasecmp (uri, "caldav") == 0 || - g_ascii_strcasecmp (uri, "exchange") == 0 || Deleted: gnome-panel-bonobo.install =================================================================== --- gnome-panel-bonobo.install 2011-02-23 20:01:27 UTC (rev 111069) +++ gnome-panel-bonobo.install 2011-02-23 20:13:58 UTC (rev 111070) @@ -1,11 +0,0 @@ -post_install() { - usr/bin/gio-querymodules usr/lib/gnome-panel/modules -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -}
