Hi all,
Here are some more patches from .dev. This almost qualified for an FYI but I
figured since I am touching some core stuff it should be reviewed.
All of these are to get konqueror-embedded working.
1) dcopidl-fetch.patch
dcopidl*-native: fix unfetchable svn, close oebug 3067
Applied to .dev in revision: c11c3170aaefc8aa258777e4a5f0e932f9c63915
2) dcopidl-upgrade-3.5.8.patch
dcopidl*-native: upgrade to 3.5.8 to fix fetch issues
Applied to .dev in revision: 080fcdca01d44047b988dbb0ff626190537f5cae
3) konqe-20070316-oe.patch
konqueror-embedded: upgrade to 20070316 version, fix build
Applied to .dev in revision: 987c8d92ee736e8162fb230be7d61936f9640e8d /
e30b32245314b0a9fc5b49e8c78a9927583e0c69
4) libqpe-opie-rtti.patch
libqpe-opie: enable rtti (required for konqueror-embedded)
Applied to .dev in revision: 6d532bfce825597fec36d8f6f32a231105d0d2bc
(slightly modified, I haven't bothered with the PR bump for the CVS version
in stable)
5) preferred-versions.patch
Update preferred versions for dcopidl*-native and konqueror-embedded
Partially applied to .dev in revision:
0d25e98bdf0c1d029587a346db9cb19346e4c78c (dcopidl*-native fix not applicable
in .dev, only modified preferred konqueror-embedded version for 1.2.3 in
stable)
Thanks,
Paul
#
#
# patch "packages/dcop/dcopidl-native_3.5.4.bb"
# from [d59a902debf6b381a27d4ada33b9ac1a2b0fa225]
# to [1578e74d509d78b5e2e421c869dfcbbf69f3bdfc]
#
# patch "packages/dcop/dcopidl2cpp-native_3.5.4.bb"
# from [51ee91734486bf0055de5dee7bf715a896dcb520]
# to [70114ba9db0b75943f6fab62b2fc49d1dd2b0cd3]
#
============================================================
--- packages/dcop/dcopidl-native_3.5.4.bb d59a902debf6b381a27d4ada33b9ac1a2b0fa225
+++ packages/dcop/dcopidl-native_3.5.4.bb 1578e74d509d78b5e2e421c869dfcbbf69f3bdfc
@@ -1,12 +1,12 @@ DEPENDS = "uicmoc3-native"
DESCRIPTION = "DCOP IDL parser"
SECTION = "kde/devel"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "uicmoc3-native"
-SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl \
+SRC_URI = "ftp://download.kde.org/pub/kde/stable/3.5.4/src/kdelibs-3.5.4.tar.bz2 \
file://dcopidl-compile.patch;patch=1 "
-S = "${WORKDIR}/dcopidl"
+S = "${WORKDIR}/kdelibs-3.5.4/dcop/dcopidl"
inherit native qmake qt3e
============================================================
--- packages/dcop/dcopidl2cpp-native_3.5.4.bb 51ee91734486bf0055de5dee7bf715a896dcb520
+++ packages/dcop/dcopidl2cpp-native_3.5.4.bb 70114ba9db0b75943f6fab62b2fc49d1dd2b0cd3
@@ -1,13 +1,13 @@ DEPENDS = "uicmoc3-native"
DESCRIPTION = "DCOP IDL parser"
SECTION = "kde/devel"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "uicmoc3-native"
-SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl2cpp "
+SRC_URI = "ftp://download.kde.org/pub/kde/stable/3.5.4/src/kdelibs-3.5.4.tar.bz2 "
#\
# file://dcopidl-compile.patch;patch=1 "
-S = "${WORKDIR}/dcopidl2cpp"
+S = "${WORKDIR}/kdelibs-3.5.4/dcop/dcopidl2cpp"
inherit native qmake qt3e
#
#
# rename "packages/dcop/dcopidl-native_3.5.4.bb"
# to "packages/dcop/dcopidl-native_3.5.8.bb"
#
# rename "packages/dcop/dcopidl2cpp-native_3.5.4.bb"
# to "packages/dcop/dcopidl2cpp-native_3.5.8.bb"
#
# patch "packages/dcop/dcopidl-native_3.5.8.bb"
# from [1578e74d509d78b5e2e421c869dfcbbf69f3bdfc]
# to [aed120a55a7df8ad48c737277ece65ef2bfcb53d]
#
# patch "packages/dcop/dcopidl2cpp-native_3.5.8.bb"
# from [70114ba9db0b75943f6fab62b2fc49d1dd2b0cd3]
# to [bc28556b40dfb66faf9d5723e19a11065e2aab1a]
#
============================================================
--- packages/dcop/dcopidl-native_3.5.4.bb 1578e74d509d78b5e2e421c869dfcbbf69f3bdfc
+++ packages/dcop/dcopidl-native_3.5.8.bb aed120a55a7df8ad48c737277ece65ef2bfcb53d
@@ -1,12 +1,12 @@ DEPENDS = "uicmoc3-native"
DESCRIPTION = "DCOP IDL parser"
SECTION = "kde/devel"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "uicmoc3-native"
-SRC_URI = "ftp://download.kde.org/pub/kde/stable/3.5.4/src/kdelibs-3.5.4.tar.bz2 \
+SRC_URI = "ftp://download.kde.org/pub/kde/stable/${PV}/src/kdelibs-${PV}.tar.bz2 \
file://dcopidl-compile.patch;patch=1 "
-S = "${WORKDIR}/kdelibs-3.5.4/dcop/dcopidl"
+S = "${WORKDIR}/kdelibs-${PV}/dcop/dcopidl"
inherit native qmake qt3e
============================================================
--- packages/dcop/dcopidl2cpp-native_3.5.4.bb 70114ba9db0b75943f6fab62b2fc49d1dd2b0cd3
+++ packages/dcop/dcopidl2cpp-native_3.5.8.bb bc28556b40dfb66faf9d5723e19a11065e2aab1a
@@ -1,13 +1,13 @@ DEPENDS = "uicmoc3-native"
DESCRIPTION = "DCOP IDL parser"
SECTION = "kde/devel"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "uicmoc3-native"
-SRC_URI = "ftp://download.kde.org/pub/kde/stable/3.5.4/src/kdelibs-3.5.4.tar.bz2 "
+SRC_URI = "ftp://download.kde.org/pub/kde/stable/${PV}/src/kdelibs-${PV}.tar.bz2";
#\
# file://dcopidl-compile.patch;patch=1 "
-S = "${WORKDIR}/kdelibs-3.5.4/dcop/dcopidl2cpp"
+S = "${WORKDIR}/kdelibs-${PV}/dcop/dcopidl2cpp"
inherit native qmake qt3e
#
# old_revision [61ef17d3eecc6a9212f6bb579069727d6a934d2e]
#
# rename "packages/konqueror/konqueror-embedded-20070212"
# to "packages/konqueror/konqueror-embedded-20070316"
#
# rename "packages/konqueror/konqueror-embedded_20070212.bb"
# to "packages/konqueror/konqueror-embedded_20070316.bb"
#
# add_file "packages/konqueror/konqueror-embedded-20070316/fix_configure.patch"
# content [489a3e3a35916b2a1937af2e2bd5cc3513a650f2]
#
# add_file "packages/konqueror/konqueror-embedded-20070316/fix_segfault.patch"
# content [68bade64e2e699aa13247f2e1e196333dd3b0fa7]
#
# patch "packages/konqueror/konqueror-embedded-20070316/konqe_new_opie.patch"
# from [97449995738e923ea33949a405e6f928e11bdf83]
# to [fa173691844ffa2b26adf010b3d5b2e3080a1282]
#
# patch "packages/konqueror/konqueror-embedded-20070316/konqueror.desktop"
# from [f61654c86352e52a354a25c38006bfde302806ed]
# to [a1a145baa691f7f01386d8342a96cdd226cabfa5]
#
# patch "packages/konqueror/konqueror-embedded_20070316.bb"
# from [4b7b9152573fa0cb5af1e59387644f90358278dc]
# to [adf4391b2551d7ef984cd1b7a1962f59d3288ebd]
#
============================================================
--- packages/konqueror/konqueror-embedded-20070316/fix_configure.patch 489a3e3a35916b2a1937af2e2bd5cc3513a650f2
+++ packages/konqueror/konqueror-embedded-20070316/fix_configure.patch 489a3e3a35916b2a1937af2e2bd5cc3513a650f2
@@ -0,0 +1,22 @@
+--- kdenox/configure.in 2008-08-02 19:02:36.000000000 +0100
++++ kdenox/configure.in 2008-08-02 18:59:40.000000000 +0100
+@@ -6,6 +6,8 @@
+ # I lifted it in some mater. (Stephan Kulow)
+ # I used much code from Janos Farkas
+
++m4_pattern_allow([_AC_PATH_X_XMKMF])
++
+ dnl Process this file with autoconf to produce a configure script.
+
+ AC_INIT(acinclude.m4) dnl a source file from your sub dir
+--- kdenox/configure.in.in 2008-08-02 19:02:50.000000000 +0100
++++ kdenox/configure.in.in 2008-08-02 19:03:30.000000000 +0100
+@@ -2,6 +2,8 @@
+ # I lifted it in some mater. (Stephan Kulow)
+ # I used much code from Janos Farkas
+
++m4_pattern_allow([_AC_PATH_X_XMKMF])
++
+ dnl Process this file with autoconf to produce a configure script.
+
+ AC_INIT(acinclude.m4) dnl a source file from your sub dir
============================================================
--- packages/konqueror/konqueror-embedded-20070316/fix_segfault.patch 68bade64e2e699aa13247f2e1e196333dd3b0fa7
+++ packages/konqueror/konqueror-embedded-20070316/fix_segfault.patch 68bade64e2e699aa13247f2e1e196333dd3b0fa7
@@ -0,0 +1,32 @@
+--- kdenox/konq-embed/src/mainwindow_road.cc.old 2008-08-31 17:11:46.000000000 +0100
++++ kdenox/konq-embed/src/mainwindow_road.cc 2008-08-31 17:54:38.000000000 +0100
+@@ -396,8 +396,10 @@
+
+ bool exists = false;
+ int i = 0;
++ qDebug("setLocationBarURL 1");
+ if ( m_locationCombo->currentText().isEmpty() )
+ m_locationCombo->removeItem( m_locationCombo->currentItem() );
++ qDebug("setLocationBarURL 2");
+ for (; i < m_locationCombo->count(); ++i )
+ if ( m_locationCombo->text( i ) == url )
+ {
+@@ -409,14 +411,14 @@
+ m_locationCombo->setCurrentItem( i );
+ else
+ {
+- URLCombo* filteringBox = dynamic_cast<URLCombo*>(m_locationCombo);
++/* URLCombo* filteringBox = dynamic_cast<URLCombo*>(m_locationCombo);
+ if (filteringBox)
+- filteringBox->addURL( url );
++ filteringBox->addURL( url );
+ else
+- {
++ {*/
+ m_locationCombo->insertItem( url, 0 );
+ m_locationCombo->setCurrentItem( 0 );
+- }
++ //}
+ }
+ }
+
============================================================
--- packages/konqueror/konqueror-embedded-20070316/konqe_new_opie.patch 97449995738e923ea33949a405e6f928e11bdf83
+++ packages/konqueror/konqueror-embedded-20070316/konqe_new_opie.patch fa173691844ffa2b26adf010b3d5b2e3080a1282
@@ -1,6 +1,6 @@
-diff -urNd --exclude-from=excludelist kdenox/acinclude.m4 kdenox_new/acinclude.m4
+diff -urNd --exclude-from=excludelist kdenox/acinclude.m4 kdenox/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
++++ kdenox/acinclude.m4 2007-02-25 22:00:27.000000000 +1300
@@ -880,7 +880,7 @@
)
@@ -10,9 +10,9 @@ diff -urNd --exclude-from=excludelist kd
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
+diff -urNd --exclude-from=excludelist kdenox/configure.in kdenox/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
++++ kdenox/configure.in 2007-02-25 17:49:59.000000000 +1300
@@ -60,10 +60,10 @@
@@ -26,9 +26,9 @@ diff -urNd --exclude-from=excludelist kd
fi
dnl Checks for header files.
-diff -urNd --exclude-from=excludelist kdenox/configure.in.in kdenox_new/configure.in.in
+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_new/configure.in.in 2007-02-25 17:49:27.000000000 +1300
++++ kdenox/configure.in.in 2007-02-25 17:49:27.000000000 +1300
@@ -56,10 +56,10 @@
@@ -42,9 +42,9 @@ diff -urNd --exclude-from=excludelist kd
fi
dnl Checks for header files.
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kfiledialog.cpp kdenox_new/konq-embed/dropin/kfiledialog.cpp
+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_new/konq-embed/dropin/kfiledialog.cpp 2007-02-24 03:29:25.000000000 +1300
++++ kdenox/konq-embed/dropin/kfiledialog.cpp 2007-02-24 03:29:25.000000000 +1300
@@ -23,6 +23,7 @@
@@ -53,9 +53,9 @@ diff -urNd --exclude-from=excludelist kd
#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
+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_new/konq-embed/dropin/kio/kprotocolmanager.cpp 2007-02-24 03:32:31.000000000 +1300
++++ kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp 2007-02-24 03:32:31.000000000 +1300
@@ -23,7 +23,9 @@
*/
@@ -66,9 +66,9 @@ diff -urNd --exclude-from=excludelist kd
#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
+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_new/konq-embed/dropin/kio/progressbase.cpp 2007-02-24 03:33:10.000000000 +1300
++++ kdenox/konq-embed/dropin/kio/progressbase.cpp 2007-02-24 03:33:10.000000000 +1300
@@ -18,6 +18,7 @@
#include "jobclasses.h"
@@ -77,9 +77,9 @@ diff -urNd --exclude-from=excludelist kd
//namespace KIO {
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/ipkg/preinst kdenox_new/konq-embed/ipkg/preinst
+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_new/konq-embed/ipkg/preinst 2007-02-25 21:20:10.000000000 +1300
++++ kdenox/konq-embed/ipkg/preinst 2007-02-25 21:20:10.000000000 +1300
@@ -0,0 +1,15 @@
+#!/bin/sh
+
@@ -96,9 +96,9 @@ diff -urNd --exclude-from=excludelist kd
+ fi
+done
+
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h kdenox_new/konq-embed/kdesrc/kdecore/kmultipledrag.h
+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_new/konq-embed/kdesrc/kdecore/kmultipledrag.h 2007-02-25 16:15:28.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"
@@ -108,9 +108,9 @@ diff -urNd --exclude-from=excludelist kd
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
+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_new/konq-embed/kdesrc/khtml/css/Makefile.am 2007-02-25 16:36:23.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) \
@@ -120,9 +120,9 @@ diff -urNd --exclude-from=excludelist kd
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
+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_new/konq-embed/kdesrc/khtml/dom/Makefile.am 2007-02-25 16:35:07.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
@@ -132,9 +132,9 @@ diff -urNd --exclude-from=excludelist kd
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
+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_new/konq-embed/kdesrc/khtml/ecma/Makefile.am 2007-02-25 17:24:35.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.
@@ -144,9 +144,9 @@ diff -urNd --exclude-from=excludelist kd
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
+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_new/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp 2007-02-25 17:27:39.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>
@@ -158,9 +158,9 @@ diff -urNd --exclude-from=excludelist kd
#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
+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_new/konq-embed/kdesrc/khtml/html/Makefile.am 2007-02-25 16:39:50.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) \
@@ -170,9 +170,9 @@ diff -urNd --exclude-from=excludelist kd
# 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
+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_new/konq-embed/kdesrc/khtml/khtml_part.cpp 2007-02-25 17:22:46.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());
@@ -211,9 +211,9 @@ diff -urNd --exclude-from=excludelist kd
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
+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_new/konq-embed/kdesrc/khtml/misc/Makefile.am 2007-02-25 16:33:47.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
@@ -223,9 +223,9 @@ diff -urNd --exclude-from=excludelist kd
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
+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_new/konq-embed/kdesrc/khtml/rendering/Makefile.am 2007-02-25 16:40:50.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
@@ -235,9 +235,9 @@ diff -urNd --exclude-from=excludelist kd
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
+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_new/konq-embed/kdesrc/khtml/rendering/render_layer.h 2007-02-25 16:56:00.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>
@@ -254,9 +254,9 @@ diff -urNd --exclude-from=excludelist kd
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
+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_new/konq-embed/kdesrc/khtml/rendering/render_object.cpp 2007-02-25 16:44:58.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>
@@ -265,9 +265,9 @@ diff -urNd --exclude-from=excludelist kd
#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
+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_new/konq-embed/kdesrc/khtml/rendering/render_table.h 2007-02-25 16:56:49.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>
@@ -276,9 +276,9 @@ diff -urNd --exclude-from=excludelist kd
#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
+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_new/konq-embed/kdesrc/khtml/rendering/render_text.h 2007-02-25 16:46:39.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"
@@ -287,9 +287,9 @@ diff -urNd --exclude-from=excludelist kd
#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
+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_new/konq-embed/kdesrc/khtml/xml/Makefile.am 2007-02-25 16:38:27.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 \
@@ -299,9 +299,9 @@ diff -urNd --exclude-from=excludelist kd
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
+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_new/konq-embed/kdesrc/kjs/dtoa.cpp 2007-02-25 18:22:33.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>
@@ -322,9 +322,9 @@ diff -urNd --exclude-from=excludelist kd
#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
+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_new/konq-embed/kdesrc/kjs/dtoa.h 2007-02-25 18:20:51.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_
@@ -342,9 +342,9 @@ diff -urNd --exclude-from=excludelist kd
-
+
#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
+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_new/konq-embed/kdesrc/kjs/number_object.cpp 2007-02-25 18:05:36.000000000 +1300
++++ kdenox/konq-embed/kdesrc/kjs/number_object.cpp 2007-02-25 18:05:36.000000000 +1300
@@ -20,6 +20,8 @@
*
*/
@@ -354,9 +354,9 @@ diff -urNd --exclude-from=excludelist kd
#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
+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_new/konq-embed/kdesrc/kjs/ustring.cpp 2007-02-25 18:10:22.000000000 +1300
++++ kdenox/konq-embed/kdesrc/kjs/ustring.cpp 2007-02-25 18:10:22.000000000 +1300
@@ -21,9 +21,7 @@
*
*/
@@ -367,9 +367,9 @@ diff -urNd --exclude-from=excludelist kd
#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
+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_new/konq-embed/src/actions/konqe.rc 2007-02-25 21:20:10.000000000 +1300
++++ 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">
@@ -478,9 +478,9 @@ diff -urNd --exclude-from=excludelist kd
+ <Action name="edit_paste"/>
+</ToolBar>
+</kpartgui>
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditimpl.cc kdenox_new/konq-embed/src/bookmarkeditimpl.cc
+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_new/konq-embed/src/bookmarkeditimpl.cc 2007-02-25 19:17:29.000000000 +1300
++++ kdenox/konq-embed/src/bookmarkeditimpl.cc 2007-02-25 19:17:29.000000000 +1300
@@ -24,6 +24,8 @@
#include "bookmarkeditimpl.h"
@@ -490,9 +490,9 @@ diff -urNd --exclude-from=excludelist kd
#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
+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_new/konq-embed/src/bookmarkeditor.cc 2007-02-25 17:40:34.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>
@@ -502,9 +502,9 @@ diff -urNd --exclude-from=excludelist kd
namespace
{
QPixmap getPngPixmap( const QString &name )
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierarchical.cc kdenox_new/konq-embed/src/bookmarkeditorhierarchical.cc
+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_new/konq-embed/src/bookmarkeditorhierarchical.cc 2007-02-25 20:46:27.000000000 +1300
++++ kdenox/konq-embed/src/bookmarkeditorhierarchical.cc 2007-02-25 20:46:27.000000000 +1300
@@ -22,11 +22,20 @@
*/
@@ -535,9 +535,9 @@ diff -urNd --exclude-from=excludelist kd
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
+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_new/konq-embed/src/bookmarkeditorhierarchical.h 2007-02-25 18:27:17.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__
@@ -550,9 +550,9 @@ diff -urNd --exclude-from=excludelist kd
#include "bookmarkeditorimpl.h"
class XMLElement;
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorimpl.cc kdenox_new/konq-embed/src/bookmarkeditorimpl.cc
+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_new/konq-embed/src/bookmarkeditorimpl.cc 2007-02-25 19:16:40.000000000 +1300
++++ kdenox/konq-embed/src/bookmarkeditorimpl.cc 2007-02-25 19:16:40.000000000 +1300
@@ -23,12 +23,12 @@
#include "bookmarkeditorimpl.h"
@@ -568,9 +568,9 @@ diff -urNd --exclude-from=excludelist kd
#include "bookmarks.h"
#include "xmltree.h"
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.cc kdenox_new/konq-embed/src/bookmarks.cc
+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_new/konq-embed/src/bookmarks.cc 2007-02-25 18:28:08.000000000 +1300
++++ kdenox/konq-embed/src/bookmarks.cc 2007-02-25 18:28:08.000000000 +1300
@@ -24,6 +24,8 @@
#if defined(ENABLE_BOOKMARKS)
@@ -588,9 +588,9 @@ diff -urNd --exclude-from=excludelist kd
#include <klocale.h>
#include <kstandarddirs.h>
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.h kdenox_new/konq-embed/src/bookmarks.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_new/konq-embed/src/bookmarks.h 2007-02-25 18:26:32.000000000 +1300
++++ kdenox/konq-embed/src/bookmarks.h 2007-02-25 18:26:32.000000000 +1300
@@ -34,6 +34,8 @@
#include <kurl.h>
@@ -600,9 +600,9 @@ diff -urNd --exclude-from=excludelist kd
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
+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_new/konq-embed/src/mainwindow_qpe.cc 2007-02-25 17:46:32.000000000 +1300
++++ kdenox/konq-embed/src/mainwindow_qpe.cc 2007-02-25 17:46:32.000000000 +1300
@@ -90,7 +90,7 @@
return iconSet;
}
@@ -621,9 +621,9 @@ diff -urNd --exclude-from=excludelist kd
{
statusJustText( _msg, visible );
}
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.h kdenox_new/konq-embed/src/mainwindow_qpe.h
+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_new/konq-embed/src/mainwindow_qpe.h 2007-02-25 17:47:23.000000000 +1300
++++ kdenox/konq-embed/src/mainwindow_qpe.h 2007-02-25 17:47:23.000000000 +1300
@@ -39,6 +39,10 @@
protected:
@@ -635,9 +635,9 @@ diff -urNd --exclude-from=excludelist kd
};
#endif
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_road.cc kdenox_new/konq-embed/src/mainwindow_road.cc
+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_new/konq-embed/src/mainwindow_road.cc 2007-02-25 20:32:12.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
@@ -651,9 +651,9 @@ diff -urNd --exclude-from=excludelist kd
#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
+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_new/konq-embed/src/mainwindow_x11.cc 2007-02-25 20:33:10.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
@@ -663,9 +663,9 @@ diff -urNd --exclude-from=excludelist kd
#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
+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_new/konq-embed/src/roadtabbar.cc 2007-02-25 17:44:19.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.
*/
@@ -700,9 +700,9 @@ diff -urNd --exclude-from=excludelist kd
// 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
+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_new/konq-embed/src/roadtabbar.h 2007-02-25 17:42:40.000000000 +1300
++++ kdenox/konq-embed/src/roadtabbar.h 2007-02-25 17:42:40.000000000 +1300
@@ -22,6 +22,9 @@
#define __roadtabbar_h__
@@ -713,9 +713,9 @@ diff -urNd --exclude-from=excludelist kd
struct RoadTabParams
{
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/run.cc kdenox_new/konq-embed/src/run.cc
+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_new/konq-embed/src/run.cc 2007-02-25 17:34:35.000000000 +1300
++++ kdenox/konq-embed/src/run.cc 2007-02-25 17:34:35.000000000 +1300
@@ -24,6 +24,7 @@
#include "view.h"
@@ -733,9 +733,9 @@ diff -urNd --exclude-from=excludelist kd
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
+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_new/konq-embed/dropin/khtml/khtml_ext.cpp 2007-02-24 03:38:24.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 )
============================================================
--- packages/konqueror/konqueror-embedded-20070316/konqueror.desktop f61654c86352e52a354a25c38006bfde302806ed
+++ packages/konqueror/konqueror-embedded-20070316/konqueror.desktop a1a145baa691f7f01386d8342a96cdd226cabfa5
@@ -1,6 +1,6 @@ Type=Application
[Desktop Entry]
Exec=konqueror
Icon=konqueror/konqueror
Type=Application
-Name=konqueror
+Name=Konqueror
Comment=Konqueror browser
============================================================
--- packages/konqueror/konqueror-embedded_20070212.bb 4b7b9152573fa0cb5af1e59387644f90358278dc
+++ packages/konqueror/konqueror-embedded_20070316.bb adf4391b2551d7ef984cd1b7a1962f59d3288ebd
@@ -1,19 +1,21 @@ LICENSE = "LGPL GPL"
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"
+PR = "r6"
# 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 \
+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://konqe-kapplication.patch;patch=1 \
+ file://fix_configure.patch;patch=1"
+# file://fix_segfault.patch;patch=1"
S = "${WORKDIR}/kdenox"
export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake"
@@ -21,7 +23,7 @@ export UIC = "${STAGING_BINDIR_NATIVE}/u
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 CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DENABLE_BOOKMARKS"
export PCRE_CONFIG = "invalid"
# uncomment this for a static build
# EXTRAFLAGS = "-lts"
@@ -46,7 +48,7 @@ EXTRA_OECONF = '--prefix=${palmtopdir} \
--disable-static \
--enable-shared \
--disable-debug \
- --with-gui=qpe \
+ --with-gui=road \
--with-ipv6-lookup=no \
--without-xinerama \
# --disable-scrollbars \
@@ -62,7 +64,7 @@ EXTRA_OECONF = '--prefix=${palmtopdir} \
--disable-selection \
--enable-final \
--enable-qt-embedded \
-# --enable-rtti-embedded \
+ --enable-rtti-embedded \
--enable-mt \
--enable-qpe \
--enable-qt-mt \
#
# old_revision [61ef17d3eecc6a9212f6bb579069727d6a934d2e]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [6ba28abd1dba3062e30330b29df1c433b12c1a0f]
# to [47698ae0130023df64cc0af853db3246bb9a6cc0]
#
# patch "conf/distro/include/preferred-opie-versions-1.2.3.inc"
# from [22eae7904db1714ab869c44a5359c3c968f94c4f]
# to [4520c93cc5a96ba999d0653f9a463e26cfe06b17]
#
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc 6ba28abd1dba3062e30330b29df1c433b12c1a0f
+++ conf/distro/include/angstrom-2007-preferred-versions.inc 47698ae0130023df64cc0af853db3246bb9a6cc0
@@ -226,8 +226,8 @@ PREFERRED_VERSION_dcetest ?= "1.2"
PREFERRED_VERSION_dbus-native ?= "1.0.1"
PREFERRED_VERSION_dbus-python ?= "0.71"
PREFERRED_VERSION_dcetest ?= "1.2"
-PREFERRED_VERSION_dcopidl-native ?= "3.5.4"
-PREFERRED_VERSION_dcopidl2cpp-native ?= "3.5.4"
+PREFERRED_VERSION_dcopidl-native ?= "3.5.8"
+PREFERRED_VERSION_dcopidl2cpp-native ?= "3.5.8"
PREFERRED_VERSION_dcron ?= "2.3.3"
PREFERRED_VERSION_ddclient ?= "3.6.3"
PREFERRED_VERSION_debianutils ?= "2.19"
============================================================
--- conf/distro/include/preferred-opie-versions-1.2.3.inc 22eae7904db1714ab869c44a5359c3c968f94c4f
+++ conf/distro/include/preferred-opie-versions-1.2.3.inc 4520c93cc5a96ba999d0653f9a463e26cfe06b17
@@ -208,4 +208,4 @@ PREFERRED_VERSION_opie-stumbler = "${OPI
PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
+PREFERRED_VERSION_konqueror-embedded = "20070316"
-PREFERRED_VERSION_konqueror-embedded = "20070212"
#
#
# patch "packages/libqpe/libqpe-opie.inc"
# from [c1bd05f4b3fca2a8fb673bea16b9192a4c6a1dc3]
# to [39a3ed985b49d78d9e5d903134cb404b9f1eff0e]
#
# patch "packages/libqpe/libqpe-opie_1.2.3.bb"
# from [e1f62cd8a04ab15a45006ed051ef1ad1e05c9f1f]
# to [e40ccb715212c4467dad3596d2f776c152097df7]
#
# patch "packages/libqpe/libqpe-opie_cvs.bb"
# from [1be4fc68fcba5b0e72363211f2fd5c6249ec3333]
# to [220c730d3576bd768e9e7acf18c1d7478616d45d]
#
============================================================
--- packages/libqpe/libqpe-opie.inc c1bd05f4b3fca2a8fb673bea16b9192a4c6a1dc3
+++ packages/libqpe/libqpe-opie.inc 39a3ed985b49d78d9e5d903134cb404b9f1eff0e
@@ -11,11 +11,12 @@ inherit palmtop
inherit palmtop
+OE_QMAKE_CXXFLAGS := "[EMAIL PROTECTED]('-fno-rtti', '${OE_QMAKE_CXXFLAGS}', d)}"
QMAKE_PROFILES = "library.pro"
EXTRA_QMAKEVARS_PRE += "CONFIG+=LIBQPE_WITHROHFEEDBACK"
EXTRA_QMAKEVARS_POST += "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES"
-CXXFLAGS_append = " -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC"
+CXXFLAGS_append = " -frtti -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC"
do_compile() {
mkdir -p ${STAGING_INCDIR}/qpe \
============================================================
--- packages/libqpe/libqpe-opie_1.2.3.bb e1f62cd8a04ab15a45006ed051ef1ad1e05c9f1f
+++ packages/libqpe/libqpe-opie_1.2.3.bb e40ccb715212c4467dad3596d2f776c152097df7
@@ -1,6 +1,6 @@ require ${PN}.inc
require ${PN}.inc
-PR = "r2"
+PR = "r3"
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
============================================================
--- packages/libqpe/libqpe-opie_cvs.bb 1be4fc68fcba5b0e72363211f2fd5c6249ec3333
+++ packages/libqpe/libqpe-opie_cvs.bb 220c730d3576bd768e9e7acf18c1d7478616d45d
@@ -1,7 +1,7 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r4"
+PR = "r5"
SRC_URI = "${HANDHELDS_CVS};module=opie/library \
file://fix-titleheight.patch;patch=1 \
_______________________________________________
Openembedded-stablebranch mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-stablebranch
