summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-05-03 12:11:47 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-05-03 12:11:47 +0000
commit35f113f2a6f4b64f6a7c746dfa584dcc3ea36b2e (patch)
tree02363bc184f06d1bcf93207a4853f7aa8b54138f
parentfbf7226b0f84dd30faa87a27f00424aa2f252799 (diff)
parent55d65275800bafcba628ecec9af25747354781b1 (diff)
merge of '2b2a9e8be1e996a583b85b56656ca087e2b52b4b'
and 'e51f8fd8eb90b9022f84e7606c680a142a3ca9c4'
-rw-r--r--packages/libqpe/libqpe-opie/unbreak-logging.patch21
-rw-r--r--packages/libqpe/libqpe-opie_cvs.bb6
2 files changed, 25 insertions, 2 deletions
diff --git a/packages/libqpe/libqpe-opie/unbreak-logging.patch b/packages/libqpe/libqpe-opie/unbreak-logging.patch
new file mode 100644
index 0000000000..fedd73be35
--- /dev/null
+++ b/packages/libqpe/libqpe-opie/unbreak-logging.patch
@@ -0,0 +1,21 @@
+--- library/qpeapplication.cpp.org 2007-01-24 19:54:07.000000000 +0000
++++ library/qpeapplication.cpp 2007-05-03 03:34:10.000000000 +0000
+@@ -792,14 +792,14 @@
+ {
+ switch ( type ) {
+ case QtDebugMsg:
+-#ifdef QT_DEBUG
++//#ifdef QT_DEBUG
+ fprintf( stderr, "Debug: %s\n", msg );
+-#endif
++//#endif
+ break;
+ case QtWarningMsg:
+-#ifdef QT_DEBUG
++//#ifdef QT_DEBUG
+ fprintf( stderr, "Warning: %s\n", msg );
+-#endif
++//#endif
+ break;
+ case QtFatalMsg:
+ fprintf( stderr, "Fatal: %s\n", msg );
diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index 7a6cda7b9b..0debaa004f 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -1,8 +1,10 @@
require ${PN}.inc
PV = "1.2.2+cvs${SRCDATE}"
-PR = "r7"
+PR = "r8"
SRC_URI = "${HANDHELDS_CVS};module=opie/library \
- file://fix-titleheight.patch;patch=1"
+ file://fix-titleheight.patch;patch=1 \
+ file://unbreak-logging.patch;patch=1 \
+ "