org.handhelds.familiar/packages/konqueror/konqueror-embedded-20050322/qt-embedded.patch

   1
   2 #
   3 # Patch managed by http://www.holgerschurig.de/patcher.html
   4 #
   5
   6 --- konqueror3-embedded-0.2-20050322/konq-embed/kdesrc/kparts/browserextension.cpp~qt-embedded.patch
   7 +++ konqueror3-embedded-0.2-20050322/konq-embed/kdesrc/kparts/browserextension.cpp
   8 @@ -441,6 +441,7 @@
   9
  10  void BrowserExtension::pasteRequest()
  11  {
  12 +#ifndef QT_NO_CLIPBOARD
  13      QCString plain("plain");
  14      QString url = QApplication::clipboard()->text(plain, QClipboard::Selection).stripWhiteSpace();
  15      // Remove linefeeds and any whitespace surrounding it.
  16 @@ -477,6 +478,7 @@
  17                     KStdGuiItem::cancel(), "MiddleClickSearch" ) == KMessageBox::Yes)
  18            slotOpenURLRequest( filterData.uri(), KParts::URLArgs() );
  19      }
  20 +#endif
  21  }
  22
  23  void BrowserExtension::slotOpenURLRequest( const KURL &url, const KParts::URLArgs &args )
  24 --- konqueror3-embedded-0.2-20050322/konq-embed/kdesrc/khtml/khtmlview.cpp~qt-embedded.patch
  25 +++ konqueror3-embedded-0.2-20050322/konq-embed/kdesrc/khtml/khtmlview.cpp
  26 @@ -96,8 +96,10 @@
  27
  28  //#define DEBUG_PIXEL
  29
  30 +#ifdef THIS_DOESNT_WORK_WITH_QT_EMBEDDED
  31  #include <X11/Xlib.h>
  32  #include <fixx11h.h>
  33 +#endif
  34
  35  #define PAINT_BUFFER_HEIGHT 128
  36
  37 @@ -1182,9 +1184,11 @@
  38          if( !d->cursor_icon_widget ) {
  39              QPixmap icon_pixmap = KGlobal::iconLoader()->loadIcon( "mail_generic", KIcon::Small, 0, KIcon::DefaultState, 0, true );
  40              d->cursor_icon_widget = new QWidget( NULL, NULL, WX11BypassWM );
  41 +#ifdef THIS_DOESNT_WORK_WITH_QT_EMBEDDED
  42              XSetWindowAttributes attr;
  43              attr.save_under = True;
  44              XChangeWindowAttributes( qt_xdisplay(), d->cursor_icon_widget->winId(), CWSaveUnder, &attr );
  45 +#endif
  46              d->cursor_icon_widget->resize( icon_pixmap.width(), icon_pixmap.height());
  47              if( icon_pixmap.mask() )
  48                  d->cursor_icon_widget->setMask( *icon_pixmap.mask());
  49 @@ -1195,8 +1199,10 @@
  50          }
  51          QPoint c_pos = QCursor::pos();
  52          d->cursor_icon_widget->move( c_pos.x() + 15, c_pos.y() + 15 );
  53 +#ifdef THIS_DOESNT_WORK_WITH_QT_EMBEDDED
  54          XRaiseWindow( qt_xdisplay(), d->cursor_icon_widget->winId());
  55          QApplication::flushX();
  56 +#endif
  57          d->cursor_icon_widget->show();
  58      }
  59      else if ( d->cursor_icon_widget )
  60 --- konqueror3-embedded-0.2-20050322/acinclude.m4~qt-embedded.patch
  61 +++ konqueror3-embedded-0.2-20050322/acinclude.m4
  62 @@ -2131,9 +2131,9 @@
  63  save_CXXFLAGS="$CXXFLAGS"
  64  kde_safe_LIBS="$LIBS"
  65  LIBS="$LIBS $X_EXTRA_LIBS"
  66 -if test "$GXX" = "yes"; then
  67 -CXXFLAGS="$CXXFLAGS -pedantic-errors"
  68 -fi
  69 +#if test "$GXX" = "yes"; then
  70 +#CXXFLAGS="$CXXFLAGS -pedantic-errors"
  71 +#fi
  72  AC_TRY_COMPILE([
  73  $2
  74  ],
  75 @@ -3012,7 +3012,7 @@
  76    if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
  77      if test "$kde_use_debug_code" != "no"; then
  78        if test "$CXX" = "KCC"; then
  79 -        CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
  80 +        CXXFLAGS="+K0 -Wall -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
  81        else
  82          if test "$kde_use_debug_code" = "full"; then
  83            CXXFLAGS="-g3 -fno-inline $CXXFLAGS"
  84 @@ -3052,7 +3052,7 @@
  85          case $host in
  86            *-*-linux-gnu)
  87              CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
  88 -            CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
  89 +            CXXFLAGS="-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
  90              KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
  91              KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
  92            ;;