diff options
| -rw-r--r-- | conf/distro/preferred-opie-versions.inc | 2 | ||||
| -rw-r--r-- | conf/machine/zaurus-clamshell-2.4.conf | 6 | ||||
| -rw-r--r-- | conf/machine/zaurus-clamshell-2.6.conf | 6 | ||||
| -rw-r--r-- | packages/opie-help-en/opie-help-en_1.2.0.bb | 6 | ||||
| -rw-r--r-- | packages/qpe-vexed/files/vit.patch | 82 | ||||
| -rw-r--r-- | packages/qpe-vexed/qpe-vexed_1.3.bb | 5 |
6 files changed, 99 insertions, 8 deletions
diff --git a/conf/distro/preferred-opie-versions.inc b/conf/distro/preferred-opie-versions.inc index 2530f028ec..05f1e2ebd2 100644 --- a/conf/distro/preferred-opie-versions.inc +++ b/conf/distro/preferred-opie-versions.inc @@ -31,7 +31,7 @@ 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-checkbook = "${OPIE_CHECKBOOK}" +PREFERRED_VERSION_opie-checkbook = "${OPIE_VERSION}" PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}" PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}" PREFERRED_VERSION_opie-clockapplet = "${OPIE_VERSION}" diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf index 31f1ed9398..3c0ee3fc0f 100644 --- a/conf/machine/zaurus-clamshell-2.4.conf +++ b/conf/machine/zaurus-clamshell-2.4.conf @@ -1,7 +1,9 @@ PREFERRED_PROVIDER_virtual/kernel = "c7x0-kernels-2.4-embedix" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel \ -hostap-modules orinoco-modules sharp-sdmmc-support chkhinge" +hostap-modules orinoco-modules sharp-sdmmc-support chkhinge \ +hostap-utils prism3-firmware prism3-support" BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support \ kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \ -kernel-module-usbdcore kernel-module-usbdmonitor chkhinge" +kernel-module-usbdcore kernel-module-usbdmonitor chkhinge \ +hostap-utils prism3-firmware prism3-support" diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf index e408c5c86e..4cefec7af2 100644 --- a/conf/machine/zaurus-clamshell-2.6.conf +++ b/conf/machine/zaurus-clamshell-2.6.conf @@ -3,9 +3,11 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" PREFERRED_VERSION_orinoco-modules = "0.13e-26" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils hostap-modules orinoco-modules \ -pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin" +pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin \ +hostap-utils prism3-firmware prism3-support" BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs \ -pcmcia-cs apm ppp wireless-tools irda-utils udev-utils console-tools" +pcmcia-cs apm ppp wireless-tools irda-utils udev-utils console-tools \ +hostap-utils prism3-firmware prism3-support" # NFS Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" diff --git a/packages/opie-help-en/opie-help-en_1.2.0.bb b/packages/opie-help-en/opie-help-en_1.2.0.bb index e69de29bb2..280f9fa807 100644 --- a/packages/opie-help-en/opie-help-en_1.2.0.bb +++ b/packages/opie-help-en/opie-help-en_1.2.0.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" +PR = "r0" + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/help/en/html" diff --git a/packages/qpe-vexed/files/vit.patch b/packages/qpe-vexed/files/vit.patch index e69de29bb2..c07d46983a 100644 --- a/packages/qpe-vexed/files/vit.patch +++ b/packages/qpe-vexed/files/vit.patch @@ -0,0 +1,82 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qpe-vexed_arm/mainWidget.cpp~vit ++++ qpe-vexed_arm/mainWidget.cpp +@@ -24,7 +24,7 @@ + #include <qhbox.h> + #include <qpe/qpeapplication.h> + +-MainWidget::MainWidget(QWidget *parent, const char *name) : QWidget(parent, name) { ++MainWidget::MainWidget(QWidget *parent, const char *name, WFlags f) : QMainWindow(parent, name, f) { + this -> setBackgroundMode(PaletteButton); + this -> setCaption("QPE-Vexed"); + +--- qpe-vexed_arm/mainWidget.h~vit ++++ qpe-vexed_arm/mainWidget.h +@@ -28,7 +28,7 @@ + #include "level.h" + #include "statuslabel.h" + +-#include <qwidget.h> ++#include <qmainwindow.h> + #include <qstring.h> + + /* +@@ -36,10 +36,11 @@ + * Handles allmost all signals + */ + +-class MainWidget : public QWidget { ++class MainWidget : public QMainWindow { + Q_OBJECT + public: +- MainWidget(QWidget *parent = NULL, const char *name = NULL); ++ static QString appName() { return QString::fromLatin1("qpevexed"); } ++ MainWidget(QWidget *parent = NULL, const char *name = NULL, WFlags f = 0); + ~MainWidget(); + protected: + void keyPressEvent(QKeyEvent*); +--- qpe-vexed_arm/qpeVexed.cpp~vit ++++ qpe-vexed_arm/qpeVexed.cpp +@@ -18,15 +18,8 @@ + * + */ + +-#include <qpe/qpeapplication.h> + #include "mainWidget.h" ++#include <opie2/oapplicationfactory.h> + +-int main(int argc, char **argv) { +- QPEApplication a(argc, argv); +- +- MainWidget mw; +- +- a.setMainWidget(&mw); +- mw.show(); +- a.exec(); +-} ++using namespace Opie::Core; ++OPIE_EXPORT_APP( OApplicationFactory<MainWidget> ) +--- qpe-vexed_arm/statuslabel.cpp~vit ++++ qpe-vexed_arm/statuslabel.cpp +@@ -32,6 +32,6 @@ + StatusLabel::~StatusLabel() {} + + void StatusLabel::setLabel(const QString& pack, const QString& name, int num) { +- QString s = QString::number(num); ++ QString s = QString::number(num+1); + setText(pack+" ("+s+"):\n\t"+name); + } +--- qpe-vexed_arm/qpe-vexed.pro~vit ++++ qpe-vexed_arm/qpe-vexed.pro +@@ -5,6 +5,6 @@ + SOURCES = button.cpp fileiface.cpp level.cpp mainWidget.cpp menuBar.cpp playingBoard.cpp qpeVexed.cpp stone.cpp about.cpp statuslabel.cpp instruction.cpp + INCLUDEPATH += $(QPEDIR)/include + DEPENDPATH += $(QPEDIR)/include +-LIBS += -lqpe -lqte ++LIBS += -lqpe -lqte -lopiecore2 + #INTERFACES = board_designed.ui + TARGET = qpe-vexed diff --git a/packages/qpe-vexed/qpe-vexed_1.3.bb b/packages/qpe-vexed/qpe-vexed_1.3.bb index c6920756a1..f33fbe484e 100644 --- a/packages/qpe-vexed/qpe-vexed_1.3.bb +++ b/packages/qpe-vexed/qpe-vexed_1.3.bb @@ -10,11 +10,10 @@ RDEPENDS = "qpe-vexed-levels" APPNAME = "qpe-vexed" APPTYPE = "binary" APPDESKTOP = "${S}" -PR = "r2" +PR = "r3" SRC_URI = "http://wwwcip.informatik.uni-erlangen.de/~sialhaus/qpe-vexed_1.3_src.tar.gz \ -file://vit.patch;patch=1 \ -" + file://vit.patch;patch=1" S = "${WORKDIR}/qpe-vexed_arm/" |