[oe-commits] org.oe.dev keyring: fix compilation. Closes 2418.
MarekVasut commit
oe at amethyst.openembedded.net
Sun May 18 19:59:29 UTC 2008
keyring: fix compilation. Closes 2418.
* Commit by Laibsch
Author: MarekVasut
Branch: org.openembedded.dev
Revision: 9471612e3b35a9a35d0e4439ce9556e21718d5b0
ViewMTN: http://monotone.openembedded.org/revision/info/9471612e3b35a9a35d0e4439ce9556e21718d5b0
Files:
1
packages/keyring/keyring-0.6.8
packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch
packages/keyring/keyring_0.6.8.bb
Diffs:
#
# mt diff -r3290f95e113d0da965ed4791ceb9de80bb2b03bd -r9471612e3b35a9a35d0e4439ce9556e21718d5b0
#
#
#
# add_dir "packages/keyring/keyring-0.6.8"
#
# add_file "packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch"
# content [20aad83748060bdeaff7f817d93e61f7f3d10d42]
#
# patch "packages/keyring/keyring_0.6.8.bb"
# from [2cfb564b37ee4f9a7f8fc38d6a1ef53cf057ac03]
# to [e0d93d0a4a92bc44db6eeeafa9ecbcf49ef6babe]
#
============================================================
--- packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch 20aad83748060bdeaff7f817d93e61f7f3d10d42
+++ packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch 20aad83748060bdeaff7f817d93e61f7f3d10d42
@@ -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();
============================================================
--- packages/keyring/keyring_0.6.8.bb 2cfb564b37ee4f9a7f8fc38d6a1ef53cf057ac03
+++ packages/keyring/keyring_0.6.8.bb e0d93d0a4a92bc44db6eeeafa9ecbcf49ef6babe
@@ -5,7 +5,8 @@ PR = "r2"
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
More information about the Openembedded-commits
mailing list