[oe-commits] org.oe.dev qte, qte-mt 2.3.10: Fix build with recent kernel headers.

[polyonymous commit]

qte, qte-mt 2.3.10: Fix build with recent kernel headers.
* Closes #2201.

Author: polyonymous at klever.net
Branch: org.openembedded.dev
Revision: b896e366f22797c8a8d7c7db63a0236eefe66dc9
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b896e366f22797c8a8d7c7db63a0236eefe66dc9
Files:
1
packages/qte/qte-2.3.10/kernel-asm-page.patch
packages/qte/qte-common_2.3.10.inc
packages/qte/qte-mt-static_2.3.10.bb
packages/qte/qte-mt_2.3.10.bb
packages/qte/qte_2.3.10.bb
Diffs:

#
# mt diff -rba1cabe56e69c8589c61e7c884217cc75f950877 -rb896e366f22797c8a8d7c7db63a0236eefe66dc9
#
# 
# 
# add_file "packages/qte/qte-2.3.10/kernel-asm-page.patch"
#  content [9261e3562f56c02a5f6f6912310a42f75c16c747]
# 
# patch "packages/qte/qte-common_2.3.10.inc"
#  from [4f1d2039506a32408d82758590178638308a0c96]
#    to [ded8ab84304cf4e0cc2e2faf4c4e54856827b3db]
# 
# patch "packages/qte/qte-mt-static_2.3.10.bb"
#  from [5f4e4458a4ccf2748cff791ad08ea8412edf4f4b]
#    to [588530d72a8bca88176aaeb94bf68ea99aa6fe21]
# 
# patch "packages/qte/qte-mt_2.3.10.bb"
#  from [bb8c2ef7f78300f47ee57dbd065f399443e54e2a]
#    to [3696b615e76ee1a6264f44fa769bb3314458702f]
# 
# patch "packages/qte/qte_2.3.10.bb"
#  from [1d29356f9f2db5ba721690e68970b94d557d25e3]
#    to [0c09f9ca6fac5e02467ddb087a0c62b84b0af4df]
# 
============================================================
--- packages/qte/qte-2.3.10/kernel-asm-page.patch	9261e3562f56c02a5f6f6912310a42f75c16c747
+++ packages/qte/qte-2.3.10/kernel-asm-page.patch	9261e3562f56c02a5f6f6912310a42f75c16c747
@@ -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
============================================================
--- packages/qte/qte-common_2.3.10.inc	4f1d2039506a32408d82758590178638308a0c96
+++ packages/qte/qte-common_2.3.10.inc	ded8ab84304cf4e0cc2e2faf4c4e54856827b3db
@@ -47,6 +47,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/q
 	   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 = "-system-jpeg -system-lib
 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"
 
 #
============================================================
--- packages/qte/qte-mt-static_2.3.10.bb	5f4e4458a4ccf2748cff791ad08ea8412edf4f4b
+++ packages/qte/qte-mt-static_2.3.10.bb	588530d72a8bca88176aaeb94bf68ea99aa6fe21
@@ -1,5 +1,5 @@ require qte-common_${PV}.inc
 require qte-common_${PV}.inc
-PR = "r5"
+PR = "r6"
 
 EXTRA_OECONF += "-static -thread"
 
============================================================
--- packages/qte/qte-mt_2.3.10.bb	bb8c2ef7f78300f47ee57dbd065f399443e54e2a
+++ packages/qte/qte-mt_2.3.10.bb	3696b615e76ee1a6264f44fa769bb3314458702f
@@ -1,5 +1,5 @@ require qte-common_${PV}.inc
 require qte-common_${PV}.inc
-PR = "r11"
+PR = "r12"
 
 EXTRA_OECONF += "-thread"
 
============================================================
--- packages/qte/qte_2.3.10.bb	1d29356f9f2db5ba721690e68970b94d557d25e3
+++ packages/qte/qte_2.3.10.bb	0c09f9ca6fac5e02467ddb087a0c62b84b0af4df
@@ -1,3 +1,3 @@ require qte-common_${PV}.inc
 require qte-common_${PV}.inc
-PR = "r49"
+PR = "r50"