[oe-commits] org.oe.dev merge of '5d8c39ff16936c56ad5426172b300fff2de24c42'

[oe commit]

merge of '5d8c39ff16936c56ad5426172b300fff2de24c42'
     and '86618f966282489d43b51fbf0ee93b954ac615ae'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 79e634145baa64265863342297f7b440e08d7d22
ViewMTN: http://monotone.openembedded.org/revision/info/79e634145baa64265863342297f7b440e08d7d22
Files:
1
packages/python/python-pycairo_1.4.0.bb
packages/linux/linux_2.6.24.bb
Diffs:

#
# mt diff -r5d8c39ff16936c56ad5426172b300fff2de24c42 -r79e634145baa64265863342297f7b440e08d7d22
#
# 
# 
# patch "packages/python/python-pycairo_1.4.0.bb"
#  from [52c1c22bf531fe813bfaeeb5d2f01051a708e792]
#    to [40ff6119240303102e9c5470a24f319e90095c2d]
# 
============================================================
--- packages/python/python-pycairo_1.4.0.bb	52c1c22bf531fe813bfaeeb5d2f01051a708e792
+++ packages/python/python-pycairo_1.4.0.bb	40ff6119240303102e9c5470a24f319e90095c2d
@@ -1,9 +1,9 @@ DEPENDS = "cairo"
 DESCRIPTION = "Python Bindings for the Cairo canvas library"
 SECTION = "python-devel"
 HOMEPAGE = "http://cairographics.org/pycairo"
 LICENSE = "LGPL MPL"
 DEPENDS = "cairo"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz"
 S = "${WORKDIR}/pycairo-${PV}"
@@ -13,4 +13,7 @@ do_stage() {
 do_stage() {
 	install -d ${STAGING_INCDIR}
 	install -m 0644 cairo/pycairo.h ${STAGING_INCDIR}
+
+    # nasty pkgconfig fix necessary here
+    sed -i -e s,${STAGING_DIR_NATIVE},, pycairo.pc
 }


#
# mt diff -r86618f966282489d43b51fbf0ee93b954ac615ae -r79e634145baa64265863342297f7b440e08d7d22
#
# 
# 
# patch "packages/linux/linux_2.6.24.bb"
#  from [a75375b7ca7ed76615cb9278e38774e06c4104cc]
#    to [7f921d9c61b4d5bec81b3d36d7e23a98063b25ef]
# 
============================================================
--- packages/linux/linux_2.6.24.bb	a75375b7ca7ed76615cb9278e38774e06c4104cc
+++ packages/linux/linux_2.6.24.bb	7f921d9c61b4d5bec81b3d36d7e23a98063b25ef
@@ -13,13 +13,12 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
            http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \
-           file://powerpc-clockres.patch;patch=1 \
-           file://leds-cpu-activity.patch;patch=1 \
-           file://leds-cpu-activity-powerpc.patch;patch=1 \
            file://defconfig"
 
-# Real-time preemption. This is experimental and requires a different defconfig.
-#SRC_URI += " http://www.kernel.org/pub/linux/kernel/projects/rt/patch-2.6.24-rt1.bz2;patch=1"
+# Moved away temporarely until committed properly (work in progress).
+#           file://powerpc-clockres.patch;patch=1 \
+#           file://leds-cpu-activity.patch;patch=1 \
+#           file://leds-cpu-activity-powerpc.patch;patch=1 \
 
 SRC_URI_append_simpad = "\
            file://linux-2.6.24-SIMpad-GPIO-MMC-mod.patch;patch=1 \