[arch-commits] CVS update of extra/network/gnome-bluetooth (3 files)
Roman Kyrylych
roman at archlinux.org
Wed Feb 27 22:16:12 UTC 2008
Date: Wednesday, February 27, 2008 @ 17:16:12
Author: roman
Path: /home/cvs-extra/extra/network/gnome-bluetooth
Modified: PKGBUILD (1.16 -> 1.17) gnome-bluetooth.install (1.3 -> 1.4)
Removed: libegg-mustdie.patch (1.1)
upgpkg: gnome-bluetooth 0.11.0-1
-------------------------+
PKGBUILD | 23 +--
gnome-bluetooth.install | 20 --
libegg-mustdie.patch | 323 ----------------------------------------------
3 files changed, 15 insertions(+), 351 deletions(-)
Index: extra/network/gnome-bluetooth/PKGBUILD
diff -u extra/network/gnome-bluetooth/PKGBUILD:1.16 extra/network/gnome-bluetooth/PKGBUILD:1.17
--- extra/network/gnome-bluetooth/PKGBUILD:1.16 Sun Oct 7 15:46:50 2007
+++ extra/network/gnome-bluetooth/PKGBUILD Wed Feb 27 17:16:12 2008
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD,v 1.16 2007/10/07 19:46:50 varun Exp $
+# $Id: PKGBUILD,v 1.17 2008/02/27 22:16:12 roman Exp $
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=gnome-bluetooth
-pkgver=0.9.1
+pkgver=0.11.0
pkgrel=1
pkgdesc="The GNOME Bluetooth Subsystem."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
url="http://www.usefulinc.com/software/gnome-bluetooth/"
license=('GPL' 'LGPL')
-depends=('libbtctl>=0.9.0' 'libgnomeui>=2.18.1-2')
-makedepends=('gob2' 'intltool' 'pkgconfig' 'python>=2.5')
-options=('!libtool')
+depends=('libbtctl>=0.9.0' 'libgnomeui>=2.18.1-2' 'gconf>=2.18.0.1-4'
+ 'desktop-file-utils')
+makedepends=('gob2' 'intltool' 'python>=2.5')
+options=('!libtool' '!emptydirs')
install=gnome-bluetooth.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/0.9/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2841562546638f39f93775865c85a6f7')
+source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/0.11/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('5447739dfd687b3b5a075df9bac092e1')
build() {
cd ${startdir}/src/${pkgname}-${pkgver}
aclocal || return 1
automake || return 1
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
sed -e 's|^pythondir = /usr|pythondir = |' \
-e 's|^pydir = /usr|pydir = |' \
-i src/Makefile
@@ -28,6 +28,7 @@
make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
- gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
+ gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas \
+ ${startdir}/pkg/etc/gconf/schemas/*.schemas
rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
}
Index: extra/network/gnome-bluetooth/gnome-bluetooth.install
diff -u extra/network/gnome-bluetooth/gnome-bluetooth.install:1.3 extra/network/gnome-bluetooth/gnome-bluetooth.install:1.4
--- extra/network/gnome-bluetooth/gnome-bluetooth.install:1.3 Sun Apr 22 13:33:21 2007
+++ extra/network/gnome-bluetooth/gnome-bluetooth.install Wed Feb 27 17:16:12 2008
@@ -1,8 +1,7 @@
pkgname=gnome-bluetooth
post_install() {
- export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
- usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
+ usr/sbin/gconfpkg --install ${pkgname}
update-desktop-database -q
}
@@ -15,23 +14,10 @@
}
pre_remove() {
- if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
- schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
- elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
- schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
- else
- schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
- fi
- export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-
- usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+ usr/sbin/gconfpkg --uninstall ${pkgname}
}
post_remove() {
update-desktop-database -q
}
-
-op=$1
-shift
-
-$op $*
+y
\ No newline at end of file
Index: extra/network/gnome-bluetooth/libegg-mustdie.patch
diff -u extra/network/gnome-bluetooth/libegg-mustdie.patch:1.1 extra/network/gnome-bluetooth/libegg-mustdie.patch:removed
--- extra/network/gnome-bluetooth/libegg-mustdie.patch:1.1 Mon Oct 30 12:13:46 2006
+++ extra/network/gnome-bluetooth/libegg-mustdie.patch Wed Feb 27 17:16:12 2008
@@ -1,323 +0,0 @@
-? libegg-mustdie.patch
-Index: Makefile.am
-===================================================================
-RCS file: /cvs/gnome/gnome-bluetooth/Makefile.am,v
-retrieving revision 1.11
-diff -c -r1.11 Makefile.am
-*** Makefile.am 18 Sep 2006 15:36:33 -0000 1.11
---- Makefile.am 14 Oct 2006 14:28:21 -0000
-***************
-*** 1,6 ****
- ## Process this file with automake to produce Makefile.in
-
-! SUBDIRS = po libegg src obex data ui pixmaps
-
- EXTRA_DIST = \
- intltool-extract.in intltool-merge.in intltool-update.in \
---- 1,6 ----
- ## Process this file with automake to produce Makefile.in
-
-! SUBDIRS = po src obex data ui pixmaps
-
- EXTRA_DIST = \
- intltool-extract.in intltool-merge.in intltool-update.in \
-Index: configure.in
-===================================================================
-RCS file: /cvs/gnome/gnome-bluetooth/configure.in,v
-retrieving revision 1.60
-diff -c -r1.60 configure.in
-*** configure.in 4 Oct 2006 14:16:50 -0000 1.60
---- configure.in 14 Oct 2006 14:28:22 -0000
-***************
-*** 69,75 ****
- AC_SUBST(GNOME_BLUETOOTH_DATA_DIR)
-
- dnl stuff for obex
-! PKG_CHECK_MODULES(GOBEX, gtk+-2.0 >= 2.6.0 gnome-vfs-2.0 librsvg-2.0 libgnomeui-2.0 libglade-2.0 libgnome-2.0 >= 2.0.0 gnome-vfs-module-2.0)
- AC_SUBST(GOBEX_LIBS)
- AC_SUBST(GOBEX_CFLAGS)
-
---- 69,75 ----
- AC_SUBST(GNOME_BLUETOOTH_DATA_DIR)
-
- dnl stuff for obex
-! PKG_CHECK_MODULES(GOBEX, gtk+-2.0 >= 2.10.0 gnome-vfs-2.0 librsvg-2.0 libgnomeui-2.0 libglade-2.0 libgnome-2.0 >= 2.0.0 gnome-vfs-module-2.0)
- AC_SUBST(GOBEX_LIBS)
- AC_SUBST(GOBEX_CFLAGS)
-
-***************
-*** 114,121 ****
- else
- AC_MSG_RESULT(no)
- fi
--
-- AC_CONFIG_SUBDIRS(libegg)
-
- AC_OUTPUT([
- Makefile
---- 114,119 ----
-Index: obex/Makefile.am
-===================================================================
-RCS file: /cvs/gnome/gnome-bluetooth/obex/Makefile.am,v
-retrieving revision 1.10
-diff -c -r1.10 Makefile.am
-*** obex/Makefile.am 19 Apr 2006 19:37:13 -0000 1.10
---- obex/Makefile.am 14 Oct 2006 14:28:22 -0000
-***************
-*** 15,21 ****
-
- gnome_obex_server_LDADD = \
- $(GNOME_BLUETOOTH_LIBS) \
-- ../libegg/libegg/tray/libeggtray.la \
- ../src/libgnomebt.la
-
- gnome_obex_send_LDFLAGS = \
---- 15,20 ----
-***************
-*** 23,29 ****
- ../src/libgnomebt.la
-
- INCLUDES = $(GNOME_BLUETOOTH_CFLAGS) \
-! -I$(top_srcdir)/libegg/libegg/tray -I../src \
- -I$(top_srcdir)/src \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -DDATA_DIR="\"$(GNOME_BLUETOOTH_DATA_DIR)\"" \
---- 22,28 ----
- ../src/libgnomebt.la
-
- INCLUDES = $(GNOME_BLUETOOTH_CFLAGS) \
-! -I../src \
- -I$(top_srcdir)/src \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -DDATA_DIR="\"$(GNOME_BLUETOOTH_DATA_DIR)\"" \
-Index: obex/gnome-obex-server.c
-===================================================================
-RCS file: /cvs/gnome/gnome-bluetooth/obex/gnome-obex-server.c,v
-retrieving revision 1.11
-diff -c -r1.11 gnome-obex-server.c
-*** obex/gnome-obex-server.c 17 Apr 2006 10:50:00 -0000 1.11
---- obex/gnome-obex-server.c 14 Oct 2006 14:28:22 -0000
-***************
-*** 48,56 ****
-
- #include <btobex.h>
-
-! #include "eggtrayicon.h"
- #include "gnomebt-controller.h"
-! #include "gnomebt-spinner.h"
- #include "gnomebt-permissiondialog.h"
- #include "gnomebt-fileactiondialog.h"
- #include "util.h"
---- 48,56 ----
-
- #include <btobex.h>
-
-! //#include "eggtrayicon.h"
- #include "gnomebt-controller.h"
-! //#include "gnomebt-spinner.h"
- #include "gnomebt-permissiondialog.h"
- #include "gnomebt-fileactiondialog.h"
- #include "util.h"
-***************
-*** 58,66 ****
- typedef struct _appinfo {
- GnomebtController *btctl;
- BtctlObex *obex;
-! GnomebtSpinner *spin;
- GtkTooltips *tooltip;
-! EggTrayIcon *tray_icon;
- GtkMenu *menu;
- gboolean decision;
- } MyApp;
---- 58,66 ----
- typedef struct _appinfo {
- GnomebtController *btctl;
- BtctlObex *obex;
-! //GnomebtSpinner *spin;
- GtkTooltips *tooltip;
-! GtkStatusIcon *tray_icon;
- GtkMenu *menu;
- gboolean decision;
- } MyApp;
-***************
-*** 169,187 ****
- static void
- progress_callback (BtctlObex *bo, gchar * bdaddr, MyApp *app)
- {
-! /* g_message ("Progress from %s", bdaddr); */
-! spincount++;
-! if (spincount > 3) {
-! gnomebt_spinner_spin (app->spin);
-! spincount = 0;
-! }
- }
-
- static void
- complete_callback (BtctlObex *bo, gchar * bdaddr, MyApp *app)
- {
-! /* g_message ("Operation complete from %s", bdaddr); */
-! gnomebt_spinner_reset (app->spin);
- }
-
- static void
---- 169,190 ----
- static void
- progress_callback (BtctlObex *bo, gchar * bdaddr, MyApp *app)
- {
-! //g_message ("Progress from %s", bdaddr);
-! gtk_status_icon_set_blinking(app->tray_icon,TRUE);
-! //spincount++;
-! //if (spincount > 3) {
-! //gnomebt_spinner_spin (app->spin);
-! //spincount = 0;
-! //}
- }
-
- static void
- complete_callback (BtctlObex *bo, gchar * bdaddr, MyApp *app)
- {
-! //g_message ("Operation complete from %s", bdaddr);
-! if(gtk_status_icon_get_blinking(app->tray_icon))
-! gtk_status_icon_set_blinking(app->tray_icon,FALSE);
-! //gnomebt_spinner_reset (app->spin);
- }
-
- static void
-***************
-*** 209,215 ****
- g_message ("Client aborted transfer");
- break;
- }
-! gnomebt_spinner_reset (app->spin);
- }
-
- static void
---- 212,218 ----
- g_message ("Client aborted transfer");
- break;
- }
-! //gnomebt_spinner_reset (app->spin);
- }
-
- static void
-***************
-*** 344,397 ****
- }
-
- static gboolean
-! tray_icon_press (GtkWidget *widget, GdkEventButton *event, MyApp *app)
- {
-! if (event->button == 3)
- {
- gtk_menu_popup (GTK_MENU (app->menu), NULL, NULL, NULL,
-! NULL, event->button, event->time);
- return TRUE;
- }
- return FALSE;
- }
-
-- static gboolean
-- tray_icon_release (GtkWidget *widget, GdkEventButton *event, MyApp *app)
-- {
-- if (event->button == 3) {
-- gtk_menu_popdown (GTK_MENU (app->menu));
-- return FALSE;
-- }
--
-- return TRUE;
-- }
--
-- static gboolean
-- tray_destroy_cb (GtkObject *obj, MyApp *app)
-- {
-- /* When try icon is destroyed, recreate it. This happens
-- when the notification area is removed. */
--
-- app->tray_icon = egg_tray_icon_new (_("Bluetooth File Sharing"));
-- app->spin = gnomebt_spinner_new ();
-- gnomebt_spinner_reset (app->spin);
--
-- g_signal_connect (G_OBJECT (app->tray_icon), "destroy",
-- G_CALLBACK (tray_destroy_cb), (gpointer) app);
--
-- g_signal_connect (GTK_OBJECT (app->spin), "button_press_event",
-- G_CALLBACK (tray_icon_press), (gpointer) app);
--
-- g_signal_connect (GTK_OBJECT (app->spin), "button_release_event",
-- G_CALLBACK (tray_icon_release), (gpointer) app);
--
-- gtk_container_add (GTK_CONTAINER (app->tray_icon),
-- GTK_WIDGET (app->spin));
--
-- gtk_widget_show_all (GTK_WIDGET (app->tray_icon));
--
-- return TRUE;
-- }
-
- int
- main (int argc, char *argv[])
---- 347,364 ----
- }
-
- static gboolean
-! tray_icon_press (GtkStatusIcon *status_icon,guint button,
-! guint activate_time,MyApp *app)
- {
-! if (button == 3)
- {
- gtk_menu_popup (GTK_MENU (app->menu), NULL, NULL, NULL,
-! NULL, button, activate_time);
- return TRUE;
- }
- return FALSE;
- }
-
-
- int
- main (int argc, char *argv[])
-***************
-*** 428,435 ****
- G_CALLBACK(error_callback), (gpointer) app);
- g_signal_connect (G_OBJECT(app->obex), "connect",
- G_CALLBACK(connect_callback), (gpointer) app);
-
-- app->tray_icon = egg_tray_icon_new (_("Bluetooth File Server"));
- app->btctl = gnomebt_controller_new ();
-
- app->tooltip = gtk_tooltips_new();
---- 395,408 ----
- G_CALLBACK(error_callback), (gpointer) app);
- g_signal_connect (G_OBJECT(app->obex), "connect",
- G_CALLBACK(connect_callback), (gpointer) app);
-+
-+ app->tray_icon = gtk_status_icon_new();
-+ gtk_status_icon_set_from_file(app->tray_icon ,DATA_DIR"/pixmaps/frame4.png");
-+
-+ g_signal_connect (app->tray_icon, "popup-menu",
-+ G_CALLBACK (tray_icon_press), (gpointer) app);
-+
-
- app->btctl = gnomebt_controller_new ();
-
- app->tooltip = gtk_tooltips_new();
-***************
-*** 463,472 ****
- gtk_widget_show (item);
- gtk_menu_shell_append (GTK_MENU_SHELL(app->menu), item);
-
-- tray_destroy_cb (NULL, app);
--
- gtk_tooltips_set_tip (app->tooltip,
-! GTK_WIDGET (app->spin),
- _("Ready for Bluetooth file transfers"),
- NULL);
-
---- 436,443 ----
- gtk_widget_show (item);
- gtk_menu_shell_append (GTK_MENU_SHELL(app->menu), item);
-
- gtk_tooltips_set_tip (app->tooltip,
-! app->tray_icon,
- _("Ready for Bluetooth file transfers"),
- NULL);
-
More information about the arch-commits
mailing list