diff options
author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-03-06 15:18:33 +0000 |
---|---|---|
committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-03-06 15:18:33 +0000 |
commit | 2c9d775db1ca48d0e14034284d51c33dd44904a4 (patch) | |
tree | b4fc9eb264f64f938fcc9fe13ef1560892ffb190 /packages/gpephone | |
parent | 6566744b4b5b65be7782dafdd012657927d31a51 (diff) | |
parent | 97eb2312e9c34c4972ab3ddd01ef4aba1a916414 (diff) |
merge of '06296810795c121aba4a5607d1e6e154bec0c768'
and 'eb7e5bf33c6692e556183f311e95eb606e10c626'
Diffstat (limited to 'packages/gpephone')
5 files changed, 28 insertions, 6 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}" |