[oe-commits] org.oe.dev merge of '62f049c7930cc7dcd9a1736a717fff802998ca78'

[oe commit]

merge of '62f049c7930cc7dcd9a1736a717fff802998ca78'
     and 'c58e498fe9feb390a56441e07fec74a56405b6b1'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 10e6bf1f992b208b919b4fc707871e1e1ae7e91e
ViewMTN: http://monotone.openembedded.org/revision/info/10e6bf1f992b208b919b4fc707871e1e1ae7e91e
Files:
1
packages/libqpe/libqpe-opie/argv.patch
packages/libqpe/libqpe-opie_cvs.bb
packages/gpe-calendar/gpe-calendar_0.92.bb
packages/gpe-contacts/gpe-contacts_0.49.bb
packages/gpe-login/gpe-login_0.95.bb
Diffs:

#
# mt diff -r62f049c7930cc7dcd9a1736a717fff802998ca78 -r10e6bf1f992b208b919b4fc707871e1e1ae7e91e
#
#
#
# add_file "packages/libqpe/libqpe-opie/argv.patch"
#  content [824d2cf67d344e6beca4a2ae34a5eb93ab62fa65]
# 
# patch "packages/libqpe/libqpe-opie_cvs.bb"
#  from [91e2e33456b6a52c2e638114582c8bedf85783ac]
#    to [5b455f635df061033bcf1797d4f490d5b64a3edc]
#
============================================================
--- packages/libqpe/libqpe-opie/argv.patch	824d2cf67d344e6beca4a2ae34a5eb93ab62fa65
+++ packages/libqpe/libqpe-opie/argv.patch	824d2cf67d344e6beca4a2ae34a5eb93ab62fa65
@@ -0,0 +1,13 @@
+Index: library/qpeapplication.h
+===================================================================
+--- library.orig/qpeapplication.h	2008-06-12 01:18:24.548201862 +0200
++++ library/qpeapplication.h	2008-06-12 01:18:30.861635469 +0200
+@@ -127,7 +127,7 @@
+     static void showWidget( QWidget*, bool nomax=FALSE ) QPE_WEAK_SYMBOL;
+     /* Merge setTempScreenSaverMode */
+ #ifdef QTOPIA_INTERNAL_INITAPP
+-    void initApp( int argv, char **argv );
++    void initApp( int argc, char **argv );
+ #endif
+ 
+     static void setKeepRunning();
============================================================
--- packages/libqpe/libqpe-opie_cvs.bb	91e2e33456b6a52c2e638114582c8bedf85783ac
+++ packages/libqpe/libqpe-opie_cvs.bb	5b455f635df061033bcf1797d4f490d5b64a3edc
@@ -1,11 +1,12 @@ PV = "${OPIE_CVS_PV}"
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/library \
            file://fix-titleheight.patch;patch=1 \
            file://unbreak-logging.patch;patch=1 \
            file://citytime-path.patch;patch=1 \
+	   file://argv.patch;patch=1 \
           "
 


#
# mt diff -rc58e498fe9feb390a56441e07fec74a56405b6b1 -r10e6bf1f992b208b919b4fc707871e1e1ae7e91e
#
#
#
# add_file "packages/gpe-calendar/gpe-calendar_0.92.bb"
#  content [350b266171cd6b781035f21bc253f8ee830222ea]
# 
# add_file "packages/gpe-contacts/gpe-contacts_0.49.bb"
#  content [12389d9ee885d2b01064703041a94b548b045844]
# 
# add_file "packages/gpe-login/gpe-login_0.95.bb"
#  content [aafaba0fd81e9e931a35ba2e8e104138da5c249f]
#
============================================================
--- packages/gpe-calendar/gpe-calendar_0.92.bb	350b266171cd6b781035f21bc253f8ee830222ea
+++ packages/gpe-calendar/gpe-calendar_0.92.bb	350b266171cd6b781035f21bc253f8ee830222ea
@@ -0,0 +1,16 @@
+DESCRIPTION = "GPE calendar is the calendar application of the GPE PIM suite."
+SECTION = "gpe"
+LICENSE = "GPL"
+
+DEPENDS = "libhandoff libsoup libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype libsoundgen"
+RDEPENDS = "gpe-icons"
+
+PR = "r0"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit autotools gpe
+
+do_configure () {
+        autotools_do_configure
+}
============================================================
--- packages/gpe-contacts/gpe-contacts_0.49.bb	12389d9ee885d2b01064703041a94b548b045844
+++ packages/gpe-contacts/gpe-contacts_0.49.bb	12389d9ee885d2b01064703041a94b548b045844
@@ -0,0 +1,13 @@
+DESCRIPTION = "GPE contacts manager"
+LICENSE = "GPL"
+SECTION = "gpe"
+
+DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus-glib"
+RDEPENDS = "gpe-icons"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit gpe autotools
+
+FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts"
+
============================================================
--- packages/gpe-login/gpe-login_0.95.bb	aafaba0fd81e9e931a35ba2e8e104138da5c249f
+++ packages/gpe-login/gpe-login_0.95.bb	aafaba0fd81e9e931a35ba2e8e104138da5c249f
@@ -0,0 +1,37 @@
+DESCRIPTION = "GPE user login screen"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
+RDEPENDS = "xkbd gpe-theme-clearlooks"
+RPROVIDES_${PN} = "gpe-session-starter"
+PR = "r0"
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit gpe autotools pkgconfig
+
+
+SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
+SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
+SRC_URI += " file://c-locale.patch;patch=1 "
+
+SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+
+
+CONFFILES_${PN} += " \
+${sysconfdir}/apm/suspend.d/S98lock-display \
+${sysconfdir}/gpe/gpe-login.conf \
+${sysconfdir}/gpe/locale.alias \
+${sysconfdir}/sysconfig/gpelogin \
+${sysconfdir}/X11/gpe-login.keylaunchrc \
+${sysconfdir}/X11/gpe-login.gtkrc \
+${sysconfdir}/X11/gpe-login.setup \
+${sysconfdir}/X11/gpe-login.pre-session \
+${sysconfdir}/X11/Xinit.d/99gpe-login \
+${sysconfdir}/X11/Xsession.d/50autolock \
+"