summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorMichael Krelin <hacker@klever.net>2007-07-15 12:22:36 +0000
committerMichael Krelin <hacker@klever.net>2007-07-15 12:22:36 +0000
commit243de1dbecc79bde80db21fd1643289a55af0dc4 (patch)
tree3b7dfe6e6e8df513714fa7aaace43cbb39c4e278 /packages
parent7d2d3ab59a2103851a973ad48e6d57abd6a1a41c (diff)
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.
Diffstat (limited to 'packages')
-rw-r--r--packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch4
-rw-r--r--packages/uicmoc/uicmoc-native_2.3.10.bb2
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 \