merge of 8f860e5acf5f3449ded79e9bc876a6b5b70cbc47

     and fde5a287da3f85a26581cb7c6634cc8fb3ca4a59

3 files changed, 130 insertions, 16 deletions

diff --git a/packages/qt/qt4-x11-free-4.1.1/fix-mkspecs.patch b/packages/qt/qt4-x11-free-4.1.1/fix-mkspecs.patch
new file mode 100644
index 0000000000..e927df9c7d
--- /dev/null
+++ b/packages/qt/qt4-x11-free-4.1.1/fix-mkspecs.patch
@@ -0,0 +1,102 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-x11-opensource-src-4.1.1/mkspecs/linux-g++/qmake.conf~fix-qmakespec
++++ qt-x11-opensource-src-4.1.1/mkspecs/linux-g++/qmake.conf
+@@ -8,7 +8,7 @@
+ QT			+= core gui
+ QMAKE_INCREMENTAL_STYLE = sublib
+ 
+-QMAKE_CC		= gcc
++QMAKE_CC		= $(OE_QMAKE_CC)
+ QMAKE_LEX		= flex
+ QMAKE_LEXFLAGS		=
+ QMAKE_YACC		= yacc
+@@ -16,19 +16,19 @@
+ QMAKE_YACCFLAGS_MANGLE  = -p $base -b $base
+ QMAKE_YACC_HEADER       = $base.tab.h
+ QMAKE_YACC_SOURCE       = $base.tab.c
+-QMAKE_CFLAGS		= -pipe
++QMAKE_CFLAGS		= -pipe $(OE_QMAKE_CFLAGS)
+ QMAKE_CFLAGS_DEPS	= -M
+ QMAKE_CFLAGS_WARN_ON	= -Wall -W
+ QMAKE_CFLAGS_WARN_OFF	= -w
+-QMAKE_CFLAGS_RELEASE	= -O2
++QMAKE_CFLAGS_RELEASE	= -O2 
+ QMAKE_CFLAGS_DEBUG	= -g
+ QMAKE_CFLAGS_SHLIB	= -fPIC
+ QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+ QMAKE_CFLAGS_THREAD	= -D_REENTRANT
+ QMAKE_CFLAGS_HIDESYMS   = -fvisibility=hidden
+ 
+-QMAKE_CXX		= g++
+-QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
++QMAKE_CXX		= $(OE_QMAKE_CXX)
++QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
+ QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
+ QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
+@@ -41,37 +41,37 @@
+ 
+ QMAKE_INCDIR		=
+ QMAKE_LIBDIR		=
+-QMAKE_INCDIR_X11	= /usr/X11R6/include
+-QMAKE_LIBDIR_X11	= /usr/X11R6/lib
+-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
+-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
+-QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
++QMAKE_INCDIR_X11	=
++QMAKE_LIBDIR_X11	=
++QMAKE_INCDIR_QT		= $(OE_QMAKE_INCDIR_QT)
++QMAKE_LIBDIR_QT		= $(OE_QMAKE_LIBDIR_QT)
++QMAKE_INCDIR_OPENGL	=
++QMAKE_LIBDIR_OPENGL	=
+ 
+-QMAKE_LINK		= g++
+-QMAKE_LINK_SHLIB	= g++
+-QMAKE_LFLAGS		=
++QMAKE_LINK		= $(OE_QMAKE_LINK)
++QMAKE_LINK_SHLIB	= $(OE_QMAKE_LINK)
++QMAKE_LFLAGS		= $(OE_QMAKE_LDFLAGS)
+ QMAKE_LFLAGS_RELEASE	=
+ QMAKE_LFLAGS_DEBUG	=
+ QMAKE_LFLAGS_SHLIB	= -shared
+ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
+ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
+ QMAKE_LFLAGS_THREAD	=
+-QMAKE_RPATH		= -Wl,-rpath,
++QMAKE_RPATH		= -Wl,-rpath-link,
+ 
+ QMAKE_LIBS		=
+ QMAKE_LIBS_DYNLOAD	= -ldl
+-QMAKE_LIBS_X11		= -lXext -lX11 -lm
+-QMAKE_LIBS_X11SM	= -lSM -lICE
++QMAKE_LIBS_X11		= $(OE_QMAKE_LIBS_X11)
++QMAKE_LIBS_X11SM	= $(OE_QMAKE_LIBS_X11SM)
+ QMAKE_LIBS_NIS		= -lnsl
+ QMAKE_LIBS_OPENGL	= -lGLU -lGL
+ QMAKE_LIBS_OPENGL_QT	= -lGL
+ QMAKE_LIBS_THREAD	= -lpthread
+ 
+-QMAKE_MOC		= $$[QT_INSTALL_BINS]/moc
+-QMAKE_UIC		= $$[QT_INSTALL_BINS]/uic
++QMAKE_MOC		= $(OE_QMAKE_MOC)
++QMAKE_UIC		= $(OE_QMAKE_UIC)
+ 
+-QMAKE_AR		= ar cqs
++QMAKE_AR		= $(OE_QMAKE_AR) cqs
+ QMAKE_RANLIB		=
+ 
+ QMAKE_TAR		= tar -cf
+@@ -83,7 +83,7 @@
+ QMAKE_MOVE		= mv -f
+ QMAKE_DEL_FILE		= rm -f
+ QMAKE_DEL_DIR		= rmdir
+-QMAKE_STRIP             = strip
++QMAKE_STRIP             = $(OE_QMAKE_STRIP)
+ QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
+ QMAKE_CHK_DIR_EXISTS	= test -d
+ QMAKE_MKDIR		= mkdir -p
diff --git a/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch b/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch
index 17836802a6..0e5d3ff153 100644
--- a/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch
+++ b/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch
@@ -1,6 +1,19 @@
---- qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp~64bit	2005-12-14 15:51:23.000000000 +0000
-+++ qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp	2005-12-14 15:52:29.000000000 +0000
-@@ -176,7 +176,7 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp~64bit-cleanup.patch
++++ qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp
+@@ -40,6 +40,7 @@
+ 
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -176,7 +177,7 @@
  				 MAP_SHARED, fd, 0);
      data += dataoffset;
  
@@ -9,7 +22,7 @@
  	perror("mapping /dev/fb0");
  	qWarning("Error: failed to map framebuffer device to memory.");
  	return FALSE;
-@@ -737,7 +737,7 @@
+@@ -737,7 +738,7 @@
      psize += 8;     // for alignment
      psize &= ~0x7;  // align
  
@@ -18,8 +31,8 @@
      pos += psize;
      entryp = ((int *)pos);
      lowest = ((unsigned int *)pos)+1;
---- qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp~64bit	2005-12-14 15:34:43.000000000 +0000
-+++ qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp	2005-12-14 15:35:26.000000000 +0000
+--- qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp~64bit-cleanup.patch
++++ qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp
 @@ -31,6 +31,7 @@
  **********************************************************************/
  
@@ -37,8 +50,8 @@
      return FALSE;
    else
      return TRUE;
---- qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp~64bit	2005-12-14 15:27:14.000000000 +0000
-+++ qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp	2005-12-14 15:28:37.000000000 +0000
+--- qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp~64bit-cleanup.patch
++++ qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp
 @@ -107,6 +107,7 @@
  #include <locale.h>
  #include <errno.h>
@@ -79,8 +92,8 @@
  			else
  			    QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor);
  		    }
---- qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp~64bit	2005-12-14 15:29:17.000000000 +0000
-+++ qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp	2005-12-14 15:29:54.000000000 +0000
+--- qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp~64bit-cleanup.patch
++++ qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp
 @@ -49,6 +49,7 @@
  #include "qgfx_qws.h"
  #include "qtextengine_p.h"
@@ -98,8 +111,8 @@
  
  	// look for the requested font in the engine data cache
  	engineData = QFontCache::instance->findEngineData( key );
---- qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp~64bit	2005-12-14 15:32:12.000000000 +0000
-+++ qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp	2005-12-14 15:32:52.000000000 +0000
+--- qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp~64bit-cleanup.patch
++++ qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp
 @@ -32,6 +32,7 @@
  #include "qwsdisplay_qws.h"
  #include "qwsregionmanager_qws.h"
@@ -117,8 +130,8 @@
  #else
  	int dataSize = sizeof(QWSRegionHeader)                // header
  		    + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index
---- qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp~64bit	2005-12-14 15:30:36.000000000 +0000
-+++ qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp	2005-12-14 15:31:37.000000000 +0000
+--- qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp~64bit-cleanup.patch
++++ qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp
 @@ -53,6 +53,7 @@
  #include "qwsmanager_qws.h"
  #include "qwsregionmanager_qws.h"
diff --git a/packages/uicmoc/uicmoc3-native_3.3.5.bb b/packages/uicmoc/uicmoc3-native_3.3.5.bb
index 142b3997e0..d75b9c889b 100644
--- a/packages/uicmoc/uicmoc3-native_3.3.5.bb
+++ b/packages/uicmoc/uicmoc3-native_3.3.5.bb
@@ -4,12 +4,11 @@ SECTION = "devel"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL QPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2 \
            file://no-examples.patch;patch=1 \
            file://64bit-cleanup.patch;patch=1"
-
 S = "${WORKDIR}/qt-embedded-free-${PV}"
 
 inherit native qmake-base qt3e