[oe-commits] org.oe.dev merge of '1eb5618e7a9c615ad27d9d1ed9285311c3a0e2cc'
mickeyl commit
openembedded-commits at lists.openembedded.org
Mon Nov 12 16:05:02 UTC 2007
merge of '1eb5618e7a9c615ad27d9d1ed9285311c3a0e2cc'
and 'ace1edeb5a57c79c092da74aa3e679bf270021df'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 2020c10f56d3103deffbaedb7f3c5737234c4628
ViewMTN: http://monotone.openembedded.org/revision/info/2020c10f56d3103deffbaedb7f3c5737234c4628
Files:
1
packages/maemo3/libconic
packages/monotone/monotone-6-0.37
packages/maemo-mapper/files/mapper-hildon1.diff
packages/maemo-mapper/maemo-mapper_svn.bb
packages/maemo3/libconic/dbus-api-update.patch
packages/maemo3/libconic_0.13.bb
packages/monotone/monotone-6-0.37/txt2c-cross-post-0.22.patch
packages/monotone/monotone-6_0.37.bb
packages/poppler/poppler_0.6.2.bb
packages/squid/squid-native_2.6.STABLE14.bb
conf/distro/include/sane-srcrevs.inc
conf/machine/simpad.conf
packages/apmd/apmd_3.2.2.bb
packages/fontconfig/fontconfig_2.4.1.bb
packages/linux/linux-openmoko/defconfig-2.6.22.5
packages/linux/linux-openmoko_2.6.22.5.bb
packages/maemo3/hildon-1_svn.bb
packages/maemo3/libhildonfm_1.9.41.bb
packages/squid/squid_2.6.STABLE14.bb
site/common-glibc
packages/python/python-formencode/setup.py.diff
packages/python/python-pygtk-1.2/acinclude.m4
packages/python/python-formencode_svn.bb
packages/python/python-gst_0.10.8.bb
Diffs:
#
# mt diff -r1eb5618e7a9c615ad27d9d1ed9285311c3a0e2cc -r2020c10f56d3103deffbaedb7f3c5737234c4628
#
#
#
# add_dir "packages/maemo3/libconic"
#
# add_dir "packages/monotone/monotone-6-0.37"
#
# add_file "packages/maemo-mapper/files/mapper-hildon1.diff"
# content [2dff18a84a4c192197eed4710e8d20b244175b92]
#
# add_file "packages/maemo-mapper/maemo-mapper_svn.bb"
# content [8932daad08877170ec5cccb94f910cbbe677f388]
#
# add_file "packages/maemo3/libconic/dbus-api-update.patch"
# content [444fe88252705927354a1abe138e385eba51b634]
#
# add_file "packages/maemo3/libconic_0.13.bb"
# content [a868945ce6c923fc705a172c4c384f2e3ccf6103]
#
# add_file "packages/monotone/monotone-6-0.37/txt2c-cross-post-0.22.patch"
# content [0308e4291bf561e94b2e202360e2b7fc0c5a689f]
#
# add_file "packages/monotone/monotone-6_0.37.bb"
# content [5bb7d92532a3b355818f285713eea744a937e5c6]
#
# add_file "packages/poppler/poppler_0.6.2.bb"
# content [5051018c95108165af0a9b9d2a66681132cac581]
#
# add_file "packages/squid/squid-native_2.6.STABLE14.bb"
# content [1172f29b0c10317874bdc571c8d3f5ff1b162d49]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [a1ed2aaae46a50f38296d82fc4908dfdc9ba2e3d]
# to [a5c8530186b1620c562bb7e94df157e23c4b8928]
#
# patch "conf/machine/simpad.conf"
# from [d7f28d3f37d981feeeaf5365793c3aff8d5b0f07]
# to [32f2aeca8055f0ccf3e78753f11723249b169136]
#
# patch "packages/apmd/apmd_3.2.2.bb"
# from [40a29924ea4530cc172b5f300d88c87e3b2adac2]
# to [468e386d67d32dcf673ffd462940acdf206daeee]
#
# patch "packages/fontconfig/fontconfig_2.4.1.bb"
# from [8a529f524c54cb5fef5e520821d90acda5fbd9fb]
# to [d1bbd036150276e6c165ee78593ba796695d165a]
#
# patch "packages/linux/linux-openmoko/defconfig-2.6.22.5"
# from [32e5ec1cebe56f60f3801d3cbcfe98120895d6ca]
# to [5e689013fe1bfa8136d80ab711b5dc1f1bd4d254]
#
# patch "packages/linux/linux-openmoko_2.6.22.5.bb"
# from [dc22701bab72ff440fe319db29a5b316f9f44f90]
# to [ceab318f69d73c5b803a6c4c045abd2c43d97495]
#
# patch "packages/maemo3/hildon-1_svn.bb"
# from [6024377620c35f410873bffd7b553a6ddb28bbb3]
# to [edf86c14e7b48711bcfee2189b9f546e573603d4]
#
# patch "packages/maemo3/libhildonfm_1.9.41.bb"
# from [28bd888a778dcd453876624cbdc43e8650ebcd59]
# to [3152331d0e5291c8a6586a8679d55f536cb6d2dc]
#
# patch "packages/squid/squid_2.6.STABLE14.bb"
# from [5aa7fbb4de7e6c5a481b693a5c5ae386e4433b0f]
# to [a3362ec5fbb758d23c416f5a20431fc5e27a6f40]
#
# patch "site/common-glibc"
# from [3e43d6ac698b298428b7690661db1d6e213c16df]
# to [6805917425c88e6085e0d4ddc9881ab19e272e62]
#
============================================================
--- packages/maemo-mapper/files/mapper-hildon1.diff 2dff18a84a4c192197eed4710e8d20b244175b92
+++ packages/maemo-mapper/files/mapper-hildon1.diff 2dff18a84a4c192197eed4710e8d20b244175b92
@@ -0,0 +1,20 @@
+--- /tmp/maemo-mapper.c 2007-10-02 12:15:04.000000000 +0200
++++ maemo-mapper/src/maemo-mapper.c 2007-10-02 12:18:06.622045000 +0200
+@@ -52,7 +52,7 @@
+ #include <hildon-widgets/hildon-controlbar.h>
+ #include <hildon-widgets/hildon-note.h>
+ #include <hildon-widgets/hildon-color-button.h>
+-#include <hildon-widgets/hildon-file-chooser-dialog.h>
++#include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h>
+ #include <hildon-widgets/hildon-number-editor.h>
+ #include <hildon-widgets/hildon-banner.h>
+ #include <hildon-widgets/hildon-system-sound.h>
+@@ -6532,8 +6532,6 @@
+
+ gtk_widget_show_all(GTK_WIDGET(menu));
+
+- gtk_widget_tap_and_hold_setup(_map_widget, GTK_WIDGET(menu), NULL, 0);
+-
+ vprintf("%s(): return\n", __PRETTY_FUNCTION__);
+ }
+
============================================================
--- packages/maemo-mapper/maemo-mapper_svn.bb 8932daad08877170ec5cccb94f910cbbe677f388
+++ packages/maemo-mapper/maemo-mapper_svn.bb 8932daad08877170ec5cccb94f910cbbe677f388
@@ -0,0 +1,21 @@
+DESCRIPTION = "GPS navigation/map display software"
+LICENSE = "GPL"
+DEPENDS = "gdbm libconic sqlite3 gtk+ libhildonfm libosso osso-ic-oss libosso-help gnome-vfs dbus bluez-libs"
+RDEPENDS = "bluez-utils"
+RRECOMMENDS = "gpsd flite"
+PV = "2.0.3+svnr${SRCREV}"
+PR = "r2"
+
+SRC_URI = "svn://garage.maemo.org/svn/maemo-mapper;proto=https;module=trunk \
+ file://mapper-hildon1.diff;patch=1;maxrev=108"
+
+S = "${WORKDIR}/trunk"
+
+inherit autotools pkgconfig
+
+do_install_append () {
+ install -d ${D}${datadir}/applications/
+ mv ${D}/maemo-mapper.desktop ${D}${datadir}/applications/
+}
+
+#FILES_${PN} += "${datadir}/icons"
============================================================
--- packages/maemo3/libconic/dbus-api-update.patch 444fe88252705927354a1abe138e385eba51b634
+++ packages/maemo3/libconic/dbus-api-update.patch 444fe88252705927354a1abe138e385eba51b634
@@ -0,0 +1,19 @@
+--- /tmp/conicconnection.c 2007-11-12 12:45:37.000000000 +0100
++++ libconic-0.13/conic/conicconnection.c 2007-11-12 12:46:04.663234000 +0100
+@@ -473,7 +473,7 @@
+ ICD_DBUS_PATH,
+ &icd_vtable,
+ NULL)) {
+- dbus_connection_disconnect(dbus_connection);
++ dbus_connection_close(dbus_connection);
+ dbus_connection_unref(dbus_connection);
+ dbus_connection = NULL;
+ }
+--- /tmp/Makefile.am 2007-11-12 12:47:22.000000000 +0100
++++ libconic-0.13/Makefile.am 2007-11-12 12:47:29.773234000 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = conic tests
++SUBDIRS = conic
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = conic.pc
============================================================
--- packages/maemo3/libconic_0.13.bb a868945ce6c923fc705a172c4c384f2e3ccf6103
+++ packages/maemo3/libconic_0.13.bb a868945ce6c923fc705a172c4c384f2e3ccf6103
@@ -0,0 +1,13 @@
+DESCRIPTION = "Internet connection library"
+LICENSE = "LGPL"
+DEPENDS = "dbus-glib gconf"
+
+SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}.tar.gz \
+ file://dbus-api-update.patch;patch=1"
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
+
+
============================================================
--- packages/monotone/monotone-6-0.37/txt2c-cross-post-0.22.patch 0308e4291bf561e94b2e202360e2b7fc0c5a689f
+++ packages/monotone/monotone-6-0.37/txt2c-cross-post-0.22.patch 0308e4291bf561e94b2e202360e2b7fc0c5a689f
@@ -0,0 +1,11 @@
+--- /tmp/Makefile.am 2007-11-12 14:43:17.000000000 +0100
++++ monotone-0.37/Makefile.am 2007-11-12 14:43:35.633234000 +0100
+@@ -692,7 +692,7 @@
+ CLEANFILES = $(BUILT_SOURCES) $(CLEAN_SOURCES) $(EPS_FIGURES)
+
+ txt2c: txt2c.cc
+- $(CXX) $(CXXFLAGS) -o $@ $<
++ $(BUILD_CXX) $(BUILD_CXXFLAGS) -o $@ $<
+ chmod 0755 $@$(EXEEXT)
+
+ # FIXME: should use stamp files.
============================================================
--- packages/monotone/monotone-6_0.37.bb 5bb7d92532a3b355818f285713eea744a937e5c6
+++ packages/monotone/monotone-6_0.37.bb 5bb7d92532a3b355818f285713eea744a937e5c6
@@ -0,0 +1,52 @@
+DESCRIPTION = "Monotone is a distributed Source Control System"
+HOMEPAGE = "http://www.monotone.ca/"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "MIT"
+DEPENDS = "boost"
+
+PROVIDES = "monotone"
+RPROVIDES = "monotone"
+
+S = "${WORKDIR}/monotone-${PV}"
+# no cross compile support - it tries to run the test program even with
+# --enable_ipv6=yes
+EXTRA_OECONF = "--disable-ipv6 \
+ --disable-dependency-tracking \
+ --disable-rpath \
+ --disable-nls \
+ --with-gnu-ld \
+ --with-bundled-lua --with-bundled-sqlite"
+
+inherit autotools
+
+# Release 0.22 reveals bugs in g++ for thumb (g++ generates
+# relocations which the linker cannot represent)
+#FIXME: remove the following
+ARM_INSTRUCTION_SET = "arm"
+
+PR = "r0"
+
+SRC_URI = "http://monotone.ca/downloads/${PV}/monotone-${PV}.tar.gz \
+ file://txt2c-cross-post-0.22.patch;patch=1 \
+# file://uclibc.database.hh.stdarg.patch;patch=1 \
+ file://configure.ac-no-sync-with-stdio-0.31.patch;patch=1 \
+ "
+do_compile_append() {
+ touch testsuite
+}
+
+# This makes the testsuite as a package and renames the monotone executable
+# to include the netsync suffix.
+do_install_append() {
+ install -d ${D}${tsd}
+ install -c -m 755 testsuite ${D}${tsd}/testsuite
+ cp -pPR tests ${D}${tsd}/tests
+ rm ${D}/home/monotone/monotone-6/tests/diff_a_binary_file/binary
+}
+
+PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite"
+tsd = "/home/monotone/${PN}"
+FILES_${PN}-testsuite = "${tsd}/testsuite ${tsd}/tests"
+RDEPENDS_${PN}-testsuite += "bash sed grep cvs patch perl perl-modules"
+
============================================================
--- packages/poppler/poppler_0.6.2.bb 5051018c95108165af0a9b9d2a66681132cac581
+++ packages/poppler/poppler_0.6.2.bb 5051018c95108165af0a9b9d2a66681132cac581
@@ -0,0 +1,6 @@
+require poppler.inc
+
+PR = "r0"
+
+EXTRA_OECONF_append = " --disable-abiword-output "
+
============================================================
--- packages/squid/squid-native_2.6.STABLE14.bb 1172f29b0c10317874bdc571c8d3f5ff1b162d49
+++ packages/squid/squid-native_2.6.STABLE14.bb 1172f29b0c10317874bdc571c8d3f5ff1b162d49
@@ -0,0 +1,11 @@
+inherit native autotools
+
+SRC_URI = "http://www.squid-cache.org/Versions/v2/2.6/squid-${PV}.tar.bz2"
+S = "${WORKDIR}/squid-${PV}"
+
+inherit native autotools
+
+do_stage() {
+ install -d ${STAGING_BINDIR_NATIVE}
+ install -m 0755 src/cf_gen ${STAGING_BINDIR_NATIVE}/cf_gen
+}
============================================================
--- conf/distro/include/sane-srcrevs.inc a1ed2aaae46a50f38296d82fc4908dfdc9ba2e3d
+++ conf/distro/include/sane-srcrevs.inc a5c8530186b1620c562bb7e94df157e23c4b8928
@@ -25,14 +25,14 @@ SRCREV_pn-gypsy ?= "56"
SRCREV_pn-gconf-dbus ?= "606"
SRCREV_pn-gnuradio ?= "6377"
SRCREV_pn-gypsy ?= "56"
-SRCREV_pn-hildon-1 ?= "14173"
+SRCREV_pn-hildon-1 ?= "14429"
SRCREV_pn-kismet ?= "2285"
SRCREV_pn-kismet-newcore ?= "2285"
SRCREV_pn-libfakekey ?= "1455"
SRCREV_pn-libgsmd ?= "3074"
SRCREV_pn-libgsmd-devel ?= "3293"
SRCREV_pn-libjana ?= "665"
-SRCREV_pn-libmokogsmd2 ?= "2950"
+SRCREV_pn-libmokogsmd2 ?= "3362"
SRCREV_pn-libmokojournal2 ?= "3217"
SRCREV_pn-libmokopanelui2 ?= "3226"
SRCREV_pn-libmokoui2 ?= "3229"
@@ -43,14 +43,14 @@ SRCREV_pn-llvm-gcc4-cross ?= "374"
SRCREV_pn-linux-openmoko ?= "3238"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
-SRCREV_pn-maemo-mapper ?= "108"
+SRCREV_pn-maemo-mapper ?= "118"
SRCREV_pn-matchbox-desktop-2 ?= "1778"
SRCREV_pn-matchbox-keyboard ?= "1739"
SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739"
SRCREV_pn-matchbox-panel-2 ?= "1626"
SRCREV_pn-moko-gtk-engine ?= "3207"
SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-neod ?= "2956"
+SRCREV_pn-neod ?= "3358"
SRCREV_pn-oh-puzzles ?= "22"
SRCREV_pn-osb-browser ?= "125"
SRCREV_pn-osb-jscore ?= "117"
@@ -58,7 +58,7 @@ SRCREV_pn-openmoko-appmanager ?= "1851"
SRCREV_pn-osb-nrcore ?= "126"
SRCREV_pn-openmoko-appearance ?= "3239"
SRCREV_pn-openmoko-appmanager ?= "1851"
-SRCREV_pn-openmoko-appmanager2 ?= "3338"
+SRCREV_pn-openmoko-appmanager2 ?= "3382"
SRCREV_pn-openmoko-browser2 ?= "3249"
SRCREV_pn-openmoko-calculator ?= "2404"
SRCREV_pn-openmoko-calculator2 ?= "3235"
@@ -69,7 +69,7 @@ SRCREV_pn-openmoko-dialer ?= "2811"
SRCREV_pn-openmoko-dates ?= "467"
SRCREV_pn-openmoko-dates2 ?= "659"
SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "3298"
+SRCREV_pn-openmoko-dialer2 ?= "3361"
SRCREV_pn-openmoko-feedreader2 ?= "3080"
SRCREV_pn-openmoko-finger-demo ?= "1671"
SRCREV_pn-openmoko-firststart2 ?= "3158"
@@ -81,7 +81,7 @@ SRCREV_pn-openmoko-messages ?= "2276"
SRCREV_pn-openmoko-libs ?= "2367"
SRCREV_pn-openmoko-mediaplayer2 ?= "3300"
SRCREV_pn-openmoko-messages ?= "2276"
-SRCREV_pn-openmoko-panel-battery ?= "3272"
+SRCREV_pn-openmoko-panel-battery ?= "3360"
SRCREV_pn-openmoko-panel-bt ?= "2896"
SRCREV_pn-openmoko-panel-clock ?= "2567"
SRCREV_pn-openmoko-panel-demo ?= "1622"
@@ -89,7 +89,7 @@ SRCREV_pn-openmoko-panel-mainmenu ?= "25
SRCREV_pn-openmoko-panel-gps ?= "2900"
SRCREV_pn-openmoko-panel-gsm ?= "3185"
SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
-SRCREV_pn-openmoko-panel-usb ?= "2893"
+SRCREV_pn-openmoko-panel-usb ?= "3360"
SRCREV_pn-openmoko-session ?= "152"
SRCREV_pn-openmoko-simplemediaplayer ?= "1688"
SRCREV_pn-openmoko-sound-theme-standard2 ?= "3192"
@@ -106,7 +106,7 @@ SRCREV_pn-openmoko-today2-folders ?= "26
SRCREV_pn-openmoko-today ?= "3056"
SRCREV_pn-openmoko-today2 ?= "3342"
SRCREV_pn-openmoko-today2-folders ?= "2680"
-SRCREV_pn-openmoko-worldclock2 ?= "3301"
+SRCREV_pn-openmoko-worldclock2 ?= "3365"
SRCREV_pn-openocd ?= "206"
SRCREV_pn-openocd-native ?= "206"
SRCREV_pn-oprofileui ?= "160"
============================================================
--- conf/machine/simpad.conf d7f28d3f37d981feeeaf5365793c3aff8d5b0f07
+++ conf/machine/simpad.conf 32f2aeca8055f0ccf3e78753f11723249b169136
@@ -1,8 +1,8 @@
#@TYPE: Machine
#@NAME: SIEMENS SIMpad SL4, SIEMENS SIMpad CL4, SIEMENS SIMpad SLC, Telekom T-Sinus PAD
#@DESCRIPTION: Machine configuration for the SA1100 based SIEMENS SIMpad and Telekom T-Sinus PAD devices
-MACHINE_KERNEL_VERSION ?= "2.4"
+MACHINE_KERNEL_VERSION ?= "2.6"
TARGET_ARCH = "arm"
============================================================
--- packages/apmd/apmd_3.2.2.bb 40a29924ea4530cc172b5f300d88c87e3b2adac2
+++ packages/apmd/apmd_3.2.2.bb 468e386d67d32dcf673ffd462940acdf206daeee
@@ -5,7 +5,7 @@ PR = "r8"
LICENSE = "GPL"
PR = "r8"
-SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz; \
+SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz \
file://debian.patch;patch=1 \
file://workaround.patch;patch=1 \
file://zaurus24.patch;patch=1 \
============================================================
--- packages/fontconfig/fontconfig_2.4.1.bb 8a529f524c54cb5fef5e520821d90acda5fbd9fb
+++ packages/fontconfig/fontconfig_2.4.1.bb d1bbd036150276e6c165ee78593ba796695d165a
@@ -5,7 +5,7 @@ SRC_URI = "http://fontconfig.org/release
SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h"
-PR = "r1"
+PR = "r2"
PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
@@ -43,6 +43,7 @@ do_stage () {
oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/fontconfig
for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
+ ln -sf ${STAGING_INCDIR}/fontconfig/device_symbols.h ${STAGING_INCDIR}
}
BUILD_CFLAGS += " -I${STAGING_INCDIR_NATIVE}/freetype2"
============================================================
--- packages/linux/linux-openmoko/defconfig-2.6.22.5 32e5ec1cebe56f60f3801d3cbcfe98120895d6ca
+++ packages/linux/linux-openmoko/defconfig-2.6.22.5 5e689013fe1bfa8136d80ab711b5dc1f1bd4d254
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.22.5
-# Thu Nov 8 21:49:01 2007
+# Mon Nov 12 08:23:42 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -928,7 +928,13 @@ CONFIG_TOUCHSCREEN_S3C2410=y
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
# CONFIG_TOUCHSCREEN_UCB1400 is not set
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+CONFIG_INPUT_UINPUT=m
#
# Hardware I/O ports
@@ -1251,6 +1257,7 @@ CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
CONFIG_SND_S3C24XX_SOC=m
CONFIG_SND_S3C24XX_SOC_I2S=m
CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
+# CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753 is not set
#
# SoC Audio support for SuperH
============================================================
--- packages/linux/linux-openmoko_2.6.22.5.bb dc22701bab72ff440fe319db29a5b316f9f44f90
+++ packages/linux/linux-openmoko_2.6.22.5.bb ceab318f69d73c5b803a6c4c045abd2c43d97495
@@ -9,7 +9,7 @@ PV = "${KERNEL_RELEASE}-moko11+svnr${SRC
#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}-moko11+svnr${SRCREV}"
PV = "${KERNEL_RELEASE}-moko11+svnr${SRCREV}"
-PR = "r7"
+PR = "r8"
KERNEL_IMAGETYPE = "uImage"
UBOOT_ENTRYPOINT = "30008000"
============================================================
--- packages/maemo3/hildon-1_svn.bb 6024377620c35f4108%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -race1edeb5a57c79c092da74aa3e679bf270021df -r2020c10f56d3103deffbaedb7f3c5737234c4628
#
#
#
# delete "packages/python/python-formencode/setup.py.diff"
#
# add_file "packages/python/python-pygtk-1.2/acinclude.m4"
# content [a88d00bee840b475039af1207dad53ea6337f513]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [55bb345ba07c40cd4315595684f5d8a2e8da0bad]
# to [a5c8530186b1620c562bb7e94df157e23c4b8928]
#
# patch "packages/python/python-formencode_svn.bb"
# from [ac2c7266591c960d97cbce6da4fe68f88febf4c7]
# to [fade2e233328120a69f7b22dd50ef7e4e4cd24ef]
#
# patch "packages/python/python-gst_0.10.8.bb"
# from [c738ad94538f071894dcbaebf4a60e829de0e880]
# to [bfb2e80bf7941825e00221fb6bec64e8791e4a26]
#
============================================================
--- packages/python/python-pygtk-1.2/acinclude.m4 a88d00bee840b475039af1207dad53ea6337f513
+++ packages/python/python-pygtk-1.2/acinclude.m4 a88d00bee840b475039af1207dad53ea6337f513
@@ -0,0 +1,90 @@
+## this one is commonly used with AM_PATH_PYTHONDIR ...
+dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
+dnl Check if a module containing a given symbol is visible to python.
+AC_DEFUN(AM_CHECK_PYMOD,
+[AC_REQUIRE([AM_PATH_PYTHON])
+py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
+AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
+AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
+ifelse([$2],[], [prog="
+import sys
+try:
+ import $1
+except ImportError:
+ sys.exit(1)
+except:
+ sys.exit(0)
+sys.exit(0)"], [prog="
+import $1
+$1.$2"])
+if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
+ then
+ eval "py_cv_mod_$py_mod_var=yes"
+ else
+ eval "py_cv_mod_$py_mod_var=no"
+ fi
+])
+py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
+if test "x$py_val" != xno; then
+ AC_MSG_RESULT(yes)
+ ifelse([$3], [],, [$3
+])dnl
+else
+ AC_MSG_RESULT(no)
+ ifelse([$4], [],, [$4
+])dnl
+fi
+])
+
+dnl a macro to check for ability to create python extensions
+dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
+dnl function also defines PYTHON_INCLUDES
+AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+[AC_REQUIRE([AM_PATH_PYTHON])
+AC_MSG_CHECKING(for headers required to compile python extensions)
+dnl deduce PYTHON_INCLUDES
+AC_ARG_WITH(python-includes,
+ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval)
+if test x$py_exec_prefix != x; then
+PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+else
+py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+if test "$py_prefix" != "$py_exec_prefix"; then
+ PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+fi
+fi
+AC_SUBST(PYTHON_INCLUDES)
+dnl check if the headers exist:
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+AC_TRY_CPP([#include <Python.h>],dnl
+[AC_MSG_RESULT(found)
+$1],dnl
+[AC_MSG_RESULT(not found)
+$2])
+CPPFLAGS="$save_CPPFLAGS"
+])
+
+dnl
+dnl JH_ADD_CFLAG(FLAG)
+dnl checks whether the C compiler supports the given flag, and if so, adds
+dnl it to $CFLAGS. If the flag is already present in the list, then the
+dnl check is not performed.
+AC_DEFUN([JH_ADD_CFLAG],
+[
+case " $CFLAGS " in
+*@<:@\ \ @:>@$1@<:@\ \ @:>@*)
+ ;;
+*)
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $1"
+ AC_MSG_CHECKING([whether [$]CC understands $1])
+ AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
+ AC_MSG_RESULT($jh_has_option)
+ if test $jh_has_option = no; then
+ CFLAGS="$save_CFLAGS"
+ fi
+ ;;
+esac])
============================================================
--- conf/distro/include/sane-srcrevs.inc 55bb345ba07c40cd4315595684f5d8a2e8da0bad
+++ conf/distro/include/sane-srcrevs.inc a5c8530186b1620c562bb7e94df157e23c4b8928
@@ -111,6 +111,7 @@ SRCREV_pn-psplash ?= "249"
SRCREV_pn-openocd-native ?= "206"
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-psplash ?= "249"
+SRCREV_pn-python-formencode = "3148"
SRCREV_pn-settings-daemon ?= "1755"
SRCREV_pn-sjf2410-linux-native ?= "933"
SRCREV_pn-sphyrna ?= "45"
============================================================
--- packages/python/python-formencode_svn.bb ac2c7266591c960d97cbce6da4fe68f88febf4c7
+++ packages/python/python-formencode_svn.bb fade2e233328120a69f7b22dd50ef7e4e4cd24ef
@@ -1,15 +1,14 @@ SRCNAME = "FormEncode"
DESCRIPTION = "HTML form validation, generation, and conversion package"
SECTION = "devel/python"
PRIORITY = "optional"
LICENSE = "LGPL"
DEPENDS = "sqlite3"
SRCNAME = "FormEncode"
-PV = "0.4+svn${SRCDATE}"
+PV = "0.4+svnr${SRCREV}"
PR = "ml0"
inherit distutils
-SRC_URI = "svn://svn.colorstudy.com/FormEncode;module=trunk;proto=http \
- file://setup.py.diff;patch=1"
+SRC_URI = "svn://svn.colorstudy.com/FormEncode;module=trunk;proto=http"
S = "${WORKDIR}/trunk"
============================================================
--- packages/python/python-gst_0.10.8.bb c738ad94538f071894dcbaebf4a60e829de0e880
+++ packages/python/python-gst_0.10.8.bb bfb2e80bf7941825e00221fb6bec64e8791e4a26
@@ -21,4 +21,6 @@ do_stage() {
autotools_stage_all
}
+FILES_${PN} += "${datadir}/gst-python"
+FILES_${PN}-dev += "${datadir}/gst-python/0.10/defs"
+FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/"
-FILES_${PN}-dbg = "${libdir}/python2.5/site-packages/gst-0.10/gst/.debug/"
More information about the Openembedded-commits
mailing list