konqueror 20060404 add gcc4 patch, remove 20050322

5 files changed, 19 insertions, 148 deletions

diff --git a/packages/konqueror/files/gcc4.patch b/packages/konqueror/files/gcc4.patch
new file mode 100644
index 0000000000..88735242cb
--- /dev/null
+++ b/packages/konqueror/files/gcc4.patch
@@ -0,0 +1,16 @@
+
+#
+# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de>
+#
+
+--- kdenox/konq-embed/dropin/kapplication.h~gcc4
++++ kdenox/konq-embed/dropin/kapplication.h
+@@ -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-20050322/.mtn2git_empty b/packages/konqueror/konqueror-embedded-20050322/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/konqueror/konqueror-embedded-20050322/.mtn2git_empty
+++ /dev/null
diff --git a/packages/konqueror/konqueror-embedded-20050322/qt-embedded.patch b/packages/konqueror/konqueror-embedded-20050322/qt-embedded.patch
deleted file mode 100644
index cb0dc644c9..0000000000
--- a/packages/konqueror/konqueror-embedded-20050322/qt-embedded.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- konqueror3-embedded-0.2-20050322/konq-embed/kdesrc/kparts/browserextension.cpp~qt-embedded.patch
-+++ konqueror3-embedded-0.2-20050322/konq-embed/kdesrc/kparts/browserextension.cpp
-@@ -441,6 +441,7 @@
- 
- void BrowserExtension::pasteRequest()
- {
-+#ifndef QT_NO_CLIPBOARD
-     QCString plain("plain");
-     QString url = QApplication::clipboard()->text(plain, QClipboard::Selection).stripWhiteSpace();
-     // Remove linefeeds and any whitespace surrounding it.
-@@ -477,6 +478,7 @@
- 		    KStdGuiItem::cancel(), "MiddleClickSearch" ) == KMessageBox::Yes)
-           slotOpenURLRequest( filterData.uri(), KParts::URLArgs() );
-     }
-+#endif
- }
- 
- void BrowserExtension::slotOpenURLRequest( const KURL &url, const KParts::URLArgs &args )
---- konqueror3-embedded-0.2-20050322/konq-embed/kdesrc/khtml/khtmlview.cpp~qt-embedded.patch
-+++ konqueror3-embedded-0.2-20050322/konq-embed/kdesrc/khtml/khtmlview.cpp
-@@ -96,8 +96,10 @@
- 
- //#define DEBUG_PIXEL
- 
-+#ifdef THIS_DOESNT_WORK_WITH_QT_EMBEDDED
- #include <X11/Xlib.h>
- #include <fixx11h.h>
-+#endif
- 
- #define PAINT_BUFFER_HEIGHT 128
- 
-@@ -1182,9 +1184,11 @@
-         if( !d->cursor_icon_widget ) {
-             QPixmap icon_pixmap = KGlobal::iconLoader()->loadIcon( "mail_generic", KIcon::Small, 0, KIcon::DefaultState, 0, true );
-             d->cursor_icon_widget = new QWidget( NULL, NULL, WX11BypassWM );
-+#ifdef THIS_DOESNT_WORK_WITH_QT_EMBEDDED
-             XSetWindowAttributes attr;
-             attr.save_under = True;
-             XChangeWindowAttributes( qt_xdisplay(), d->cursor_icon_widget->winId(), CWSaveUnder, &attr );
-+#endif
-             d->cursor_icon_widget->resize( icon_pixmap.width(), icon_pixmap.height());
-             if( icon_pixmap.mask() )
-                 d->cursor_icon_widget->setMask( *icon_pixmap.mask());
-@@ -1195,8 +1199,10 @@
-         }
-         QPoint c_pos = QCursor::pos();
-         d->cursor_icon_widget->move( c_pos.x() + 15, c_pos.y() + 15 );
-+#ifdef THIS_DOESNT_WORK_WITH_QT_EMBEDDED
-         XRaiseWindow( qt_xdisplay(), d->cursor_icon_widget->winId());
-         QApplication::flushX();
-+#endif
-         d->cursor_icon_widget->show();
-     }
-     else if ( d->cursor_icon_widget )
---- konqueror3-embedded-0.2-20050322/acinclude.m4~qt-embedded.patch
-+++ konqueror3-embedded-0.2-20050322/acinclude.m4
-@@ -2131,9 +2131,9 @@
- save_CXXFLAGS="$CXXFLAGS"
- kde_safe_LIBS="$LIBS"
- LIBS="$LIBS $X_EXTRA_LIBS"
--if test "$GXX" = "yes"; then
--CXXFLAGS="$CXXFLAGS -pedantic-errors"
--fi
-+#if test "$GXX" = "yes"; then
-+#CXXFLAGS="$CXXFLAGS -pedantic-errors"
-+#fi
- AC_TRY_COMPILE([
- $2
- ],
-@@ -3012,7 +3012,7 @@
-   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
-     if test "$kde_use_debug_code" != "no"; then
-       if test "$CXX" = "KCC"; then
--        CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
-+        CXXFLAGS="+K0 -Wall -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
-       else
-         if test "$kde_use_debug_code" = "full"; then
-           CXXFLAGS="-g3 -fno-inline $CXXFLAGS"
-@@ -3052,7 +3052,7 @@
-         case $host in
-           *-*-linux-gnu)	
-             CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
--            CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
-+            CXXFLAGS="-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
-             KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
-             KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
-           ;;
diff --git a/packages/konqueror/konqueror-embedded_20050322.bb b/packages/konqueror/konqueror-embedded_20050322.bb
deleted file mode 100644
index 1fec1375c5..0000000000
--- a/packages/konqueror/konqueror-embedded_20050322.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition"
-BROKEN = "1"
-SECTION = "applications"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.cirulla.net/kdenox-snapshots/"
-DEPENDS = "openssl pcre"
-LICENSE = "LGPL/GPL"
-PR = "r3"
-
-# Note if this .bb files fails with the error:
-# "No rule to make target `-lpcre', needed by `konqueror'.  Stop."
-# a workaround is to install the libpcre3-dev package onto your build
-# machine (Ubuntu/Debain) or your distro's equivalent (FC = pcre-devel).
-
-SRC_URI = "http://www.cirulla.net/kdenox-snapshots/snapshots/konqueror3-embedded-0.2-${PV}.tar.bz2 \
-           file://qt-embedded.patch;patch=1"
-S = "${WORKDIR}/konqueror3-embedded-0.2-${PV}"
-
-DEFAULT_PREFERENCE = "-1"
-
-inherit autotools
-
-FILES_${PN} = "${palmtopdir}"
-
-export QMAKE = "${STAGING_BINDIR}/qmake"
-export MOC = "${STAGING_BINDIR}/moc"
-export UIC = "${STAGING_BINDIR}/uic"
-export exec_prefix = "${STAGING_LIBDIR}/.."
-
-EXTRA_OECONF  = '--prefix=${palmtopdir} --exec-prefix=${palmtopdir}'
-EXTRA_OECONF += '--with-extra-includes=${STAGING_INCDIR} --with-extra-libs=${STAGING_LIBDIR}'
-EXTRA_OECONF += '--enable-static --disable-shared --disable-debug'
-EXTRA_OECONF += '--enable-qt-embedded --enable-embedded --without-arts'
-EXTRA_OECONF += '--with-javascript=static --with-gui=kiosk'
-EXTRA_OECONF += '--disable-selection --disable-scrollbars --disable-bookmarks'
-EXTRA_OECONF += '--with-ssl-version=0.9.7e --with-ssl-dir=${STAGING_LIBDIR}/..'
-EXTRA_OECONF += '--with-qt-includes=${STAGING_INCDIR}/qt3'
-EXTRA_OECONF += '--with-qt-libraries=${STAGING_LIBDIR}'
-
-MOC = "${STAGING_BINDIR}/moc3"
-UIC = "${STAGING_BINDIR}/uic3"
-
-do_compile_prepend() {
-	perl admin/am_edit
-}
-
-do_install() {
-    install -d ${D}${palmtopdir}/share/
-    install -d ${D}${palmtopdir}/share/config/
-    
-    install -m 0644 ${WORKDIR}/konq-embedrc ${D}${palmtopdir}/share/config/
-    
-    autotools_do_install
-}
diff --git a/packages/konqueror/konqueror-embedded_20060404.bb b/packages/konqueror/konqueror-embedded_20060404.bb
index e5f2901cb8..8ab25baf6e 100644
--- a/packages/konqueror/konqueror-embedded_20060404.bb
+++ b/packages/konqueror/konqueror-embedded_20060404.bb
@@ -4,14 +4,15 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.konqueror.org/"
 DEPENDS = "openssl pcre virtual/libqte2 dcopidl-native dcopidl2cpp-native"
 LICENSE = "LGPL/GPL"
-PR = "r2"
+PR = "r3"
 
 # this Konqueror needs the KDEDIR set and the font helvetica installed on the target
 
 inherit autotools
 
 SRC_URI = "svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.1;module=kdelibs;date=${PV} \
-           svn://anonsvn.kde.org/home/kde/trunk;module=kdenox;date=${PV}"
+           svn://anonsvn.kde.org/home/kde/trunk;module=kdenox;date=${PV} \
+           file://gcc4.patch;patch=1"
 # uncomment this for a static build
 #          file://inject-extraflags.patch;patch=1"
 S = "${WORKDIR}/kdenox"