diff options
| author | Michael Krelin <hacker@klever.net> | 2007-07-03 23:06:52 +0000 |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2007-07-03 23:06:52 +0000 |
| commit | 0656303da8128a1ff55fe8e424d9b8592c92b5d5 (patch) | |
| tree | 1c72d3fa89f629e91762efd83519dceaa72379a3 | |
| parent | 5103645699eb1d07d721e457d65a1c6600429e95 (diff) | |
uicmoc-native 2.3.10: an attempt to fix build against recent kernel, bug #2564
| -rw-r--r-- | packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch | 20 | ||||
| -rw-r--r-- | packages/uicmoc/uicmoc-native_2.3.10.bb | 5 |
2 files changed, 23 insertions, 2 deletions
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 new file mode 100644 index 0000000000..bad2d95967 --- /dev/null +++ b/packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch @@ -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 + + diff --git a/packages/uicmoc/uicmoc-native_2.3.10.bb b/packages/uicmoc/uicmoc-native_2.3.10.bb index 90c9b432fb..cda233554c 100644 --- a/packages/uicmoc/uicmoc-native_2.3.10.bb +++ b/packages/uicmoc/uicmoc-native_2.3.10.bb @@ -3,14 +3,15 @@ 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 |