merge of '309e33d0dffe90b672817f37e57ed736d1f9672f'

     and 'efbc6b44ed8a82418c052ce81b199d54d7f6c831'

8 files changed, 8 insertions, 137 deletions

diff --git a/conf/distro/include/preferred-opie-cvs-versions.inc b/conf/distro/include/preferred-opie-cvs-versions.inc
index d27f56fb04..8ffad210bb 100644
--- a/conf/distro/include/preferred-opie-cvs-versions.inc
+++ b/conf/distro/include/preferred-opie-cvs-versions.inc
@@ -42,7 +42,7 @@ SRCDATE_opie-buzzword ?= "${OPIE_VERSION}"
 SRCDATE_opie-calculator ?= "${OPIE_VERSION}"
 SRCDATE_opie-calibrate ?= "${OPIE_VERSION}"
 SRCDATE_opie-camera ?= "${OPIE_VERSION}"
-SRCDATE_opie-cardmon ?= "${OPIE_VERSION}"
+SRCDATE_opie-cardapplet ?= "${OPIE_VERSION}"
 SRCDATE_opie-checkbook ?= "${OPIE_VERSION}"
 SRCDATE_opie-citytime ?= "${OPIE_VERSION}"
 SRCDATE_opie-clipboardapplet ?= "${OPIE_VERSION}"
diff --git a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
index 0a95b1ff67..4b5b3a408b 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
@@ -3,7 +3,7 @@
 QTE_VERSION ?= "2.3.10"
 PALMTOP_USE_MULTITHREADED_QT ?= "yes"
 
-OPIE_SRCDATE ?= "20080127"
+OPIE_SRCDATE ?= "20080906"
 OPIE_VERSION ?= "1.2.3+cvs${OPIE_SRCDATE}"
 OPIE_CVS_PV ?= "1.2.3+cvs${OPIE_SRCDATE}"
 
@@ -54,7 +54,7 @@ PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-camera = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-cardapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-checkbook = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}"
diff --git a/packages/libqpe/libqpe-opie/argv.patch b/packages/libqpe/libqpe-opie/argv.patch
deleted file mode 100644
index 5926a8d000..0000000000
--- a/packages/libqpe/libqpe-opie/argv.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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();
diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index 7c69904cd2..d3b17ac7ee 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -7,6 +7,5 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/library \
            file://fix-titleheight.patch;patch=1 \
            file://unbreak-logging.patch;patch=1 \
            file://citytime-path-2.patch;patch=1 \
-	   file://argv.patch;patch=1 \
           "
 
diff --git a/packages/opie-console/files/.mtn2git_empty b/packages/opie-console/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/opie-console/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/opie-console/files/double_name.patch b/packages/opie-console/files/double_name.patch
deleted file mode 100644
index 47e127e160..0000000000
--- a/packages/opie-console/files/double_name.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-Index: opie-console/profiledialogwidget.h
-===================================================================
---- opie-console.orig/profiledialogwidget.h	2002-10-21 23:43:44.000000000 +0200
-+++ opie-console/profiledialogwidget.h	2008-08-26 16:22:31.618071081 +0200
-@@ -13,7 +13,7 @@
-         Terminal,
-         Keyboard
-     };
--    ProfileDialogWidget( const QString& name, QWidget* parent, const char* name = 0l);
-+    ProfileDialogWidget( const QString& name, QWidget* parent, const char* na = 0l);
-     ~ProfileDialogWidget();
- 
-     /*
-@@ -34,7 +34,7 @@
-     Q_OBJECT
- public:
-     ProfileDialogTerminalWidget( const QString& name, QWidget* widget,
--                                 const char* name  =0l);
-+                                 const char* na  =0l);
-     ~ProfileDialogTerminalWidget();
-     Type type()const;
- };
-@@ -42,7 +42,7 @@
-     Q_OBJECT
- public:
-     ProfileDialogConnectionWidget( const QString& name, QWidget* parent,
--                                   const char* name =0l);
-+                                   const char* na =0l);
-     ~ProfileDialogConnectionWidget();
-     Type type() const;
- 
-@@ -51,7 +51,7 @@
-     Q_OBJECT
- public:
-     ProfileDialogKeyWidget( const QString &name, QWidget* parent,
--                           const char *name =0l);
-+                           const char *na =0l);
-     ~ProfileDialogKeyWidget();
-     Type type() const;
- };
-Index: opie-console/function_keyboard.h
-===================================================================
---- opie-console.orig/function_keyboard.h	2007-08-27 01:49:15.000000000 +0200
-+++ opie-console/function_keyboard.h	2008-08-26 16:22:31.618071081 +0200
-@@ -86,7 +86,7 @@
-     Q_OBJECT
- 
- public:
--    FunctionKeyboardConfig(const QString& name, QWidget *wid, const char* name = 0l );
-+    FunctionKeyboardConfig(const QString& name, QWidget *wid, const char* na = 0l );
-     ~FunctionKeyboardConfig();
- 
-     void load(const Profile&);
-Index: opie-console/serialconfigwidget.h
-===================================================================
---- opie-console.orig/serialconfigwidget.h	2002-10-09 01:13:17.000000000 +0200
-+++ opie-console/serialconfigwidget.h	2008-08-26 16:22:31.618071081 +0200
-@@ -10,7 +10,7 @@
- class SerialConfigWidget : public ProfileDialogConnectionWidget {
-     Q_OBJECT
- public:
--    SerialConfigWidget( const QString& name, QWidget* parent, const char* name = 0l );
-+    SerialConfigWidget( const QString& name, QWidget* parent, const char* na = 0l );
-     ~SerialConfigWidget();
- 
-     void load( const Profile& );
-Index: opie-console/irdaconfigwidget.h
-===================================================================
---- opie-console.orig/irdaconfigwidget.h	2002-10-09 18:33:36.000000000 +0200
-+++ opie-console/irdaconfigwidget.h	2008-08-26 16:22:31.618071081 +0200
-@@ -12,7 +12,7 @@
-     Q_OBJECT
- 
- public:
--    IrdaConfigWidget( const QString& name, QWidget* parent, const char* name = 0l );
-+    IrdaConfigWidget( const QString& name, QWidget* parent, const char* na = 0l );
-     ~IrdaConfigWidget();
- 
-     void load( const Profile& );
-Index: opie-console/btconfigwidget.h
-===================================================================
---- opie-console.orig/btconfigwidget.h	2002-10-17 16:16:03.000000000 +0200
-+++ opie-console/btconfigwidget.h	2008-08-26 16:22:31.618071081 +0200
-@@ -14,7 +14,7 @@
-     Q_OBJECT
- 
- public:
--    BTConfigWidget( const QString& name, QWidget* parent, const char* name = 0l );
-+    BTConfigWidget( const QString& name, QWidget* parent, const char* na = 0l );
-     ~BTConfigWidget();
- 
-     void load( const Profile& );
-Index: opie-console/modemconfigwidget.h
-===================================================================
---- opie-console.orig/modemconfigwidget.h	2002-10-13 23:10:15.000000000 +0200
-+++ opie-console/modemconfigwidget.h	2008-08-26 16:22:31.618071081 +0200
-@@ -15,7 +15,7 @@
-     Q_OBJECT
- 
- public:
--    ModemConfigWidget( const QString& name, QWidget* parent, const char* name = 0l );
-+    ModemConfigWidget( const QString& name, QWidget* parent, const char* na = 0l );
-     ~ModemConfigWidget();
- 
-     void load( const Profile& );
-Index: opie-console/consoleconfigwidget.h
-===================================================================
---- opie-console.orig/consoleconfigwidget.h	2008-08-26 16:23:08.198065869 +0200
-+++ opie-console/consoleconfigwidget.h	2008-08-26 16:23:12.938066770 +0200
-@@ -11,7 +11,7 @@
- class ConsoleConfigWidget : public ProfileDialogConnectionWidget {
-     Q_OBJECT
- public:
--    ConsoleConfigWidget( const QString& name, QWidget* parent, const char* name = 0l );
-+    ConsoleConfigWidget( const QString& name, QWidget* parent, const char* na = 0l );
-     ~ConsoleConfigWidget();
- 
-     void load( const Profile& );
diff --git a/packages/opie-console/opie-console_cvs.bb b/packages/opie-console/opie-console_cvs.bb
index 00f8a284a3..857f6d10a1 100644
--- a/packages/opie-console/opie-console_cvs.bb
+++ b/packages/opie-console/opie-console_cvs.bb
@@ -6,5 +6,4 @@ PR = "r2"
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
            ${HANDHELDS_CVS};module=opie/pics \
            ${HANDHELDS_CVS};module=opie/apps \
-	   file://double_name.patch;patch=1 \
           "
diff --git a/packages/xqt/xqt_0.0.9.bb b/packages/xqt/xqt_0.0.9.bb
index 3fc071ec28..c2673edfc6 100644
--- a/packages/xqt/xqt_0.0.9.bb
+++ b/packages/xqt/xqt_0.0.9.bb
@@ -2,6 +2,8 @@ HOMEPAGE = "http://xqt.sourceforge.jp"
 LICENSE = "GPL"
 SECTION = "x11"
 
+PR = "r1"
+
 SRCDATE = "20041111"
 DEPENDS = "freetype libxi libxmu flex-native virtual/libqte2 libqpe-opie"
 
@@ -9,6 +11,8 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/xqt;module=xc;method=pserv
 	   file://imake-staging.patch;patch=1 \
 	   file://moc_call.patch;patch=1 "
 
+inherit palmtop
+
 S = "${WORKDIR}/xc"
 
 do_configure() {
@@ -28,7 +32,7 @@ do_configure() {
 	# Qt defines
 	echo "#define QtCmnDefs -fno-exceptions -fno-rtti" >> config/cf/host.def
 	echo "#define QtDir ${QTDIR}" >> config/cf/host.def
-	echo "#define QtLibs -lqpe -lqte -lm -lpng -ljpeg -lts -lsupc++" >> config/cf/host.def
+	echo "#define QtLibs -lqpe -l${QT_LIBRARY} -lm -lpng -ljpeg -lts -lsupc++" >> config/cf/host.def
 	echo "#define MocBin ${STAGING_BINDIR_NATIVE}/moc" >> config/cf/host.def
 	echo "#define QtDefs -DQWS -DOPIE_NEW_MALLOC -DOPIE_NO_ERASE_RECT_HACKFIX  QtCmnDefs" >> config/cf/host.def