summaryrefslogtreecommitdiff
path: root/extra/gnome-panel
diff options
context:
space:
mode:
Diffstat (limited to 'extra/gnome-panel')
-rw-r--r--extra/gnome-panel/PKGBUILD59
-rw-r--r--extra/gnome-panel/fix-crasher-launchers.patch42
-rw-r--r--extra/gnome-panel/gnome-panel.install18
3 files changed, 69 insertions, 50 deletions
diff --git a/extra/gnome-panel/PKGBUILD b/extra/gnome-panel/PKGBUILD
index d7014aab0..43867ad01 100644
--- a/extra/gnome-panel/PKGBUILD
+++ b/extra/gnome-panel/PKGBUILD
@@ -1,54 +1,41 @@
-# $Id: PKGBUILD 108473 2011-01-31 14:15:15Z ibiru $
+# $Id: PKGBUILD 119512 2011-04-11 20:09:24Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
-pkgbase=gnome-panel
-pkgname=('gnome-panel' 'gnome-panel-bonobo')
-pkgver=2.32.1
-pkgrel=2
+pkgname=gnome-panel
+pkgver=3.0.0.1
+pkgrel=3
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' 'dconf' 'telepathy-glib')
+makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra')
+install=gnome-panel.install
+groups=('gnome')
+replaces=('gnome-panel-bonobo')
+provides=("gnome-panel-bonobo=${pkgver}")
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}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2
+ fix-crasher-launchers.patch)
+sha256sums=('2014225215afc8a8a4363481c26f9a9443d3dfc944aa7bcb0c5224f723c0b98b'
+ '6724690bb2943f50ab296af6f1e1a7c10a91415ba150586b5623f20cc214ace0')
build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=633566
- patch -Np1 -i "${srcdir}/evolution-appointments.patch"
-
- ./configure --prefix=/usr --sysconfdir=/etc \
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/fix-crasher-launchers.patch"
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static \
--libexecdir=/usr/lib/gnome-panel \
- --disable-scrollkeeper
+ --disable-scrollkeeper \
+ --disable-schemas-compile
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}"
+package() {
+ cd "${srcdir}/${pkgname}-${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
-}
diff --git a/extra/gnome-panel/fix-crasher-launchers.patch b/extra/gnome-panel/fix-crasher-launchers.patch
new file mode 100644
index 000000000..b15fdf29c
--- /dev/null
+++ b/extra/gnome-panel/fix-crasher-launchers.patch
@@ -0,0 +1,42 @@
+From 8c275a2adf4ad99297a17cabf251344837620831 Mon Sep 17 00:00:00 2001
+From: Josselin Mouette <joss@malsain.org>
+Date: Mon, 11 Apr 2011 13:05:32 +0000
+Subject: panel: Fix crash when starting launcher
+
+Do not destroy a widget in its draw signal. This is bad. Really.
+
+This was happening in the animation that is being drawn after clicking a
+launcher.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=641325
+---
+diff --git a/gnome-panel/xstuff.c b/gnome-panel/xstuff.c
+index 8465341..5acbf66 100644
+--- a/gnome-panel/xstuff.c
++++ b/gnome-panel/xstuff.c
+@@ -305,6 +305,14 @@ zoom_timeout (GtkWidget *window)
+ }
+
+ static gboolean
++idle_destroy (gpointer data)
++{
++ gtk_widget_destroy (GTK_WIDGET (data));
++
++ return FALSE;
++}
++
++static gboolean
+ zoom_draw (GtkWidget *widget,
+ cairo_t *cr,
+ gpointer user_data)
+@@ -323,7 +331,7 @@ zoom_draw (GtkWidget *widget,
+
+ g_slice_free (CompositedZoomData, zoom);
+
+- gtk_widget_destroy (widget);
++ g_idle_add (idle_destroy, widget);
+ } else {
+ GdkPixbuf *scaled;
+ int width, height;
+--
+cgit v0.9
diff --git a/extra/gnome-panel/gnome-panel.install b/extra/gnome-panel/gnome-panel.install
index 7fef8cf05..e3175df5e 100644
--- a/extra/gnome-panel/gnome-panel.install
+++ b/extra/gnome-panel/gnome-panel.install
@@ -1,34 +1,24 @@
pkgname=gnome-panel
post_install() {
- GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
- usr/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --load \
- etc/gconf/schemas/panel-default-setup.entries >/dev/null
usr/sbin/gconfpkg --install ${pkgname}
-
+ usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}
pre_upgrade() {
- pre_remove $1
+ pre_remove
}
post_upgrade() {
- post_install $1
+ post_install
}
pre_remove() {
- GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
- if [ -f opt/gnome/etc/gconf/schemas/panel-default-setup.entries ]; then
- usr/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --unload \
- opt/gnome/etc/gconf/schemas/panel-default-setup.entries >/dev/null
- else
- usr/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --unload \
- etc/gconf/schemas/panel-default-setup.entries > /dev/null
- fi
usr/sbin/gconfpkg --uninstall ${pkgname}
}
post_remove() {
+ usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}