From 04816977b91c5f7affe139e0dd09f8f2498df4d8 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 6 Feb 2006 00:29:32 +0000 Subject: gpe-bluetooth: Add verison 0.51, remove 0.36.3 to 0.44 --- .../gpe-bluetooth-0.36.3/.mtn2git_empty | 0 .../gpe-bluetooth-0.36.3/segfault.patch | 30 -------------- .../gpe-bluetooth-0.37/.mtn2git_empty | 0 .../change-sdp-to-bluetooth.patch | 12 ------ .../gpe-bluetooth-0.37/dbus-service-name.patch | 47 ---------------------- .../gpe-bluetooth-0.37/hciattach-path.patch | 11 ----- .../gpe-bluetooth-0.37/icon-resize.patch | 43 -------------------- packages/gpe-bluetooth/gpe-bluetooth_0.36.3.bb | 15 ------- packages/gpe-bluetooth/gpe-bluetooth_0.37.bb | 17 -------- packages/gpe-bluetooth/gpe-bluetooth_0.38.bb | 13 ------ packages/gpe-bluetooth/gpe-bluetooth_0.43.bb | 15 ------- packages/gpe-bluetooth/gpe-bluetooth_0.44.bb | 15 ------- packages/gpe-bluetooth/gpe-bluetooth_0.51.bb | 14 +++++++ 13 files changed, 14 insertions(+), 218 deletions(-) delete mode 100644 packages/gpe-bluetooth/gpe-bluetooth-0.36.3/.mtn2git_empty delete mode 100644 packages/gpe-bluetooth/gpe-bluetooth-0.36.3/segfault.patch delete mode 100644 packages/gpe-bluetooth/gpe-bluetooth-0.37/.mtn2git_empty delete mode 100644 packages/gpe-bluetooth/gpe-bluetooth-0.37/change-sdp-to-bluetooth.patch delete mode 100644 packages/gpe-bluetooth/gpe-bluetooth-0.37/dbus-service-name.patch delete mode 100644 packages/gpe-bluetooth/gpe-bluetooth-0.37/hciattach-path.patch delete mode 100644 packages/gpe-bluetooth/gpe-bluetooth-0.37/icon-resize.patch delete mode 100644 packages/gpe-bluetooth/gpe-bluetooth_0.36.3.bb delete mode 100644 packages/gpe-bluetooth/gpe-bluetooth_0.37.bb delete mode 100644 packages/gpe-bluetooth/gpe-bluetooth_0.38.bb delete mode 100644 packages/gpe-bluetooth/gpe-bluetooth_0.43.bb delete mode 100644 packages/gpe-bluetooth/gpe-bluetooth_0.44.bb create mode 100644 packages/gpe-bluetooth/gpe-bluetooth_0.51.bb (limited to 'packages/gpe-bluetooth') diff --git a/packages/gpe-bluetooth/gpe-bluetooth-0.36.3/.mtn2git_empty b/packages/gpe-bluetooth/gpe-bluetooth-0.36.3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gpe-bluetooth/gpe-bluetooth-0.36.3/segfault.patch b/packages/gpe-bluetooth/gpe-bluetooth-0.36.3/segfault.patch deleted file mode 100644 index d18cb38aac..0000000000 --- a/packages/gpe-bluetooth/gpe-bluetooth-0.36.3/segfault.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: main.c -=================================================================== -RCS file: /cvs/gpe/base/gpe-bluetooth/main.c,v -retrieving revision 1.51 -retrieving revision 1.52 -diff -u -r1.51 -r1.52 ---- main.c 7 Mar 2004 17:41:27 -0000 1.51 -+++ main.c 7 Sep 2004 00:01:17 -0000 1.52 -@@ -508,7 +508,7 @@ - { - GtkWidget *window; - GdkBitmap *bitmap; -- GtkWidget *menu_remove, *menu_file; -+ GtkWidget *menu_remove; - GtkTooltips *tooltips; - int dd; - -@@ -560,12 +560,10 @@ - - gtk_widget_show (menu_devices); - gtk_widget_show (menu_remove); -- gtk_widget_show (menu_file); - - gtk_menu_append (GTK_MENU (menu), menu_radio_on); - gtk_menu_append (GTK_MENU (menu), menu_radio_off); - gtk_menu_append (GTK_MENU (menu), menu_devices); -- gtk_menu_append (GTK_MENU (menu), menu_file); - gtk_menu_append (GTK_MENU (menu), menu_remove); - - if (gpe_load_icons (my_icons) == FALSE) diff --git a/packages/gpe-bluetooth/gpe-bluetooth-0.37/.mtn2git_empty b/packages/gpe-bluetooth/gpe-bluetooth-0.37/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gpe-bluetooth/gpe-bluetooth-0.37/change-sdp-to-bluetooth.patch b/packages/gpe-bluetooth/gpe-bluetooth-0.37/change-sdp-to-bluetooth.patch deleted file mode 100644 index 009b9a576f..0000000000 --- a/packages/gpe-bluetooth/gpe-bluetooth-0.37/change-sdp-to-bluetooth.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNd ../gpe-bluetooth-0.37-r0/gpe-bluetooth-0.37/Makefile gpe-bluetooth-0.37/Makefile ---- ../gpe-bluetooth-0.37-r0/gpe-bluetooth-0.37/Makefile 2004-09-07 01:01:06.000000000 +0100 -+++ gpe-bluetooth-0.37/Makefile 2004-10-18 11:55:53.000000000 +0100 -@@ -20,7 +20,7 @@ - PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GPECFLAGS) `pkg-config --cflags dbus-glib-1` `pkg-config --cflags libglade-2.0` `pkg-config --cflags mimedir-1.0` `$(LIBGPEVTYPE_PC_EXTRA) pkg-config --cflags $(LIBGPEVTYPE_PC)` - PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS) -DDBUS_API_SUBJECT_TO_CHANGE -DGPE_BLUETOOTH - PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" --PACKAGE_LDFLAGS += $(GPELIBS) -lbluetooth -lsdp `pkg-config --libs gthread-2.0` `pkg-config --libs dbus-glib-1` `pkg-config --libs libglade-2.0` -lopenobex `pkg-config --libs mimedir-1.0` `$(LIBGPEVTYPE_PC_EXTRA) pkg-config --libs $(LIBGPEVTYPE_PC)` -lsqlite -+PACKAGE_LDFLAGS += $(GPELIBS) -lbluetooth -lbluetooth `pkg-config --libs gthread-2.0` `pkg-config --libs dbus-glib-1` `pkg-config --libs libglade-2.0` -lopenobex `pkg-config --libs mimedir-1.0` `$(LIBGPEVTYPE_PC_EXTRA) pkg-config --libs $(LIBGPEVTYPE_PC)` -lsqlite - - ifeq ($(CVSBUILD),yes) - BUILD = ../build diff --git a/packages/gpe-bluetooth/gpe-bluetooth-0.37/dbus-service-name.patch b/packages/gpe-bluetooth/gpe-bluetooth-0.37/dbus-service-name.patch deleted file mode 100644 index b7dc93b4e8..0000000000 --- a/packages/gpe-bluetooth/gpe-bluetooth-0.37/dbus-service-name.patch +++ /dev/null @@ -1,47 +0,0 @@ -Index: dbus.c -=================================================================== -RCS file: /cvs/gpe/base/gpe-bluetooth/dbus.c,v -retrieving revision 1.7 -diff -u -r1.7 dbus.c ---- gpe-bluetooth/dbus.c 7 Sep 2004 00:01:27 -0000 1.7 -+++ gpe-bluetooth/dbus.c 9 Jan 2005 13:56:46 -0000 -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2002, 2003, 2004 Philip Blundell -+ * Copyright (C) 2002, 2003, 2004, 2005 Philip Blundell - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License -@@ -27,9 +27,11 @@ - - #define _(x) gettext(x) - --#define SERVICE_NAME "org.handhelds.gpe.bluez" --#define PIN_INTERFACE_NAME SERVICE_NAME ".PinAgent" --#define OBEX_INTERFACE_NAME SERVICE_NAME ".OBEX" -+#define PIN_SERVICE_NAME "org.bluez.PinAgent" -+#define PIN_INTERFACE_NAME PIN_SERVICE_NAME -+ -+#define OBEX_SERVICE_NAME "org.handhelds.gpe.bluez" -+#define OBEX_INTERFACE_NAME OBEX_SERVICE_NAME ".OBEX" - - extern DBusHandlerResult bluez_pin_handle_dbus_request (DBusConnection *connection, DBusMessage *message); - extern DBusHandlerResult obex_client_handle_dbus_request (DBusConnection *connection, DBusMessage *message); -@@ -96,7 +98,7 @@ - - dbus_connection_register_object_path (connection, object_path1, &dbus_pin_vtable, NULL); - -- dbus_bus_acquire_service (connection, SERVICE_NAME, 0, &error); -+ dbus_bus_acquire_service (connection, PIN_SERVICE_NAME, 0, &error); - if (dbus_error_is_set (&error)) - { - gpe_error_box_fmt (_("Failed to acquire service: %s"), error.message); -@@ -118,7 +120,7 @@ - - dbus_connection_register_object_path (connection, object_path2, &dbus_obex_vtable, NULL); - -- dbus_bus_acquire_service (connection, SERVICE_NAME, 0, &error); -+ dbus_bus_acquire_service (connection, OBEX_SERVICE_NAME, 0, &error); - if (dbus_error_is_set (&error)) - { - gpe_error_box_fmt (_("Failed to acquire service: %s"), error.message); diff --git a/packages/gpe-bluetooth/gpe-bluetooth-0.37/hciattach-path.patch b/packages/gpe-bluetooth/gpe-bluetooth-0.37/hciattach-path.patch deleted file mode 100644 index 4b122668a6..0000000000 --- a/packages/gpe-bluetooth/gpe-bluetooth-0.37/hciattach-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gpe-bluetooth-0.37/hciattach.sh.old 2004-11-23 14:11:16.000000000 +0000 -+++ gpe-bluetooth-0.37/hciattach.sh 2004-11-23 14:11:23.000000000 +0000 -@@ -3,7 +3,7 @@ - if [ -f /etc/sysconfig/bluetooth ]; then - . /etc/sysconfig/bluetooth - -- exec hciattach -n $BLUETOOTH_PORT $BLUETOOTH_PROTOCOL $BLUETOOTH_SPEED -+ exec /sbin/hciattach -n $BLUETOOTH_PORT $BLUETOOTH_PROTOCOL $BLUETOOTH_SPEED - else - echo "Bluetooth not configured" - exit 1 diff --git a/packages/gpe-bluetooth/gpe-bluetooth-0.37/icon-resize.patch b/packages/gpe-bluetooth/gpe-bluetooth-0.37/icon-resize.patch deleted file mode 100644 index 2580d9c3c8..0000000000 --- a/packages/gpe-bluetooth/gpe-bluetooth-0.37/icon-resize.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -u -r1.52 main.c ---- gpe-bluetooth/main.c 7 Sep 2004 00:01:17 -0000 1.52 -+++ gpe-bluetooth/main.c 19 Oct 2004 08:16:27 -0000 -@@ -503,6 +503,22 @@ - g_timeout_add (time, (GSourceFunc) cancel_dock_message, (gpointer)id); - } - -+gboolean -+configure_event (GtkWidget *window, GdkEventConfigure *event, GdkBitmap *bitmap) -+{ -+ GdkPixbuf *buf; -+ int xoff, yoff; -+ -+ buf = gpe_find_icon ("bt-off"); -+ -+ xoff = (event->width - gdk_pixbuf_get_width (buf)) / 2; -+ yoff = (event->height - gdk_pixbuf_get_height (buf)) / 2; -+ -+ gtk_widget_shape_combine_mask (window, bitmap, xoff, yoff); -+ -+ return FALSE; -+} -+ - int - main (int argc, char *argv[]) - { -@@ -572,14 +588,14 @@ - icon = gtk_image_new_from_pixbuf (gpe_find_icon (radio_is_on ? "bt-on" : "bt-off")); - gtk_widget_show (icon); - gdk_pixbuf_render_pixmap_and_mask (gpe_find_icon ("bt-off"), NULL, &bitmap, 255); -- gtk_widget_shape_combine_mask (window, bitmap, 2, 0); -- gdk_bitmap_unref (bitmap); -+ gtk_widget_shape_combine_mask (window, bitmap, 0, 0); - - gpe_set_window_icon (window, "bt-on"); - - tooltips = gtk_tooltips_new (); - gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), window, _("This is the Bluetooth control.\nTap here to turn the radio on and off, or to see a list of Bluetooth devices."), NULL); - -+ g_signal_connect (G_OBJECT (window), "configure-event", G_CALLBACK (configure_event), bitmap); - g_signal_connect (G_OBJECT (window), "button-press-event", G_CALLBACK (clicked), NULL); - gtk_widget_add_events (window, GDK_BUTTON_PRESS_MASK); - diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.36.3.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.36.3.bb deleted file mode 100644 index 763f9a739f..0000000000 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.36.3.bb +++ /dev/null @@ -1,15 +0,0 @@ -LICENSE = "GPL" -inherit gpe - -DESCRIPTION = "GPE bluetooth support" -DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe" -RDEPENDS = "bluez-utils blueprobe" -MAINTAINER = "Phil Blundell " -SECTION = "gpe" -PRIORITY = "optional" -PR = "r3" - -SRC_URI += "file://segfault.patch;patch=1;pnum=0" - -FILES_${PN} += '${datadir}/bluez-pin' - diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.37.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.37.bb deleted file mode 100644 index 5c7581e224..0000000000 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.37.bb +++ /dev/null @@ -1,17 +0,0 @@ -LICENSE = "GPL" -inherit gpe - -DESCRIPTION = "GPE bluetooth support" -DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus" -RDEPENDS = "bluez-utils-dbus blueprobe" -MAINTAINER = "Phil Blundell " -SECTION = "gpe" -PRIORITY = "optional" -PR = "r7" - -FILES_${PN} += '${datadir}/bluez-pin' - -SRC_URI += "file://change-sdp-to-bluetooth.patch;patch=1 \ - file://icon-resize.patch;patch=1 \ - file://hciattach-path.patch;patch=1 \ - file://dbus-service-name.patch;patch=1" diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.38.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.38.bb deleted file mode 100644 index 80076dab01..0000000000 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.38.bb +++ /dev/null @@ -1,13 +0,0 @@ -LICENSE = "GPL" -inherit gpe - -DESCRIPTION = "GPE bluetooth support" -DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus" -RDEPENDS = "bluez-utils-dbus blueprobe" -MAINTAINER = "Phil Blundell " -SECTION = "gpe" -PRIORITY = "optional" -PR = "r0" - -FILES_${PN} += '${datadir}/bluez-pin' - diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.43.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.43.bb deleted file mode 100644 index 6a4e6dc907..0000000000 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.43.bb +++ /dev/null @@ -1,15 +0,0 @@ -LICENSE = "GPL" -inherit gpe autotools - -DESCRIPTION = "GPE bluetooth support" -DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus" -RDEPENDS = "bluez-utils-dbus blueprobe" -MAINTAINER = "Phil Blundell " -SECTION = "gpe" -PRIORITY = "optional" -PR = "r0" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" - -FILES_${PN} += '${datadir}/bluez-pin' - diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.44.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.44.bb deleted file mode 100644 index 6a4e6dc907..0000000000 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.44.bb +++ /dev/null @@ -1,15 +0,0 @@ -LICENSE = "GPL" -inherit gpe autotools - -DESCRIPTION = "GPE bluetooth support" -DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus" -RDEPENDS = "bluez-utils-dbus blueprobe" -MAINTAINER = "Phil Blundell " -SECTION = "gpe" -PRIORITY = "optional" -PR = "r0" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" - -FILES_${PN} += '${datadir}/bluez-pin' - diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb new file mode 100644 index 0000000000..12833d7dde --- /dev/null +++ b/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb @@ -0,0 +1,14 @@ +LICENSE = "GPL" +DESCRIPTION = "GPE bluetooth support user interface tool." +SECTION = "gpe" +PRIORITY = "optional" +MAINTAINER = "Florian Boor " + + +DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus" +RDEPENDS = "bluez-utils-dbus blueprobe" + +GPE_TARBALL_SUFFIX= "bz2" +inherit gpe autotools + +FILES_${PN} += '${datadir}/bluez-pin' -- cgit v1.2.3