nunome: fix non-working nunome on spitz/Angstrom

* Thanks to polyonymous for providing the patch
* fixes access to the timer object before allocating it

diff --git a/packages/nunome/files/timer.patch b/packages/nunome/files/timer.patch
new file mode 100644 (file)
index 0000000..ccd6564
--- /dev/null
+++ b/packages/nunome/files/timer.patch
@@ -0,0 +1,21 @@
+diff --git a/ui/nnmCanvas.cpp b/ui/nnmCanvas.cpp
+index a548ddf..3b8e7d4 100755
+--- a/ui/nnmCanvas.cpp
++++ b/ui/nnmCanvas.cpp
+@@ -35,7 +35,7 @@
+ 
+ nnmCanvas::nnmCanvas( QWidget *parent, int timeoutParam, int initID,
+                     const char *name, WFlags f )
+-                      : QWidget( parent, name, f )
++                      : QWidget( parent, name, f ), timer(0)
+ {
+       setFixedSize( NnmCANVAS_DISPLAY_SIZE, NnmCANVAS_DISPLAY_SIZE );
+       init();
+@@ -149,7 +149,7 @@ void       nnmCanvas::resizeEvent( QResizeEvent *event )
+ 
+ void  nnmCanvas::init( void )
+ {
+-      if ( timeoutMsec > 0  &&  timer->isActive() )   {
++      if ( timeoutMsec > 0  &&  timer && timer->isActive() )  {
+               timer->stop();
+       }
\ No newline at end of file

diff --git a/packages/nunome/nunome_1.0.2.bb b/packages/nunome/nunome_1.0.2.bb
index ae29277..0401c19 100644 (file)
--- a/packages/nunome/nunome_1.0.2.bb
+++ b/packages/nunome/nunome_1.0.2.bb
@@ -1,11 +1,13 @@
 DESCRIPTION = "Japanese input method plugin"
+HOMEPAGE = "http://www.sikigami.com/nunome-Qtopia-1.0/"
 SECTION = "opie/inputmethods"
 PRIORITY = "optional"
 LICENSE = "GPL"
-HOMEPAGE = "http://www.sikigami.com/nunome-Qtopia-1.0/"
 RDEPENDS = "virtual/japanese-font"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/nunome-${PV}.tar.bz2 \
+       file://timer.patch;patch=1 \
        file://nunome.patch;patch=1"
 S = "${WORKDIR}/nunome"