From 0e1961253c3d5ee45fce7d84e2addc88f35d910d Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 6 Mar 2007 11:22:52 +0000 Subject: libim: Add 0.2, remove 0.1 and move some files in place. --- packages/gpephone/gpephone-image-vm.bb | 39 ----- packages/gpephone/gpephone-image.bb | 38 ----- packages/gpephone/libim-0.1/im-dbus-segfault.patch | 179 --------------------- packages/gpephone/libim_0.1.bb | 23 --- packages/gpephone/libim_0.2.bb | 23 +++ packages/gpephone/meta-gpephone.bb | 15 -- packages/images/gpephone-image-vm.bb | 39 +++++ packages/images/gpephone-image.bb | 38 +++++ packages/meta/meta-gpephone.bb | 15 ++ 9 files changed, 115 insertions(+), 294 deletions(-) delete mode 100644 packages/gpephone/gpephone-image-vm.bb delete mode 100644 packages/gpephone/gpephone-image.bb delete mode 100644 packages/gpephone/libim-0.1/im-dbus-segfault.patch delete mode 100644 packages/gpephone/libim_0.1.bb create mode 100644 packages/gpephone/libim_0.2.bb delete mode 100644 packages/gpephone/meta-gpephone.bb create mode 100644 packages/images/gpephone-image-vm.bb create mode 100644 packages/images/gpephone-image.bb create mode 100644 packages/meta/meta-gpephone.bb (limited to 'packages') diff --git a/packages/gpephone/gpephone-image-vm.bb b/packages/gpephone/gpephone-image-vm.bb deleted file mode 100644 index 472577be8b..0000000000 --- a/packages/gpephone/gpephone-image-vm.bb +++ /dev/null @@ -1,39 +0,0 @@ -PR = "r0" - -export IMAGE_BASENAME = "gpephone-image-vm" - -GPE_EXTRA_THEMES = "" - -GPE_EXTRA_INSTALL_none = "" -GPE_EXTRA_INSTALL_x86 = "grub xserver-kdrive-xephyr xoo-vm xoo-theme-gpephone" -GPE_EXTRA_INSTALL_bigscreen = "${GPE_EXTRA_THEMES}" -GPE_EXTRA_INSTALL_smallscreen = "${GPE_EXTRA_THEMES}" - -GUI_MACHINE_CLASS ?= "none" -GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}" - -#ship more stuff with devices with >16MB of flash -GPE_BIGFLASH_INSTALL := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\ -",d)}' - -GPE_EXTRA_INSTALL += "${GPE_BIGFLASH_INSTALL}" - -XSERVER ?= "xserver-kdrive-fbdev" - -DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpephone" -RDEPENDS = "${PACKAGE_INSTALL}" - -export PACKAGE_INSTALL = "\ - ${MACHINE_TASK_PROVIDER} \ - gpephone-task-base \ - gpephone-task-pim \ - gpephone-task-settings \ - gpephone-task-development \ - gpephone-task-apps \ - gpephone-task-connectivity \ - ${XSERVER} \ - ${GPE_EXTRA_INSTALL}" - -inherit image - -LICENSE = "MIT" diff --git a/packages/gpephone/gpephone-image.bb b/packages/gpephone/gpephone-image.bb deleted file mode 100644 index 2fe9e3b3fc..0000000000 --- a/packages/gpephone/gpephone-image.bb +++ /dev/null @@ -1,38 +0,0 @@ -PR = "r0" - -export IMAGE_BASENAME = "gpephone-image" - -GPE_EXTRA_THEMES = "" - -GPE_EXTRA_INSTALL_none = "" -GPE_EXTRA_INSTALL_x86 = "grub" -GPE_EXTRA_INSTALL_bigscreen = "${GPE_EXTRA_THEMES}" -GPE_EXTRA_INSTALL_smallscreen = "${GPE_EXTRA_THEMES}" - -GUI_MACHINE_CLASS ?= "none" -GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}" - -#ship more stuff with devices with >16MB of flash -GPE_BIGFLASH_INSTALL := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\ -",d)}' - -GPE_EXTRA_INSTALL += "${GPE_BIGFLASH_INSTALL}" - -XSERVER ?= "xserver-kdrive-fbdev" - -DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpephone" -RDEPENDS = "${PACKAGE_INSTALL}" - -export PACKAGE_INSTALL = "\ - ${MACHINE_TASK_PROVIDER} \ - gpephone-task-base \ - gpephone-task-pim \ - gpephone-task-settings \ - gpephone-task-development \ - gpephone-task-apps \ - gpephone-task-connectivity \ - ${XSERVER} \ - ${GPE_EXTRA_INSTALL}" - -inherit image -LICENSE = "MIT" diff --git a/packages/gpephone/libim-0.1/im-dbus-segfault.patch b/packages/gpephone/libim-0.1/im-dbus-segfault.patch deleted file mode 100644 index 3ef6cd909d..0000000000 --- a/packages/gpephone/libim-0.1/im-dbus-segfault.patch +++ /dev/null @@ -1,179 +0,0 @@ -Index: test/im_proxy.c -=================================================================== ---- test/im_proxy.c (Revision 550) -+++ test/im_proxy.c (Arbeitskopie) -@@ -26,7 +26,7 @@ - - open_log_file (IM_DBUS_LOG_FILE); - -- bus_conn = dbus_init (); -+ bus_conn = dbus_init_im (); - if (!bus_conn) - { - close_log_file (); -Index: src/dbus-if.h -=================================================================== ---- src/dbus-if.h (Revision 550) -+++ src/dbus-if.h (Arbeitskopie) -@@ -25,7 +25,7 @@ - - #include - --DBusConnection *dbus_init (void); -+DBusConnection *dbus_init_im (void); - void dbus_add_msg_listener (const gchar *interface, const gchar *method, - void (*callback) ()); - -Index: src/im_client_dbus.c -=================================================================== ---- src/im_client_dbus.c (Revision 550) -+++ src/im_client_dbus.c (Arbeitskopie) -@@ -63,7 +63,6 @@ - * - *@note for inner usage only. - */ --// static DBusMessageIter *_pIter = NULL; - - evt_src_t *im_evt_src = NULL; - -@@ -116,7 +115,6 @@ - char *cdata; - im_presence_t *presence; - -- //im_uri_t*user; - char *cuser; - char *desc; - im_presence_state_t state; -@@ -165,7 +163,6 @@ - prtl = tdata; - g_print ("=============|-evt_data: protocol = %d\n", tdata); - -- // im_uri_new(cuser, prtl, &user); - im_presence_new (prtl, NULL, &presence); - im_presence_set_from (presence, cuser); - im_presence_set_state (presence, state); -@@ -569,20 +566,12 @@ - _im_evt_get (evt_src_t *evt_src, - sid_t sid, evt_t **evt, int timeout, DBusMessageIter *pIter) - { --// int a[10240]; - dbus_int32_t tdata; - evt_type_t evt_type = -1; - evt_data_free_t evt_data_free = NULL; - int asynch = 0; - evt_err_t rt = EVT_ERROR_NONE; - --// int b[10240]; -- --/* a[0] = 1; -- a[10239] = 2; -- b[0] = 3; -- b[10239] = 4;*/ --// g_print("=============in %s:%s %d\n", __FILE__, __FUNCTION__, __LINE__); - dbus_message_iter_next (pIter); - if (dbus_message_iter_get_arg_type (pIter) != DBUS_TYPE_INT32) - return IM_ERROR_DBUS; -@@ -671,51 +660,37 @@ - if (asynch) - { - rt = im_client_incoming_asyn_handle (pIter, evt); --// g_print("in %s:%s %d\n", __FILE__, __FUNCTION__, __LINE__); - } - else - { - rt = im_client_incoming_evt_handle (pIter, evt); --// g_print("in %s:%s %d\n", __FILE__, __FUNCTION__, __LINE__); - } --// g_print("in %s:%s %d\n", __FILE__, __FUNCTION__, __LINE__); --// printf("++++++++++%d\n", rt); --// printf("%d %d %d %d\n",a[0], a[10239], b[0], b[10239]); - return rt; --// return EVT_ERROR_NONE; - }; - --// G_LOCK_DEFINE(_pIter); - - void - im_client_incoming_evt (DBusMessage *message) - { - DBusMessageIter iter; - --// G_LOCK(_pIter); --// _pIter = &iter; - dbus_message_iter_init (message, &iter); - if (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_UINT32) - { - dbus_uint32_t sid; - - dbus_message_iter_get_basic (&iter, &sid); //get sid -- //evt_process(im_evt_src, sid, -1); - evt_t *evt = NULL; - - if (_im_evt_get (im_evt_src, sid, &evt, -1, &iter) != EVT_ERROR_NONE) - { --// g_print("=============in %s:%s %d\n", __FILE__, __FUNCTION__, __LINE__); - g_message ("Error when receiving event: %s:%s %d\n", __FILE__, - __FUNCTION__, __LINE__); - return; - } --// g_print("=============in %s:%s %d\n", __FILE__, __FUNCTION__, __LINE__); - evt_call (im_evt_src, evt); - evt_release (im_evt_src, evt); - } --// _pIter = NULL; --// G_UNLOCK(_pIter); - } - - im_err_t -@@ -759,7 +734,7 @@ - { - im_err_t rt = IM_ERROR_NONE; - -- bus_conn = dbus_init (); -+ bus_conn = dbus_init_im (); - if (!bus_conn) - { - return IM_ERROR_DBUS; -@@ -789,8 +764,6 @@ - DBusMessage *message = NULL; - DBusMessage *reply = NULL; - -- // int result; -- - dbus_error_init (&error); - - message = dbus_message_new_method_call (IM_DBUS_SERVICE, -Index: src/Makefile.am -=================================================================== ---- src/Makefile.am (Revision 550) -+++ src/Makefile.am (Arbeitskopie) -@@ -1,7 +1,7 @@ - - - # set the include path found by configure --INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include \ -+INCLUDES = -Wall -I$(top_srcdir)/src -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/log -I$(top_srcdir)/src/xmpp $(all_includes) - - # the library search path. -Index: src/dbus-if.c -=================================================================== ---- src/dbus-if.c (Revision 550) -+++ src/dbus-if.c (Arbeitskopie) -@@ -118,7 +118,7 @@ - } - - DBusConnection * --dbus_init (void) -+dbus_init_im (void) - { - DBusError error; - GMainLoop *mainloop; -@@ -140,7 +140,6 @@ - - dbus_connection_add_filter (bus, msg_filter, mainloop, NULL); - g_main_loop_unref (mainloop); -- - return bus; - } - diff --git a/packages/gpephone/libim_0.1.bb b/packages/gpephone/libim_0.1.bb deleted file mode 100644 index 5458f510aa..0000000000 --- a/packages/gpephone/libim_0.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -LICENSE = "LGPL" -DESCRIPTION = "LiPS event model library." -SECTION = "gpe/libs" -PRIORITY = "optional" -DEPENDS = "glib-2.0 libgpg-error libgcrypt gnutls libidn iksemel gloox dbus-glib liblipsevent" -PR = "r1" - -inherit gpephone pkgconfig autotools - -SRC_URI = "${GPEPHONE_MIRROR}/${P}/lips_im-${PV}.tar.gz \ - file://im-dbus-segfault.patch;patch=1;pnum=0" - -EXTRA_OECONF = "--with-session-bus-services-dir=${datadir}/dbus-1/services" - -PARALLEL_MAKE = "" - -S = ${WORKDIR}/lips_im-${PV} - -FILES_${PN} += " ${datadir}/dbus-1" - -do_stage () { - autotools_stage_all -} diff --git a/packages/gpephone/libim_0.2.bb b/packages/gpephone/libim_0.2.bb new file mode 100644 index 0000000000..e66a3921e5 --- /dev/null +++ b/packages/gpephone/libim_0.2.bb @@ -0,0 +1,23 @@ +LICENSE = "LGPL" +DESCRIPTION = "LiPS event model library." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "glib-2.0 libgpg-error libgcrypt gnutls libidn iksemel gloox dbus-glib liblipsevent" +PR = "r0" + +inherit gpephone pkgconfig autotools + +SRC_URI = "${GPEPHONE_MIRROR}/${P}/lips_im-${PV}.tar.gz \ + file://im-dbus-segfault.patch;patch=1;pnum=0" + +EXTRA_OECONF = "--with-session-bus-services-dir=${datadir}/dbus-1/services" + +PARALLEL_MAKE = "" + +S = ${WORKDIR}/lips_im-${PV} + +FILES_${PN} += " ${datadir}/dbus-1" + +do_stage () { + autotools_stage_all +} diff --git a/packages/gpephone/meta-gpephone.bb b/packages/gpephone/meta-gpephone.bb deleted file mode 100644 index 96e393bf47..0000000000 --- a/packages/gpephone/meta-gpephone.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Meta-package for GPE Palmtop Environment Phone packages" -LICENSE = "MIT" -PR = "r0" - -ALLOW_EMPTY = "1" -BUILD_ALL_DEPS = "1" - -DEPENDS = "task-gpe" - -RDEPENDS = "\ - gpe-base-depends \ - gpephone-task-base \ - gpephone-task-settings \ - gpephone-task-pim \ - gpeph-task-connectivity" diff --git a/packages/images/gpephone-image-vm.bb b/packages/images/gpephone-image-vm.bb new file mode 100644 index 0000000000..472577be8b --- /dev/null +++ b/packages/images/gpephone-image-vm.bb @@ -0,0 +1,39 @@ +PR = "r0" + +export IMAGE_BASENAME = "gpephone-image-vm" + +GPE_EXTRA_THEMES = "" + +GPE_EXTRA_INSTALL_none = "" +GPE_EXTRA_INSTALL_x86 = "grub xserver-kdrive-xephyr xoo-vm xoo-theme-gpephone" +GPE_EXTRA_INSTALL_bigscreen = "${GPE_EXTRA_THEMES}" +GPE_EXTRA_INSTALL_smallscreen = "${GPE_EXTRA_THEMES}" + +GUI_MACHINE_CLASS ?= "none" +GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}" + +#ship more stuff with devices with >16MB of flash +GPE_BIGFLASH_INSTALL := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\ +",d)}' + +GPE_EXTRA_INSTALL += "${GPE_BIGFLASH_INSTALL}" + +XSERVER ?= "xserver-kdrive-fbdev" + +DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpephone" +RDEPENDS = "${PACKAGE_INSTALL}" + +export PACKAGE_INSTALL = "\ + ${MACHINE_TASK_PROVIDER} \ + gpephone-task-base \ + gpephone-task-pim \ + gpephone-task-settings \ + gpephone-task-development \ + gpephone-task-apps \ + gpephone-task-connectivity \ + ${XSERVER} \ + ${GPE_EXTRA_INSTALL}" + +inherit image + +LICENSE = "MIT" diff --git a/packages/images/gpephone-image.bb b/packages/images/gpephone-image.bb new file mode 100644 index 0000000000..2fe9e3b3fc --- /dev/null +++ b/packages/images/gpephone-image.bb @@ -0,0 +1,38 @@ +PR = "r0" + +export IMAGE_BASENAME = "gpephone-image" + +GPE_EXTRA_THEMES = "" + +GPE_EXTRA_INSTALL_none = "" +GPE_EXTRA_INSTALL_x86 = "grub" +GPE_EXTRA_INSTALL_bigscreen = "${GPE_EXTRA_THEMES}" +GPE_EXTRA_INSTALL_smallscreen = "${GPE_EXTRA_THEMES}" + +GUI_MACHINE_CLASS ?= "none" +GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}" + +#ship more stuff with devices with >16MB of flash +GPE_BIGFLASH_INSTALL := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\ +",d)}' + +GPE_EXTRA_INSTALL += "${GPE_BIGFLASH_INSTALL}" + +XSERVER ?= "xserver-kdrive-fbdev" + +DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpephone" +RDEPENDS = "${PACKAGE_INSTALL}" + +export PACKAGE_INSTALL = "\ + ${MACHINE_TASK_PROVIDER} \ + gpephone-task-base \ + gpephone-task-pim \ + gpephone-task-settings \ + gpephone-task-development \ + gpephone-task-apps \ + gpephone-task-connectivity \ + ${XSERVER} \ + ${GPE_EXTRA_INSTALL}" + +inherit image +LICENSE = "MIT" diff --git a/packages/meta/meta-gpephone.bb b/packages/meta/meta-gpephone.bb new file mode 100644 index 0000000000..96e393bf47 --- /dev/null +++ b/packages/meta/meta-gpephone.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Meta-package for GPE Palmtop Environment Phone packages" +LICENSE = "MIT" +PR = "r0" + +ALLOW_EMPTY = "1" +BUILD_ALL_DEPS = "1" + +DEPENDS = "task-gpe" + +RDEPENDS = "\ + gpe-base-depends \ + gpephone-task-base \ + gpephone-task-settings \ + gpephone-task-pim \ + gpeph-task-connectivity" -- cgit v1.2.3