[oe-commits] org.oe.dev qte 2.3.10: Fix lack of PAGE_* in latest linux-headers properly: use getpagesize()

[polyonymous commit]

qte 2.3.10: Fix lack of PAGE_* in latest linux-headers properly: use getpagesize() 
* Closes #2201.

Author: polyonymous at klever.net
Branch: org.openembedded.dev
Revision: 63574aab45fa11754d7be72eaf51866ddc2f1fc4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=63574aab45fa11754d7be72eaf51866ddc2f1fc4
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 -rc3da8ddf3a7e9e67a05e625b3e3928d577b784fa -r63574aab45fa11754d7be72eaf51866ddc2f1fc4
#
# 
# 
# patch "packages/qte/qte-2.3.10/kernel-asm-page.patch"
#  from [9261e3562f56c02a5f6f6912310a42f75c16c747]
#    to [80a6d114216133cf5b84be77d9090ced7721b591]
# 
# patch "packages/qte/qte-common_2.3.10.inc"
#  from [ded8ab84304cf4e0cc2e2faf4c4e54856827b3db]
#    to [77b17aa1d6610e4d5c33ba805a1fef052f47a292]
# 
# patch "packages/qte/qte-mt-static_2.3.10.bb"
#  from [588530d72a8bca88176aaeb94bf68ea99aa6fe21]
#    to [32b5ae85f4bf2da0c3d5c54c6cd46449a07d89d4]
# 
# patch "packages/qte/qte-mt_2.3.10.bb"
#  from [3696b615e76ee1a6264f44fa769bb3314458702f]
#    to [a19fde79d9a812e04519973d4914b51d828a0cdb]
# 
# patch "packages/qte/qte_2.3.10.bb"
#  from [0c09f9ca6fac5e02467ddb087a0c62b84b0af4df]
#    to [9602630cbdecdf5d5484aba24642f44a3340e0d1]
# 
============================================================
--- packages/qte/qte-2.3.10/kernel-asm-page.patch	9261e3562f56c02a5f6f6912310a42f75c16c747
+++ packages/qte/qte-2.3.10/kernel-asm-page.patch	80a6d114216133cf5b84be77d9090ced7721b591
@@ -1,14 +1,20 @@ diff --git a/src/kernel/qpixmapcache.cpp
 diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp
-index c2e7d9b..b2d42b5 100644
+index c2e7d9b..8d39585 100644
 --- a/src/kernel/qpixmapcache.cpp
 +++ b/src/kernel/qpixmapcache.cpp
-@@ -122,7 +122,9 @@ void cleanup_pixmap_cache();
- 
+@@ -123,9 +123,13 @@ 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__
++# 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 
+ 
+ 
- # define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
- # endif // PAGE_ALIGN
============================================================
--- packages/qte/qte-common_2.3.10.inc	ded8ab84304cf4e0cc2e2faf4c4e54856827b3db
+++ packages/qte/qte-common_2.3.10.inc	77b17aa1d6610e4d5c33ba805a1fef052f47a292
@@ -89,8 +89,7 @@ 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 \
-		-I${STAGING_KERNEL_DIR}/include"
+		-xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32"
 EXTRA_OEMAKE = "-e"
 
 #
============================================================
--- packages/qte/qte-mt-static_2.3.10.bb	588530d72a8bca88176aaeb94bf68ea99aa6fe21
+++ packages/qte/qte-mt-static_2.3.10.bb	32b5ae85f4bf2da0c3d5c54c6cd46449a07d89d4
@@ -1,5 +1,5 @@ require qte-common_${PV}.inc
 require qte-common_${PV}.inc
-PR = "r6"
+PR = "r7"
 
 EXTRA_OECONF += "-static -thread"
 
============================================================
--- packages/qte/qte-mt_2.3.10.bb	3696b615e76ee1a6264f44fa769bb3314458702f
+++ packages/qte/qte-mt_2.3.10.bb	a19fde79d9a812e04519973d4914b51d828a0cdb
@@ -1,5 +1,5 @@ require qte-common_${PV}.inc
 require qte-common_${PV}.inc
-PR = "r12"
+PR = "r13"
 
 EXTRA_OECONF += "-thread"
 
============================================================
--- packages/qte/qte_2.3.10.bb	0c09f9ca6fac5e02467ddb087a0c62b84b0af4df
+++ packages/qte/qte_2.3.10.bb	9602630cbdecdf5d5484aba24642f44a3340e0d1
@@ -1,3 +1,3 @@ require qte-common_${PV}.inc
 require qte-common_${PV}.inc
-PR = "r50"
+PR = "r51"