keyring: fix compilation. Closes 2418.

* Commit by Laibsch

3 files changed, 95 insertions, 1 deletions

diff --git a/packages/keyring/keyring-0.6.8/.mtn2git_empty b/packages/keyring/keyring-0.6.8/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keyring/keyring-0.6.8/.mtn2git_empty
diff --git a/packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch b/packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch
new file mode 100644
index 0000000000..9f0a236b39
--- /dev/null
+++ b/packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch
@@ -0,0 +1,93 @@
+diff -Naru Keyring.orig/accountlist.cpp Keyring/accountlist.cpp
+--- Keyring.orig/accountlist.cpp	2002-09-29 17:24:09.000000000 +0200
++++ Keyring/accountlist.cpp	2007-06-05 15:46:59.000000000 +0200
+@@ -314,7 +314,7 @@
+  */
+ void AccountList::resetTimer(){
+ 	mSeconds=mTimerStart;	
+-	mStartTime = time(NULL);
++	mStartTime = (time_t*)time(NULL);
+ 	wLCD->display(mSeconds);	
+ }
+ 
+@@ -390,20 +390,20 @@
+ 	//if so and it has expired, lock keyring.
+ 	if(mTimerViewingAC && mTimerEnabled){
+ 			//Timer has expired
+-			if((time(NULL)-mStartTime) > mTimerStart){
++			if((time(NULL)-(time_t)mStartTime) > mTimerStart){
+ 					lock();
+ 			} else {
+ 					//Timer needs to be updated
+ 					time_t diff=time(NULL)-viewtime;
+ 					mSeconds=mSeconds-diff;
+-					mStartTime = time(NULL)-(mTimerStart-mSeconds);
++					mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
+ 					mUpdateTimer->start(500,false);
+ 					wLCD->display(mSeconds);	
+ 			}
+ 	} else {
+ 			if(mTimerEnabled){
+ 					mUpdateTimer->start(500,false);
+-					mStartTime = time(NULL)-(mTimerStart-mSeconds);
++					mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
+ 			}
+ 	}
+ 
+@@ -432,7 +432,7 @@
+ 		if(mTimerEnabled)
+ 			mUpdateTimer->start(500,false);
+ 		mSeconds=mTimerStart;
+-		mStartTime = time(NULL);
++		mStartTime = (time_t*)time(NULL);
+ 		updateCountDown();
+ 	
+ 		//Let's be a bastard and bitch if the
+@@ -463,11 +463,11 @@
+ void AccountList::updateCountDown(){
+ 	wLCD->display(mSeconds);	
+ 	if(mSeconds==0 || 
+-			(((time(NULL)-mStartTime) > mTimerStart) && mTimerPowerOff)){
++			(((time(NULL)-(time_t)mStartTime) > mTimerStart) && mTimerPowerOff)){
+ 		lock();
+ 		return;
+ 	}
+-	mSeconds=mTimerStart-(time(NULL)-mStartTime);
++	mSeconds=mTimerStart-(time(NULL)-(time_t)mStartTime);
+ }
+ 
+ void AccountList::selectionChanged(QListViewItem *item){
+@@ -548,20 +548,20 @@
+ 		//if so and it has expired, lock keyring.
+ 		if(mTimerViewingAC && mTimerEnabled){
+ 			//Timer has expired
+-			if((time(NULL)-mStartTime) > mTimerStart){
++			if((time(NULL)-(time_t)mStartTime) > mTimerStart){
+ 				lock();
+ 			} else {
+ 				//Timer needs to be updated
+-				time_t diff=time(NULL)-viewtime;
++				time_t diff = time(NULL)-(time_t)viewtime;
+ 				mSeconds=mSeconds-diff;
+-				mStartTime = time(NULL)-(mTimerStart-mSeconds);
++				mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
+ 				mUpdateTimer->start(500,false);
+ 				wLCD->display(mSeconds);	
+ 			}
+ 		} else {
+ 			if(mTimerEnabled){
+ 				mUpdateTimer->start(500,false);
+-				mStartTime = time(NULL)-(mTimerStart-mSeconds);
++				mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
+ 			}
+ 		}
+ 		delete qd;	
+@@ -627,7 +627,7 @@
+ 		
+ 	if(mTimerEnabled){
+ 			mUpdateTimer->start(500,false);
+-			mStartTime = time(NULL)-(mTimerStart-mSeconds);
++			mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
+ 	}
+ 
+ 	showAccountList();
diff --git a/packages/keyring/keyring_0.6.8.bb b/packages/keyring/keyring_0.6.8.bb
index 5696a6618b..5739255826 100644
--- a/packages/keyring/keyring_0.6.8.bb
+++ b/packages/keyring/keyring_0.6.8.bb
@@ -5,7 +5,8 @@ LICENSE = "GPL"
 DEPENDS = "gdbm"
 PR = "r2"
 
-SRC_URI = "http://www.scrypt.net/~celer/kweb/Keyring-0.6.8.tgz"
+SRC_URI = "http://www.scrypt.net/~celer/kweb/Keyring-0.6.8.tgz \
+	   file://keyring-0.6.8-datatype.patch;patch=1"
 S = "${WORKDIR}/Keyring"
 
 inherit palmtop