From 4ead106ddf5dde3d9b82e19928785d318f78cda1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Apr 2006 17:03:43 +0000 Subject: konqueror-embedded 20030705: update packing.patch to make it work w/ g++4.1 --- .../konqueror/konqueror-embedded-20030705/packing.patch | 14 +++++++++----- packages/konqueror/konqueror-embedded_20030705.bb | 3 ++- 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'packages/konqueror') diff --git a/packages/konqueror/konqueror-embedded-20030705/packing.patch b/packages/konqueror/konqueror-embedded-20030705/packing.patch index 37a3754854..be3f362c03 100644 --- a/packages/konqueror/konqueror-embedded-20030705/packing.patch +++ b/packages/konqueror/konqueror-embedded-20030705/packing.patch @@ -1,17 +1,21 @@ -diff -ur konqe.old/konq-embed/kdesrc/kjs/ustring.h konqueror-embedded-snapshot-20030705/konq-embed/kdesrc/kjs/ustring.h ---- konqe.old/konq-embed/kdesrc/kjs/ustring.h 2001-07-28 17:32:15.000000000 +0200 -+++ konqueror-embedded-snapshot-20030705/konq-embed/kdesrc/kjs/ustring.h 2004-08-22 21:30:04.000000000 +0200 + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- konqueror-embedded-snapshot-20030705/konq-embed/kdesrc/kjs/ustring.h~packing.patch ++++ konqueror-embedded-snapshot-20030705/konq-embed/kdesrc/kjs/ustring.h @@ -154,11 +154,11 @@ /** * @return Lower byte. */ - unsigned char& low() const { return ref().lo; } -+ unsigned char& low() const { return *(&ref().lo); } ++ unsigned char& low() const { return *((unsigned char*)&ref().lo); } /** * @return Higher byte. */ - unsigned char& high() const { return ref().hi; } -+ unsigned char& high() const { return *(&ref().hi); } ++ unsigned char& high() const { return *((unsigned char*)&ref().hi); } /** * @return Character converted to lower case. */ diff --git a/packages/konqueror/konqueror-embedded_20030705.bb b/packages/konqueror/konqueror-embedded_20030705.bb index 7bfd88568c..5bdc4ed765 100644 --- a/packages/konqueror/konqueror-embedded_20030705.bb +++ b/packages/konqueror/konqueror-embedded_20030705.bb @@ -1,9 +1,10 @@ DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition" +HOMEPAGE = "http://www.konqueror.org/embedded" SECTION = "opie/applications" PRIORITY = "optional" DEPENDS = "libqpe-opie openssl pcre" LICENSE = "LGPL/GPL" -PR = "r4" +PR = "r5" # Note if this .bb files fails with the error: # "No rule to make target `-lpcre', needed by `konqueror'. Stop." -- cgit v1.2.3 From f7edf91b7fd086747232a545ad8f0f9931379030 Mon Sep 17 00:00:00 2001 From: Dirk Opfer Date: Tue, 4 Apr 2006 12:21:57 +0000 Subject: packages/konqueror: add new svn version of konqueror embedded - Needs a multithreaded qte version - To build this package dcopidl-native are needed: ASSUME_PROVIDED += "dcopidl-native" --- packages/konqueror/konqueror-embedded_svn.bb | 76 ++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 packages/konqueror/konqueror-embedded_svn.bb (limited to 'packages/konqueror') diff --git a/packages/konqueror/konqueror-embedded_svn.bb b/packages/konqueror/konqueror-embedded_svn.bb new file mode 100644 index 0000000000..26d2877d81 --- /dev/null +++ b/packages/konqueror/konqueror-embedded_svn.bb @@ -0,0 +1,76 @@ +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" +LICENSE = "LGPL/GPL" +DEFAULT_PREFERENCE = "-1" +FILES_${PN} = "${palmtopdir} /usr/share" +PR = "r0" +PV = "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 " + +S = "${WORKDIR}/kdenox" + +export QMAKE = "${STAGING_BINDIR}/qmake" +export MOC = "${STAGING_BINDIR}/moc" +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" + +EXTRA_OECONF = '--prefix=${palmtopdir} \ + --exec-prefix=${palmtopdir} \ + --includedir=${STAGING_INCDIR} \ + --with-extra-includes=${STAGING_INCDIR} \ + --with-extra-libs=${STAGING_LIBDIR} \ + --with-ssl-version=0.9.7e \ + --with-ssl-dir=${STAGING_LIBDIR}/.. \ + --with-qt-includes=${STAGING_DIR}/${HOST_SYS}/qt2/include \ + --with-qt-libraries=${STAGING_DIR}/${HOST_SYS}/qt2/lib \ + --enable-fontsubs \ + --with-konq-tmp-prefix=/tmp/kde-cache \ + --enable-static \ +# --disable-static \ +# --enable-shared \ + --disable-debug \ + --with-gui=road \ + --with-ipv6-lookup=no \ + --without-xinerama \ + --disable-scrollbars \ + --disable-selection \ + --disable-bookmarks \ + --with-javascript=static \ + --enable-debug=yes \ + --disable-printing \ + --enable-pcre \ + --without-arts \ + --enable-jshostext \ + --disable-selection \ + --enable-final \ + --enable-qt-embedded \ + --enable-rtti-embedded \ + --enable-mt \ + --enable-qt-mt\ + --enable-fwnewepg=yes \ + --enable-embedded ' + +do_configure_prepend() { + cd ${S} + if ! test -L admin + then + ln -s ../kdelibs/admin admin + fi + make -f Makefile.cvs +} + +do_compile_prepend() { + perl admin/am_edit +} -- cgit v1.2.3 From 6e762f9b1fcd6db9b07011303efaf77fce8c2849 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 Apr 2006 22:07:10 +0000 Subject: konqueror-embedded: make svn version use libqte-mt-static (for now) --- packages/konqueror/files/.mtn2git_empty | 0 packages/konqueror/files/inject-extraflags.patch | 16 ++++++++++++++++ packages/konqueror/konqueror-embedded_svn.bb | 13 ++++++++----- 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 packages/konqueror/files/.mtn2git_empty create mode 100644 packages/konqueror/files/inject-extraflags.patch (limited to 'packages/konqueror') diff --git a/packages/konqueror/files/.mtn2git_empty b/packages/konqueror/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 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} \ -- cgit v1.2.3