[oe-commits] org.oe.dev uicmoc-native 2.3.10: fix build against recent build-system headers, close bug #2564

[polyonymous commit]

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.

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: d67594e637a1de6c5131d4695749b243b4c90fb4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d67594e637a1de6c5131d4695749b243b4c90fb4
Files:
1
packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch
packages/uicmoc/uicmoc-native_2.3.10.bb
Diffs:

#
# mt diff -rb9f28950ce0e5032433908dc3314bafd097337e3 -rd67594e637a1de6c5131d4695749b243b4c90fb4
#
# 
# 
# patch "packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch"
#  from [80a6d114216133cf5b84be77d9090ced7721b591]
#    to [a39f97d0da5e0a3b4566cbcd06c6c4c9ee184c6f]
# 
# patch "packages/uicmoc/uicmoc-native_2.3.10.bb"
#  from [5f5ef578c72a6f1a4350fd30b2b73d049ce313c6]
#    to [aef21967161c38e506e0763c794755313d83cad0]
# 
============================================================
--- packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch	80a6d114216133cf5b84be77d9090ced7721b591
+++ packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch	a39f97d0da5e0a3b4566cbcd06c6c4c9ee184c6f
@@ -1,11 +1,11 @@ index c2e7d9b..8d39585 100644
 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)
============================================================
--- packages/uicmoc/uicmoc-native_2.3.10.bb	5f5ef578c72a6f1a4350fd30b2b73d049ce313c6
+++ packages/uicmoc/uicmoc-native_2.3.10.bb	aef21967161c38e506e0763c794755313d83cad0
@@ -1,9 +1,9 @@ LICENSE = "GPL QPL"
 DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 2.x"
 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 \