summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2007-10-26 14:48:57 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2007-10-26 14:48:57 +0000
commitc241a0745bcc75e61bc2522ef089483fb6037cc7 (patch)
tree1deff7abf6e3302a9a8c7a168c280079d4e987d8
parentf7176db9a62177003ad6352e357f30824a90a3da (diff)
parentb76ebfe8428225c6f58304b98bd15c0af684b727 (diff)
merge of 'a41270f197c19482f466d5e12850e9c76c7358b5'
and 'f3edd5c73b71cef16fcff1594f21d2d1af16cf3a'
-rw-r--r--packages/kdepimpi/files/gcc42.patch13
-rw-r--r--packages/kdepimpi/kdepimpi_2.2.7.bb3
2 files changed, 15 insertions, 1 deletions
diff --git a/packages/kdepimpi/files/gcc42.patch b/packages/kdepimpi/files/gcc42.patch
new file mode 100644
index 0000000000..30e425aeda
--- /dev/null
+++ b/packages/kdepimpi/files/gcc42.patch
@@ -0,0 +1,13 @@
+diff --git a/kabc/secrecy.h b/kabc/secrecy.h
+index 21e22f2..3011ae9 100644
+--- a/kabc/secrecy.h
++++ b/kabc/secrecy.h
+@@ -98,5 +98,8 @@ private:
+ int mType;
+ };
+
++QDataStream& operator<<(QDataStream& s,const Secrecy &secrecy);
++QDataStream& operator>>(QDataStream& s,Secrecy &secrecy);
++
+ }
+ #endif
diff --git a/packages/kdepimpi/kdepimpi_2.2.7.bb b/packages/kdepimpi/kdepimpi_2.2.7.bb
index 7252d0a6f1..b8e4345b46 100644
--- a/packages/kdepimpi/kdepimpi_2.2.7.bb
+++ b/packages/kdepimpi/kdepimpi_2.2.7.bb
@@ -1,6 +1,7 @@
SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \
file://gcc4.patch;patch=1 \
- file://qt-mt.patch;patch=1"
+ file://qt-mt.patch;patch=1 \
+ file://gcc42.patch;patch=1"
require kdepimpi-base.inc