summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-03-20 18:04:42 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-03-20 18:04:42 +0000
commit97964b6f55be174b13ce082a37da7a786d75d02f (patch)
tree26e5f7b646f3ca126b594d52c9a335ab1d99f825
parentc63074e8357393f2f8c2984e3e0d2efa7a70c939 (diff)
konqueror-embedded 20030705: apply patch to make it compile w/ gcc4.x
-rw-r--r--packages/konqueror/konqueror-embedded-20030705/gcc4.patch15
-rw-r--r--packages/konqueror/konqueror-embedded_20030705.bb17
2 files changed, 24 insertions, 8 deletions
diff --git a/packages/konqueror/konqueror-embedded-20030705/gcc4.patch b/packages/konqueror/konqueror-embedded-20030705/gcc4.patch
new file mode 100644
index 0000000000..54e3fe6cc3
--- /dev/null
+++ b/packages/konqueror/konqueror-embedded-20030705/gcc4.patch
@@ -0,0 +1,15 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- konqueror-embedded-snapshot-20030705/konq-embed/src/bookmarks.h~gcc4 2002-12-05 16:39:43.000000000 +0100
++++ konqueror-embedded-snapshot-20030705/konq-embed/src/bookmarks.h 2006-03-20 18:58:49.000000000 +0100
+@@ -16,6 +16,7 @@
+ class XMLElement;
+ class ActionMenu;
+ class KAction;
++class BookmarkFolder;
+
+ class BookmarkAction: public QAction
+ {
diff --git a/packages/konqueror/konqueror-embedded_20030705.bb b/packages/konqueror/konqueror-embedded_20030705.bb
index d3b5dd46a8..7bfd88568c 100644
--- a/packages/konqueror/konqueror-embedded_20030705.bb
+++ b/packages/konqueror/konqueror-embedded_20030705.bb
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
PRIORITY = "optional"
DEPENDS = "libqpe-opie openssl pcre"
LICENSE = "LGPL/GPL"
-PR = "r3"
+PR = "r4"
# Note if this .bb files fails with the error:
# "No rule to make target `-lpcre', needed by `konqueror'. Stop."
@@ -13,13 +13,14 @@ PR = "r3"
SRC_URI = "http://devel-home.kde.org/~hausmann/snapshots/Attic/konqueror-embedded-snapshot-${PV}.tar.gz \
file://opie1.patch;patch=1 \
file://packing.patch;patch=1 \
- file://include_qconfig.patch;patch=1 \
- file://useragent.patch;patch=1 \
- file://kcookiejar-merge.patch;patch=1 \
- file://malformed.patch;patch=1 \
- file://cachepath.patch;patch=1 \
- file://konq-embedrc \
- file://vit.patch;patch=1"
+ file://include_qconfig.patch;patch=1 \
+ file://useragent.patch;patch=1 \
+ file://kcookiejar-merge.patch;patch=1 \
+ file://malformed.patch;patch=1 \
+ file://cachepath.patch;patch=1 \
+ file://vit.patch;patch=1 \
+ file://gcc4.patch;patch=1 \
+ file://konq-embedrc"
S = "${WORKDIR}/konqueror-embedded-snapshot-${PV}"
inherit autotools