[oe-commits] org.oe.dev merge of '48173d5e9ba6b9c01006caf0faeedb090a20d0d1'

[hrw commit]

merge of '48173d5e9ba6b9c01006caf0faeedb090a20d0d1'
     and 'f3281034536642327c1e507cb7559b3899f99d18'

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

#
# mt diff -r48173d5e9ba6b9c01006caf0faeedb090a20d0d1 -r86d74b08ce4bcaf0d0662e4f6ed740ba528fd0cc
#
# 
# 
# patch "packages/qemu/qemu-native.inc"
#  from [a6c0e5a75f0d0228a83c274f444a11031af95f6c]
#    to [71d3322a1e1cff08495c023c071fdd6a29e15a80]
# 
============================================================
--- packages/qemu/qemu-native.inc	a6c0e5a75f0d0228a83c274f444a11031af95f6c
+++ packages/qemu/qemu-native.inc	71d3322a1e1cff08495c023c071fdd6a29e15a80
@@ -1,6 +1,6 @@ FILESPATH =. "${@os.path.dirname(bb.data
 FILESPATH =. "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qemu-${PV}:"
 # prefix = "${STAGING_DIR}/${BUILD_SYS}"
-DEPENDS = "libsdl-native"
+DEPENDS = "libsdl-native zlib-native"
 
 python __anonymous() {
     from bb import which, data


#
# mt diff -rf3281034536642327c1e507cb7559b3899f99d18 -r86d74b08ce4bcaf0d0662e4f6ed740ba528fd0cc
#
# 
# 
# add_file "packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch"
#  content [80a6d114216133cf5b84be77d9090ced7721b591]
# 
# patch "packages/uicmoc/uicmoc-native_2.3.10.bb"
#  from [3eb23cf0c505c798552d20494b420631903c6ab1]
#    to [5f5ef578c72a6f1a4350fd30b2b73d049ce313c6]
# 
============================================================
--- packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch	80a6d114216133cf5b84be77d9090ced7721b591
+++ packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch	80a6d114216133cf5b84be77d9090ced7721b591
@@ -0,0 +1,20 @@
+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();
+ #ifdef THROW_AWAY_UNUSED_PAGES
+ # include <sys/mman.h> // madvise
+ # 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)
++# endif
+ # ifndef PAGE_ALIGN
+-# define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
+-# endif // PAGE_ALIGN
++#  define PAGE_ALIGN(addr)      (((addr)+getpagesize()-1)&~(getpagesize()-1))
++# endif
+ #endif // THROW_AWAY_UNUSED_PAGES 
+ 
+ 
============================================================
--- packages/uicmoc/uicmoc-native_2.3.10.bb	3eb23cf0c505c798552d20494b420631903c6ab1
+++ packages/uicmoc/uicmoc-native_2.3.10.bb	5f5ef578c72a6f1a4350fd30b2b73d049ce313c6
@@ -1,16 +1,17 @@ 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 = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \
            file://fix-makefile.patch;patch=1 \
            file://gcc3_4.patch;patch=1" \
            file://gcc4.patch;patch=1 \
            file://gcc4_1.patch;patch=1 \
-           file://64bit-cleanup.patch;patch=1"
+           file://64bit-cleanup.patch;patch=1 \
+	   file://kernel-asm-page.patch;patch=1"
 S = "${WORKDIR}/qt-${PV}"
 
 inherit native qmake-base