diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-05-03 06:51:18 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-05-03 06:51:18 +0000 |
| commit | 276cbec6d15b6d5037708f641675c9ccdad3bb26 (patch) | |
| tree | ae823a21dbf4e1cf8f1856b87e53035715abe212 | |
| parent | 1d7e64956bf90b38b702b4d480c65629f9013204 (diff) | |
| parent | 99cb96ea16a0649b18b9137de4706432e88300d0 (diff) | |
merge of '6d811ac107aadf1d105bf5af985162ee4955637b'
and 'c97b8005b2f1a28eefa9f9d303214fa1a70e9db5'
| -rw-r--r-- | packages/qte/qte-2.3.10/kernel-asm-page.patch | 14 | ||||
| -rw-r--r-- | packages/qte/qte-common_2.3.10.inc | 4 | ||||
| -rw-r--r-- | packages/qte/qte-mt-static_2.3.10.bb | 2 | ||||
| -rw-r--r-- | packages/qte/qte-mt_2.3.10.bb | 2 | ||||
| -rw-r--r-- | packages/qte/qte_2.3.10.bb | 2 |
5 files changed, 20 insertions, 4 deletions
diff --git a/packages/qte/qte-2.3.10/kernel-asm-page.patch b/packages/qte/qte-2.3.10/kernel-asm-page.patch new file mode 100644 index 0000000000..cbbd114144 --- /dev/null +++ b/packages/qte/qte-2.3.10/kernel-asm-page.patch @@ -0,0 +1,14 @@ +diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp +index c2e7d9b..b2d42b5 100644 +--- a/src/kernel/qpixmapcache.cpp ++++ b/src/kernel/qpixmapcache.cpp +@@ -122,7 +122,9 @@ void cleanup_pixmap_cache(); + + #ifdef THROW_AWAY_UNUSED_PAGES + # include <sys/mman.h> // madvise ++# define __KERNEL__ + # include <asm/page.h> // PAGE_SIZE,PAGE_MASK,PAGE_ALIGN ++# undef __KERNEL__ + # ifndef PAGE_ALIGN + # define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) + # endif // PAGE_ALIGN diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index 65204050ac..28233c0680 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -47,6 +47,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m file://fix-errno-exception-spec.patch;patch=1 \ file://keyboardless-buttonmap.patch;patch=1 \ file://kernel-keymap.patch;patch=1 \ + file://kernel-asm-page.patch;patch=1 \ file://sharp_char.h \ file://switches.h " @@ -88,7 +89,8 @@ EXTRA_OECONF_CONFIG = "-qconfig qpe" EXTRA_OECONF_CONFIG_c7x0 = "-qconfig qpe -accel-w100" EXTRA_OECONF_CONFIG_native = "-qconfig qpe -qvfb" EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif \ - -xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32" + -xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32 \ + -I${STAGING_KERNEL_DIR}/include" EXTRA_OEMAKE = "-e" # diff --git a/packages/qte/qte-mt-static_2.3.10.bb b/packages/qte/qte-mt-static_2.3.10.bb index 446b601adb..113d471df6 100644 --- a/packages/qte/qte-mt-static_2.3.10.bb +++ b/packages/qte/qte-mt-static_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r5" +PR = "r6" EXTRA_OECONF += "-static -thread" diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb index 4bc8c60b79..4c6170ee59 100644 --- a/packages/qte/qte-mt_2.3.10.bb +++ b/packages/qte/qte-mt_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r11" +PR = "r12" EXTRA_OECONF += "-thread" diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index 3304868768..dbbdd4c0e6 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -1,3 +1,3 @@ require qte-common_${PV}.inc -PR = "r49" +PR = "r50" |