projects / vuplus_openembedded / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 42b07ec)
konqueror-embedded: fix build problems
authorPaul Eggleton <bluelightning@bluelightning.org>
Sat, 2 Aug 2008 20:15:54 +0000 (20:15 +0000)
committerPaul Eggleton <bluelightning@bluelightning.org>
Sat, 2 Aug 2008 20:15:54 +0000 (20:15 +0000)
 * Upgrade 20070212 to 20070316 (earlier version no longer available for fetching)
 * Fix _AC_PATH_X_XMKMF error during configure (fixes bug #3569)

14 files changed:
packages/konqueror/konqueror-embedded-20070212/.mtn2git_empty [deleted file] patch | blob | history
packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch [deleted file] patch | blob | history
packages/konqueror/konqueror-embedded-20070212/konqe-kapplication.patch [deleted file] patch | blob | history
packages/konqueror/konqueror-embedded-20070212/konqe_new_opie.patch [deleted file] patch | blob | history
packages/konqueror/konqueror-embedded-20070212/konqueror.desktop [deleted file] patch | blob | history
packages/konqueror/konqueror-embedded-20070212/konqueror.png [deleted file] patch | blob | history
packages/konqueror/konqueror-embedded-20070316/.mtn2git_empty [new file with mode: 0644] patch | blob
packages/konqueror/konqueror-embedded-20070316/dont-use-kde-config.patch [new file with mode: 0644] patch | blob
packages/konqueror/konqueror-embedded-20070316/konqe-kapplication.patch [new file with mode: 0644] patch | blob
packages/konqueror/konqueror-embedded-20070316/konqe_new_opie.patch [new file with mode: 0644] patch | blob
packages/konqueror/konqueror-embedded-20070316/konqueror.desktop [new file with mode: 0644] patch | blob
packages/konqueror/konqueror-embedded-20070316/konqueror.png [new file with mode: 0644] patch | blob
packages/konqueror/konqueror-embedded_20070212.bb [deleted file] patch | blob | history
packages/konqueror/konqueror-embedded_20070316.bb [new file with mode: 0644] patch | blob

diff --git a/packages/konqueror/konqueror-embedded-20070212/.mtn2git_empty b/packages/konqueror/konqueror-embedded-20070212/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch b/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch
deleted file mode 100644 (file)
index c9f40c8..0000000
--- a/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- ./acinclude.m4
-+++ ./acinclude.m4
-@@ -4937,31 +4937,11 @@ AC_DEFUN([KDE_SET_PREFIX],
-   AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
- 
-   KDE_SET_DEFAULT_BINDIRS
--  if test "x$prefix" = "xNONE"; then
--    dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it
--    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
--  else
--    dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH
--    kde_save_PATH="$PATH"
--    PATH="$exec_prefix/bin:$prefix/bin:$PATH"
--    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
--    PATH="$kde_save_PATH"
--  fi
--
--  kde_libs_prefix=`$KDECONFIG --prefix`
--  if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
--       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
--                    This means it has been moved since you installed it.
--                    This won't work. Please recompile kdelibs for the new prefix.
--                    ])
--  fi
--  kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
--  kde_libs_suffix=`$KDECONFIG --libsuffix`
- 
-   AC_MSG_CHECKING([where to install])
-   if test "x$prefix" = "xNONE"; then
-     prefix=$kde_libs_prefix
--    AC_MSG_RESULT([$prefix (as returned by kde-config)])
-+    AC_MSG_RESULT([$prefix (as NOT returned by kde-config)])
-   else
-     dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
-     given_prefix=$prefix
-@@ -4973,7 +4953,6 @@ AC_DEFUN([KDE_SET_PREFIX],
-   exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-   given_prefix=`echo "$given_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
- 
--  AC_SUBST(KDECONFIG)
-   AC_SUBST(kde_libs_prefix)
-   AC_SUBST(kde_libs_htmldir)
- 
diff --git a/packages/konqueror/konqueror-embedded-20070212/konqe-kapplication.patch b/packages/konqueror/konqueror-embedded-20070212/konqe-kapplication.patch
deleted file mode 100644 (file)
index 6feb006..0000000
--- a/packages/konqueror/konqueror-embedded-20070212/konqe-kapplication.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kdenox-orig/konq-embed/dropin/kapplication.h kdenox/konq-embed/dropin/kapplication.h
---- kdenox-orig/konq-embed/dropin/kapplication.h       2007-02-12 10:25:57.000000000 +0100
-+++ kdenox/konq-embed/dropin/kapplication.h    2007-03-15 06:07:32.000000000 +0100
-@@ -122,7 +122,7 @@
-    // required since kdelibs 3.4
-    void updateUserTimestamp(unsigned long = 0) {}
- 
--   static int KApplication::startDragDistance();
-+   static int startDragDistance();
- 
- signals:
-     // required by KHTMLView
diff --git a/packages/konqueror/konqueror-embedded-20070212/konqe_new_opie.patch b/packages/konqueror/konqueror-embedded-20070212/konqe_new_opie.patch
deleted file mode 100644 (file)
index 1079d23..0000000
--- a/packages/konqueror/konqueror-embedded-20070212/konqe_new_opie.patch
+++ /dev/null
@@ -1,756 +0,0 @@
-diff -urNd --exclude-from=excludelist kdenox/acinclude.m4 kdenox_new/acinclude.m4
---- kdenox/acinclude.m4        2007-02-12 22:26:21.000000000 +1300
-+++ kdenox_new/acinclude.m4    2007-02-25 22:00:27.000000000 +1300
-@@ -880,7 +880,7 @@
- )
- 
- AC_ARG_ENABLE(
--  embedded,
-+  rtti-embedded,
-   AC_HELP_STRING([--enable-rtti-embedded],[enable rtti support for Qt-embedded]),
-   kde_use_qt_emb_rtti=$enableval,
-   kde_use_qt_emb_rtti=no
-diff -urNd --exclude-from=excludelist kdenox/configure.in kdenox_new/configure.in
---- kdenox/configure.in        2007-02-12 22:26:21.000000000 +1300
-+++ kdenox_new/configure.in    2007-02-25 17:49:59.000000000 +1300
-@@ -60,10 +60,10 @@
- 
- 
- if test "x$want_qpe" = "xyes"; then
--    AC_PATH_QTOPIA(2.1.1)
-+    AC_PATH_QTOPIA(1.0.0)
-     dnl hack
-     CXXFLAGS="$CXXFLAGS -D_QT_QPE_"
--    LIB_QTOPIA="$LIB_QTOPIA -lqtopia -lqtopia2"
-+    dnl LIB_QTOPIA="$LIB_QTOPIA -lqtopia -lqtopia2"
- fi
- 
- dnl Checks for header files.
-diff -urNd --exclude-from=excludelist kdenox/configure.in.in kdenox_new/configure.in.in
---- kdenox/configure.in.in     2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/configure.in.in 2007-02-25 17:49:27.000000000 +1300
-@@ -56,10 +56,10 @@
- 
- 
- if test "x$want_qpe" = "xyes"; then
--    AC_PATH_QTOPIA(2.1.1)
-+    AC_PATH_QTOPIA(1.0.0)
-     dnl hack
-     CXXFLAGS="$CXXFLAGS -D_QT_QPE_"
--    LIB_QTOPIA="$LIB_QTOPIA -lqtopia -lqtopia2"
-+    dnl LIB_QTOPIA="$LIB_QTOPIA -lqtopia -lqtopia2"
- fi
- 
- dnl Checks for header files.
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kfiledialog.cpp kdenox_new/konq-embed/dropin/kfiledialog.cpp
---- kdenox/konq-embed/dropin/kfiledialog.cpp   2007-02-12 22:25:57.000000000 +1300
-+++ kdenox_new/konq-embed/dropin/kfiledialog.cpp       2007-02-24 03:29:25.000000000 +1300
-@@ -23,6 +23,7 @@
- 
- 
- #include "kfiledialog.h"
-+#include "kdebug.h"
- 
- #include <qlayout.h>
- #include <qconfig.h>
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp kdenox_new/konq-embed/dropin/kio/kprotocolmanager.cpp
---- kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp  2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/dropin/kio/kprotocolmanager.cpp      2007-02-24 03:32:31.000000000 +1300
-@@ -23,7 +23,9 @@
- */
- 
- #include "kprotocolmanager.h"
-+#include <kdebug.h>
- #include <kglobal.h>
-+#include <klocale.h>
- #include <kconfig.h>
- #include <ioslave_defaults.h>
- #include <kdeversion.h>
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/progressbase.cpp kdenox_new/konq-embed/dropin/kio/progressbase.cpp
---- kdenox/konq-embed/dropin/kio/progressbase.cpp      2007-02-12 22:25:56.000000000 +1300
-+++ kdenox_new/konq-embed/dropin/kio/progressbase.cpp  2007-02-24 03:33:10.000000000 +1300
-@@ -18,6 +18,7 @@
- 
- #include "jobclasses.h"
- #include "progressbase.h"
-+#include <kdebug.h>
- 
- //namespace KIO {
- 
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/ipkg/preinst kdenox_new/konq-embed/ipkg/preinst
---- kdenox/konq-embed/ipkg/preinst     1970-01-01 12:00:00.000000000 +1200
-+++ kdenox_new/konq-embed/ipkg/preinst 2007-02-25 21:20:10.000000000 +1300
-@@ -0,0 +1,15 @@
-+#!/bin/sh
-+
-+prefix=/usr/kde/3.5
-+prunefiles="lib/libkhtml.la lib/libkhtml.so lib/libkhtml.so.4.0.0"
-+prunefiles="$prunefiles lib/libkhtml.so.4"
-+prunefiles="$prunefiles lib/kjs_html.la lib/kjs_html.so"
-+
-+for _file in $prunefiles; do
-+    file=$PKG_ROOT/$prefix/$_file;
-+    if [ -f $file ]; then
-+        echo "found old file $_file from b0rked konqueror ipkg. removing."
-+      rm -f $file
-+    fi
-+done
-+
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h kdenox_new/konq-embed/kdesrc/kdecore/kmultipledrag.h
---- kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h   2007-02-12 21:31:39.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/kdecore/kmultipledrag.h       2007-02-25 16:15:28.000000000 +1300
-@@ -26,6 +26,8 @@
- #include <qvaluelist.h>
- #include "kdelibs_export.h"
- 
-+#define QPtrList QList
-+
- class KMultipleDragPrivate;
- /**
-  * This class makes it easy for applications to provide a drag object
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/css/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/css/Makefile.am
---- kdenox/konq-embed/kdesrc/khtml/css/Makefile.am     2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/css/Makefile.am 2007-02-25 16:36:23.000000000 +1300
-@@ -39,7 +39,7 @@
- INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
-  -I$(top_srcdir)/khtml -I$(top_srcdir)/libltdl -I$(top_srcdir) \
-  -I$(top_srcdir)/kwallet/client -I$(top_srcdir)/kutils \
-- -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes)
-+ -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes)
- 
- cssdir = $(kde_datadir)/khtml/css
- css_DATA = html4.css quirks.css
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/dom/Makefile.am
---- kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am     2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/dom/Makefile.am 2007-02-25 16:35:07.000000000 +1300
-@@ -47,7 +47,7 @@
- #     css_extensions.h
- 
- INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
-- -I$(top_srcdir)/khtml -I$(top_srcdir) -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes)
-+ -I$(top_srcdir)/khtml -I$(top_srcdir) -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes)
- 
- SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
- 
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/ecma/Makefile.am
---- kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am    2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/ecma/Makefile.am        2007-02-25 17:24:35.000000000 +1300
-@@ -16,7 +16,7 @@
- #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- #    Boston, MA 02110-1301, USA.
- 
--INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kio/bookmarks -I$(top_srcdir)/khtml -I$(top_srcdir)/khtml/java -I$(top_srcdir)/kwallet/client -I$(top_srcdir)/kutils -I$(top_builddir)/kjs -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes)
-+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kio/bookmarks -I$(top_srcdir)/khtml -I$(top_srcdir)/khtml/java -I$(top_srcdir)/kwallet/client -I$(top_srcdir)/kutils -I$(top_builddir)/kjs -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes)
- 
- KDE_CXXFLAGS = $(USE_EXCEPTIONS)
- 
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp kdenox_new/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp
---- kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp     2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp 2007-02-25 17:27:39.000000000 +1300
-@@ -38,6 +38,10 @@
- #include <qobject.h>
- #include <kdebug.h>
- 
-+#if (QT_VERSION < 0x030000)
-+#include "qt3regexp.h"
-+#endif
-+
- #ifdef APPLE_CHANGES
- #include "KWQLoader.h"
- #else
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/html/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/html/Makefile.am
---- kdenox/konq-embed/kdesrc/khtml/html/Makefile.am    2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/html/Makefile.am        2007-02-25 16:39:50.000000000 +1300
-@@ -43,7 +43,7 @@
-  -I$(top_srcdir)/kio/kssl \
-  -I$(top_srcdir)/kjs -I$(top_srcdir)/khtml -I$(top_srcdir) \
-  -I$(top_srcdir)/kwallet/client -I$(top_srcdir)/kutils \
-- -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes)
-+ -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes)
- 
- # Use "make doctypes" to regenerate doctypes.cpp from doctypes.gperf
- doctypes: $(srcdir)/doctypes.gperf $(srcdir)/Makefile.am
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp kdenox_new/konq-embed/kdesrc/khtml/khtml_part.cpp
---- kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp      2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/khtml_part.cpp  2007-02-25 17:22:46.000000000 +1300
-@@ -3221,14 +3221,14 @@
-         {
-           khtml::RenderTextArea *parent= static_cast<khtml::RenderTextArea *>(obj->parent());
-           s = parent->text();
--          s = s.replace(0xa0, ' ');
-+          s = s.replace(QRegExp(QString(QChar(0xa0))), ' ');
-           tmpTextArea = parent;
-         }
-         else if ( renderLineText )
-         {
-           khtml::RenderLineEdit *parentLine= static_cast<khtml::RenderLineEdit *>(obj);
-           s = parentLine->widget()->text();
--          s = s.replace(0xa0, ' ');
-+          s = s.replace(QRegExp(QString(QChar(0xa0))), ' ');
-         }
-         else if ( obj->isText() )
-         {
-@@ -3256,7 +3256,7 @@
-           if ( isLink && obj->parent()!=tmpTextArea )
-           {
-             s = static_cast<khtml::RenderText *>(obj)->data().string();
--            s = s.replace(0xa0, ' ');
-+            s = s.replace(QRegExp(QString(QChar(0xa0))), ' ');
-           }
-         }
-         else if ( obj->isBR() )
-@@ -6785,9 +6785,9 @@
-     // get selected text and paste to the clipboard
- #ifndef QT_NO_CLIPBOARD
-     QString text = selectedText();
--    text.replace(QChar(0xa0), ' ');
-+    text.replace(QRegExp(QString(QChar(0xa0))), " ");
-     disconnect( kapp->clipboard(), SIGNAL( selectionChanged()), this, SLOT( slotClearSelection()));
--    kapp->clipboard()->setText(text,QClipboard::Selection);
-+    kapp->clipboard()->setText(text);
-     connect( kapp->clipboard(), SIGNAL( selectionChanged()), SLOT( slotClearSelection()));
- #endif
-     //kdDebug( 6000 ) << "selectedText = " << text << endl;
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/misc/Makefile.am
---- kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am    2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/misc/Makefile.am        2007-02-25 16:33:47.000000000 +1300
-@@ -32,7 +32,7 @@
-       stringit.h htmlhashes.h helper.h shared.h arena.h 
- 
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/dcop -I$(top_srcdir)/kio -I$(top_srcdir)/libltdl \
--           -I$(top_srcdir)/khtml -I$(top_srcdir)/kutils -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes)
-+           -I$(top_srcdir)/khtml -I$(top_srcdir)/kutils -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes)
- 
- SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
- 
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/rendering/Makefile.am
---- kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am       2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/rendering/Makefile.am   2007-02-25 16:40:50.000000000 +1300
-@@ -42,7 +42,7 @@
-       render_generated.h enumerate.h
- 
- INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
-- -I$(top_srcdir)/kfile -I$(top_srcdir)/khtml -I$(top_srcdir)/kutils -I$(top_srcdir) -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes)
-+ -I$(top_srcdir)/kfile -I$(top_srcdir)/khtml -I$(top_srcdir)/kutils -I$(top_srcdir) -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes)
- 
- SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
- 
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h kdenox_new/konq-embed/kdesrc/khtml/rendering/render_layer.h
---- kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h    2007-02-12 21:31:42.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/rendering/render_layer.h        2007-02-25 16:56:00.000000000 +1300
-@@ -46,12 +46,14 @@
- 
- #include <qcolor.h>
- #include <qrect.h>
-+#include <qtextstream.h>
- #include <assert.h>
- 
- #include "render_object.h"
- 
- class QScrollBar;
--template <class T> class QPtrVector;
-+template <class T> class QVector;
-+#define QPtrVector QVector
- 
- namespace khtml {
-     class RenderStyle;
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp kdenox_new/konq-embed/kdesrc/khtml/rendering/render_object.cpp
---- kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp 2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/rendering/render_object.cpp     2007-02-25 16:44:58.000000000 +1300
-@@ -46,6 +46,7 @@
- #include <kdebug.h>
- #include <kglobal.h>
- #include <qpainter.h>
-+#include <qtextstream.h>
- #include "khtmlview.h"
- #include <khtml_part.h>
- 
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h kdenox_new/konq-embed/kdesrc/khtml/rendering/render_table.h
---- kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h    2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/rendering/render_table.h        2007-02-25 16:56:49.000000000 +1300
-@@ -30,6 +30,7 @@
- #include <qcolor.h>
- #include <qptrvector.h>
- #include <qmemarray.h>
-+#include <qtextstream.h>
- 
- #include "rendering/render_box.h"
- #include "rendering/render_block.h"
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h kdenox_new/konq-embed/kdesrc/khtml/rendering/render_text.h
---- kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h     2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/rendering/render_text.h 2007-02-25 16:46:39.000000000 +1300
-@@ -31,6 +31,7 @@
- #include "rendering/render_line.h"
- 
- #include <qptrvector.h>
-+#include <qtextstream.h>
- #include <assert.h>
- 
- class QPainter;
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/xml/Makefile.am
---- kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am     2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/xml/Makefile.am 2007-02-25 16:38:27.000000000 +1300
-@@ -37,7 +37,7 @@
- 
- INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
-  -I$(top_srcdir)/khtml -I$(top_srcdir) -I$(top_srcdir)/kwallet/client \
-- -I$(top_srcdir)/kutils -I$(top_builddir)/kjs -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes)
-+ -I$(top_srcdir)/kutils -I$(top_builddir)/kjs -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes)
- 
- SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
- 
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.cpp kdenox_new/konq-embed/kdesrc/kjs/dtoa.cpp
---- kdenox/konq-embed/kdesrc/kjs/dtoa.cpp      2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/kjs/dtoa.cpp  2007-02-25 18:22:33.000000000 +1300
-@@ -1,4 +1,9 @@
--#ifndef KONQ_EMBEDDED
-+#include <config.h>
-+
-+#ifdef KONQ_EMBEDDED
-+#include "stdlib.h"
-+extern "C" double kjs_strtod(const char *s00, char **se) { return strtod(s00,se); }
-+#else
- /****************************************************************
-  *
-  * The author of this software is David M. Gay.
-@@ -175,8 +180,6 @@
- #undef CONST
- #endif
- 
--#include <config.h>
--
- #include "stdlib.h"
- 
- #ifdef WORDS_BIGENDIAN
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.h kdenox_new/konq-embed/kdesrc/kjs/dtoa.h
---- kdenox/konq-embed/kdesrc/kjs/dtoa.h        2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/kjs/dtoa.h    2007-02-25 18:20:51.000000000 +1300
-@@ -23,14 +23,11 @@
- #ifndef _KJS_DTOA_H_
- #define _KJS_DTOA_H_
- 
--#ifndef KONQ_EMBEDDED
- extern "C" double kjs_strtod(const char *s00, char **se);
-+#ifndef KONQ_EMBEDDED
- extern "C" char *kjs_dtoa(double d, int mode, int ndigits,
-                         int *decpt, int *sign, char **rve);
- extern "C" void kjs_freedtoa(char *s);
--#else
--#include "stdlib.h"
--extern "C" double kjs_strtod(const char *s00, char **se) { return strtod(s00,se); }
- #endif
--
-+         
- #endif /* _KJS_DTOA_H */
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/number_object.cpp kdenox_new/konq-embed/kdesrc/kjs/number_object.cpp
---- kdenox/konq-embed/kdesrc/kjs/number_object.cpp     2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/kjs/number_object.cpp 2007-02-25 18:05:36.000000000 +1300
-@@ -20,6 +20,8 @@
-  *
-  */
- 
-+#include <config.h>
-+
- #include "value.h"
- #include "object.h"
- #include "types.h"
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/ustring.cpp kdenox_new/konq-embed/kdesrc/kjs/ustring.cpp
---- kdenox/konq-embed/kdesrc/kjs/ustring.cpp   2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/kjs/ustring.cpp       2007-02-25 18:10:22.000000000 +1300
-@@ -21,9 +21,7 @@
-  *
-  */
- 
--#ifdef HAVE_CONFIG_H
- #include <config.h>
--#endif
- 
- #include <stdlib.h>
- #include <stdio.h>
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/actions/konqe.rc kdenox_new/konq-embed/src/actions/konqe.rc
---- kdenox/konq-embed/src/actions/konqe.rc     1970-01-01 12:00:00.000000000 +1200
-+++ kdenox_new/konq-embed/src/actions/konqe.rc 2007-02-25 21:20:10.000000000 +1300
-@@ -0,0 +1,107 @@
-+<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-+<kpartgui name="konqe" version="1">
-+<Create>
-+ <Action name="file_new" stdAction="true" icon="filenew.png"/>
-+ <Action name="file_open" stdAction="true" icon="fileopen.png"/>
-+ <Action name="file_save" stdAction="true" icon="filesave.png"/>
-+ <Action name="file_save_as" stdAction="true" icon="filesaveas.png"/>
-+ <Action name="file_print" stdAction="true" icon="fileprint.png"/>
-+ <Action name="go_home" stdAction="true" icon="gohome.png"/>
-+ <Action name="go_back" stdAction="true" icon="back.png"/>
-+ <Action name="go_forward" stdAction="true" icon="forward.png"/>
-+ <Action name="edit_undo" stdAction="true" icon="undo.png"/>
-+ <Action name="edit_redo" stdAction="true" icon="redo.png"/>
-+ <Action name="edit_cut" stdAction="true" icon="editcut.png"/>
-+ <Action name="edit_copy" stdAction="true" icon="editcopy.png"/>
-+ <Action name="edit_paste" stdAction="true" icon="editpaste.png"/>
-+ <Action name="edit_find" stdAction="true" icon="find.png"/>
-+ <Action name="view_redisplay" stdAction="true" icon="reload.png"/>
-+ <Action name="view_zoom" stdAction="true" popupMenu="true" icon="viewmag.png"/>
-+ <Action name="bookmark_add" stdAction="true" icon="bookmark_add.png"/>
-+ <Action name="bookmark_edit" stdAction="true" accel="" icon="bookmark.png"/>
-+ <Action name="options_configure" stdAction="true" icon="configure.png"/>
-+</Create>
-+<Create>
-+ <Action name="windows" popupMenu="true" icon="window_list.png">
-+  <text>Windows List</text>
-+ </Action>
-+ <Action name="view_close" accel="Ctrl+W" icon="fileclose.png">
-+  <text>Close View</text>
-+ </Action>
-+ <Action name="view_next" accel="Ctrl+Tab" icon="2rightarrow.png">
-+  <text>Next View</text>
-+ </Action>
-+ <Action name="view_autoload_images" toggle="true">
-+  <text>Autoload Images</text>
-+ </Action>
-+ <Action name="go_stop" icon="stop.png">
-+  <text>Stop Loading</text>
-+ </Action>
-+ <Action name="info_security" icon="lock.png">
-+  <text>Show Security Information</text>
-+ </Action>
-+ <Action name="options_show_location" accel="F11" toggle="true">
-+  <text>Show Location Bar</text>
-+ </Action>
-+ <Action name="options_show_sidebar" accel="F12" toggle="true">
-+  <text>Show Side Bar</text>
-+ </Action>
-+ <Action name="options_show_statusbar" stdAction="true" accel="F10"/>
-+ <Action name="main_menu" popupMenu="true" icon="gear.png">
-+  <text>Main Menu</text>
-+ </Action>
-+ <Action name="view_load_images" icon="images_display.png">
-+  <text>Load Images</text>
-+ </Action>
-+</Create>
-+<Menu name="main_menu">
-+ <Action name="file_new"/>
-+ <Separator/>
-+ <Action name="view_autoload_images"/>
-+ <Action name="options_show_statusbar"/>
-+ <Action name="options_show_location"/>
-+ <Action name="options_show_sidebar"/>
-+ <Separator/>
-+ <Action name="edit_find"/>
-+ <Separator/>
-+ <Action name="options_configure"/>
-+ <Separator/>
-+ <Action name="bookmark_add"/>
-+ <Action name="bookmark_edit"/>
-+ <Action name="bookmarks"/>
-+ <Separator/>
-+ <Action name="view_next"/>
-+ <Action name="view_close"/>
-+</Menu>
-+<ToolBar name="main_bar">
-+ <Action name="main_menu"/>
-+ <ToolBar name="browser_bar"/>
-+ <ToolBar name="edit_bar"/>
-+ <Spacer/>
-+ <Action name="windows"/>
-+</ToolBar>
-+<ToolBar name="browser_bar" newline="true">
-+ <Action name="file_print"/>
-+ <Action name="go_back"/>
-+ <Action name="go_forward"/>
-+ <Action name="go_home"/>
-+ <Action name="view_redisplay"/>
-+ <Action name="go_stop"/>
-+ <Separator/>
-+ <Action name="info_security"/>
-+ <Action name="view_zoom"/>
-+ <Action name="view_load_images"/>
-+</ToolBar>
-+<ToolBar name="edit_bar" newline="true">
-+ <Action name="file_open"/>
-+ <Action name="file_save"/>
-+ <Action name="file_save_as"/>
-+ <Action name="file_print"/>
-+ <Separator/>
-+ <Action name="edit_undo"/>
-+ <Action name="edit_redo"/>
-+ <Action name="edit_cut"/>
-+ <Action name="edit_copy"/>
-+ <Action name="edit_paste"/>
-+</ToolBar>
-+</kpartgui>
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditimpl.cc kdenox_new/konq-embed/src/bookmarkeditimpl.cc
---- kdenox/konq-embed/src/bookmarkeditimpl.cc  2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/bookmarkeditimpl.cc      2007-02-25 19:17:29.000000000 +1300
-@@ -24,6 +24,8 @@
- 
- #include "bookmarkeditimpl.h"
- 
-+#include <config.h>
-+
- #if defined(ENABLE_BOOKMARKS)
- 
- #include "mainwindowbase.h"
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditor.cc kdenox_new/konq-embed/src/bookmarkeditor.cc
---- kdenox/konq-embed/src/bookmarkeditor.cc    2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/bookmarkeditor.cc        2007-02-25 17:40:34.000000000 +1300
-@@ -16,6 +16,8 @@
- #include <qimage.h>
- #include <qpixmap.h>
- 
-+#include <kstandarddirs.h>
-+
- namespace
- {
- QPixmap getPngPixmap( const QString &name )
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierarchical.cc kdenox_new/konq-embed/src/bookmarkeditorhierarchical.cc
---- kdenox/konq-embed/src/bookmarkeditorhierarchical.cc        2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/bookmarkeditorhierarchical.cc    2007-02-25 20:46:27.000000000 +1300
-@@ -22,11 +22,20 @@
- 
- */
- 
-+#include <config.h>
-+
- #if defined(ENABLE_BOOKMARKS)
- 
-+#include <xmltree.h>
-+#include <qtoolbutton.h>
-+#include <qlineedit.h>
-+#include <qlabel.h>
-+
- #include "bookmarkeditorhierarchical.h"
- #include <assert.h>
- #include "bookmarks.h"
-+#include "bookmarkeditimpl.h"
-+
- 
- //////// HELPER FUNCTIONS /////////////////////////////////
- namespace {
-@@ -204,7 +213,7 @@
- void BookmarkEditorHierarchical::newFolder()
- {
-     BookmarkEdit *edit = new BookmarkEdit( this );
--    edit->setCaption( i18n( "New Folder" ) );
-+    edit->setCaption( tr( "New Folder" ) );
-     edit->location->setEnabled(false);
-     edit->location->hide();
-     edit->TextLabel2->hide();
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierarchical.h kdenox_new/konq-embed/src/bookmarkeditorhierarchical.h
---- kdenox/konq-embed/src/bookmarkeditorhierarchical.h 2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/bookmarkeditorhierarchical.h     2007-02-25 18:27:17.000000000 +1300
-@@ -22,9 +22,10 @@
- #ifndef __bookmarkeditorhierarchical_h__
- #define __bookmarkeditorhierarchical_h__
- 
-+#include <config.h>
-+
- #if defined(ENABLE_BOOKMARKS)
- 
--#include <config.h>
- #include "bookmarkeditorimpl.h"
- 
- class XMLElement;
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorimpl.cc kdenox_new/konq-embed/src/bookmarkeditorimpl.cc
---- kdenox/konq-embed/src/bookmarkeditorimpl.cc        2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/bookmarkeditorimpl.cc    2007-02-25 19:16:40.000000000 +1300
-@@ -23,12 +23,12 @@
- 
- #include "bookmarkeditorimpl.h"
- 
-+#include <config.h>
-+
- #if defined(ENABLE_BOOKMARKS)
- 
- #include "bookmarkeditimpl.h"
- 
--#include <config.h>
--
- #include "bookmarks.h"
- #include "xmltree.h"
- 
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.cc kdenox_new/konq-embed/src/bookmarks.cc
---- kdenox/konq-embed/src/bookmarks.cc 2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/bookmarks.cc     2007-02-25 18:28:08.000000000 +1300
-@@ -24,6 +24,8 @@
- 
- #if defined(ENABLE_BOOKMARKS)
- 
-+#warning BOOKMARKS ARE ENABLED
-+
- #include "bookmarks.h"
- #include "xmltree.h"
- #include "mainwindowbase.h"
-@@ -39,6 +41,7 @@
- #include <qstring.h>
- #include <qwidget.h>
- #include <qfile.h>
-+#include <qtimer.h>
- 
- #include <klocale.h>
- #include <kstandarddirs.h>
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.h kdenox_new/konq-embed/src/bookmarks.h
---- kdenox/konq-embed/src/bookmarks.h  2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/bookmarks.h      2007-02-25 18:26:32.000000000 +1300
-@@ -34,6 +34,8 @@
- 
- #include <kurl.h>
- 
-+#define QPtrList QList
-+
- class QPopupMenu;
- class XMLElement;
- class ActionMenu;
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.cc kdenox_new/konq-embed/src/mainwindow_qpe.cc
---- kdenox/konq-embed/src/mainwindow_qpe.cc    2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/mainwindow_qpe.cc        2007-02-25 17:46:32.000000000 +1300
-@@ -90,7 +90,7 @@
-     return iconSet;
- }
- 
--void MainWindowBase::statusJustText( const QString &_msg, bool )
-+void MainWindowQPE::statusJustText( const QString &_msg, bool )
- {
-     QString msg = _msg;
-     msg.replace( QRegExp( "</?qt>" ), QString::null );
-@@ -99,7 +99,7 @@
-     Global::statusMessage( msg );
- }
- 
--void MainWindowBase::statusMessage( const QString &_msg, bool visible )
-+void MainWindowQPE::statusMessage( const QString &_msg, bool visible )
- {
-     statusJustText( _msg, visible );
- }
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.h kdenox_new/konq-embed/src/mainwindow_qpe.h
---- kdenox/konq-embed/src/mainwindow_qpe.h     2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/mainwindow_qpe.h 2007-02-25 17:47:23.000000000 +1300
-@@ -39,6 +39,10 @@
- 
- protected:
-     virtual QIconSet loadPixmap( const char * const xpm[] );
-+
-+protected slots:
-+    virtual void statusJustText( const QString &msg, bool visible );
-+    virtual void statusMessage( const QString &msg, bool visible );
- };
- 
- #endif
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_road.cc kdenox_new/konq-embed/src/mainwindow_road.cc
---- kdenox/konq-embed/src/mainwindow_road.cc   2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/mainwindow_road.cc       2007-02-25 20:32:12.000000000 +1300
-@@ -20,10 +20,11 @@
- 
- #ifdef KONQ_GUI_ROAD
- 
-+#include <config.h>
-+
- #include "mainwindow_road.h"
- #include "popupaction.h"
- 
--
- #include <qpopupmenu.h>
- #include <qtoolbar.h>
- #include <qaction.h>
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_x11.cc kdenox_new/konq-embed/src/mainwindow_x11.cc
---- kdenox/konq-embed/src/mainwindow_x11.cc    2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/mainwindow_x11.cc        2007-02-25 20:33:10.000000000 +1300
-@@ -21,6 +21,8 @@
- 
- // Implementation of the X11 GUI
- 
-+#include <config.h>
-+
- #include "mainwindow_x11.h"
- #include "popupaction.h"
- 
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.cc kdenox_new/konq-embed/src/roadtabbar.cc
---- kdenox/konq-embed/src/roadtabbar.cc        2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/roadtabbar.cc    2007-02-25 17:44:19.000000000 +1300
-@@ -18,6 +18,9 @@
-     Boston, MA 02110-1301, USA.
- */
- 
-+#include <qaction.h>
-+#include <kconfig.h>
-+
- #include "roadtabbar.h"
- 
- RoadTabParams::RoadTabParams( const QIconSet &defaultIS, const QIconSet &loadingIS,
-@@ -114,12 +117,12 @@
- 
- void RoadTabBar::initContextMenu()
- {
--    QAction *qa = new QAction( QString::null, i18n( "&Close Tab" ), 0, this, "contextTabClose" );
-+    QAction *qa = new QAction( QString::null, tr( "&Close Tab" ), 0, this, "contextTabClose" );
-     connect( qa, SIGNAL( activated() ), this, SLOT( contextClose() ) );
-     qa->addTo( &m_contextMenu );
-     m_contextMenuCloseId = m_contextMenu.idAt( 0 );
- 
--    qa = new QAction( QString::null, i18n( "&New tab" ), 0, this, "contextTabNew" );
-+    qa = new QAction( QString::null, tr( "&New tab" ), 0, this, "contextTabNew" );
-     connect( qa, SIGNAL( activated() ), this, SIGNAL( requestNewView() ) );
-     qa->addTo( &m_contextMenu );
- }
-@@ -184,7 +187,7 @@
- {
-     QString caption( text );
-     if ( caption.isEmpty() )
--        caption = i18n( "Blank" );
-+        caption = tr( "Blank" );
-     // the caption may not exceed a given width, so shorten it if necessary
-     // the following is inefficient, but clear, correct, and unlikely to be a bottleneck
-     if ( m_params.fontMetrics.width( caption ) > m_params.maxWidth )
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.h kdenox_new/konq-embed/src/roadtabbar.h
---- kdenox/konq-embed/src/roadtabbar.h 2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/roadtabbar.h     2007-02-25 17:42:40.000000000 +1300
-@@ -22,6 +22,9 @@
- #define __roadtabbar_h__
- 
- #include <qtabbar.h>
-+#include <qpopupmenu.h>
-+
-+#include "view.h"
- 
- struct RoadTabParams
- {
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/run.cc kdenox_new/konq-embed/src/run.cc
---- kdenox/konq-embed/src/run.cc       2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/run.cc   2007-02-25 17:34:35.000000000 +1300
-@@ -24,6 +24,7 @@
- #include "view.h"
- 
- #include <khtml_part.h>
-+#include <khtml_ext.h>
- 
- Run::Run( View *view, const KURL &url, const KParts::URLArgs &args )
-     : KHTMLRun( static_cast<KHTMLPart *>(view->part()), 0,
-@@ -48,7 +49,7 @@
- //            if ( isTextExecutable(mimeType) )
- //                mimeType = QString::fromLatin1("text/plain"); // view, don't execute
-             QString suggestedFilename = m_strURL.filename(); 
--            KHTMLPopupGUIClient::saveURL( part()->widget(), i18n( "Save As" ), m_strURL, urlArgs().metaData(), QString::null, 0, suggestedFilename, type );
-+            KHTMLPopupGUIClient::saveURL( part()->widget(), QObject::tr( "Save As" ), m_strURL, urlArgs().metaData(), QString::null, 0, suggestedFilename, type );
- 
-             m_bFinished = true;
-             emit error();
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/khtml/khtml_ext.cpp kdenox_new/konq-embed/dropin/khtml/khtml_ext.cpp
---- kdenox/konq-embed/dropin/khtml/khtml_ext.cpp       2007-02-12 22:25:56.000000000 +1300
-+++ kdenox_new/konq-embed/dropin/khtml/khtml_ext.cpp   2007-02-24 03:38:24.000000000 +1300
-@@ -115,7 +115,8 @@
-                                    const QString &filter, long cacheId,
-                                    const QString & suggestedFilename, const QString& mimeType )
- {
--  QString name = QString::fromLatin1( "index.html" );
-+/*
-+QString name = QString::fromLatin1( "index.html" );
-   if ( !suggestedFilename.isEmpty() )
-     name = suggestedFilename;
-   else if ( !url.fileName().isEmpty() )
-@@ -166,6 +167,7 @@
- 
-   if ( destURL.isValid() )
-     saveURL(url, destURL, metadata, cacheId, f);
-+*/
- }
- 
- void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
diff --git a/packages/konqueror/konqueror-embedded-20070212/konqueror.desktop b/packages/konqueror/konqueror-embedded-20070212/konqueror.desktop
deleted file mode 100644 (file)
index 1f47311..0000000
--- a/packages/konqueror/konqueror-embedded-20070212/konqueror.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Exec=konqueror
-Icon=konqueror/konqueror
-Type=Application
-Name=konqueror
-Comment=Konqueror browser
diff --git a/packages/konqueror/konqueror-embedded-20070212/konqueror.png b/packages/konqueror/konqueror-embedded-20070212/konqueror.png
deleted file mode 100644 (file)
index 879d470..0000000
Binary files a/packages/konqueror/konqueror-embedded-20070212/konqueror.png and /dev/null differ
diff --git a/packages/konqueror/konqueror-embedded-20070316/.mtn2git_empty b/packages/konqueror/konqueror-embedded-20070316/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/konqueror/konqueror-embedded-20070316/dont-use-kde-config.patch b/packages/konqueror/konqueror-embedded-20070316/dont-use-kde-config.patch
new file mode 100644 (file)
index 0000000..c9f40c8
--- /dev/null
+++ b/packages/konqueror/konqueror-embedded-20070316/dont-use-kde-config.patch
@@ -0,0 +1,43 @@
+--- ./acinclude.m4
++++ ./acinclude.m4
+@@ -4937,31 +4937,11 @@ AC_DEFUN([KDE_SET_PREFIX],
+   AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
+ 
+   KDE_SET_DEFAULT_BINDIRS
+-  if test "x$prefix" = "xNONE"; then
+-    dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it
+-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
+-  else
+-    dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH
+-    kde_save_PATH="$PATH"
+-    PATH="$exec_prefix/bin:$prefix/bin:$PATH"
+-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
+-    PATH="$kde_save_PATH"
+-  fi
+-
+-  kde_libs_prefix=`$KDECONFIG --prefix`
+-  if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
+-       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
+-                    This means it has been moved since you installed it.
+-                    This won't work. Please recompile kdelibs for the new prefix.
+-                    ])
+-  fi
+-  kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
+-  kde_libs_suffix=`$KDECONFIG --libsuffix`
+ 
+   AC_MSG_CHECKING([where to install])
+   if test "x$prefix" = "xNONE"; then
+     prefix=$kde_libs_prefix
+-    AC_MSG_RESULT([$prefix (as returned by kde-config)])
++    AC_MSG_RESULT([$prefix (as NOT returned by kde-config)])
+   else
+     dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
+     given_prefix=$prefix
+@@ -4973,7 +4953,6 @@ AC_DEFUN([KDE_SET_PREFIX],
+   exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
+   given_prefix=`echo "$given_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
+ 
+-  AC_SUBST(KDECONFIG)
+   AC_SUBST(kde_libs_prefix)
+   AC_SUBST(kde_libs_htmldir)
+ 
diff --git a/packages/konqueror/konqueror-embedded-20070316/konqe-kapplication.patch b/packages/konqueror/konqueror-embedded-20070316/konqe-kapplication.patch
new file mode 100644 (file)
index 0000000..6feb006
--- /dev/null
+++ b/packages/konqueror/konqueror-embedded-20070316/konqe-kapplication.patch
@@ -0,0 +1,12 @@
+diff -Naur kdenox-orig/konq-embed/dropin/kapplication.h kdenox/konq-embed/dropin/kapplication.h
+--- kdenox-orig/konq-embed/dropin/kapplication.h       2007-02-12 10:25:57.000000000 +0100
++++ kdenox/konq-embed/dropin/kapplication.h    2007-03-15 06:07:32.000000000 +0100
+@@ -122,7 +122,7 @@
+    // required since kdelibs 3.4
+    void updateUserTimestamp(unsigned long = 0) {}
+ 
+-   static int KApplication::startDragDistance();
++   static int startDragDistance();
+ 
+ signals:
+     // required by KHTMLView
diff --git a/packages/konqueror/konqueror-embedded-20070316/konqe_new_opie.patch b/packages/konqueror/konqueror-embedded-20070316/konqe_new_opie.patch
new file mode 100644 (file)
index 0000000..a662acb
--- /dev/null
+++ b/packages/konqueror/konqueror-embedded-20070316/konqe_new_opie.patch
@@ -0,0 +1,756 @@
+diff -urNd --exclude-from=excludelist kdenox/acinclude.m4 kdenox/acinclude.m4
+--- kdenox/acinclude.m4        2007-02-12 22:26:21.000000000 +1300
++++ kdenox/acinclude.m4        2007-02-25 22:00:27.000000000 +1300
+@@ -880,7 +880,7 @@
+ )
+ 
+ AC_ARG_ENABLE(
+-  embedded,
++  rtti-embedded,
+   AC_HELP_STRING([--enable-rtti-embedded],[enable rtti support for Qt-embedded]),
+   kde_use_qt_emb_rtti=$enableval,
+   kde_use_qt_emb_rtti=no
+diff -urNd --exclude-from=excludelist kdenox/configure.in kdenox/configure.in
+--- kdenox/configure.in        2007-02-12 22:26:21.000000000 +1300
++++ kdenox/configure.in        2007-02-25 17:49:59.000000000 +1300
+@@ -60,10 +60,10 @@
+ 
+ 
+ if test "x$want_qpe" = "xyes"; then
+-    AC_PATH_QTOPIA(2.1.1)
++    AC_PATH_QTOPIA(1.0.0)
+     dnl hack
+     CXXFLAGS="$CXXFLAGS -D_QT_QPE_"
+-    LIB_QTOPIA="$LIB_QTOPIA -lqtopia -lqtopia2"
++    dnl LIB_QTOPIA="$LIB_QTOPIA -lqtopia -lqtopia2"
+ fi
+ 
+ dnl Checks for header files.
+diff -urNd --exclude-from=excludelist kdenox/configure.in.in kdenox/configure.in.in
+--- kdenox/configure.in.in     2007-02-12 22:26:20.000000000 +1300
++++ kdenox/configure.in.in     2007-02-25 17:49:27.000000000 +1300
+@@ -56,10 +56,10 @@
+ 
+ 
+ if test "x$want_qpe" = "xyes"; then
+-    AC_PATH_QTOPIA(2.1.1)
++    AC_PATH_QTOPIA(1.0.0)
+     dnl hack
+     CXXFLAGS="$CXXFLAGS -D_QT_QPE_"
+-    LIB_QTOPIA="$LIB_QTOPIA -lqtopia -lqtopia2"
++    dnl LIB_QTOPIA="$LIB_QTOPIA -lqtopia -lqtopia2"
+ fi
+ 
+ dnl Checks for header files.
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kfiledialog.cpp kdenox/konq-embed/dropin/kfiledialog.cpp
+--- kdenox/konq-embed/dropin/kfiledialog.cpp   2007-02-12 22:25:57.000000000 +1300
++++ kdenox/konq-embed/dropin/kfiledialog.cpp   2007-02-24 03:29:25.000000000 +1300
+@@ -23,6 +23,7 @@
+ 
+ 
+ #include "kfiledialog.h"
++#include "kdebug.h"
+ 
+ #include <qlayout.h>
+ #include <qconfig.h>
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp
+--- kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp  2007-02-12 22:25:55.000000000 +1300
++++ kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp  2007-02-24 03:32:31.000000000 +1300
+@@ -23,7 +23,9 @@
+ */
+ 
+ #include "kprotocolmanager.h"
++#include <kdebug.h>
+ #include <kglobal.h>
++#include <klocale.h>
+ #include <kconfig.h>
+ #include <ioslave_defaults.h>
+ #include <kdeversion.h>
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/progressbase.cpp kdenox/konq-embed/dropin/kio/progressbase.cpp
+--- kdenox/konq-embed/dropin/kio/progressbase.cpp      2007-02-12 22:25:56.000000000 +1300
++++ kdenox/konq-embed/dropin/kio/progressbase.cpp      2007-02-24 03:33:10.000000000 +1300
+@@ -18,6 +18,7 @@
+ 
+ #include "jobclasses.h"
+ #include "progressbase.h"
++#include <kdebug.h>
+ 
+ //namespace KIO {
+ 
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/ipkg/preinst kdenox/konq-embed/ipkg/preinst
+--- kdenox/konq-embed/ipkg/preinst     1970-01-01 12:00:00.000000000 +1200
++++ kdenox/konq-embed/ipkg/preinst     2007-02-25 21:20:10.000000000 +1300
+@@ -0,0 +1,15 @@
++#!/bin/sh
++
++prefix=/usr/kde/3.5
++prunefiles="lib/libkhtml.la lib/libkhtml.so lib/libkhtml.so.4.0.0"
++prunefiles="$prunefiles lib/libkhtml.so.4"
++prunefiles="$prunefiles lib/kjs_html.la lib/kjs_html.so"
++
++for _file in $prunefiles; do
++    file=$PKG_ROOT/$prefix/$_file;
++    if [ -f $file ]; then
++        echo "found old file $_file from b0rked konqueror ipkg. removing."
++      rm -f $file
++    fi
++done
++
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h
+--- kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h   2007-02-12 21:31:39.000000000 +1300
++++ kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h   2007-02-25 16:15:28.000000000 +1300
+@@ -26,6 +26,8 @@
+ #include <qvaluelist.h>
+ #include "kdelibs_export.h"
+ 
++#define QPtrList QList
++
+ class KMultipleDragPrivate;
+ /**
+  * This class makes it easy for applications to provide a drag object
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/css/Makefile.am kdenox/konq-embed/kdesrc/khtml/css/Makefile.am
+--- kdenox/konq-embed/kdesrc/khtml/css/Makefile.am     2007-02-12 22:26:20.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/css/Makefile.am     2007-02-25 16:36:23.000000000 +1300
+@@ -39,7 +39,7 @@
+ INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
+  -I$(top_srcdir)/khtml -I$(top_srcdir)/libltdl -I$(top_srcdir) \
+  -I$(top_srcdir)/kwallet/client -I$(top_srcdir)/kutils \
+- -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes)
++ -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes)
+ 
+ cssdir = $(kde_datadir)/khtml/css
+ css_DATA = html4.css quirks.css
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am
+--- kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am     2007-02-12 22:26:20.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am     2007-02-25 16:35:07.000000000 +1300
+@@ -47,7 +47,7 @@
+ #     css_extensions.h
+ 
+ INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
+- -I$(top_srcdir)/khtml -I$(top_srcdir) -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes)
++ -I$(top_srcdir)/khtml -I$(top_srcdir) -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes)
+ 
+ SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
+ 
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am
+--- kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am    2007-02-12 22:26:20.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am    2007-02-25 17:24:35.000000000 +1300
+@@ -16,7 +16,7 @@
+ #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ #    Boston, MA 02110-1301, USA.
+ 
+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kio/bookmarks -I$(top_srcdir)/khtml -I$(top_srcdir)/khtml/java -I$(top_srcdir)/kwallet/client -I$(top_srcdir)/kutils -I$(top_builddir)/kjs -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes)
++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kio/bookmarks -I$(top_srcdir)/khtml -I$(top_srcdir)/khtml/java -I$(top_srcdir)/kwallet/client -I$(top_srcdir)/kutils -I$(top_builddir)/kjs -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes)
+ 
+ KDE_CXXFLAGS = $(USE_EXCEPTIONS)
+ 
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp
+--- kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp     2007-02-12 22:26:20.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp     2007-02-25 17:27:39.000000000 +1300
+@@ -38,6 +38,10 @@
+ #include <qobject.h>
+ #include <kdebug.h>
+ 
++#if (QT_VERSION < 0x030000)
++#include "qt3regexp.h"
++#endif
++
+ #ifdef APPLE_CHANGES
+ #include "KWQLoader.h"
+ #else
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/html/Makefile.am kdenox/konq-embed/kdesrc/khtml/html/Makefile.am
+--- kdenox/konq-embed/kdesrc/khtml/html/Makefile.am    2007-02-12 22:26:20.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/html/Makefile.am    2007-02-25 16:39:50.000000000 +1300
+@@ -43,7 +43,7 @@
+  -I$(top_srcdir)/kio/kssl \
+  -I$(top_srcdir)/kjs -I$(top_srcdir)/khtml -I$(top_srcdir) \
+  -I$(top_srcdir)/kwallet/client -I$(top_srcdir)/kutils \
+- -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes)
++ -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes)
+ 
+ # Use "make doctypes" to regenerate doctypes.cpp from doctypes.gperf
+ doctypes: $(srcdir)/doctypes.gperf $(srcdir)/Makefile.am
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp
+--- kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp      2007-02-12 22:26:20.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp      2007-02-25 17:22:46.000000000 +1300
+@@ -3221,14 +3221,14 @@
+         {
+           khtml::RenderTextArea *parent= static_cast<khtml::RenderTextArea *>(obj->parent());
+           s = parent->text();
+-          s = s.replace(0xa0, ' ');
++          s = s.replace(QRegExp(QString(QChar(0xa0))), ' ');
+           tmpTextArea = parent;
+         }
+         else if ( renderLineText )
+         {
+           khtml::RenderLineEdit *parentLine= static_cast<khtml::RenderLineEdit *>(obj);
+           s = parentLine->widget()->text();
+-          s = s.replace(0xa0, ' ');
++          s = s.replace(QRegExp(QString(QChar(0xa0))), ' ');
+         }
+         else if ( obj->isText() )
+         {
+@@ -3256,7 +3256,7 @@
+           if ( isLink && obj->parent()!=tmpTextArea )
+           {
+             s = static_cast<khtml::RenderText *>(obj)->data().string();
+-            s = s.replace(0xa0, ' ');
++            s = s.replace(QRegExp(QString(QChar(0xa0))), ' ');
+           }
+         }
+         else if ( obj->isBR() )
+@@ -6785,9 +6785,9 @@
+     // get selected text and paste to the clipboard
+ #ifndef QT_NO_CLIPBOARD
+     QString text = selectedText();
+-    text.replace(QChar(0xa0), ' ');
++    text.replace(QRegExp(QString(QChar(0xa0))), " ");
+     disconnect( kapp->clipboard(), SIGNAL( selectionChanged()), this, SLOT( slotClearSelection()));
+-    kapp->clipboard()->setText(text,QClipboard::Selection);
++    kapp->clipboard()->setText(text);
+     connect( kapp->clipboard(), SIGNAL( selectionChanged()), SLOT( slotClearSelection()));
+ #endif
+     //kdDebug( 6000 ) << "selectedText = " << text << endl;
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am
+--- kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am    2007-02-12 22:26:20.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am    2007-02-25 16:33:47.000000000 +1300
+@@ -32,7 +32,7 @@
+       stringit.h htmlhashes.h helper.h shared.h arena.h 
+ 
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/dcop -I$(top_srcdir)/kio -I$(top_srcdir)/libltdl \
+-           -I$(top_srcdir)/khtml -I$(top_srcdir)/kutils -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes)
++           -I$(top_srcdir)/khtml -I$(top_srcdir)/kutils -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes)
+ 
+ SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
+ 
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am
+--- kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am       2007-02-12 22:26:20.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am       2007-02-25 16:40:50.000000000 +1300
+@@ -42,7 +42,7 @@
+       render_generated.h enumerate.h
+ 
+ INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
+- -I$(top_srcdir)/kfile -I$(top_srcdir)/khtml -I$(top_srcdir)/kutils -I$(top_srcdir) -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes)
++ -I$(top_srcdir)/kfile -I$(top_srcdir)/khtml -I$(top_srcdir)/kutils -I$(top_srcdir) -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes)
+ 
+ SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
+ 
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h
+--- kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h    2007-02-12 21:31:42.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h    2007-02-25 16:56:00.000000000 +1300
+@@ -46,12 +46,14 @@
+ 
+ #include <qcolor.h>
+ #include <qrect.h>
++#include <qtextstream.h>
+ #include <assert.h>
+ 
+ #include "render_object.h"
+ 
+ class QScrollBar;
+-template <class T> class QPtrVector;
++template <class T> class QVector;
++#define QPtrVector QVector
+ 
+ namespace khtml {
+     class RenderStyle;
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp
+--- kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp 2007-02-12 22:26:20.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp 2007-02-25 16:44:58.000000000 +1300
+@@ -46,6 +46,7 @@
+ #include <kdebug.h>
+ #include <kglobal.h>
+ #include <qpainter.h>
++#include <qtextstream.h>
+ #include "khtmlview.h"
+ #include <khtml_part.h>
+ 
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h
+--- kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h    2007-02-12 22:26:20.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h    2007-02-25 16:56:49.000000000 +1300
+@@ -30,6 +30,7 @@
+ #include <qcolor.h>
+ #include <qptrvector.h>
+ #include <qmemarray.h>
++#include <qtextstream.h>
+ 
+ #include "rendering/render_box.h"
+ #include "rendering/render_block.h"
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h
+--- kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h     2007-02-12 22:26:20.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h     2007-02-25 16:46:39.000000000 +1300
+@@ -31,6 +31,7 @@
+ #include "rendering/render_line.h"
+ 
+ #include <qptrvector.h>
++#include <qtextstream.h>
+ #include <assert.h>
+ 
+ class QPainter;
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am
+--- kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am     2007-02-12 22:26:20.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am     2007-02-25 16:38:27.000000000 +1300
+@@ -37,7 +37,7 @@
+ 
+ INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
+  -I$(top_srcdir)/khtml -I$(top_srcdir) -I$(top_srcdir)/kwallet/client \
+- -I$(top_srcdir)/kutils -I$(top_builddir)/kjs -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(X_INCLUDES) $(all_includes)
++ -I$(top_srcdir)/kutils -I$(top_builddir)/kjs -I$(top_builddir)/konq-embed/kdesrc -I$(top_builddir)/konq-embed/kdesrc/kssl -I$(top_srcdir)/konq-embed/dropin -I$(top_srcdir)/konq-embed/kdesrc/kio -I$(top_srcdir)/konq-embed/kdesrc/kdecore -I$(top_srcdir)/konq-embed/kdesrc/kutils -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/../misc -I$(srcdir)/../misc -I$(srcdir)/../css -I$(srcdir)/../dom -I$(srcdir)/../xml -I$(srcdir)/../html -I$(top_srcdir)/konq-embed/dropin/kio -I$(srcdir)/../.. -I$(srcdir)/../../kjs -I$(top_srcdir)/konq-embed/dropin/kssl -I$(srcdir)/../../../dropin/khtml -I$(top_srcdir)/konq-embed/dropin/khtml/java $(QT_INCLUDES) $(QTOPIA_INCLUDES) $(X_INCLUDES) $(all_includes)
+ 
+ SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
+ 
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.cpp kdenox/konq-embed/kdesrc/kjs/dtoa.cpp
+--- kdenox/konq-embed/kdesrc/kjs/dtoa.cpp      2007-02-12 22:26:20.000000000 +1300
++++ kdenox/konq-embed/kdesrc/kjs/dtoa.cpp      2007-02-25 18:22:33.000000000 +1300
+@@ -1,4 +1,9 @@
+-#ifndef KONQ_EMBEDDED
++#include <config.h>
++
++#ifdef KONQ_EMBEDDED
++#include "stdlib.h"
++extern "C" double kjs_strtod(const char *s00, char **se) { return strtod(s00,se); }
++#else
+ /****************************************************************
+  *
+  * The author of this software is David M. Gay.
+@@ -175,8 +180,6 @@
+ #undef CONST
+ #endif
+ 
+-#include <config.h>
+-
+ #include "stdlib.h"
+ 
+ #ifdef WORDS_BIGENDIAN
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.h kdenox/konq-embed/kdesrc/kjs/dtoa.h
+--- kdenox/konq-embed/kdesrc/kjs/dtoa.h        2007-02-12 22:26:20.000000000 +1300
++++ kdenox/konq-embed/kdesrc/kjs/dtoa.h        2007-02-25 18:20:51.000000000 +1300
+@@ -23,14 +23,11 @@
+ #ifndef _KJS_DTOA_H_
+ #define _KJS_DTOA_H_
+ 
+-#ifndef KONQ_EMBEDDED
+ extern "C" double kjs_strtod(const char *s00, char **se);
++#ifndef KONQ_EMBEDDED
+ extern "C" char *kjs_dtoa(double d, int mode, int ndigits,
+                         int *decpt, int *sign, char **rve);
+ extern "C" void kjs_freedtoa(char *s);
+-#else
+-#include "stdlib.h"
+-extern "C" double kjs_strtod(const char *s00, char **se) { return strtod(s00,se); }
+ #endif
+-
++         
+ #endif /* _KJS_DTOA_H */
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/number_object.cpp kdenox/konq-embed/kdesrc/kjs/number_object.cpp
+--- kdenox/konq-embed/kdesrc/kjs/number_object.cpp     2007-02-12 22:26:20.000000000 +1300
++++ kdenox/konq-embed/kdesrc/kjs/number_object.cpp     2007-02-25 18:05:36.000000000 +1300
+@@ -20,6 +20,8 @@
+  *
+  */
+ 
++#include <config.h>
++
+ #include "value.h"
+ #include "object.h"
+ #include "types.h"
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/ustring.cpp kdenox/konq-embed/kdesrc/kjs/ustring.cpp
+--- kdenox/konq-embed/kdesrc/kjs/ustring.cpp   2007-02-12 22:26:20.000000000 +1300
++++ kdenox/konq-embed/kdesrc/kjs/ustring.cpp   2007-02-25 18:10:22.000000000 +1300
+@@ -21,9 +21,7 @@
+  *
+  */
+ 
+-#ifdef HAVE_CONFIG_H
+ #include <config.h>
+-#endif
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/actions/konqe.rc kdenox/konq-embed/src/actions/konqe.rc
+--- kdenox/konq-embed/src/actions/konqe.rc     1970-01-01 12:00:00.000000000 +1200
++++ kdenox/konq-embed/src/actions/konqe.rc     2007-02-25 21:20:10.000000000 +1300
+@@ -0,0 +1,107 @@
++<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
++<kpartgui name="konqe" version="1">
++<Create>
++ <Action name="file_new" stdAction="true" icon="filenew.png"/>
++ <Action name="file_open" stdAction="true" icon="fileopen.png"/>
++ <Action name="file_save" stdAction="true" icon="filesave.png"/>
++ <Action name="file_save_as" stdAction="true" icon="filesaveas.png"/>
++ <Action name="file_print" stdAction="true" icon="fileprint.png"/>
++ <Action name="go_home" stdAction="true" icon="gohome.png"/>
++ <Action name="go_back" stdAction="true" icon="back.png"/>
++ <Action name="go_forward" stdAction="true" icon="forward.png"/>
++ <Action name="edit_undo" stdAction="true" icon="undo.png"/>
++ <Action name="edit_redo" stdAction="true" icon="redo.png"/>
++ <Action name="edit_cut" stdAction="true" icon="editcut.png"/>
++ <Action name="edit_copy" stdAction="true" icon="editcopy.png"/>
++ <Action name="edit_paste" stdAction="true" icon="editpaste.png"/>
++ <Action name="edit_find" stdAction="true" icon="find.png"/>
++ <Action name="view_redisplay" stdAction="true" icon="reload.png"/>
++ <Action name="view_zoom" stdAction="true" popupMenu="true" icon="viewmag.png"/>
++ <Action name="bookmark_add" stdAction="true" icon="bookmark_add.png"/>
++ <Action name="bookmark_edit" stdAction="true" accel="" icon="bookmark.png"/>
++ <Action name="options_configure" stdAction="true" icon="configure.png"/>
++</Create>
++<Create>
++ <Action name="windows" popupMenu="true" icon="window_list.png">
++  <text>Windows List</text>
++ </Action>
++ <Action name="view_close" accel="Ctrl+W" icon="fileclose.png">
++  <text>Close View</text>
++ </Action>
++ <Action name="view_next" accel="Ctrl+Tab" icon="2rightarrow.png">
++  <text>Next View</text>
++ </Action>
++ <Action name="view_autoload_images" toggle="true">
++  <text>Autoload Images</text>
++ </Action>
++ <Action name="go_stop" icon="stop.png">
++  <text>Stop Loading</text>
++ </Action>
++ <Action name="info_security" icon="lock.png">
++  <text>Show Security Information</text>
++ </Action>
++ <Action name="options_show_location" accel="F11" toggle="true">
++  <text>Show Location Bar</text>
++ </Action>
++ <Action name="options_show_sidebar" accel="F12" toggle="true">
++  <text>Show Side Bar</text>
++ </Action>
++ <Action name="options_show_statusbar" stdAction="true" accel="F10"/>
++ <Action name="main_menu" popupMenu="true" icon="gear.png">
++  <text>Main Menu</text>
++ </Action>
++ <Action name="view_load_images" icon="images_display.png">
++  <text>Load Images</text>
++ </Action>
++</Create>
++<Menu name="main_menu">
++ <Action name="file_new"/>
++ <Separator/>
++ <Action name="view_autoload_images"/>
++ <Action name="options_show_statusbar"/>
++ <Action name="options_show_location"/>
++ <Action name="options_show_sidebar"/>
++ <Separator/>
++ <Action name="edit_find"/>
++ <Separator/>
++ <Action name="options_configure"/>
++ <Separator/>
++ <Action name="bookmark_add"/>
++ <Action name="bookmark_edit"/>
++ <Action name="bookmarks"/>
++ <Separator/>
++ <Action name="view_next"/>
++ <Action name="view_close"/>
++</Menu>
++<ToolBar name="main_bar">
++ <Action name="main_menu"/>
++ <ToolBar name="browser_bar"/>
++ <ToolBar name="edit_bar"/>
++ <Spacer/>
++ <Action name="windows"/>
++</ToolBar>
++<ToolBar name="browser_bar" newline="true">
++ <Action name="file_print"/>
++ <Action name="go_back"/>
++ <Action name="go_forward"/>
++ <Action name="go_home"/>
++ <Action name="view_redisplay"/>
++ <Action name="go_stop"/>
++ <Separator/>
++ <Action name="info_security"/>
++ <Action name="view_zoom"/>
++ <Action name="view_load_images"/>
++</ToolBar>
++<ToolBar name="edit_bar" newline="true">
++ <Action name="file_open"/>
++ <Action name="file_save"/>
++ <Action name="file_save_as"/>
++ <Action name="file_print"/>
++ <Separator/>
++ <Action name="edit_undo"/>
++ <Action name="edit_redo"/>
++ <Action name="edit_cut"/>
++ <Action name="edit_copy"/>
++ <Action name="edit_paste"/>
++</ToolBar>
++</kpartgui>
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditimpl.cc kdenox/konq-embed/src/bookmarkeditimpl.cc
+--- kdenox/konq-embed/src/bookmarkeditimpl.cc  2007-02-12 22:25:55.000000000 +1300
++++ kdenox/konq-embed/src/bookmarkeditimpl.cc  2007-02-25 19:17:29.000000000 +1300
+@@ -24,6 +24,8 @@
+ 
+ #include "bookmarkeditimpl.h"
+ 
++#include <config.h>
++
+ #if defined(ENABLE_BOOKMARKS)
+ 
+ #include "mainwindowbase.h"
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditor.cc kdenox/konq-embed/src/bookmarkeditor.cc
+--- kdenox/konq-embed/src/bookmarkeditor.cc    2007-02-12 22:25:55.000000000 +1300
++++ kdenox/konq-embed/src/bookmarkeditor.cc    2007-02-25 17:40:34.000000000 +1300
+@@ -16,6 +16,8 @@
+ #include <qimage.h>
+ #include <qpixmap.h>
+ 
++#include <kstandarddirs.h>
++
+ namespace
+ {
+ QPixmap getPngPixmap( const QString &name )
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierarchical.cc kdenox/konq-embed/src/bookmarkeditorhierarchical.cc
+--- kdenox/konq-embed/src/bookmarkeditorhierarchical.cc        2007-02-12 22:25:55.000000000 +1300
++++ kdenox/konq-embed/src/bookmarkeditorhierarchical.cc        2007-02-25 20:46:27.000000000 +1300
+@@ -22,11 +22,20 @@
+ 
+ */
+ 
++#include <config.h>
++
+ #if defined(ENABLE_BOOKMARKS)
+ 
++#include <xmltree.h>
++#include <qtoolbutton.h>
++#include <qlineedit.h>
++#include <qlabel.h>
++
+ #include "bookmarkeditorhierarchical.h"
+ #include <assert.h>
+ #include "bookmarks.h"
++#include "bookmarkeditimpl.h"
++
+ 
+ //////// HELPER FUNCTIONS /////////////////////////////////
+ namespace {
+@@ -204,7 +213,7 @@
+ void BookmarkEditorHierarchical::newFolder()
+ {
+     BookmarkEdit *edit = new BookmarkEdit( this );
+-    edit->setCaption( i18n( "New Folder" ) );
++    edit->setCaption( tr( "New Folder" ) );
+     edit->location->setEnabled(false);
+     edit->location->hide();
+     edit->TextLabel2->hide();
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierarchical.h kdenox/konq-embed/src/bookmarkeditorhierarchical.h
+--- kdenox/konq-embed/src/bookmarkeditorhierarchical.h 2007-02-12 22:25:55.000000000 +1300
++++ kdenox/konq-embed/src/bookmarkeditorhierarchical.h 2007-02-25 18:27:17.000000000 +1300
+@@ -22,9 +22,10 @@
+ #ifndef __bookmarkeditorhierarchical_h__
+ #define __bookmarkeditorhierarchical_h__
+ 
++#include <config.h>
++
+ #if defined(ENABLE_BOOKMARKS)
+ 
+-#include <config.h>
+ #include "bookmarkeditorimpl.h"
+ 
+ class XMLElement;
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorimpl.cc kdenox/konq-embed/src/bookmarkeditorimpl.cc
+--- kdenox/konq-embed/src/bookmarkeditorimpl.cc        2007-02-12 22:25:55.000000000 +1300
++++ kdenox/konq-embed/src/bookmarkeditorimpl.cc        2007-02-25 19:16:40.000000000 +1300
+@@ -23,12 +23,12 @@
+ 
+ #include "bookmarkeditorimpl.h"
+ 
++#include <config.h>
++
+ #if defined(ENABLE_BOOKMARKS)
+ 
+ #include "bookmarkeditimpl.h"
+ 
+-#include <config.h>
+-
+ #include "bookmarks.h"
+ #include "xmltree.h"
+ 
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.cc kdenox/konq-embed/src/bookmarks.cc
+--- kdenox/konq-embed/src/bookmarks.cc 2007-02-12 22:25:55.000000000 +1300
++++ kdenox/konq-embed/src/bookmarks.cc 2007-02-25 18:28:08.000000000 +1300
+@@ -24,6 +24,8 @@
+ 
+ #if defined(ENABLE_BOOKMARKS)
+ 
++#warning BOOKMARKS ARE ENABLED
++
+ #include "bookmarks.h"
+ #include "xmltree.h"
+ #include "mainwindowbase.h"
+@@ -39,6 +41,7 @@
+ #include <qstring.h>
+ #include <qwidget.h>
+ #include <qfile.h>
++#include <qtimer.h>
+ 
+ #include <klocale.h>
+ #include <kstandarddirs.h>
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.h kdenox/konq-embed/src/bookmarks.h
+--- kdenox/konq-embed/src/bookmarks.h  2007-02-12 22:25:55.000000000 +1300
++++ kdenox/konq-embed/src/bookmarks.h  2007-02-25 18:26:32.000000000 +1300
+@@ -34,6 +34,8 @@
+ 
+ #include <kurl.h>
+ 
++#define QPtrList QList
++
+ class QPopupMenu;
+ class XMLElement;
+ class ActionMenu;
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.cc kdenox/konq-embed/src/mainwindow_qpe.cc
+--- kdenox/konq-embed/src/mainwindow_qpe.cc    2007-02-12 22:25:55.000000000 +1300
++++ kdenox/konq-embed/src/mainwindow_qpe.cc    2007-02-25 17:46:32.000000000 +1300
+@@ -90,7 +90,7 @@
+     return iconSet;
+ }
+ 
+-void MainWindowBase::statusJustText( const QString &_msg, bool )
++void MainWindowQPE::statusJustText( const QString &_msg, bool )
+ {
+     QString msg = _msg;
+     msg.replace( QRegExp( "</?qt>" ), QString::null );
+@@ -99,7 +99,7 @@
+     Global::statusMessage( msg );
+ }
+ 
+-void MainWindowBase::statusMessage( const QString &_msg, bool visible )
++void MainWindowQPE::statusMessage( const QString &_msg, bool visible )
+ {
+     statusJustText( _msg, visible );
+ }
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.h kdenox/konq-embed/src/mainwindow_qpe.h
+--- kdenox/konq-embed/src/mainwindow_qpe.h     2007-02-12 22:25:55.000000000 +1300
++++ kdenox/konq-embed/src/mainwindow_qpe.h     2007-02-25 17:47:23.000000000 +1300
+@@ -39,6 +39,10 @@
+ 
+ protected:
+     virtual QIconSet loadPixmap( const char * const xpm[] );
++
++protected slots:
++    virtual void statusJustText( const QString &msg, bool visible );
++    virtual void statusMessage( const QString &msg, bool visible );
+ };
+ 
+ #endif
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_road.cc kdenox/konq-embed/src/mainwindow_road.cc
+--- kdenox/konq-embed/src/mainwindow_road.cc   2007-02-12 22:25:55.000000000 +1300
++++ kdenox/konq-embed/src/mainwindow_road.cc   2007-02-25 20:32:12.000000000 +1300
+@@ -20,10 +20,11 @@
+ 
+ #ifdef KONQ_GUI_ROAD
+ 
++#include <config.h>
++
+ #include "mainwindow_road.h"
+ #include "popupaction.h"
+ 
+-
+ #include <qpopupmenu.h>
+ #include <qtoolbar.h>
+ #include <qaction.h>
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_x11.cc kdenox/konq-embed/src/mainwindow_x11.cc
+--- kdenox/konq-embed/src/mainwindow_x11.cc    2007-02-12 22:25:55.000000000 +1300
++++ kdenox/konq-embed/src/mainwindow_x11.cc    2007-02-25 20:33:10.000000000 +1300
+@@ -21,6 +21,8 @@
+ 
+ // Implementation of the X11 GUI
+ 
++#include <config.h>
++
+ #include "mainwindow_x11.h"
+ #include "popupaction.h"
+ 
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.cc kdenox/konq-embed/src/roadtabbar.cc
+--- kdenox/konq-embed/src/roadtabbar.cc        2007-02-12 22:25:55.000000000 +1300
++++ kdenox/konq-embed/src/roadtabbar.cc        2007-02-25 17:44:19.000000000 +1300
+@@ -18,6 +18,9 @@
+     Boston, MA 02110-1301, USA.
+ */
+ 
++#include <qaction.h>
++#include <kconfig.h>
++
+ #include "roadtabbar.h"
+ 
+ RoadTabParams::RoadTabParams( const QIconSet &defaultIS, const QIconSet &loadingIS,
+@@ -114,12 +117,12 @@
+ 
+ void RoadTabBar::initContextMenu()
+ {
+-    QAction *qa = new QAction( QString::null, i18n( "&Close Tab" ), 0, this, "contextTabClose" );
++    QAction *qa = new QAction( QString::null, tr( "&Close Tab" ), 0, this, "contextTabClose" );
+     connect( qa, SIGNAL( activated() ), this, SLOT( contextClose() ) );
+     qa->addTo( &m_contextMenu );
+     m_contextMenuCloseId = m_contextMenu.idAt( 0 );
+ 
+-    qa = new QAction( QString::null, i18n( "&New tab" ), 0, this, "contextTabNew" );
++    qa = new QAction( QString::null, tr( "&New tab" ), 0, this, "contextTabNew" );
+     connect( qa, SIGNAL( activated() ), this, SIGNAL( requestNewView() ) );
+     qa->addTo( &m_contextMenu );
+ }
+@@ -184,7 +187,7 @@
+ {
+     QString caption( text );
+     if ( caption.isEmpty() )
+-        caption = i18n( "Blank" );
++        caption = tr( "Blank" );
+     // the caption may not exceed a given width, so shorten it if necessary
+     // the following is inefficient, but clear, correct, and unlikely to be a bottleneck
+     if ( m_params.fontMetrics.width( caption ) > m_params.maxWidth )
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.h kdenox/konq-embed/src/roadtabbar.h
+--- kdenox/konq-embed/src/roadtabbar.h 2007-02-12 22:25:55.000000000 +1300
++++ kdenox/konq-embed/src/roadtabbar.h 2007-02-25 17:42:40.000000000 +1300
+@@ -22,6 +22,9 @@
+ #define __roadtabbar_h__
+ 
+ #include <qtabbar.h>
++#include <qpopupmenu.h>
++
++#include "view.h"
+ 
+ struct RoadTabParams
+ {
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/run.cc kdenox/konq-embed/src/run.cc
+--- kdenox/konq-embed/src/run.cc       2007-02-12 22:25:55.000000000 +1300
++++ kdenox/konq-embed/src/run.cc       2007-02-25 17:34:35.000000000 +1300
+@@ -24,6 +24,7 @@
+ #include "view.h"
+ 
+ #include <khtml_part.h>
++#include <khtml_ext.h>
+ 
+ Run::Run( View *view, const KURL &url, const KParts::URLArgs &args )
+     : KHTMLRun( static_cast<KHTMLPart *>(view->part()), 0,
+@@ -48,7 +49,7 @@
+ //            if ( isTextExecutable(mimeType) )
+ //                mimeType = QString::fromLatin1("text/plain"); // view, don't execute
+             QString suggestedFilename = m_strURL.filename(); 
+-            KHTMLPopupGUIClient::saveURL( part()->widget(), i18n( "Save As" ), m_strURL, urlArgs().metaData(), QString::null, 0, suggestedFilename, type );
++            KHTMLPopupGUIClient::saveURL( part()->widget(), QObject::tr( "Save As" ), m_strURL, urlArgs().metaData(), QString::null, 0, suggestedFilename, type );
+ 
+             m_bFinished = true;
+             emit error();
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/khtml/khtml_ext.cpp kdenox/konq-embed/dropin/khtml/khtml_ext.cpp
+--- kdenox/konq-embed/dropin/khtml/khtml_ext.cpp       2007-02-12 22:25:56.000000000 +1300
++++ kdenox/konq-embed/dropin/khtml/khtml_ext.cpp       2007-02-24 03:38:24.000000000 +1300
+@@ -115,7 +115,8 @@
+                                    const QString &filter, long cacheId,
+                                    const QString & suggestedFilename, const QString& mimeType )
+ {
+-  QString name = QString::fromLatin1( "index.html" );
++/*
++QString name = QString::fromLatin1( "index.html" );
+   if ( !suggestedFilename.isEmpty() )
+     name = suggestedFilename;
+   else if ( !url.fileName().isEmpty() )
+@@ -166,6 +167,7 @@
+ 
+   if ( destURL.isValid() )
+     saveURL(url, destURL, metadata, cacheId, f);
++*/
+ }
+ 
+ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
diff --git a/packages/konqueror/konqueror-embedded-20070316/konqueror.desktop b/packages/konqueror/konqueror-embedded-20070316/konqueror.desktop
new file mode 100644 (file)
index 0000000..cb84c96
--- /dev/null
+++ b/packages/konqueror/konqueror-embedded-20070316/konqueror.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Exec=konqueror
+Icon=konqueror/konqueror
+Type=Application
+Name=Konqueror
+Comment=Konqueror browser
diff --git a/packages/konqueror/konqueror-embedded-20070316/konqueror.png b/packages/konqueror/konqueror-embedded-20070316/konqueror.png
new file mode 100644 (file)
index 0000000..879d470
Binary files /dev/null and b/packages/konqueror/konqueror-embedded-20070316/konqueror.png differ
diff --git a/packages/konqueror/konqueror-embedded_20070212.bb b/packages/konqueror/konqueror-embedded_20070212.bb
deleted file mode 100644 (file)
index 3fb8a5c..0000000
--- a/packages/konqueror/konqueror-embedded_20070212.bb
+++ /dev/null
@@ -1,95 +0,0 @@
-DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.konqueror.org/"
-DEPENDS = "openssl libpcre virtual/libqte2 dcopidl-native dcopidl2cpp-native"
-LICENSE = "LGPL GPL"
-PR = "r5"
-
-# this Konqueror needs the KDEDIR set and the font helvetica installed on the target
-
-inherit autotools
-
-SRC_URI = "http://www.basyskom.de/uploads/175/35/kdenox_snapshot_Qt2_2007.02.12.tar.bz2 \
-          file://dont-use-kde-config.patch;patch=1 \
-           file://konqe_new_opie.patch;patch=1 \
-          file://konqe-kapplication.patch;patch=1"
-S = "${WORKDIR}/kdenox"
-
-export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake"
-export MOC = "${STAGING_BINDIR_NATIVE}/moc"
-export UIC = "${STAGING_BINDIR_NATIVE}/uic"
-#export exec_prefix = "${palmtopdir}"
-#export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DQT_NO_DOM -DENABLE_BOOKMARKS"
-export CXXFLAGS = "-fexceptions -fno-rtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DENABLE_BOOKMARKS"
-export PCRE_CONFIG = "invalid"
-# uncomment this for a static build
-# EXTRAFLAGS = "-lts"
-# EXTRAFLAGS_c7x0 = "-lts -laticore"
-export EXTRA_OEMAKE = "EXTRA_LDFLAGS='${EXTRAFLAGS}'"
-
-EXTRA_OECONF = '--prefix=${palmtopdir} \
-       --exec-prefix=${palmtopdir} \
-#      --includedir=${STAGING_INCDIR} \
-       --includedir=/usr/include \
-       --with-extra-includes=${STAGING_INCDIR} \
-       --with-extra-libs=${STAGING_LIBDIR} \
-       --with-qtopia-dir=${OPIEDIR} \
-       --with-ssl-version=0.9.7e \
-       --with-ssl-dir=${STAGING_DIR_HOST}${layout_exec_prefix} \
-       --with-qt-includes=${STAGING_DIR_HOST}/qt2/include \
-       --with-qt-libraries=${STAGING_DIR_HOST}/qt2/lib \
-       --with-qt-dir=${QTDIR} \
-       --enable-fontsubs \
-       --with-konq-tmp-prefix=/tmp/kde-cache \
-#      --enable-static \
-       --disable-static \
-       --enable-shared \
-       --disable-debug \
-       --with-gui=qpe \
-       --with-ipv6-lookup=no \
-       --without-xinerama \
-#      --disable-scrollbars \
-       --disable-selection \
-       --disable-bookmarks \
-       --with-javascript=static \
-       --enable-debug=yes \
-       --disable-printing \
-#      --enable-pcre \
-       --disable-pcre \
-       --without-arts \
-       --enable-jshostext \
-       --disable-selection \
-       --enable-final \
-       --enable-qt-embedded \
-#      --enable-rtti-embedded \
-       --enable-mt \
-       --enable-qpe \
-       --enable-qt-mt \
-       --enable-fwnewepg=yes \
-       --enable-embedded '
-
-do_configure_prepend() {
-       cd ${S}
-       if ! test -L admin
-       then
-           ln -s ../kdelibs/admin admin
-       fi
-}
-
-do_compile_prepend() {
-       perl admin/am_edit
-}
-
-do_install_append() {
-       install -d ${D}${palmtopdir}/apps/Applications
-       install -m 0644 ${FILESDIR}/konqueror.desktop ${D}${palmtopdir}/apps/Applications/
-       install -d ${D}${palmtopdir}/pics/konqueror
-       install -m 0644 ${FILESDIR}/konqueror.png ${D}${palmtopdir}/pics/konqueror/
-       mv ${D}${palmtopdir}/bin ${D}${bindir}
-       mv ${D}${bindir}/konqueror ${D}${bindir}/konqueror.bin
-       { echo '#!/bin/sh' ; echo "KDEDIR=/usr exec ${bindir}/konqueror.bin" ; } > ${D}${bindir}/konqueror
-       chmod 0755 ${D}${bindir}/konqueror
-}
-
-FILES_${PN} = "${palmtopdir} ${datadir} ${bindir}/konqueror* ${libdir}/libkonq*"
diff --git a/packages/konqueror/konqueror-embedded_20070316.bb b/packages/konqueror/konqueror-embedded_20070316.bb
new file mode 100644 (file)
index 0000000..5a12751
--- /dev/null
+++ b/packages/konqueror/konqueror-embedded_20070316.bb
@@ -0,0 +1,96 @@
+DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.konqueror.org/"
+DEPENDS = "openssl libpcre virtual/libqte2 dcopidl-native dcopidl2cpp-native"
+LICENSE = "LGPL GPL"
+PR = "r5"
+
+# this Konqueror needs the KDEDIR set and the font helvetica installed on the target
+
+inherit autotools
+
+SRC_URI = "http://www.basyskom.de/uploads/175/37/kdenox_snapshot_qt2_20070316.tar.bz2 \
+          file://dont-use-kde-config.patch;patch=1 \
+           file://konqe_new_opie.patch;patch=1 \
+          file://konqe-kapplication.patch;patch=1 \
+           file://fix_configure.patch;patch=1"
+S = "${WORKDIR}/kdenox"
+
+export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake"
+export MOC = "${STAGING_BINDIR_NATIVE}/moc"
+export UIC = "${STAGING_BINDIR_NATIVE}/uic"
+#export exec_prefix = "${palmtopdir}"
+#export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DQT_NO_DOM -DENABLE_BOOKMARKS"
+export CXXFLAGS = "-fexceptions -fno-rtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DENABLE_BOOKMARKS"
+export PCRE_CONFIG = "invalid"
+# uncomment this for a static build
+# EXTRAFLAGS = "-lts"
+# EXTRAFLAGS_c7x0 = "-lts -laticore"
+export EXTRA_OEMAKE = "EXTRA_LDFLAGS='${EXTRAFLAGS}'"
+
+EXTRA_OECONF = '--prefix=${palmtopdir} \
+       --exec-prefix=${palmtopdir} \
+#      --includedir=${STAGING_INCDIR} \
+       --includedir=/usr/include \
+       --with-extra-includes=${STAGING_INCDIR} \
+       --with-extra-libs=${STAGING_LIBDIR} \
+       --with-qtopia-dir=${OPIEDIR} \
+       --with-ssl-version=0.9.7e \
+       --with-ssl-dir=${STAGING_DIR_HOST}${layout_exec_prefix} \
+       --with-qt-includes=${STAGING_DIR_HOST}/qt2/include \
+       --with-qt-libraries=${STAGING_DIR_HOST}/qt2/lib \
+       --with-qt-dir=${QTDIR} \
+       --enable-fontsubs \
+       --with-konq-tmp-prefix=/tmp/kde-cache \
+#      --enable-static \
+       --disable-static \
+       --enable-shared \
+       --disable-debug \
+       --with-gui=qpe \
+       --with-ipv6-lookup=no \
+       --without-xinerama \
+#      --disable-scrollbars \
+       --disable-selection \
+       --disable-bookmarks \
+       --with-javascript=static \
+       --enable-debug=yes \
+       --disable-printing \
+#      --enable-pcre \
+       --disable-pcre \
+       --without-arts \
+       --enable-jshostext \
+       --disable-selection \
+       --enable-final \
+       --enable-qt-embedded \
+#      --enable-rtti-embedded \
+       --enable-mt \
+       --enable-qpe \
+       --enable-qt-mt \
+       --enable-fwnewepg=yes \
+       --enable-embedded '
+
+do_configure_prepend() {
+       cd ${S}
+       if ! test -L admin
+       then
+           ln -s ../kdelibs/admin admin
+       fi
+}
+
+do_compile_prepend() {
+       perl admin/am_edit
+}
+
+do_install_append() {
+       install -d ${D}${palmtopdir}/apps/Applications
+       install -m 0644 ${FILESDIR}/konqueror.desktop ${D}${palmtopdir}/apps/Applications/
+       install -d ${D}${palmtopdir}/pics/konqueror
+       install -m 0644 ${FILESDIR}/konqueror.png ${D}${palmtopdir}/pics/konqueror/
+       mv ${D}${palmtopdir}/bin ${D}${bindir}
+       mv ${D}${bindir}/konqueror ${D}${bindir}/konqueror.bin
+       { echo '#!/bin/sh' ; echo "KDEDIR=/usr exec ${bindir}/konqueror.bin" ; } > ${D}${bindir}/konqueror
+       chmod 0755 ${D}${bindir}/konqueror
+}
+
+FILES_${PN} = "${palmtopdir} ${datadir} ${bindir}/konqueror* ${libdir}/libkonq*"
openembedded 1.6 repository.