From: Michael Krelin <hacker@klever.net>
Date: Sun, 15 Jul 2007 12:22:36 +0000 (+0000)
Subject: uicmoc-native 2.3.10: fix build against recent build-system headers, close bug #2564
X-Git-Tag: Release-2010-05/1~8868^2~149^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=243de1dbecc79bde80db21fd1643289a55af0dc4;p=openembedded.git

uicmoc-native 2.3.10: fix build against recent build-system headers, close bug #2564
not only recent headers do not define relevant stuff in asm/page.h, but they do not
provide the file anymore.
---

diff --git a/packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch b/packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch
index bad2d95967..0d3187417a 100644
--- a/packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch
+++ b/packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch
@@ -2,10 +2,10 @@ diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp
 index c2e7d9b..8d39585 100644
 --- a/src/kernel/qpixmapcache.cpp
 +++ b/src/kernel/qpixmapcache.cpp
-@@ -123,9 +123,13 @@ void cleanup_pixmap_cache();
+@@ -123,9 +123,12 @@ void cleanup_pixmap_cache();
  #ifdef THROW_AWAY_UNUSED_PAGES
  # include <sys/mman.h> // madvise
- # include <asm/page.h> // PAGE_SIZE,PAGE_MASK,PAGE_ALIGN
+-# include <asm/page.h> // PAGE_SIZE,PAGE_MASK,PAGE_ALIGN
 +# include <unistd.h>	// getpagesize()
 +# if (!defined(PAGE_ALIGN)) && defined(PAGE_SIZE) && defined(PAGE_MASK)
 +#  define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
diff --git a/packages/uicmoc/uicmoc-native_2.3.10.bb b/packages/uicmoc/uicmoc-native_2.3.10.bb
index cda233554c..4d6b16a3b3 100644
--- a/packages/uicmoc/uicmoc-native_2.3.10.bb
+++ b/packages/uicmoc/uicmoc-native_2.3.10.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 PRIORITY = "optional"
 LICENSE = "GPL QPL"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
            file://fix-makefile.patch;patch=1 \