[oe-commits] org.oe.dev konqueror-embedded: fix build problems

bluelightning commit oe at amethyst.openembedded.net
Mon Sep 1 17:48:53 UTC 2008 

konqueror-embedded: fix build problems
 * Upgrade 20070212 to 20070316 (earlier version no longer available for fetching)
 * Fix _AC_PATH_X_XMKMF error during configure (fixes bug #3569)

Author: bluelightning at openembedded.org
Branch: org.openembedded.dev
Revision: 987c8d92ee736e8162fb230be7d61936f9640e8d
ViewMTN: http://monotone.openembedded.org/revision/info/987c8d92ee736e8162fb230be7d61936f9640e8d
Files:
1
packages/konqueror/konqueror-embedded-20070212
packages/konqueror/konqueror-embedded-20070316
packages/konqueror/konqueror-embedded_20070212.bb
packages/konqueror/konqueror-embedded_20070316.bb
packages/konqueror/konqueror-embedded-20070316/konqe_new_opie.patch
packages/konqueror/konqueror-embedded-20070316/konqueror.desktop
Diffs:

#
# mt diff -ref96b95bd9637cbe10bcca0129b560159fdedafb -r987c8d92ee736e8162fb230be7d61936f9640e8d
#
#
#
# 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"
# 
# 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 [6e24fc121d123e76770ab74b853705ff5b790e98]
#    to [86f01914d98db2ca4443578b2001273781984d3e]
#
============================================================
--- 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/kj%s
>>> DIFF TRUNCATED @ 16K

More information about the Openembedded-commits mailing list