[oe-commits] org.oe.dev nunome: fix non-working nunome on spitz/Angstrom

[Laibsch commit]

nunome: fix non-working nunome on spitz/Angstrom
* Thanks to polyonymous for providing the patch
* fixes access to the timer object before allocating it

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 378deeb40b41ec05cc902c4d69546d9f2f604c30
ViewMTN: http://monotone.openembedded.org/revision.psp?id=378deeb40b41ec05cc902c4d69546d9f2f604c30
Files:
1
packages/nunome/files/timer.patch
packages/nunome/nunome_1.0.2.bb
Diffs:

#
# mt diff -r4373d2d8d48bd6bc78a3aefbe9919302fc6bf5cc -r378deeb40b41ec05cc902c4d69546d9f2f604c30
#
# 
# 
# add_file "packages/nunome/files/timer.patch"
#  content [6cd7506b71be127fe1409b580feebe90564027bb]
# 
# patch "packages/nunome/nunome_1.0.2.bb"
#  from [12405a0b597b6f1af9df3f71c25f53d14db98c82]
#    to [e4b96a314bff3d24dc02a0d1de6b718adc10dece]
# 
============================================================
--- packages/nunome/files/timer.patch	6cd7506b71be127fe1409b580feebe90564027bb
+++ packages/nunome/files/timer.patch	6cd7506b71be127fe1409b580feebe90564027bb
@@ -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();
+ 	}
============================================================
--- packages/nunome/nunome_1.0.2.bb	12405a0b597b6f1af9df3f71c25f53d14db98c82
+++ packages/nunome/nunome_1.0.2.bb	e4b96a314bff3d24dc02a0d1de6b718adc10dece
@@ -1,11 +1,13 @@ DESCRIPTION = "Japanese input method plu
 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"