summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-04-04 22:07:10 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-04 22:07:10 +0000
commit6e762f9b1fcd6db9b07011303efaf77fce8c2849 (patch)
tree9bd6842b7f638ae4e91326178eaa587be97d4f17 /packages
parentf7edf91b7fd086747232a545ad8f0f9931379030 (diff)
konqueror-embedded: make svn version use libqte-mt-static (for now)
Diffstat (limited to 'packages')
-rw-r--r--packages/konqueror/files/.mtn2git_empty0
-rw-r--r--packages/konqueror/files/inject-extraflags.patch16
-rw-r--r--packages/konqueror/konqueror-embedded_svn.bb13
3 files changed, 24 insertions, 5 deletions
diff --git a/packages/konqueror/files/.mtn2git_empty b/packages/konqueror/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/konqueror/files/.mtn2git_empty
diff --git a/packages/konqueror/files/inject-extraflags.patch b/packages/konqueror/files/inject-extraflags.patch
new file mode 100644
index 0000000000..1b8b02d175
--- /dev/null
+++ b/packages/konqueror/files/inject-extraflags.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- kdenox/konq-embed/src/Makefile.am~fixit
++++ kdenox/konq-embed/src/Makefile.am
+@@ -49,7 +49,7 @@
+ $(top_builddir)/konq-embed/kdesrc/kssl/libkssl.la
+
+
+-konqueror_LDFLAGS = $(KONQ_SSL_LDFLAGS) $(all_libraries) -export-dynamic
++konqueror_LDFLAGS = $(KONQ_SSL_LDFLAGS) $(all_libraries) -export-dynamic $(EXTRA_LDFLAGS)
+ konqueror_METASOURCES = AUTO
+ konqueror_DEPENDENCIES = $(LIB_KJSHTML) $(LIB_KHTML) $(LIB_ADDONS)
+ BUILT_SOURCES = init.inc
diff --git a/packages/konqueror/konqueror-embedded_svn.bb b/packages/konqueror/konqueror-embedded_svn.bb
index 26d2877d81..f032b9b587 100644
--- a/packages/konqueror/konqueror-embedded_svn.bb
+++ b/packages/konqueror/konqueror-embedded_svn.bb
@@ -1,21 +1,21 @@
DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition"
-BROKEN = "1"
SECTION = "opie/applications"
PRIORITY = "optional"
HOMEPAGE = "http://www.konqueror.org/"
-DEPENDS = "openssl pcre libqte-mt dcopidl-native"
+DEPENDS = "openssl pcre libqte-mt-static dcopidl-native"
LICENSE = "LGPL/GPL"
DEFAULT_PREFERENCE = "-1"
FILES_${PN} = "${palmtopdir} /usr/share"
-PR = "r0"
-PV = "svn${SRCDATE}"
+PR = "r1"
+PV = "3.5.1+svn${SRCDATE}"
# this Konqueror needs the KDEDIR set and the font helvetica installed on the target
inherit autotools
SRC_URI = "svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.1;module=kdelibs \
- svn://anonsvn.kde.org/home/kde/trunk;module=kdenox "
+ svn://anonsvn.kde.org/home/kde/trunk;module=kdenox \
+ file://inject-extraflags.patch;patch=1"
S = "${WORKDIR}/kdenox"
@@ -25,6 +25,9 @@ export UIC = "${STAGING_BINDIR}/uic"
export exec_prefix = "${palmtopdir}"
export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DQT_NO_DOM -DENABLE_BOOKMARKS"
export PCRE_CONFIG = "invalid"
+EXTRAFLAGS = "-lts"
+EXTRAFLAGS_c7x0 = "-lts -laticore"
+export EXTRA_OEMAKE = "EXTRA_LDFLAGS='${EXTRAFLAGS}'"
EXTRA_OECONF = '--prefix=${palmtopdir} \
--exec-prefix=${palmtopdir} \