From 709c4d66e0b107ca606941b988bad717c0b45d9b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 17 Mar 2009 14:32:59 -0400 Subject: rename packages/ to recipes/ per earlier agreement See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko Acked-by: Mike Westerhof Acked-by: Philip Balister Acked-by: Khem Raj Acked-by: Marcin Juszkiewicz Acked-by: Koen Kooi Acked-by: Frans Meulenbroeks --- .../keyring-0.6.8/keyring-0.6.8-datatype.patch | 93 ++++++++++++++++++++++ recipes/keyring/keyring_0.6.8.bb | 36 +++++++++ 2 files changed, 129 insertions(+) create mode 100644 recipes/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch create mode 100644 recipes/keyring/keyring_0.6.8.bb (limited to 'recipes/keyring') diff --git a/recipes/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch b/recipes/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch new file mode 100644 index 0000000000..9f0a236b39 --- /dev/null +++ b/recipes/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/recipes/keyring/keyring_0.6.8.bb b/recipes/keyring/keyring_0.6.8.bb new file mode 100644 index 0000000000..5739255826 --- /dev/null +++ b/recipes/keyring/keyring_0.6.8.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "Stores accounts and passwords in an encrypted file." +SECTION = "opie/applications" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gdbm" +PR = "r2" + +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 + +QPEDIR = "${OPIEDIR}" + +do_install() { + install -d ${D}${palmtopdir}/bin \ + ${D}${palmtopdir}/apps/Applications \ + ${D}${palmtopdir}/pics/keyring + install -m 0755 keyring ${D}${palmtopdir}/bin/ + install -m 0644 keyring.desktop \ + ${D}${palmtopdir}/apps/Applications/ + install -m 0644 ${S}/Keyring.png \ + ${S}/keyring-pwlist.png \ + ${D}${palmtopdir}/pics/ + + # The following should appear in an assoicated DOC package. + + install -d ${D}${palmtopdir}/help/html + install -m 0644 ${S}/*.html ${D}${palmtopdir}/help/html/ +} + +PACKAGES = "${PN}-dbg ${PN} ${PN}-help" +FILES_${PN} = " ${palmtopdir}${base_bindir} ${palmtopdir}/apps ${palmtopdir}/pics" +FILES_${PN}-help = " ${palmtopdir}/help/html" + -- cgit 1.2.3-korg