diff options
| author | Justin Patrin <papercrane@gmail.com> | 2007-07-15 18:22:28 +0000 |
|---|---|---|
| committer | Justin Patrin <papercrane@gmail.com> | 2007-07-15 18:22:28 +0000 |
| commit | 1fa5ac1e14b9c5d49049291c7320ef02dd642987 (patch) | |
| tree | 6c3de768f4657e8457b2665ab299b3afc4a852b3 /packages/uicmoc | |
| parent | 2a459e94bce798e983c094c88b56336bb3a741e7 (diff) | |
| parent | 49fda09ae55ff5ddecfe74cc7337a5a2ee87cb93 (diff) | |
merge of '1387039c3c15738450afefa2fce201e47d65b903'
and '452f86f495845b7b3291db690dea35910db6e714'
Diffstat (limited to 'packages/uicmoc')
| -rw-r--r-- | packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch | 4 | ||||
| -rw-r--r-- | packages/uicmoc/uicmoc-native_2.3.10.bb | 2 |
2 files changed, 3 insertions, 3 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 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 \ |