rpm/gnome-bluetooth
SHA256
1
0
Fork 0
forked from pool/gnome-bluetooth
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-bluetooth?expand=0&rev=9

Browse Source
This commit is contained in:
OBS User unknown 2007-10-25 23:58:20 +00:00 committed by Git OBS Bridge
parent 61e33f7a14
commit 3fe2755be3
9 changed files with 132 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
dont-disable-deprecated.patch
View File

@ -1,48 +0,0 @@
Index: gnome-bluetooth-0.8.0/libegg/libegg/Makefile.am
===================================================================
--- gnome-bluetooth-0.8.0.orig/libegg/libegg/Makefile.am
+++ gnome-bluetooth-0.8.0/libegg/libegg/Makefile.am
@@ -3,10 +3,7 @@ SUBDIRS = util tray iconlist
INCLUDES = \
$(EGG_CFLAGS) \
- -DEGG_COMPILATION \
- -DGTK_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED \
- -DG_DISABLE_DEPRECATED
+ -DEGG_COMPILATION
##noinst_LTLIBRARIES = libegg.la
Index: gnome-bluetooth-0.8.0/libegg/libegg/iconlist/Makefile.am
===================================================================
--- gnome-bluetooth-0.8.0.orig/libegg/libegg/iconlist/Makefile.am
+++ gnome-bluetooth-0.8.0/libegg/libegg/iconlist/Makefile.am
@@ -2,10 +2,7 @@
INCLUDES = \
$(EGG_CFLAGS) \
-I$(top_srcdir)/libegg/util \
- -DEGG_COMPILATION \
- -DGTK_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED \
- -DG_DISABLE_DEPRECATED
+ -DEGG_COMPILATION
noinst_LTLIBRARIES = libeggiconlist.la
Index: gnome-bluetooth-0.8.0/libegg/libegg/tray/Makefile.am
===================================================================
--- gnome-bluetooth-0.8.0.orig/libegg/libegg/tray/Makefile.am
+++ gnome-bluetooth-0.8.0/libegg/libegg/tray/Makefile.am
@@ -2,10 +2,7 @@
INCLUDES = \
$(EGG_TRAY_CFLAGS) \
-I$(top_srcdir)/libegg/util \
- -DEGG_COMPILATION \
- -DGTK_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED \
- -DG_DISABLE_DEPRECATED
+ -DEGG_COMPILATION
noinst_LTLIBRARIES = libeggtray.la

3
gnome-bluetooth-0.8.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:10823e914d36fe7fe79dadec29b180cb7f850cea2dd6de7a3322aa4bca1ba87a
size 795141

3
gnome-bluetooth-0.9.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:de8cbc2baf8d145f6e389fe4a101d0b8fc0f66840905204283aec070859a043c
size 559765

16
gnome-bluetooth-desktop.diff
View File

@ -1,16 +0,0 @@
--- gnome-bluetooth-0.7.0/obex/gnome-obex-server.desktop.in
+++ gnome-bluetooth-0.7.0/obex/gnome-obex-server.desktop.in
@@ -1,12 +1,10 @@
[Desktop Entry]
-Encoding=UTF-8
_Name=Bluetooth File Sharing
-_Comment=Receive files sent by Bluetooth devices
+_GenericName=Receive files sent by Bluetooth devices
Icon=blueradio-48
Exec=gnome-obex-server
Terminal=0
Type=Application
-Categories=Application;System;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-bluetooth
X-GNOME-Bugzilla-Component=obex-server

26
gnome-bluetooth-fail-cleanly.patch
View File

@ -1,26 +0,0 @@
--- python/manager.py
+++ python/manager.py
@@ -82,10 +82,13 @@
self.btctl.connect ("status_change", self.on_status_change)
self.btctl.connect ("add_device", self.on_add_device)
- if not self.btctl.is_initialised():
+ try:
+ self.btctl.is_initialised()
+ except:
hig_alert.reportError (self.window, _("Could not find Bluetooth devices on the system"), _("Please make sure that your Bluetooth adapter is correctly plugged in your machine."))
sys.exit (1)
+ self.window.show_all ()
self.read_devices ()
def setup_gui (self):
@@ -163,8 +166,6 @@
self.scrolly.set_policy (gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
self.scrolly.add (self.iconlist)
- self.window.show_all ()
-
logoname = self.image_file ("btdevice-misc.png")
self.logo = gtk.gdk.pixbuf_new_from_file (logoname)

16
gnome-bluetooth-pixmapsdir.patch
View File

@ -1,16 +0,0 @@
Index: python/manager.py
===================================================================
RCS file: /cvs/gnome/gnome-bluetooth/python/manager.py,v
retrieving revision 1.15
diff -u -p -r1.15 manager.py
--- python/manager.py 7 Aug 2005 16:51:50 -0000 1.15
+++ python/manager.py 2 Feb 2006 18:46:25 -0000
@@ -265,7 +265,7 @@ class BTManager (object):
dialog.show ()
def image_file (self, fname):
- for d in [os.path.join (__datadir__, "pixmaps"), "../pixmaps"]:
+ for d in [os.path.join (__datadir__, "pixmaps"), os.path.join (__datadir__, "../pixmaps"), "../pixmaps"]:
if os.path.isfile (os.path.join (d, fname)):
return os.path.join (d, fname)
return None

90
gnome-bluetooth-transparent-trayicon.patch
View File

@ -1,90 +0,0 @@
--- libegg/libegg/tray/eggtrayicon.c
+++ libegg/libegg/tray/eggtrayicon.c
@@ -62,6 +62,9 @@
static void egg_tray_icon_realize (GtkWidget *widget);
static void egg_tray_icon_unrealize (GtkWidget *widget);
+static void egg_tray_icon_add (GtkContainer *container,
+ GtkWidget *widget);
+
static void egg_tray_icon_update_manager_window (EggTrayIcon *icon);
GType
@@ -104,6 +107,7 @@
{
GObjectClass *gobject_class = (GObjectClass *)klass;
GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
+ GtkContainerClass *container_class = (GtkContainerClass *)klass;
parent_class = g_type_class_peek_parent (klass);
@@ -112,6 +116,8 @@
widget_class->realize = egg_tray_icon_realize;
widget_class->unrealize = egg_tray_icon_unrealize;
+ container_class->add = egg_tray_icon_add;
+
g_object_class_install_property (gobject_class,
PROP_ORIENTATION,
g_param_spec_enum ("orientation",
@@ -330,6 +336,36 @@
}
}
+static gboolean
+transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
+{
+ gdk_window_clear_area (widget->window, event->area.x, event->area.y,
+ event->area.width, event->area.height);
+ return FALSE;
+}
+
+static void
+make_transparent_again (GtkWidget *widget, GtkStyle *previous_style,
+ gpointer user_data)
+{
+ gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
+}
+
+static void
+make_transparent (GtkWidget *widget, gpointer user_data)
+{
+ if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
+ return;
+
+ gtk_widget_set_app_paintable (widget, TRUE);
+ gtk_widget_set_double_buffered (widget, FALSE);
+ gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
+ g_signal_connect (widget, "expose_event",
+ G_CALLBACK (transparent_expose_event), NULL);
+ g_signal_connect_after (widget, "style_set",
+ G_CALLBACK (make_transparent_again), NULL);
+}
+
static void
egg_tray_icon_realize (GtkWidget *widget)
{
@@ -343,6 +379,8 @@
if (GTK_WIDGET_CLASS (parent_class)->realize)
GTK_WIDGET_CLASS (parent_class)->realize (widget);
+ make_transparent (widget, NULL);
+
screen = gtk_widget_get_screen (widget);
display = gdk_screen_get_display (screen);
xdisplay = gdk_x11_display_get_xdisplay (display);
@@ -373,6 +411,14 @@
egg_tray_icon_manager_filter, icon);
}
+static void
+egg_tray_icon_add (GtkContainer *container, GtkWidget *widget)
+{
+ g_signal_connect (widget, "realize",
+ G_CALLBACK (make_transparent), NULL);
+ GTK_CONTAINER_CLASS (parent_class)->add (container, widget);
+}
+
EggTrayIcon *
egg_tray_icon_new_for_xscreen (Screen *xscreen, const char *name)
{

21
gnome-bluetooth.changes
View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Thu Oct 25 16:25:05 CEST 2007 - jpr@suse.de
- Update to 0.9.1
* Fix a typo that meant the obex server was crashing when receiving
a file
* Send a disconnect when we finish sending a file, fixes reception
of files on some devices
* Use new GTK+ features for the tray icon
* Build fixes
- Remove gnome-bluetooth-desktop.diff and use
%suse_update_desktop_file instead
- Remove gnome-bluetooth-pixmapsdir.patch, the icon hierarchy is used
now
- Remove gnome-bluetooth-transparent-trayicon.patch and
dont-disable-deprecated, libegg is no longer used
- Remove gnome-bluetooth-fail-cleanly.patch, the UI it changed is
- Split off libgnomebt0, python-gnome-bluetooth and
gnome-bluetooth-lang
- Rename gnome-bluetooth-devel to libgnomebt-devel
-------------------------------------------------------------------
Wed Aug 8 18:53:55 CEST 2007 - maw@suse.de

153
gnome-bluetooth.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package gnome-bluetooth (Version 0.8.0)
# spec file for package gnome-bluetooth (Version 0.9.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -15,22 +15,14 @@ BuildRequires: fdupes gob2 intltool libbtctl-devel libglade2-devel libgnomeui-d
License: GPL v2 or later
Group: System/GUI/GNOME
Requires: gnome-vfs2 python-gnome
Version: 0.8.0
Release: 99
Version: 0.9.1
Release: 1
Summary: GNOME Bluetooth Support
URL: http://usefulinc.com/software/gnome-bluetooth/
Url: http://usefulinc.com/software/gnome-bluetooth/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.8/%{name}-%{version}.tar.bz2
Patch0: %name-desktop.diff
Patch1: gnome-bluetooth-pixmapsdir.patch
Patch2: gnome-bluetooth-transparent-trayicon.patch
Patch3: gnome-bluetooth-fail-cleanly.patch
Patch4: dont-disable-deprecated.patch
Requires: %{name}-lang = %{version}
Autoreqprov: on
%py_requires
AutoReqProv: on
%gconf_schemas_prereq
%description
@ -59,17 +51,51 @@ Authors:
Anders Carlsson <andersca@gnu.org>
James Henstridge <james@daa.com.au>
%package devel
%package -n libgnomebt0
Summary: GNOME Bluetooth Support
Group: System/GUI/GNOME
Requires: %{name} = %{version} glib2-devel libbtctl-devel libglade2-devel libgnomeui-devel libjpeg-devel libbonoboui-devel gnome-keyring-devel libxml2-devel libgnomecanvas-devel libart_lgpl-devel libgnome-devel esound-devel alsa-devel resmgr audiofile-devel popt-devel gtk2-devel atk-devel pango-devel cairo-devel fontconfig-devel glitz-devel libpng-devel freetype2-devel libexpat-devel libbonobo-devel gnome-vfs2-devel zlib-devel openssl-devel libopenssl-devel orbit2-devel gconf2-devel
Requires: %{name} = %{version}
%description -n libgnomebt0
This package contains a controller class, GnomebtController, to
controlBluetooth devices and a simple GUI to explore which devices are
available (gnome-bluetooth-manager). An OBEX server is
available,gnome-obex-server. This receives files sent via Bluetooth to
yourPC and saves them in your home directory. The program
gnome-obex-send enables you to send files. It is used by the Nautilus
component--select the files to send and choose "Send via Bluetooth"
from the context menu.
Authors:
--------
Edd Dumbill <edd@usefulinc.com>
Bastien Nocera <hadess@hadess.net>
Dag Brattli <dagb@cs.uit.no>
Pontus Fuchs <pontus.fuchs@tactel.se>
Fons Botman <budely@tref.nl>
Jean Tourrilhes <jt@hpl.hp.com>
Marcel Holtmann <marcel@holtmann.org>
Jonathan Blandford <jrb@redhat.com>
Kristian Rietveld <kris@gtk.org>
Anders Carlsson <andersca@gnu.org>
James Henstridge <james@daa.com.au>
%package -n libgnomebt-devel
Summary: GNOME Bluetooth Support
Group: Development/Libraries/GNOME
Requires: %{name} = %{version} libgnomebt0 = %{version} glib2-devel libbtctl-devel libglade2-devel libgnomeui-devel libjpeg-devel libbonoboui-devel gnome-keyring-devel libxml2-devel libgnomecanvas-devel libart_lgpl-devel libgnome-devel esound-devel alsa-devel resmgr audiofile-devel popt-devel gtk2-devel atk-devel pango-devel cairo-devel fontconfig-devel glitz-devel libpng-devel freetype2-devel libexpat-devel libbonobo-devel gnome-vfs2-devel zlib-devel openssl-devel libopenssl-devel orbit2-devel gconf2-devel
%if %suse_version > 1010
Requires: dbus-1-glib-devel
%else
Requires: dbus-1-devel dbus-1-glib
%endif
# gnome-bluetooth-devel was last used in openSUSE 10.3
Provides: gnome-bluetooth-devel = %{version}
Obsoletes: gnome-bluetooth-devel <= 0.8
%description devel
%description -n libgnomebt-devel
This package contains a controller class, GnomebtController, to control
Bluetooth devices and a simple GUI to explore which devices are
available (gnome-bluetooth-manager). An OBEX server is available,
@ -81,6 +107,38 @@ from the context menu.
Authors:
--------
Edd Dumbill <edd@usefulinc.com>
Bastien Nocera <hadess@hadess.net>
Dag Brattli <dagb@cs.uit.no>
Pontus Fuchs <pontus.fuchs@tactel.se>
Fons Botman <budely@tref.nl>
Jean Tourrilhes <jt@hpl.hp.com>
Marcel Holtmann <marcel@holtmann.org>
Jonathan Blandford <jrb@redhat.com>
Kristian Rietveld <kris@gtk.org>
Anders Carlsson <andersca@gnu.org>
James Henstridge <james@daa.com.au>
%package -n python-gnome-bluetooth
Summary: GNOME Bluetooth Support
Group: System/GUI/GNOME
Requires: %{name} = %{version} libgnomebt0 = %{version}
%py_requires
%description -n python-gnome-bluetooth
This package contains a controller class, GnomebtController, to
controlBluetooth devices and a simple GUI to explore which devices are
available (gnome-bluetooth-manager). An OBEX server is
available,gnome-obex-server. This receives files sent via Bluetooth to
yourPC and saves them in your home directory. The program
gnome-obex-send enables you to send files. It is used by the Nautilus
component--select the files to send and choose "Send via Bluetooth"
from the context menu.
Authors:
--------
Edd Dumbill <edd@usefulinc.com>
@ -98,72 +156,77 @@ Authors:
%lang_package
%prep
%setup -q
%patch0 -p1
#%patch1 -p0
%patch2 -p0
#%patch3 -p0
%patch4 -p1
rm -f libegg/aclocal.m4 aclocal.m4
%build
autoreconf -f -i
# These variables test are some old cruft that is nowhere used.
# Setting them skips the tests, since they test for librsvg which is not needed.
# If they would be used, the build would fail ;-).
export GOBEX_LIBS="-empty"
export GOBEX_CFLAGS="-empty "
export EGG_RECENT_CFLAGS="-empty"
export EGG_RECENT_LIBS="-empty"
%configure\
--disable-schemas-install
make %{?jobs:-j%jobs}
%__make %{?jobs:-j%jobs}
%install
make install DESTDIR=$RPM_BUILD_ROOT
%makeinstall
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
%suse_update_desktop_file -G "" -C "Receive files sent by Bluetooth devices" gnome-obex-server System Applet
%suse_update_desktop_file -r -N "GNOME Obex Server" -G "Bluetooth File Sharing" gnome-obex-server System Applet
%find_lang %{name}
%find_gconf_schemas
cat %{name}.schemas_list >%{name}.lst
rm $RPM_BUILD_ROOT%{py_sitedir}/gnomebt/*.la
%fdupes $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%postun
/sbin/ldconfig
%pre -f %{name}.schemas_pre
%post
/sbin/ldconfig
%posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun
%post -n libgnomebt0 -p /sbin/ldconfig
%postun -n libgnomebt0 -p /sbin/ldconfig
%files -f %{name}.lst
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/*
%{_libdir}/*.so.*
%{_datadir}/applications/*.desktop
%{_datadir}/gnome-bluetooth
%{_datadir}/pixmaps/blueradio-48.png
%{py_sitedir}/gnomebt
%files lang -f %{name}.lang
%files devel
%files -n libgnomebt0
%defattr(-, root, root)
%{_libdir}/*.so.0*
%files -n python-gnome-bluetooth
%defattr(-, root, root)
%{py_sitedir}/gnomebt
%files -n libgnomebt-devel
%defattr(-, root, root)
%{_includedir}/gnome-bluetooth
%{_libdir}/*.so
%{_libdir}/*.*a
%{_libdir}/pkgconfig/*.pc
%changelog
* Thu Oct 25 2007 - jpr@suse.de
- Update to 0.9.1
* Fix a typo that meant the obex server was crashing when receiving
a file
* Send a disconnect when we finish sending a file, fixes reception
of files on some devices
* Use new GTK+ features for the tray icon
* Build fixes
- Remove gnome-bluetooth-desktop.diff and use
%%suse_update_desktop_file instead
- Remove gnome-bluetooth-pixmapsdir.patch, the icon hierarchy is used
now
- Remove gnome-bluetooth-transparent-trayicon.patch and
dont-disable-deprecated, libegg is no longer used
- Remove gnome-bluetooth-fail-cleanly.patch, the UI it changed is
- Split off libgnomebt0, python-gnome-bluetooth and
gnome-bluetooth-lang
- Rename gnome-bluetooth-devel to libgnomebt-devel
* Wed Aug 08 2007 - maw@suse.de
- Use %%fdupes
- Split off a -lang subpackage