diff options
Diffstat (limited to 'packages/gpephone')
-rw-r--r-- | packages/gpephone/gpe-applauncher-0.7/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/gpephone/gpe-applauncher-0.7/default-icon.patch | 20 | ||||
-rw-r--r-- | packages/gpephone/gpe-applauncher_0.7.bb | 4 | ||||
-rwxr-xr-x | packages/gpephone/gpe-session-scripts-phone/phonesession | 4 | ||||
-rw-r--r-- | packages/gpephone/gpe-session-scripts-phone_0.67.bb | 6 | ||||
-rw-r--r-- | packages/gpephone/gpephone-image-vm.bb | 39 | ||||
-rw-r--r-- | packages/gpephone/gpephone-image.bb | 38 | ||||
-rw-r--r-- | packages/gpephone/libim-0.1/im-dbus-segfault.patch | 179 | ||||
-rw-r--r-- | packages/gpephone/libim_0.2.bb (renamed from packages/gpephone/libim_0.1.bb) | 5 | ||||
-rw-r--r-- | packages/gpephone/meta-gpephone.bb | 15 | ||||
-rw-r--r-- | packages/gpephone/sms-1.0/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/gpephone/sms-1.0/somefixes.patch | 57 | ||||
-rw-r--r-- | packages/gpephone/sms_1.0.bb | 4 | ||||
-rw-r--r-- | packages/gpephone/task-gpephone.bb | 92 |
14 files changed, 90 insertions, 373 deletions
diff --git a/packages/gpephone/gpe-applauncher-0.7/.mtn2git_empty b/packages/gpephone/gpe-applauncher-0.7/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpephone/gpe-applauncher-0.7/.mtn2git_empty diff --git a/packages/gpephone/gpe-applauncher-0.7/default-icon.patch b/packages/gpephone/gpe-applauncher-0.7/default-icon.patch new file mode 100644 index 0000000000..e1ec24f141 --- /dev/null +++ b/packages/gpephone/gpe-applauncher-0.7/default-icon.patch @@ -0,0 +1,20 @@ +Index: applications.c +=================================================================== +--- applications.c (Revision 598) ++++ applications.c (Arbeitskopie) +@@ -463,8 +463,13 @@ + applauncher_settings.themename ? applauncher_settings.themename : "default", + THEMEFOLDER, ICON_LOADING, NULL); + } +- +- g_print ("\nloading icon: %s\n", file); ++ ++ if (!g_file_test (file, G_FILE_TEST_EXISTS)) ++ { ++ g_free (file); ++ file = g_build_filename (LOCAL_THEMEDIR, "default", ++ THEMEFOLDER, ICON_LOADING, NULL); ++ } + + nc_window = gtk_app_notification_new(); + gtk_widget_set_size_request(GTK_WIDGET(nc_window), -1, 70); diff --git a/packages/gpephone/gpe-applauncher_0.7.bb b/packages/gpephone/gpe-applauncher_0.7.bb index ae6cd31d9a..349330047b 100644 --- a/packages/gpephone/gpe-applauncher_0.7.bb +++ b/packages/gpephone/gpe-applauncher_0.7.bb @@ -2,13 +2,15 @@ LICENSE = "GPL" DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" -PR = "r0" +PR = "r1" DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libxsettings-client" GPE_TARBALL_SUFFIX= "gz" inherit gpephone autotools +SRC_URI += " file://default-icon.patch;patch=1;pnum=0" + #EXTRA_OECONF = "--enable-gridlayout" FILES_${PN} += '${datadir}/themes' diff --git a/packages/gpephone/gpe-session-scripts-phone/phonesession b/packages/gpephone/gpe-session-scripts-phone/phonesession index b08aa74dbc..8fb5065d67 100755 --- a/packages/gpephone/gpe-session-scripts-phone/phonesession +++ b/packages/gpephone/gpe-session-scripts-phone/phonesession @@ -45,8 +45,8 @@ soundserver & # Run GSM support stuff -cms92init & +#cms92init & gsmMux -d -p /dev/ttyS0 -m cms92 -f 128 -b 115200 -c /dev/ptmx /dev/ptmx & # Start PhoneServer -phoneserver & +phoneserver diff --git a/packages/gpephone/gpe-session-scripts-phone_0.67.bb b/packages/gpephone/gpe-session-scripts-phone_0.67.bb index beb1b360ad..afa4fb1683 100644 --- a/packages/gpephone/gpe-session-scripts-phone_0.67.bb +++ b/packages/gpephone/gpe-session-scripts-phone_0.67.bb @@ -4,8 +4,8 @@ DESCRIPTION = "GPE session startup scripts hack for GPE Phone Edition" LICENSE = "GPL" SECTION = "gpe" PRIORITY = "optional" -RDEPENDS_${PN} = "gpe-applauncher gpe-phonepanel gpe-session-starter gpe-question xmodmap xdpyinfo xserver-common" -DEPENDS = "matchbox-wm gpe-applauncher gpe-phonepanel gpe-question xmodmap xdpyinfo xserver-common" +RDEPENDS_${PN} = "gpe-applauncher gpe-phonepanel gpe-session-starter gpe-question xmodmap xdpyinfo xserver-common esd esd-utils" +DEPENDS = "matchbox-wm gpe-applauncher gpe-phonepanel gpe-question xmodmap xdpyinfo xserver-common esound" SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \ file://matchbox-session \ @@ -13,7 +13,7 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \ file://phonesession \ file://disable-composite.xsettings" -PR = "r1" +PR = "r2" S = "${WORKDIR}/gpe-session-scripts-${PV}" 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 <dbus/dbus.h> - --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.2.bb index 5458f510aa..4d59957d79 100644 --- a/packages/gpephone/libim_0.1.bb +++ b/packages/gpephone/libim_0.2.bb @@ -3,12 +3,11 @@ 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" +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" +SRC_URI = "${GPEPHONE_MIRROR}/${P}/lips_im-${PV}.tar.gz" EXTRA_OECONF = "--with-session-bus-services-dir=${datadir}/dbus-1/services" 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/gpephone/sms-1.0/.mtn2git_empty b/packages/gpephone/sms-1.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpephone/sms-1.0/.mtn2git_empty diff --git a/packages/gpephone/sms-1.0/somefixes.patch b/packages/gpephone/sms-1.0/somefixes.patch new file mode 100644 index 0000000000..41be6c4ae6 --- /dev/null +++ b/packages/gpephone/sms-1.0/somefixes.patch @@ -0,0 +1,57 @@ +Index: src/callbacks.c +=================================================================== +--- src/callbacks.c (Revision 487) ++++ src/callbacks.c (Arbeitskopie) +@@ -927,11 +927,15 @@ + + /* While we have constructed the UI manager we can create the menus as well. */ + pop_menu_left = gtk_ui_manager_get_widget (ui_manager, menu_left); +- g_signal_connect (G_OBJECT (pop_menu_left), +- "key-press-event", G_CALLBACK (popup_key_press_handler), +- NULL); +- g_signal_connect (G_OBJECT (pop_menu_left), "unmap", +- G_CALLBACK (popup_mapping_handler), NULL); ++ ++ if (pop_menu_left) ++ { ++ g_signal_connect (G_OBJECT (pop_menu_left), ++ "key-press-event", G_CALLBACK (popup_key_press_handler), ++ NULL); ++ g_signal_connect (G_OBJECT (pop_menu_left), "unmap", ++ G_CALLBACK (popup_mapping_handler), NULL); ++ } + + pop_menu_right = gtk_ui_manager_get_widget (ui_manager, menu_right); + +Index: configure.ac +=================================================================== +--- configure.ac (Revision 487) ++++ configure.ac (Arbeitskopie) +@@ -48,7 +49,7 @@ + [ --with-gpe-dir=PATH specify location of gpephone directory ]) + + if test "x$with_gpe_dir" = "x" ; then +- GPE_DIR='$(prefix)/gpephone' ++ GPE_DIR='$(prefix)' + else + GPE_DIR=$with_gpe_dir + fi +Index: Makefile.am +=================================================================== +--- Makefile.am (Revision 487) ++++ Makefile.am (Arbeitskopie) +@@ -8,13 +8,7 @@ + pixmapsdir = $(GPE_DIR)/share/pixmaps
+ pixmaps_DATA = sms.png
+
+-EXTRA_DIR = sms.desktop.in \
+- intltool-extract.in \
+- intltool-merge.in \
+- intltool-update.in
+-
+-
+-EXTRA_DIST = $(desktop_DATA) \
++EXTRA_DIST = $(desktop_in_files) \
+ $(pixmaps_DATA) \
+ intltool-extract.in \
+ intltool-merge.in \
diff --git a/packages/gpephone/sms_1.0.bb b/packages/gpephone/sms_1.0.bb index 1718483b59..d1bcaf6e19 100644 --- a/packages/gpephone/sms_1.0.bb +++ b/packages/gpephone/sms_1.0.bb @@ -2,7 +2,7 @@ LICENSE = "LiPS" DESCRIPTION = "GSM Short message application" SECTION = "gpe" PRIORITY = "optional" -PR = "r0" +PR = "r1" DEPENDS = "gtk+ dbus-glib libmsgenabler libabenabler libiac libgpewidget libgpephone" @@ -10,4 +10,6 @@ GPE_TARBALL_SUFFIX = "bz2" inherit gpephone autotools +SRC_URI += " file://somefixes.patch;patch=1;pnum=0" + FILES_${PN} += "${datadir}/conf ${datadir}/graphic" diff --git a/packages/gpephone/task-gpephone.bb b/packages/gpephone/task-gpephone.bb deleted file mode 100644 index 6ccb91c028..0000000000 --- a/packages/gpephone/task-gpephone.bb +++ /dev/null @@ -1,92 +0,0 @@ -DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition" -PR = "r1" -LICENSE = "MIT" -ALLOW_EMPTY = "1" - -PACKAGES = "\ - gpephone-base-depends \ - gpephone-task-base \ - gpephone-task-settings \ - gpephone-task-pim \ - gpephone-task-connectivity \ - gpephone-task-apps \ - gpephone-task-development" - -RDEPENDS_gpephone-base-depends := "\ - diet-x11 \ - virtual/xserver" - -RDEPENDS_gpephone-task-development := "\ - rxvt-unicode \ - xmonobut \ - gpe-terminal \ - gpe-edit \ - gdb \ - strace \ - e2fsprogs" - -RDEPENDS_gpephone-task-base := "\ - cms92init \ - gsmmux \ - connect \ - phoneserver \ - soundserver \ - voicecall \ - sms \ - audioplayer \ - videoplayer \ - addressbook \ - calendar \ - gpe-applauncher \ - gpe-phonepanel \ - gpe-bootsplash \ - gpe-bootsplash-theme-gpephone \ - bluez-utils-dbus \ - matchbox \ - xcursor-transparent-theme \ - gtk2-theme-angelistic \ - matchbox-themes-gtk \ - xst \ - xhost \ - xrdb \ - gpe-soundserver \ - ttf-bitstream-vera \ - ttf-dejavu-sans \ - ttf-dejavu-sans-mono \ - gpe-dm \ - gpe-login \ - gpe-session-scripts-phone \ - gpe-icons \ - gpe-confd \ - gpe-autostarter \ - libgtkstylus \ - xauth \ - gdk-pixbuf-loader-png \ - gdk-pixbuf-loader-xpm \ - gdk-pixbuf-loader-jpeg \ - gdk-pixbuf-loader-gif \ - pango-module-basic-x \ - pango-module-basic-fc \ - detect-stylus" - -RDEPENDS_gpephone-task-pim := "\ - gpesyncd" - -RDEPENDS_gpephone-task-settings := "\ - gpe-su \ - gpe-conf \ - gpe-clock \ - gpe-mixer \ - gpe-taskmanager \ - keylaunch \ - minilite" - -RDEPENDS_gpephone-task-apps := "\ - gpe-watch \ - gpe-what \ - matchbox-panel-hacks \ - gpe-scap \ - gpe-windowlist" - -RDEPENDS_gpephone-task-connectivity := "\ -" |