aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2007-01-11 08:25:49 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2007-01-11 08:25:49 +0000
commitb99e2fcc68c8cb66268964bf11be2c6a367e0ebc (patch)
treea7dc9aadfd030f27de879b2ec1f548ff136a7360
parent045b580405ab84112de18964923266655f6a3b04 (diff)
downloadopenembedded-b99e2fcc68c8cb66268964bf11be2c6a367e0ebc.tar.gz
konqueror-embedded: apply patch from #844 to get rid of lack of -lpcre problem
-rw-r--r--packages/konqueror/konqueror-embedded-20030705/bug844-fix.patch13
-rw-r--r--packages/konqueror/konqueror-embedded_20030705.bb6
2 files changed, 17 insertions, 2 deletions
diff --git a/packages/konqueror/konqueror-embedded-20030705/bug844-fix.patch b/packages/konqueror/konqueror-embedded-20030705/bug844-fix.patch
new file mode 100644
index 0000000000..92dc1c8f8c
--- /dev/null
+++ b/packages/konqueror/konqueror-embedded-20030705/bug844-fix.patch
@@ -0,0 +1,13 @@
+Index: konqueror-embedded-snapshot-20030705/konq-embed/src/Makefile.am
+===================================================================
+--- konqueror-embedded-snapshot-20030705.orig/konq-embed/src/Makefile.am 2007-01-11 09:14:48.000000000 +0100
++++ konqueror-embedded-snapshot-20030705/konq-embed/src/Makefile.am 2007-01-11 09:14:51.000000000 +0100
+@@ -53,7 +53,7 @@
+
+ konqueror_LDFLAGS = $(KONQ_SSL_LDFLAGS) $(all_libraries) $(exportflag)
+ konqueror_METASOURCES = AUTO
+-konqueror_DEPENDENCIES = $(LIB_KJSHTML) $(LIB_KHTML) $(lib_addons)
++konqueror_DEPENDENCIES = $(shell echo ${LIB_KJSHTML}|sed s/\s*-l\\w\\+//g) $(LIB_KHTML) $(lib_addons)
+ BUILT_SOURCES = init.inc
+
+ icon_DATA = konqueror.png
diff --git a/packages/konqueror/konqueror-embedded_20030705.bb b/packages/konqueror/konqueror-embedded_20030705.bb
index e3fc55a88f..f89d080e9a 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"
SRC_URI = "http://devel-home.kde.org/~hausmann/snapshots/Attic/konqueror-embedded-snapshot-${PV}.tar.gz \
file://opie1.patch;patch=1 \
@@ -14,7 +14,9 @@ SRC_URI = "http://devel-home.kde.org/~hausmann/snapshots/Attic/konqueror-embedde
file://malformed.patch;patch=1 \
file://cachepath.patch;patch=1 \
file://konq-embedrc \
- file://vit.patch;patch=1"
+ file://vit.patch;patch=1 \
+ file://bug844-fix.patch;patch=1"
+
S = "${WORKDIR}/konqueror-embedded-snapshot-${PV}"
inherit autotools