[oe-commits] org.oe.dev merge of '2a95914087586c7f511061dd7404c0f44fc9ce24'

[Laibsch commit]

merge of '2a95914087586c7f511061dd7404c0f44fc9ce24'
     and '595d3bb20485f41ca08f2f400d9c3a3c7106db90'

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 518cab8ae2535562912ff7f5fdba8458448a0e18
ViewMTN: http://monotone.openembedded.org/revision/info/518cab8ae2535562912ff7f5fdba8458448a0e18
Files:
1
packages/php/php_5.2.5.bb
packages/keyring/keyring-0.6.8
packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch
packages/dropbear/dropbear-early_1.0.bb
packages/dropbear/dropbear_0.49.bb
packages/dropbear/dropbear_0.50.bb
packages/keyring/keyring_0.6.8.bb
Diffs:

#
# mt diff -r2a95914087586c7f511061dd7404c0f44fc9ce24 -r518cab8ae2535562912ff7f5fdba8458448a0e18
#
#
#
# patch "packages/php/php_5.2.5.bb"
#  from [3c1f63cc7326dce0a534438bf37d88728f3048ec]
#    to [7b323ec36d0b7855942e82ce9ecbd07e2600a9df]
#
============================================================
--- packages/php/php_5.2.5.bb	3c1f63cc7326dce0a534438bf37d88728f3048ec
+++ packages/php/php_5.2.5.bb	7b323ec36d0b7855942e82ce9ecbd07e2600a9df
@@ -1,6 +1,6 @@ require php.inc
 require php.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://pear-makefile.patch;patch=1 "
 
@@ -19,7 +19,7 @@ EXTRA_OECONF = "    --without-iconv \
                     --with-mysqli="${STAGING_BINDIR_NATIVE}/mysql_config" \
 "
 
-EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR} --with-libxml-dir=${STAGING_BINDIR}"
+EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR} --with-libxml-dir=${STAGING_BINDIR_CROSS}"
 
 export LD_LIBRARY_PATH = "${STAGING_LIBDIR}"
 export PHP_NATIVE_DIR="${STAGING_BINDIR_NATIVE}"


#
# mt diff -r595d3bb20485f41ca08f2f400d9c3a3c7106db90 -r518cab8ae2535562912ff7f5fdba8458448a0e18
#
#
#
# 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/dropbear/dropbear-early_1.0.bb"
#  from [5b7702b9d74427e400988330fbd7c6fcff176371]
#    to [f1e7db2a9ec4fc0155567720a008f3158be5d187]
# 
# patch "packages/dropbear/dropbear_0.49.bb"
#  from [251634540a152574b870f74866d793a0dedefae3]
#    to [78fcce6b1a8d01f370d8c3b57fe9feea4faa3d77]
# 
# patch "packages/dropbear/dropbear_0.50.bb"
#  from [1f1e5b54696006b7f8484bd48dff9fa684992830]
#    to [61b1e18c0d8254b164c4d1ed3bf6b6b20d9fc200]
# 
# 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/dropbear/dropbear-early_1.0.bb	5b7702b9d74427e400988330fbd7c6fcff176371
+++ packages/dropbear/dropbear-early_1.0.bb	f1e7db2a9ec4fc0155567720a008f3158be5d187
@@ -1,7 +1,7 @@ SECTION = "devel"
 DESCRIPTION = "Allow to start dropbear soon after boot, depending on kernel command line option."
 SECTION = "devel"
-PR = "r2"
 RDEPENDS = "dropbear"
+PR = "r3"
 
 SRC_URI = "file://dropbear-early"
 
============================================================
--- packages/dropbear/dropbear_0.49.bb	251634540a152574b870f74866d793a0dedefae3
+++ packages/dropbear/dropbear_0.49.bb	78fcce6b1a8d01f370d8c3b57fe9feea4faa3d77
@@ -1,5 +1,5 @@
+require dropbear.inc
+
 PR = "r2"
 
+SRC_URI += "file://scp-argument-fix.patch;patch=1"
-require dropbear.inc
-SRC_URI += "file://scp-argument-fix.patch;patch=1 \
-	   "
============================================================
--- packages/dropbear/dropbear_0.50.bb	1f1e5b54696006b7f8484bd48dff9fa684992830
+++ packages/dropbear/dropbear_0.50.bb	61b1e18c0d8254b164c4d1ed3bf6b6b20d9fc200
@@ -1,6 +1,6 @@
-PR = "r0"
+require dropbear.inc
 
-require dropbear.inc
+PR = "r1"
 
 # testing
 DEFAULT_PREFERENCE = "-1"
============================================================
--- 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