[oe] In which layer is xerces-c
Hi I'm converting my stuff to the (new) layed model. But I can't seem to find xerces-c anywhere. I have found a link to a patch from january, but the actual layer is not stated. http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg23370.html Do anyone know where the recipe is located? -- Søren Holm ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH 3/5] libwnck: use gobject-introspection-stub instead of -native which was removed in oe-core
On Sat, Jul 28, 2012 at 2:33 PM, Martin Jansa martin.ja...@gmail.com wrote: Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb | 10 +++--- meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb | 10 ++ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb b/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb index e2a3e3d..e54b8d3 100644 --- a/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb +++ b/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb @@ -5,14 +5,10 @@ LIC_FILES_CHKSUM = file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 BPN = libwnck SECTION = x11/libs -DEPENDS = gobject-introspection-native gtk+3 gdk-pixbuf-native +DEPENDS = gobject-introspection-stub gtk+3 gdk-pixbuf-native + +PR = r1 inherit gnome SRC_URI[archive.md5sum] = e4ea87320dd0600a81c50186e3804aae SRC_URI[archive.sha256sum] = 4946b612c22d53238810d431f1b05c21f073f201edfd247ff74e2fa228618083 - -EXTRA_OECONF += --enable-introspection=no - -do_configure_prepend() { - sed -i '/GOBJECT_INTROSPECTION_CHECK([0.6.14])/d' configure.ac -} diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb b/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb index 6c8ca28..935d4a3 100644 --- a/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb +++ b/meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb @@ -2,17 +2,11 @@ DESCRIPTION = Window navigation construction toolkit LICENSE = LGPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 -PR = r1 +PR = r2 SECTION = x11/libs -DEPENDS = gobject-introspection-native gtk+ gdk-pixbuf-native +DEPENDS = gobject-introspection-stub gtk+ gdk-pixbuf-native inherit gnome SRC_URI[archive.md5sum] = 4162d5b96151e6d24ec02ae3a822203c SRC_URI[archive.sha256sum] = 56b6681e89cd45491bb640165d62276d81369a08974042b26645dc1e0e954cc1 - -EXTRA_OECONF += --enable-introspection=no - -do_configure_prepend() { - sed -i '/GOBJECT_INTROSPECTION_CHECK([0.6.14])/d' configure.ac -} -- 1.7.8.6 Acked-by: Andreas Müller schnitzelt...@googlemail.com ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH 4/5] libgee: use gobject-introspection-stub instead of -native which was removed in oe-core
On Sat, Jul 28, 2012 at 2:33 PM, Martin Jansa martin.ja...@gmail.com wrote: Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb |7 +++ 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb b/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb index 4e2c643..228f96c 100644 --- a/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb +++ b/meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb @@ -1,9 +1,8 @@ require libgee.inc PE = 1 -PR = ${INC_PR}.0 -#autoreconf needs introspection.m4 (staged by gobject-introspection-native) after http://git.gnome.org/browse/libgee/commit/?id=d026a29b38ca1a3388981c6e75a92602212373d8 -DEPENDS += gobject-introspection-native -DEPENDS_virtclass-native += gobject-introspection-native +PR = ${INC_PR}.1 +DEPENDS += gobject-introspection-stub +DEPENDS_virtclass-native += gobject-introspection-stub-native SHRT_VER = ${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]} SRC_URI = http://ftp.gnome.org/pub/GNOME/sources/libgee/${SHRT_VER}/${BP}.tar.xz; -- 1.7.8.6 Acked-by: Andreas Müller schnitzelt...@googlemail.com ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH 5/5] upower: use gobject-introspection-stub instead of -native which was removed in oe-core
On Sat, Jul 28, 2012 at 2:33 PM, Martin Jansa martin.ja...@gmail.com wrote: Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta-oe/recipes-support/upower/upower_0.9.14.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/upower/upower_0.9.14.bb b/meta-oe/recipes-support/upower/upower_0.9.14.bb index 312ed58..5a33ab9 100644 --- a/meta-oe/recipes-support/upower/upower_0.9.14.bb +++ b/meta-oe/recipes-support/upower/upower_0.9.14.bb @@ -2,9 +2,9 @@ DESCRIPTION = UPower is an abstraction for enumerating power devices, listening LICENSE = GPLv2+ LIC_FILES_CHKSUM = file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08 -PR = r1 +PR = r2 -DEPENDS = libusb1 udev glib-2.0 dbus-glib polkit gobject-introspection-native +DEPENDS = libusb1 udev glib-2.0 dbus-glib polkit gobject-introspection-stub SRC_URI = http://upower.freedesktop.org/releases/${BPN}-${PV}.tar.xz; SRC_URI[md5sum] = 18803f82102d56aac90949d1e4251645 -- 1.7.8.6 Acked-by: Andreas Müller schnitzelt...@googlemail.com ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH 1/5] tcpdump: bump PR to rebuild against libpcap1 instead libpcap
On Sat, Jul 28, 2012 at 2:33 PM, Martin Jansa martin.ja...@gmail.com wrote: Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb b/meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb index 9fd0ac0..46b19a1 100644 --- a/meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb +++ b/meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb @@ -4,7 +4,7 @@ LICENSE = BSD LIC_FILES_CHKSUM = file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867 SECTION = console/network DEPENDS = libpcap -PR = r1 +PR = r2 SRC_URI = \ http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \ -- 1.7.8.6 Acked-by: Andreas Müller schnitzelt...@googlemail.com ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 6/6] gpsd: drop older version 3.4
* GNUtoo tested 3.5 and it works fine, Thanks Signed-off-by: Martin Jansa martin.ja...@gmail.com --- ...t-fix-DSO-build-for-ntpshm-garmin_monitor.patch | 41 --- ...prefix-includepy-with-sysroot-and-drop-sy.patch | 72 meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb| 123 meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb|1 - .../recipes-navigation/gpsd/gpsd_3.4.bbappend | 18 --- 5 files changed, 0 insertions(+), 255 deletions(-) delete mode 100644 meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-fix-DSO-build-for-ntpshm-garmin_monitor.patch delete mode 100644 meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch delete mode 100644 meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb delete mode 100644 meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bbappend diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-fix-DSO-build-for-ntpshm-garmin_monitor.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-fix-DSO-build-for-ntpshm-garmin_monitor.patch deleted file mode 100644 index 1aa4304..000 --- a/meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-fix-DSO-build-for-ntpshm-garmin_monitor.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e1f780fc2355c22c2c3f0a70c1a1ef2669779c53 Mon Sep 17 00:00:00 2001 -From: Martin Jansa martin.ja...@gmail.com -Date: Tue, 24 Apr 2012 13:42:38 +0200 -Subject: [PATCH] SConstruct: fix DSO build for ntpshm, garmin_monitor - -| x86_64-oe-linux-gcc -m64 ---sysroot=/OE/shr-core/tmp-eglibc/sysroots/qemux86-64 -o gpsmon ---sysroot=/OE/shr-core/tmp-eglibc/sysroots/qemux86-64 --Wl,-rpath=/OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/gpsd/gpsd-3.4-r2/gpsd-3.4 --Wl,-rpath=/OE/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib gpsmon.o -monitor_italk.o monitor_nmea.o monitor_oncore.o monitor_sirf.o -monitor_superstar2.o monitor_tnt.o monitor_ubx.o monitor_garmin.o -L. --L/OE/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib --L/OE/shr-core/tmp-eglibc/sysroots/qemux86-64/lib -lrt -lbluetooth --lgpsd -lusb-1.0 -lbluetooth -lgps -lncurses -ltinfo - -/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/4.6.4/ld: -* ntpshm.o: undefined reference to symbol 'log@@GLIBC_2.2.5' -* monitor_garmin.o: undefined reference to symbol 'hypot@@GLIBC_2.2.5' - -Signed-off-by: Martin Jansa martin.ja...@gmail.com - SConstruct |4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/SConstruct b/SConstruct -index 7bd44a1..9ff00c1 100644 a/SConstruct -+++ b/SConstruct -@@ -806,7 +806,7 @@ if qt_env: - # The libraries have dependencies on system libraries - - gpslibs = [-lgps] --gpsdlibs = [-lgpsd] + usblibs + bluezlibs + gpslibs -+gpsdlibs = [-lgpsd] + [-lm] + usblibs + bluezlibs + gpslibs - - # Source groups - --- -1.7.8.5 - diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch deleted file mode 100644 index 27c6aad..000 --- a/meta-oe/recipes-navigation/gpsd/gpsd-3.4/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch +++ /dev/null @@ -1,72 +0,0 @@ -From bc224302f1665078c8d15138318709c1a1c2c0a0 Mon Sep 17 00:00:00 2001 -From: Martin Jansa martin.ja...@gmail.com -Date: Tue, 24 Apr 2012 18:45:14 +0200 -Subject: [PATCH] SConstruct: prefix includepy with sysroot and drop sysroot - from python_lib_dir - -* without PYTHONPATH, distutil's sysconfig returns INCLUDEPY without sysroot prefix - and with PYTHONPATH from OE it's pointing to native python dir - -$ export PYTHONPATH=/OE/shr-core/tmp-eglibc/sysroots/om-gta02/usr/lib/python2.7/ -$ python -Python 2.7.2 (default, Apr 18 2012, 09:19:59) -[GCC 4.6.2] on linux2 -Type help, copyright, credits or license for more information. - from distutils import sysconfig - sysconfig.get_config_vars('INCLUDEPY') -['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7'] - -$ unset PYTHONPATH -$ python -Python 2.7.2 (default, Apr 18 2012, 09:19:59) -[GCC 4.6.2] on linux2 -Type help, copyright, credits or license for more information. - from distutils import sysconfig - sysconfig.get_config_vars('INCLUDEPY') -['/python2.7'] - import sysconfig - sysconfig.get_config_vars('INCLUDEPY') -['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7'] -* python_lib_dir = python_lib_dir.replace(env['sysroot'], '') - returns path to target sysroot - -Signed-off-by: Martin Jansa martin.ja...@gmail.com - SConstruct |9 + - 1 files changed, 9 insertions(+), 0 deletions(-) - -diff --git a/SConstruct b/SConstruct -index 9ff00c1..9c0f751 100644 a/SConstruct -+++ b/SConstruct -@@ -924,6 +924,12 @@ else: - if vars[i] is None: - vars[i]
[oe] [meta-oe][PATCH] recipes-devtools/autoconf-archive: new recipes for autoconf-archive
Add a new recipes which provides autoconf-archive 2012.04.07. This gives quite a few m4 files, which might be useful in toolchains. --- .../autoconf-archive/autoconf-archive.inc | 15 +++ .../autoconf-archive_2012.04.07.bb | 14 ++ 2 files changed, 29 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc create mode 100644 meta-oe/recipes-devtools/autoconf-archive/autoconf-archive_2012.04.07.bb diff --git a/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc b/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc new file mode 100644 index 000..e8785f4 --- /dev/null +++ b/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc @@ -0,0 +1,15 @@ +LICENSE = GPLv3 +HOMEPAGE = http://www.gnu.org/software/autoconf-archive/; +SECTION = devel + +DEPENDS += m4-native +DEPENDS_virtclass-native = m4-native gnu-config-native +DEPENDS_virtclass-nativesdk = m4-nativesdk gnu-config-nativesdk + +RDEPENDS_${PN} = m4 gnu-config +RDEPENDS_${PN}_virtclass-native = m4-native gnu-config-native +RDEPENDS_${PN}_virtclass-nativesdk = m4-nativesdk gnu-config-nativesdk + +SRC_URI = ${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 + +inherit autotools diff --git a/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive_2012.04.07.bb b/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive_2012.04.07.bb new file mode 100644 index 000..c96723f --- /dev/null +++ b/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive_2012.04.07.bb @@ -0,0 +1,14 @@ +require autoconf-archive.inc + +PR = r0 + +PARALLEL_MAKE = + +LICENSE = GPLv2 GPLv3 +LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 + +SRC_URI[md5sum] = e842c5b9fae021007bd70550362e5e80 +SRC_URI[sha256sum] = 040b443bf68efd52fbfcb294b556bfbbbfe432db78445ca25e0cfe2e88f96a14 + +EXTRA_OECONF += ac_cv_path_M4=m4 +BBCLASSEXTEND = native nativesdk -- 1.7.8.6 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-browser][PATCH] Revert chromium: use COMPATIBLE_HOST instead of COMPATIBLE_MACHINE
* COMPATIBLE_HOST is not good enough for some configurations: ERROR: chromium was skipped: incompatible with host arm-oe-linux-gnueabi (not in COMPATIBLE_HOST) This reverts commit 7fb308d4f8d68d19a91daab8d33418cea8dea57b. Signed-off-by: Martin Jansa martin.ja...@gmail.com --- recipes-browser/chromium/chromium_19.0.1049.3.bb |6 -- recipes-browser/chromium/chromium_20.0.1086.0.bb |4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/recipes-browser/chromium/chromium_19.0.1049.3.bb b/recipes-browser/chromium/chromium_19.0.1049.3.bb index 97843a3..e657c48 100644 --- a/recipes-browser/chromium/chromium_19.0.1049.3.bb +++ b/recipes-browser/chromium/chromium_19.0.1049.3.bb @@ -10,8 +10,10 @@ SRC_URI = http://commondatastorage.googleapis.com/chromium-browser-official/${P file://softfloat-fix.patch \ -# include.gypi exists only for armv6 and armv7a -COMPATIBLE_HOST = (armv6|armv7).*-linux +# include.gypi exists only for armv6 and armv7a and there isn't something like COMPATIBLE_ARCH afaik +COMPATIBLE_MACHINE = (-) +COMPATIBLE_MACHINE_armv6 = (.*) +COMPATIBLE_MACHINE_armv7a = (.*) PR = r1 diff --git a/recipes-browser/chromium/chromium_20.0.1086.0.bb b/recipes-browser/chromium/chromium_20.0.1086.0.bb index d1ae7e5..527f317 100644 --- a/recipes-browser/chromium/chromium_20.0.1086.0.bb +++ b/recipes-browser/chromium/chromium_20.0.1086.0.bb @@ -8,7 +8,9 @@ SRC_URI = http://commondatastorage.googleapis.com/chromium-browser-official/${P # include.gypi exists only for armv6 and armv7a and there isn't something like COMPATIBLE_ARCH afaik -COMPATIBLE_HOST = (armv6|armv7).*-linux +COMPATIBLE_MACHINE = (-) +COMPATIBLE_MACHINE_armv6 = (.*) +COMPATIBLE_MACHINE_armv7a = (.*) DEFAULT_PREFERENCE = -1 -- 1.7.8.6 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [oe-commits] Morgan Little : python-native: Put binaries in seperate directory
On Sun, Jul 22, 2012 at 12:43 PM, g...@git.openembedded.org wrote: Module: openembedded-core.git Branch: master Commit: a2e554f731437545e9483a7a73e6847c03f6f48a URL: http://git.openembedded.org/?p=openembedded-core.gita=commit;h=a2e554f731437545e9483a7a73e6847c03f6f48a Author: Morgan Little morgan.lit...@windriver.com Date: Thu Jul 19 13:46:06 2012 -0400 python-native: Put binaries in seperate directory Update python-native to install the binaries in the python-native directory, add pythonnative.bbclass to let recipes that need python-native use the binaries and update disutils access the new binaries. Update distutils-base to inherit pythonnative. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/classes/distutils-base.bbclass|2 +- meta/classes/distutils.bbclass |8 meta/classes/pythonnative.bbclass |3 +++ .../recipes-devtools/python/python-native_2.7.3.bb | 10 ++ 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/meta/classes/distutils-base.bbclass b/meta/classes/distutils-base.bbclass index 6d18e08..c761b36 100644 --- a/meta/classes/distutils-base.bbclass +++ b/meta/classes/distutils-base.bbclass @@ -1,5 +1,5 @@ DEPENDS += ${@[python-native python, ][(d.getVar('PACKAGES', True) == '')]} RDEPENDS_${PN} += ${@['', 'python-core']['${PN}' == '${BPN}']} -inherit distutils-common-base +inherit distutils-common-base pythonnative diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass index bcddf8d..690df73 100644 --- a/meta/classes/distutils.bbclass +++ b/meta/classes/distutils.bbclass @@ -11,14 +11,14 @@ distutils_do_compile() { STAGING_INCDIR=${STAGING_INCDIR} \ STAGING_LIBDIR=${STAGING_LIBDIR} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - ${STAGING_BINDIR_NATIVE}/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ + ${STAGING_BINDIR_NATIVE}/python-native/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ bbfatal python setup.py build_ext execution failed. } distutils_stage_headers() { install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ -${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ +${STAGING_BINDIR_NATIVE}/python-native/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ bbfatal python setup.py install_headers execution failed. } @@ -28,7 +28,7 @@ distutils_stage_all() { install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ -${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ +${STAGING_BINDIR_NATIVE}/python-native/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ bbfatal python setup.py install (stage) execution failed. } @@ -38,7 +38,7 @@ distutils_do_install() { STAGING_LIBDIR=${STAGING_LIBDIR} \ PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ -${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_INSTALL_ARGS} || \ +${STAGING_BINDIR_NATIVE}/python-native/python setup.py install ${DISTUTILS_INSTALL_ARGS} || \ bbfatal python setup.py install execution failed. for i in `find ${D} -name *.py` ; do \ diff --git a/meta/classes/pythonnative.bbclass b/meta/classes/pythonnative.bbclass new file mode 100644 index 000..bc346da --- /dev/null +++ b/meta/classes/pythonnative.bbclass @@ -0,0 +1,3 @@ +PYTHON=${STAGING_BINDIR_NATIVE}/python-native/python +PATH_prepend = ${STAGING_BINDIR_NATIVE}/python-native: +DEPENDS += python-native diff --git a/meta/recipes-devtools/python/python-native_2.7.3.bb b/meta/recipes-devtools/python/python-native_2.7.3.bb index 50bf894..bfdcd12 100644 --- a/meta/recipes-devtools/python/python-native_2.7.3.bb +++ b/meta/recipes-devtools/python/python-native_2.7.3.bb @@ -1,6 +1,6 @@ require python.inc DEPENDS = openssl-native bzip2-full-native zlib-native readline-native sqlite3-native -PR = ${INC_PR}.0 +PR = ${INC_PR}.1 SRC_URI += file://04-default-is-optimized.patch \ file://05-enable-ctypes-cross-build.patch \ @@ -20,6 +20,8 @@ inherit native RPROVIDES += python-distutils-native python-compression-native python-textutils-native python-core-native +EXTRA_OECONF += --bindir=${bindir}/${PN} + EXTRA_OEMAKE = '\ BUILD_SYS= \ HOST_SYS= \ @@ -34,11 +36,11 @@ do_configure_prepend() { do_install() { oe_runmake 'DESTDIR=${D}' install - install -d ${D}${bindir}/ - install -m 0755 Parser/pgen ${D}${bindir}/ + install -d
[oe] [PATCH] [meta-oe] glibmm: Fix compile error with latest glib
Internal glib/XXX.h files should not be included directly. Signed-off-by: Gary Thomas g...@mlbassoc.com --- .../glib-2.0/glibmm/fix-compile-error.patch| 13 + meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb |5 - 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-core/glib-2.0/glibmm/fix-compile-error.patch diff --git a/meta-oe/recipes-core/glib-2.0/glibmm/fix-compile-error.patch b/meta-oe/recipes-core/glib-2.0/glibmm/fix-compile-error.patch new file mode 100644 index 000..33c6215 --- /dev/null +++ b/meta-oe/recipes-core/glib-2.0/glibmm/fix-compile-error.patch @@ -0,0 +1,13 @@ +Index: glibmm-2.28.2/glib/glibmm/varianttype.cc +=== +--- glibmm-2.28.2.orig/glib/glibmm/varianttype.cc glibmm-2.28.2/glib/glibmm/varianttype.cc +@@ -23,7 +23,7 @@ + + #include glibmm/varianttype.h + #include glibmm/utility.h +-#include glib/gvarianttype.h ++#include glib.h + + namespace Glib + { diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb index 6604091..7ec0be2 100644 --- a/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb +++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb @@ -6,4 +6,7 @@ SRC_URI[archive.md5sum] = cf33d1861d09fb2952a6a1d69e0502e3 SRC_URI[archive.sha256sum] = 7b67178363f8494c94f8b3dd704a4c8db7ad75a253fc84a4ad229e5e179ec192 SRC_URI += file://remove-examples.patch \ - file://glib-2.32.patch + file://fix-compile-error.patch \ + + + -- 1.7.9.5 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [PATCH] [meta-oe] libxml++: New recipe
Library for C++ bindings to libxml Signed-off-by: Gary Thomas g...@mlbassoc.com --- meta-oe/recipes-core/libxml/libxml++_2.35.3.bb | 16 1 file changed, 16 insertions(+) create mode 100644 meta-oe/recipes-core/libxml/libxml++_2.35.3.bb diff --git a/meta-oe/recipes-core/libxml/libxml++_2.35.3.bb b/meta-oe/recipes-core/libxml/libxml++_2.35.3.bb new file mode 100644 index 000..ca9388c --- /dev/null +++ b/meta-oe/recipes-core/libxml/libxml++_2.35.3.bb @@ -0,0 +1,16 @@ +SUMMARY = C++ wrapper for libxml library +DESCRIPTION = C++ wrapper for libxml library +HOMEPAGE = http://libxmlplusplus.sourceforge.net; +BUGTRACKER = http://bugzilla.gnome.org/buglist.cgi?product=libxml%2B%2B; +SECTION = libs +LICENSE = GPLv2 + +SRC_URI = http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.35/libxml++-2.35.3.tar.xz; +SRC_URI[md5sum] = 196a2dcdc84ab987fe3852b3f29cafd7 +SRC_URI[sha256sum] = 715a4214bbff90365cc8406a28e427febd90461006d608fbdcdcea7fc9891eaf +LIC_FILES_CHKSUM = file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 + +DEPENDS = libxml2 glibmm + +inherit autotools pkgconfig + -- 1.7.9.5 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe 1/2] exo: stop configure detecting host's python
This patch does not cause python bindings builded properly (native headers included) error message was: ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. Rerun configure task after fixing this. The path was '/home/andreas/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/exo-0.6.2-r0/exo-0.6.2' ERROR: Function failed: do_qa_configure ERROR: Logfile of failure stored in: /home/andreas/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/exo-0.6.2-r0/temp/log.do_configure.13932 NOTE: package exo-0.6.2-r0: task do_configure: Failed Signed-off-by: Andreas Müller schnitzelt...@googlemail.com --- meta-xfce/recipes-xfce/exo/exo_0.6.2.bb |5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-xfce/recipes-xfce/exo/exo_0.6.2.bb b/meta-xfce/recipes-xfce/exo/exo_0.6.2.bb index b9fc687..ad8dc59 100644 --- a/meta-xfce/recipes-xfce/exo/exo_0.6.2.bb +++ b/meta-xfce/recipes-xfce/exo/exo_0.6.2.bb @@ -4,9 +4,9 @@ LICENSE = GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f DEPENDS = gtk+ libxfce4util virtual/libx11 perl-native cairo -PR = r0 +PR = r1 -inherit xfce +inherit xfce pythonnative # SRC_URI must follow inherited one SRC_URI += \ @@ -16,7 +16,6 @@ SRC_URI += \ file://fix-qa-desktop-type-error.patch \ - # see http://wiki.xfce.org/gnomemount-replacement do_install_append () { install -m 755 -d ${D}${bindir}/exo-mount-wrapper -- 1.7.6.5 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe 2/2] gnome-menus: stop configure detecting host's python
This patch does not cause python bindings builded properly (native headers included) error message was: ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. Rerun configure task after fixing this. The path was '/home/andreas/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/gnome-menus-2.30.5-r0/gnome-menus-2.30.5' ERROR: Function failed: do_qa_configure ERROR: Logfile of failure stored in: /home/andreas/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/gnome-menus-2.30.5-r0/temp/log.do_configure.7913 NOTE: package gnome-menus-2.30.5-r0: task do_configure: Failed Signed-off-by: Andreas Müller schnitzelt...@googlemail.com --- .../gnome-menus/gnome-menus_2.30.5.bb |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb index d4057c0..f8b2fac 100644 --- a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb +++ b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb @@ -3,10 +3,11 @@ SECTION = x11/gnome LICENSE = GPLv2 LGPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 +PR = r1 DEPENDS = python libxml2 gconf popt gtk+ -inherit gnome pkgconfig python-dir +inherit gnome pkgconfig python-dir pythonnative SRC_URI[archive.md5sum] = caa6772e63ed5870cf43dc3d354e0624 SRC_URI[archive.sha256sum] = 6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa -- 1.7.6.5 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] [meta-oe] libxml++: New recipe
On Mon, Jul 30, 2012 at 09:04:08AM -0600, Gary Thomas wrote: Library for C++ bindings to libxml Signed-off-by: Gary Thomas g...@mlbassoc.com --- meta-oe/recipes-core/libxml/libxml++_2.35.3.bb | 16 1 file changed, 16 insertions(+) create mode 100644 meta-oe/recipes-core/libxml/libxml++_2.35.3.bb diff --git a/meta-oe/recipes-core/libxml/libxml++_2.35.3.bb b/meta-oe/recipes-core/libxml/libxml++_2.35.3.bb new file mode 100644 index 000..ca9388c --- /dev/null +++ b/meta-oe/recipes-core/libxml/libxml++_2.35.3.bb @@ -0,0 +1,16 @@ +SUMMARY = C++ wrapper for libxml library +DESCRIPTION = C++ wrapper for libxml library +HOMEPAGE = http://libxmlplusplus.sourceforge.net; +BUGTRACKER = http://bugzilla.gnome.org/buglist.cgi?product=libxml%2B%2B; +SECTION = libs +LICENSE = GPLv2 + +SRC_URI = http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.35/libxml++-2.35.3.tar.xz; Use something like: SHRT_VER = ${@d.getVar('PV',True).split('.')[0]}.${@d.getVar('PV',True).split('.')[1]} SRC_URI = ${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz +SRC_URI[md5sum] = 196a2dcdc84ab987fe3852b3f29cafd7 +SRC_URI[sha256sum] = 715a4214bbff90365cc8406a28e427febd90461006d608fbdcdcea7fc9891eaf +LIC_FILES_CHKSUM = file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 + +DEPENDS = libxml2 glibmm + +inherit autotools pkgconfig + -- 1.7.9.5 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [2011.03-maintenance][PATCH 0/1] Pull request 20110723
Ping. On Tue, Jul 24, 2012 at 12:52:28AM -0400, Denys Dmytriyenko wrote: Tom, Please pull this commit that fixes opkg-utils when generating pkg index Pull URL: git://arago-project.org/git/people/denix/openembedded.git Branch: 2011.03-maintenance Browse: http://arago-project.org/git/people/?p=denix/openembedded.git;a=shortlog;h=refs/heads/2011.03-maintenance Thanks, Denys Dmytriyenko de...@ti.com --- The following changes since commit f9611c025109a3e0d6cebf12f49ae24c97759c09: psplash: convert from svn.o-hand.com to git.yoctoproject.org (2012-07-04 22:34:04 +0200) are available in the git repository at: git://arago-project.org/git/people/denix/openembedded 2011.03-maintenance Denys Dmytriyenko (1): opkg-utils: bump SRCREV to pick up subprocess.check_output fixes recipes/opkg-utils/opkg-utils_git.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- 1.7.8.6 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [2011.03-maintenance][PATCH 0/9] Pull request 20120719
Le 19-Jul-12, Apelete Seketeli a écrit: The patches that come as a follow-up of this message fix issues found while building muffinman-image on top of the 2011.03-maintenance branch. These modifications were tested by successfully building muffinman-image from scratch on a Debian Squeeze host. Please pull into 2011.03-maintenance branch. The following changes since commit f9611c025109a3e0d6cebf12f49ae24c97759c09: psplash: convert from svn.o-hand.com to git.yoctoproject.org (2012-07-04 22:34:04 +0200) are available in the git repository at: git://seketeli.net/~apelete/oe.git muffinman-image-fix Hello, Trying to bring some attention onto this thread. Are there more blocking issues I should fix before getting those patches merged ? Cheers. -- Apelete ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [2011.03-maintenance][PATCH 0/9] Pull request 20120719
On Mon, Jul 23, 2012 at 10:33:23PM +0200, Apelete Seketeli wrote: Le 23-Jul-12, Tom Rini a ?crit: On Thu, Jul 19, 2012 at 07:20:31PM +0200, Apelete Seketeli wrote: Hello, The patches that come as a follow-up of this message fix issues found while building muffinman-image on top of the 2011.03-maintenance branch. These modifications were tested by successfully building muffinman-image from scratch on a Debian Squeeze host. Please pull into 2011.03-maintenance branch. The following changes since commit f9611c025109a3e0d6cebf12f49ae24c97759c09: psplash: convert from svn.o-hand.com to git.yoctoproject.org (2012-07-04 22:34:04 +0200) are available in the git repository at: git://seketeli.net/~apelete/oe.git muffinman-image-fix I have a concern right now. It is that 9160263 was reported to have changed the behavior slightly such that some SDK tasks/images now fail. So.. I can't seem to find the commit corresponding to the 9160263 hash in the 2011.03 branch. Could you point it to me please ? Sorry, the leading 'f' got missed, and I see Denys has a pull request to deal with that breakage now. -- Tom ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [2011.03-maintenance][PATCH 0/9] Pull request 20120719
On Thu, Jul 19, 2012 at 07:20:31PM +0200, Apelete Seketeli wrote: Hello, The patches that come as a follow-up of this message fix issues found while building muffinman-image on top of the 2011.03-maintenance branch. These modifications were tested by successfully building muffinman-image from scratch on a Debian Squeeze host. Please pull into 2011.03-maintenance branch. The following changes since commit f9611c025109a3e0d6cebf12f49ae24c97759c09: psplash: convert from svn.o-hand.com to git.yoctoproject.org (2012-07-04 22:34:04 +0200) are available in the git repository at: git://seketeli.net/~apelete/oe.git muffinman-image-fix Apelete Seketeli (9): mirrors.bbclass: add new GNU_MIRROR mirrors.bbclass: add new KERNELORG_MIRROR libpng: update SRC_URI bluez4_4.84: update checksum values netsurf: update SRC_URI tzcode: update SRC_URI tzdata: update SRC_URI git: update SRC_URI opkg-utils: bump SRCREV to keep python2.6 compatibility classes/mirrors.bbclass |2 ++ recipes/bluez/bluez4_4.84.bb|4 ++-- recipes/git/git.inc |2 +- recipes/libpng/libpng.inc |2 +- recipes/netsurf/hubbub_0.0.2.bb |2 +- recipes/netsurf/libcss_0.0.2.bb |2 +- recipes/netsurf/libnsbmp_0.0.2.bb |2 +- recipes/netsurf/libnsgif_0.0.2.bb |2 +- recipes/netsurf/libparserutils_0.0.2.bb |2 +- recipes/netsurf/libwapcaplet_0.0.2.bb |2 +- recipes/netsurf/netsurf_2.6.bb |2 +- recipes/opkg-utils/opkg-utils_git.bb|4 ++-- recipes/tzcode/tzcode-native.inc|4 ++-- recipes/tzdata/tzdata.inc |2 +- 14 files changed, 18 insertions(+), 16 deletions(-) Applied, thanks. -- Tom signature.asc Description: Digital signature ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [2011.03-maintenance][PATCH 0/1] Pull request 20110723
On Tue, Jul 24, 2012 at 12:52:28AM -0400, Denys Dmytriyenko wrote: Tom, Please pull this commit that fixes opkg-utils when generating pkg index Pull URL: git://arago-project.org/git/people/denix/openembedded.git Branch: 2011.03-maintenance Browse: http://arago-project.org/git/people/?p=denix/openembedded.git;a=shortlog;h=refs/heads/2011.03-maintenance Thanks, Denys Dmytriyenko de...@ti.com --- The following changes since commit f9611c025109a3e0d6cebf12f49ae24c97759c09: psplash: convert from svn.o-hand.com to git.yoctoproject.org (2012-07-04 22:34:04 +0200) are available in the git repository at: git://arago-project.org/git/people/denix/openembedded 2011.03-maintenance Denys Dmytriyenko (1): opkg-utils: bump SRCREV to pick up subprocess.check_output fixes recipes/opkg-utils/opkg-utils_git.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Applied, thanks. -- Tom signature.asc Description: Digital signature ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 09/24] e-wm: use new update-alternatives syntax
* fixes warning WARNING: e-wm: Use of ALTERNATIVE_NAME is deprecated, see update-alternatives.bbclass for more info. Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta-efl/recipes-efl/e17/e-wm_svn.bb |9 - 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/meta-efl/recipes-efl/e17/e-wm_svn.bb b/meta-efl/recipes-efl/e17/e-wm_svn.bb index 852bbcc..6f5fab1 100644 --- a/meta-efl/recipes-efl/e17/e-wm_svn.bb +++ b/meta-efl/recipes-efl/e17/e-wm_svn.bb @@ -4,7 +4,7 @@ LICENSE = MIT BSD LIC_FILES_CHKSUM = file://COPYING;md5=2667a0f4120372ea91f7467cdff4095f SRCNAME = e PV = 0.16.999.060+svnr${SRCPV} -PR = r1 +PR = r2 SRCREV = ${EFL_SRCREV} inherit e update-alternatives gettext @@ -182,7 +182,6 @@ FILES_${PN}-doc += \ CONFFILES_${PN}-menu = ${sysconfdir}/xdg/menus/applications.menu CONFFILES_${PN}-sysactions = /etc/enlightenment/sysactions.conf -ALTERNATIVE_PATH = ${bindir}/enlightenment_start.oe -ALTERNATIVE_NAME = x-window-manager -ALTERNATIVE_LINK = ${bindir}/x-window-manager -ALTERNATIVE_PRIORITY = 16 +ALTERNATIVE_${PN} = x-window-manager +ALTERNATIVE_TARGET[x-window-manager] = ${bindir}/enlightenment_start.oe +ALTERNATIVE_PRIORITY[x-window-manager] = 16 -- 1.7.8.6 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 00/24] Merge some recipes from meta-smartphone + few fixes
The following changes since commit 9afc488a1b97bfc5378f139ba04a7a5297b15fdb: nano: add PACKAGECONFIG for 'tiny' build (2012-07-25 09:18:12 +0200) are available in the git repository at: git://git.openembedded.org/meta-openembedded-contrib jansa/pull http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull Martin Jansa (24): tcpdump: bump PR to rebuild against libpcap1 instead libpcap vala-dbus-binding-tool: bump SRCREV and add recipe for 0.4.0 tarball libwnck: use gobject-introspection-stub instead of -native which was removed in oe-core libgee: use gobject-introspection-stub instead of -native which was removed in oe-core upower: use gobject-introspection-stub instead of -native which was removed in oe-core gpsd: drop older version 3.4 webkit-efl: upgrade to 1.9.3 eve: add patch to build against newer webkit-efl e-wm: use new update-alternatives syntax gpsd: add chrpath-native to DEPENDS otherwise it could autodetect host chrpath udev-extra-rules: drop in favor of udev-extraconf from oe-core meta-elf: e-module: add *.a to PN-staticdev gnuplot: import from meta-smartphone libetpan: import from meta-smartphone claws-mail, sylpheed: import from meta-smartphone python-epydoc, python-gdata, python-ldap, python-webdav: import from meta-smartphone mcnavi, monav, omgps, orrery: import from meta-smartphone emacs: import from meta-smartphone fbreader, fltk, gpm, iksemel, joe, links, ode, openldap, opensync, xchat: import from meta-smartphone liblockfile, libungif: import from oe-classic emacs: fix dso build emacs: upgrade to 23.4 pixman: add patch to fix SEGFAULT when parsing auxv emacs: drop older version 23.1 meta-efl/recipes-efl/e17/e-module.inc |1 + meta-efl/recipes-efl/e17/e-wm_svn.bb |9 +- .../eve/0001-eve-update-for-newer-webkit-efl.patch | 38 ++ meta-efl/recipes-efl/e17/eve_svn.bb|2 + ...t-pass-P-to-the-preprocessor-when-running.patch | 76 --- ...ore-add-EINA_LIBRARIES-to-shell-build-for.patch | 28 - .../recipes-efl/webkit/webkit-efl/CMakeLists.txt | 38 +- meta-efl/recipes-efl/webkit/webkit-efl_svn.bb | 11 +- meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb | 10 +- meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb | 10 +- meta-oe/recipes-core/udev/udev-extra-rules.bb | 36 -- .../udev/udev-extra-rules/automount.rules | 19 - .../udev/udev-extra-rules/autonet.rules| 19 - .../recipes-core/udev/udev-extra-rules/local.rules | 21 - .../udev/udev-extra-rules/mount.blacklist |3 - .../recipes-core/udev/udev-extra-rules/mount.sh| 64 --- .../recipes-core/udev/udev-extra-rules/network.sh | 58 -- meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb|7 +- .../recipes-devtools/python/python-epydoc_3.0.1.bb | 18 + .../recipes-devtools/python/python-gdata_1.2.4.bb | 18 + .../python/python-ldap/setup.cfg.patch | 14 + .../recipes-devtools/python/python-ldap_2.3.9.bb | 13 + .../recipes-devtools/python/python-webdav_0.1.2.bb | 19 + .../vala-dbus-binding-tool.inc |2 +- .../vala-dbus-binding-tool_0.4.0.bb|4 + .../vala-dbus-binding-tool_git.bb |7 +- .../gnuplot/gnuplot-4.4.4/automake-1.12.x.patch| 44 ++ .../gnuplot/gnuplot-4.4.4/subdirs.patch| 11 + meta-oe/recipes-extended/gnuplot/gnuplot.inc | 35 ++ .../gnuplot/gnuplot/gnuplot.desktop|8 + .../recipes-extended/gnuplot/gnuplot/gnuplot.png | Bin 0 - 9383 bytes .../recipes-extended/gnuplot/gnuplot/qtopia.trm| 483 meta-oe/recipes-extended/gnuplot/gnuplot_4.4.4.bb | 16 + .../liblockfile/liblockfile-1.06/configure.patch | 25 + .../liblockfile/liblockfile-1.06/glibc-2.4.patch | 70 +++ .../liblockfile/liblockfile-1.06/install.patch | 48 ++ .../liblockfile/liblockfile-1.06/ldflags.patch | 21 + .../liblockfile/liblockfile_1.06.bb| 21 + .../recipes-extended/libungif/libungif_4.1.3.bb| 14 + ...lated-workarounds-in-cpu-features-detecti.patch | 121 .../xorg-lib/pixman_0.26.2.bbappend|6 +- ...t-fix-DSO-build-for-ntpshm-garmin_monitor.patch | 41 -- ...prefix-includepy-with-sysroot-and-drop-sy.patch | 72 --- meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb| 123 - meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb|5 +- meta-oe/recipes-navigation/gpsd/gpsd_git.bb|4 +- meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb | 18 + .../recipes-navigation/monav/monav/monav.desktop | 10 + meta-oe/recipes-navigation/monav/monav/monav.png | Bin 0 - 21543 bytes meta-oe/recipes-navigation/monav/monav_0.3.bb | 37 ++ .../omgps/omgps/fix.capability.patch | 59 ++ .../recipes-navigation/omgps/omgps/gcc-4.4.patch | 68 +++
[oe] [meta-oe][PATCH 07/24] webkit-efl: upgrade to 1.9.3
* some revisions are broken for armv4t, see my comment at https://bugs.webkit.org/show_bug.cgi?id=80354 * and newer then this need developement snapshot of glib/glib-networking/libsoup-2.4 https://bugs.webkit.org/show_bug.cgi?id=91626 * current version fails to find newer cairo, see: https://bugs.webkit.org/show_bug.cgi?id=84895 Signed-off-by: Martin Jansa martin.ja...@gmail.com --- ...t-pass-P-to-the-preprocessor-when-running.patch | 76 ...ore-add-EINA_LIBRARIES-to-shell-build-for.patch | 28 --- .../recipes-efl/webkit/webkit-efl/CMakeLists.txt | 38 ++ meta-efl/recipes-efl/webkit/webkit-efl_svn.bb | 11 ++-- 4 files changed, 27 insertions(+), 126 deletions(-) delete mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch delete mode 100644 meta-efl/recipes-efl/webkit/webkit-efl/0001-JavaScriptCore-add-EINA_LIBRARIES-to-shell-build-for.patch diff --git a/meta-efl/recipes-efl/webkit/webkit-efl/0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch b/meta-efl/recipes-efl/webkit/webkit-efl/0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch deleted file mode 100644 index dcd3a46..000 --- a/meta-efl/recipes-efl/webkit/webkit-efl/0001-CMake-Do-not-pass-P-to-the-preprocessor-when-running.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 3dfc99730b99472d642f19b825fb9794e32a05c4 Mon Sep 17 00:00:00 2001 -From: rak...@webkit.org - rak...@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc -Date: Tue, 10 Apr 2012 22:59:04 + -Subject: [PATCH] [CMake] Do not pass -P to the preprocessor when running - make_names.pl. - https://bugs.webkit.org/show_bug.cgi?id=83225 - -Reviewed by Rob Buis. - -This is necessary to make CMake-based ports build with the -recently-released GCC 4.7.0, whose preprocessor seems to ignore -empty lines when -P is passed to it. Such behavior breaks -make_names.pl (in fact, InFilesParser.pm), which expects an empty -line to separate common and specific sections in .in files. - -A fix for this same problem has been supposedly done in r84123, -but as the CMake-based ports always pass --preprocessor to the -Perl tools the fix never reached us. - -The idea is to define CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS -for (!MSVC !QNX) and use it in the macros which call -make_names.pl. - -* Source/cmake/OptionsCommon.cmake: -* Source/cmake/WebKitMacros.cmake: - -git-svn-id: http://svn.webkit.org/repository/webkit/trunk@113786 268f45cc-cd09-0410-ab3c-d52691b4dbfc - ChangeLog| 24 - Source/cmake/OptionsCommon.cmake |7 +++ - Source/cmake/WebKitMacros.cmake |2 +- - 3 files changed, 32 insertions(+), 1 deletions(-) - -diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake -index 11581e6..37cb4a8 100644 a/Source/cmake/OptionsCommon.cmake -+++ b/Source/cmake/OptionsCommon.cmake -@@ -5,14 +5,21 @@ IF (WTF_OS_UNIX) - ADD_DEFINITIONS(-DXP_UNIX) - ENDIF (WTF_OS_UNIX) - -+# CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS only matters with GCC = 4.7.0. Since this -+# version, -P does not output empty lines, which currently breaks make_names.pl in -+# WebCore. Investigating whether make_names.pl should be changed instead is left as an exercise to -+# the reader. - IF (MSVC) - # FIXME: Some codegenerators don't support paths with spaces. So use the executable name only. - GET_FILENAME_COMPONENT(CODE_GENERATOR_PREPROCESSOR_EXECUTABLE ${CMAKE_CXX_COMPILER} NAME) - SET(CODE_GENERATOR_PREPROCESSOR ${CODE_GENERATOR_PREPROCESSOR_EXECUTABLE} /nologo /EP) -+SET(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS ${CODE_GENERATOR_PREPROCESSOR}) - ELSEIF (CMAKE_SYSTEM_NAME MATCHES QNX) - SET(CODE_GENERATOR_PREPROCESSOR ${CMAKE_CXX_COMPILER} -E -Wp,-P -x c++) -+SET(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS ${CODE_GENERATOR_PREPROCESSOR}) - ELSE () - SET(CODE_GENERATOR_PREPROCESSOR ${CMAKE_CXX_COMPILER} -E -P -x c++) -+SET(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS ${CMAKE_CXX_COMPILER} -E -x c++) - ENDIF () - - SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON) -diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake -index 3abe342..4e7ca9f 100644 a/Source/cmake/WebKitMacros.cmake -+++ b/Source/cmake/WebKitMacros.cmake -@@ -89,7 +89,7 @@ MACRO (GENERATE_DOM_NAMES _namespace _attrs) - ADD_CUSTOM_COMMAND( - OUTPUT ${_outputfiles} - DEPENDS ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS} ${_attrs} ${_tags} --COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --preprocessor ${CODE_GENERATOR_PREPROCESSOR} --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments} ${_additionArguments} -+COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --preprocessor ${CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS} --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}
[oe] [meta-oe][PATCH 08/24] eve: add patch to build against newer webkit-efl
* otherwise fails at runtime: CRI627: /OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/webkit-efl/webkit-efl-1.9.5+svnr120144-r0/src/Source/WebKit/efl/ewk/ewk_view.cpp:1264 ewk_view_base_smart_set() Ewk_View_Smart_Class 0x617f00 is version 4 while 5 was expected. CRI627: /OE/shr-core/tmp-eglibc/work/x86_64-oe-linux/webkit-efl/webkit-efl-1.9.5+svnr120144-r0/src/Source/WebKit/efl/ewk/ewk_view.cpp:1264 ewk_view_base_smart_set() Ewk_View_Smart_Class 0x6180c0 is version 4 while 5 was expected. eve[627]: segfault at 0 ip (null) sp 7fff7ee1fb18 error 14 in eve[40+18000] Segmentation fault Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../eve/0001-eve-update-for-newer-webkit-efl.patch | 38 meta-efl/recipes-efl/e17/eve_svn.bb|2 + 2 files changed, 40 insertions(+), 0 deletions(-) create mode 100644 meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch diff --git a/meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch b/meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch new file mode 100644 index 000..a1f14df --- /dev/null +++ b/meta-efl/recipes-efl/e17/eve/0001-eve-update-for-newer-webkit-efl.patch @@ -0,0 +1,38 @@ +From 7c25cbf1901e9be1c0bebca6c9bcaa79dbbdf849 Mon Sep 17 00:00:00 2001 +From: Martin Jansa martin.ja...@gmail.com +Date: Wed, 18 Jul 2012 17:54:50 +0200 +Subject: [PATCH] eve: update for newer webkit-efl + +* ewk_settings_icon_database_icon_object_add was renamed to ewk_settings_icon_database_icon_object_get + in webkit r113173 (see https://bugs.webkit.org/show_bug.cgi?id=82438) + +Signed-off-by: Martin Jansa martin.ja...@gmail.com +--- + src/bin/chrome.c |4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/bin/chrome.c b/src/bin/chrome.c +index e402cad..ee8f0c4 100644 +--- a/src/bin/chrome.c b/src/bin/chrome.c +@@ -985,7 +985,7 @@ _chrome_state_apply(Evas_Object *chrome, Evas_Object *view) +if (old_icon) evas_object_del(old_icon); +if (url) + { +-favicon = ewk_settings_icon_database_icon_object_add(url, canvas); ++favicon = ewk_settings_icon_database_icon_object_get(url, canvas); + if (favicon) +elm_object_part_content_set(text_url, icon, favicon); + } +@@ -2456,7 +2456,7 @@ more_content_get(void *data, Evas_Object *obj, const char *part) + { + Evas_Object *chrome = evas_object_data_get(obj, chrome); + Evas *canvas = evas_object_evas_get(chrome); +- icon = ewk_settings_icon_database_icon_object_add(mmi-next, canvas); ++ icon = ewk_settings_icon_database_icon_object_get(mmi-next, canvas); + } + return icon; + } +-- +1.7.8.6 + diff --git a/meta-efl/recipes-efl/e17/eve_svn.bb b/meta-efl/recipes-efl/e17/eve_svn.bb index d760c4a..9528ff3 100644 --- a/meta-efl/recipes-efl/e17/eve_svn.bb +++ b/meta-efl/recipes-efl/e17/eve_svn.bb @@ -3,6 +3,7 @@ LICENSE = LGPLv3 LIC_FILES_CHKSUM = file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6 DEPENDS = evas ecore edje elementary webkit-efl PV = 0.3.0.0+svnr${SRCPV} +PR = r1 SRCREV = ${EFL_SRCREV} inherit e gettext @@ -14,6 +15,7 @@ do_configure_prepend() { } SRC_URI += file://eve-theme-for-smaller-screens.patch \ + file://0001-eve-update-for-newer-webkit-efl.patch \ EXTRA_OECONF = \ -- 1.7.8.6 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 10/24] gpsd: add chrpath-native to DEPENDS otherwise it could autodetect host chrpath
* which doesn't work sometimes: chrpath -d /var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.5-r7/image/usr/sbin/gpsd `/var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.5-r7/image/usr/sbin/gpsd' probably isn't a 64-bit LSB-first ELF file. elf_open: Exec format error Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb |4 ++-- meta-oe/recipes-navigation/gpsd/gpsd_git.bb |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb index 568d492..1e3ac0c 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb @@ -2,10 +2,10 @@ DESCRIPTION = A TCP/IP Daemon simplifying the communication with GPS devices SECTION = console/network LICENSE = BSD LIC_FILES_CHKSUM = file://COPYING;md5=d217a23f408e91c94359447735bc1800 -DEPENDS = dbus dbus-glib ncurses python libusb1 +DEPENDS = dbus dbus-glib ncurses python libusb1 chrpath-native PROVIDES = virtual/gpsd -PR = r4 +PR = r5 SRC_URI = http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ file://0001-SConstruct-respect-sysroot-setting-when-prepending-L.patch \ diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_git.bb b/meta-oe/recipes-navigation/gpsd/gpsd_git.bb index 8404ba1..380f3ba 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_git.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_git.bb @@ -2,10 +2,10 @@ DESCRIPTION = A TCP/IP Daemon simplifying the communication with GPS devices SECTION = console/network LICENSE = BSD LIC_FILES_CHKSUM = file://COPYING;md5=d217a23f408e91c94359447735bc1800 -DEPENDS = dbus dbus-glib ncurses python libusb1 +DEPENDS = dbus dbus-glib ncurses python libusb1 chrpath-native PROVIDES = virtual/gpsd -PR = r3 +PR = r4 SRCREV = f8744f4af8cef211de698df5d8e6caddfe33f29d -- 1.7.8.6 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 11/24] udev-extra-rules: drop in favor of udev-extraconf from oe-core
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta-oe/recipes-core/udev/udev-extra-rules.bb | 36 --- .../udev/udev-extra-rules/automount.rules | 19 -- .../udev/udev-extra-rules/autonet.rules| 19 -- .../recipes-core/udev/udev-extra-rules/local.rules | 21 --- .../udev/udev-extra-rules/mount.blacklist |3 - .../recipes-core/udev/udev-extra-rules/mount.sh| 64 .../recipes-core/udev/udev-extra-rules/network.sh | 58 -- 7 files changed, 0 insertions(+), 220 deletions(-) delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules.bb delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules/automount.rules delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules/autonet.rules delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules/local.rules delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules/mount.blacklist delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules/mount.sh delete mode 100644 meta-oe/recipes-core/udev/udev-extra-rules/network.sh diff --git a/meta-oe/recipes-core/udev/udev-extra-rules.bb b/meta-oe/recipes-core/udev/udev-extra-rules.bb deleted file mode 100644 index 7f9ca85..000 --- a/meta-oe/recipes-core/udev/udev-extra-rules.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = Extra udev rules -LICENSE = MIT -LIC_FILES_CHKSUM = file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 - -inherit allarch - -PR = r4 - -SRC_URI = \ - file://automount.rules \ - file://mount.sh \ - file://mount.blacklist \ - file://autonet.rules \ - file://network.sh \ - file://local.rules \ - - - -do_install() { -install -d ${D}${sysconfdir}/udev/rules.d - -install -m 0644 ${WORKDIR}/automount.rules ${D}${sysconfdir}/udev/rules.d/automount.rules -install -m 0644 ${WORKDIR}/autonet.rules ${D}${sysconfdir}/udev/rules.d/autonet.rules -install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules - -install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ - -install -d ${D}${sysconfdir}/udev/scripts/ - -install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh -install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts -} - -FILES_${PN} = ${sysconfdir}/udev -RDEPENDS_${PN} = udev -CONFFILES_${PN} = ${sysconfdir}/udev/mount.blacklist diff --git a/meta-oe/recipes-core/udev/udev-extra-rules/automount.rules b/meta-oe/recipes-core/udev/udev-extra-rules/automount.rules deleted file mode 100644 index 7e844c3..000 --- a/meta-oe/recipes-core/udev/udev-extra-rules/automount.rules +++ /dev/null @@ -1,19 +0,0 @@ -# There are a number of modifiers that are allowed to be used in some -# of the different fields. They provide the following subsitutions: -# -# %n the kernel number of the device. -#For example, 'sda3' has a kernel number of '3' -# %e the smallest number for that name which does not matches an existing node -# %k the kernel name for the device -# %M the kernel major number for the device -# %m the kernel minor number for the device -# %b the bus id for the device -# %c the string returned by the PROGRAM -# %s{filename} the content of a sysfs attribute -# %% the '%' char itself -# - -# Media automounting -SUBSYSTEM==block, ACTION==addRUN+=/etc/udev/scripts/mount.sh -SUBSYSTEM==block, ACTION==remove RUN+=/etc/udev/scripts/mount.sh - diff --git a/meta-oe/recipes-core/udev/udev-extra-rules/autonet.rules b/meta-oe/recipes-core/udev/udev-extra-rules/autonet.rules deleted file mode 100644 index 19676aa..000 --- a/meta-oe/recipes-core/udev/udev-extra-rules/autonet.rules +++ /dev/null @@ -1,19 +0,0 @@ -# There are a number of modifiers that are allowed to be used in some -# of the different fields. They provide the following subsitutions: -# -# %n the kernel number of the device. -#For example, 'sda3' has a kernel number of '3' -# %e the smallest number for that name which does not matches an existing node -# %k the kernel name for the device -# %M the kernel major number for the device -# %m the kernel minor number for the device -# %b the bus id for the device -# %c the string returned by the PROGRAM -# %s{filename} the content of a sysfs attribute -# %% the '%' char itself -# - -# Handle network interface setup -SUBSYSTEM==net, ACTION==add RUN+=/etc/udev/scripts/network.sh -SUBSYSTEM==net, ACTION==remove RUN+=/etc/udev/scripts/network.sh - diff --git a/meta-oe/recipes-core/udev/udev-extra-rules/local.rules b/meta-oe/recipes-core/udev/udev-extra-rules/local.rules deleted file mode 100644 index 4eaa8ca..000 --- a/meta-oe/recipes-core/udev/udev-extra-rules/local.rules +++ /dev/null @@ -1,21 +0,0 @@ -# There are a number of modifiers that are allowed to be used in some -# of the different fields. They provide the following subsitutions: -# -# %n the kernel number of the device. -#
[oe] [meta-oe][PATCH 12/24] meta-elf: e-module: add *.a to PN-staticdev
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta-efl/recipes-efl/e17/e-module.inc |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta-efl/recipes-efl/e17/e-module.inc b/meta-efl/recipes-efl/e17/e-module.inc index d3f6e1b..0923575 100644 --- a/meta-efl/recipes-efl/e17/e-module.inc +++ b/meta-efl/recipes-efl/e17/e-module.inc @@ -15,4 +15,5 @@ EXTRA_OECONF = --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc FILES_${PN} += ${libdir}/enlightenment/modules/${PN} FILES_${PN}-dbg += ${libdir}/enlightenment/modules/${PN}/*/.debug +FILES_${PN}-staticdev += ${libdir}/enlightenment/modules/${PN}/*/*.a -- 1.7.8.6 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 13/24] gnuplot: import from meta-smartphone
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../gnuplot/gnuplot-4.4.4/automake-1.12.x.patch| 44 ++ .../gnuplot/gnuplot-4.4.4/subdirs.patch| 11 + meta-oe/recipes-extended/gnuplot/gnuplot.inc | 35 ++ .../gnuplot/gnuplot/gnuplot.desktop|8 + .../recipes-extended/gnuplot/gnuplot/gnuplot.png | Bin 0 - 9383 bytes .../recipes-extended/gnuplot/gnuplot/qtopia.trm| 483 meta-oe/recipes-extended/gnuplot/gnuplot_4.4.4.bb | 16 + 7 files changed, 597 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/automake-1.12.x.patch create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/subdirs.patch create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot.inc create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.png create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot/qtopia.trm create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot_4.4.4.bb diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/automake-1.12.x.patch b/meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/automake-1.12.x.patch new file mode 100644 index 000..51f703c --- /dev/null +++ b/meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/automake-1.12.x.patch @@ -0,0 +1,44 @@ +Upstream-Status: Backport + +It's fixed in 4.6 and 4.7(HEAD) + +http://sourceforge.net/tracker/?func=detailaid=3523591group_id=2055atid=102055 + +diff -uNr gnuplot-4.4.4.orig/Makefile.am gnuplot-4.4.4/Makefile.am +--- gnuplot-4.4.4.orig/Makefile.am 2012-07-20 10:54:49.075828905 +0200 gnuplot-4.4.4/Makefile.am 2012-07-20 10:55:22.380831313 +0200 +@@ -1,5 +1,5 @@ + ## Process this file with automake to produce Makefile.in -*-Makefile-*- +-AUTOMAKE_OPTIONS = foreign 1.2h ++AUTOMAKE_OPTIONS = foreign + + SUBDIRS = config m4 term src $(LISPDIR) man share + +diff -uNr gnuplot-4.4.4.orig/configure.in gnuplot-4.4.4/configure.in +--- gnuplot-4.4.4.orig/configure.in2011-09-02 06:09:40.0 +0200 gnuplot-4.4.4/configure.in 2012-07-20 10:55:53.289833224 +0200 +@@ -16,10 +16,11 @@ + dnl configure.in body + + dnl Compiler characteristics +-dnl Check for ANSI C prototypes, the const and inline keywords, +-dnl and ANSI style stringification ++dnl Check for the const and inline keywords and ANSI style stringification ++dnl automake 1.12 dropped support for AM_C_PROTOTYPES and ansi2knr ++dnl But our code still tests for #ifdef PROTOTYPES, so define it here ++AC_DEFINE(PROTOTYPES,1,[Automake 1.12 dropped support for building without prototypes]) + AC_PROG_CC +-AM_C_PROTOTYPES + AC_PROG_CPP + AC_C_CONST + AC_C_INLINE +diff -uNr gnuplot-4.4.4.orig/src/Makefile.am gnuplot-4.4.4/src/Makefile.am +--- gnuplot-4.4.4.orig/src/Makefile.am 2010-10-06 06:53:16.0 +0200 gnuplot-4.4.4/src/Makefile.am 2012-07-20 10:56:02.376834548 +0200 +@@ -1,5 +1,5 @@ + ## Process this file with automake to produce Makefile.in -*-Makefile-*- +-AUTOMAKE_OPTIONS = ansi2knr foreign 1.2h ++AUTOMAKE_OPTIONS = foreign + + # in the spirit of automake ... + pkglibexecdir = $(libexecdir)/@PACKAGE@/@VERSION_MAJOR@ diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/subdirs.patch b/meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/subdirs.patch new file mode 100644 index 000..8c7d1f0 --- /dev/null +++ b/meta-oe/recipes-extended/gnuplot/gnuplot-4.4.4/subdirs.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200 gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200 +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in -*-Makefile-*- + AUTOMAKE_OPTIONS = foreign 1.2h + +-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share ++SUBDIRS = config m4 term src $(LISPDIR) man share + + EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \ + Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \ diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot.inc b/meta-oe/recipes-extended/gnuplot/gnuplot.inc new file mode 100644 index 000..b72bbd7 --- /dev/null +++ b/meta-oe/recipes-extended/gnuplot/gnuplot.inc @@ -0,0 +1,35 @@ +DESCRIPTION = Gnuplot is a portable command-line driven interactive datafile \ +(text or binary) and function plotting utility. +HOMEPAGE = http://www.gnuplot.info/; +SECTION = console/scientific +LICENSE = BSD-4 +LIC_FILES_CHKSUM = file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f +DEPENDS = virtual/libx11 gd cairo readline + +inherit autotools + +acpaths = + +EXTRA_OECONF = --with-readline=${STAGING_LIBDIR}/.. \ +--without-lisp-files \ +--without-tutorial \ +--disable-wxwidgets + +do_compile_prepend() { +install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/ +} + +do_install_append() { +install -d ${D}${datadir}/applications/ +
[oe] [meta-oe][PATCH 14/24] libetpan: import from meta-smartphone
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../libetpan-0.57/libetpan-autoreconf.patch| 12 ++ .../libetpan/libetpan-0.57/libetpan-ldflags.patch | 11 + meta-oe/recipes-support/libetpan/libetpan_0.57.bb | 24 3 files changed, 47 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-autoreconf.patch create mode 100644 meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-ldflags.patch create mode 100644 meta-oe/recipes-support/libetpan/libetpan_0.57.bb diff --git a/meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-autoreconf.patch b/meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-autoreconf.patch new file mode 100644 index 000..d05967d --- /dev/null +++ b/meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-autoreconf.patch @@ -0,0 +1,12 @@ +Index: libetpan-0.57/configure.ac +=== +--- libetpan-0.57.orig/configure.ac2008-10-08 19:54:20.0 + libetpan-0.57/configure.ac 2008-11-11 16:34:33.0 + +@@ -106,6 +106,7 @@ + + # Check the C compiler. + AC_PROG_CC ++AC_PROG_CXX + + # Compiler flags. + AC_ARG_ENABLE(debug, [ --enable-debug setup flags (gcc) for debugging (default=no)], diff --git a/meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-ldflags.patch b/meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-ldflags.patch new file mode 100644 index 000..438f44f --- /dev/null +++ b/meta-oe/recipes-support/libetpan/libetpan-0.57/libetpan-ldflags.patch @@ -0,0 +1,11 @@ +--- libetpan-0.57/configure.ac~2009-09-21 23:31:42.0 +0200 libetpan-0.57/configure.ac 2009-09-21 23:31:42.0 +0200 +@@ -457,7 +457,7 @@ + LDFLAGS=-$flag $LDFLAGS + AC_TRY_LINK([], [pthread_create();], + [pthflag=yes; checkpthread=no], +- [pthflag=no; LDFLAGS=$OLDCFLAGS]) ++ [pthflag=no; LDFLAGS=$OLDFLAGS]) + AC_MSG_RESULT($pthflag) + fi + done diff --git a/meta-oe/recipes-support/libetpan/libetpan_0.57.bb b/meta-oe/recipes-support/libetpan/libetpan_0.57.bb new file mode 100644 index 000..7049938 --- /dev/null +++ b/meta-oe/recipes-support/libetpan/libetpan_0.57.bb @@ -0,0 +1,24 @@ +DESCRIPTION = libetpan is a library for communicating with mail and news servers. \ +It supports the protocols SMTP, POP3, IMAP and NNTP. +HOMEPAGE = http://www.etpan.org; +SECTION = libs +DEPENDS = gnutls +LICENSE = BSD +LIC_FILES_CHKSUM = file://COPYRIGHT;md5=f18ebe7e452708c26f83954f81062ba7 + +SRC_URI = ${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \ + file://libetpan-autoreconf.patch \ + file://libetpan-ldflags.patch + +inherit autotools pkgconfig gettext binconfig + +EXTRA_OECONF = --without-openssl --with-gnutls --disable-db + +PARALLEL_MAKE = + +FILES_${PN} = ${libdir}/lib*.so.* +FILES_${PN}-dev = ${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig + + +SRC_URI[md5sum] = 8ce8c6c071e81884a475b12b7f9a9cc0 +SRC_URI[sha256sum] = 1f3fda5c9e2961d1a6298dc8aadae321493d37727d8db45bc2e8d58f20547011 -- 1.7.8.6 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 15/24] claws-mail, sylpheed: import from meta-smartphone
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../claws-mail-3.6.1/claws-mail-g_strcmp0.patch| 575 .../claws-mail/claws-mail-3.6.1/desktop.patch | 19 + .../claws-mail-3.6.1/duplicate-header.patch| 10 + .../claws-mail/claws-mail-3.6.1/glib-2.32.patch| 11 + .../recipes-sato/claws-mail/claws-mail_3.6.1.bb| 62 +++ .../claws-plugin-gtkhtml2-viewer_0.31.bb | 19 + .../claws-plugin-mailmbox-fixup.patch | 218 .../claws-mail/claws-plugin-mailmbox_1.14.bb | 19 + .../claws-mail/claws-plugin-rssyl_0.18.bb | 18 + .../claws-mail/sylpheed/glib-2.32.patch| 11 + meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb | 37 ++ 11 files changed, 999 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/claws-mail-g_strcmp0.patch create mode 100644 meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/desktop.patch create mode 100644 meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/duplicate-header.patch create mode 100644 meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/glib-2.32.patch create mode 100644 meta-oe/recipes-sato/claws-mail/claws-mail_3.6.1.bb create mode 100644 meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.31.bb create mode 100644 meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox-1.14/claws-plugin-mailmbox-fixup.patch create mode 100644 meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.14.bb create mode 100644 meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl_0.18.bb create mode 100644 meta-oe/recipes-sato/claws-mail/sylpheed/glib-2.32.patch create mode 100644 meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb diff --git a/meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/claws-mail-g_strcmp0.patch b/meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/claws-mail-g_strcmp0.patch new file mode 100644 index 000..17c213d --- /dev/null +++ b/meta-oe/recipes-sato/claws-mail/claws-mail-3.6.1/claws-mail-g_strcmp0.patch @@ -0,0 +1,575 @@ +http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=1773 + +However using if (g_utf8_collate(foo1, foo2)) works and gives good results (at +least if glibc or locale data are not broken), this usage is bad. + +If you need to just compare strings to get equal/non-equal return value, than +using of four-pass locale wise lexicographic collating is purely superfluous. + +Using simpler functions like strcmp() or g_strcmp0() will give the same result +5-50 times faster. + +In attached patch, I replaces all occurrences of upper mentioned use case. + +Stanislav Brabec + +diff -ur claws-mail-3.6.1.orig/src/addrcustomattr.c claws-mail-3.6.1/src/addrcustomattr.c +--- claws-mail-3.6.1.orig/src/addrcustomattr.c 2008-07-25 23:01:29.0 +0200 claws-mail-3.6.1/src/addrcustomattr.c 2008-11-14 14:27:12.0 +0100 +@@ -353,7 +353,7 @@ + gchar *attr; + gtk_tree_model_get(model, iter, CUSTOM_ATTR_NAME, attr, -1); + +- if (g_utf8_collate(data-attr, attr)==0) { ++ if (g_strcmp0(data-attr, attr)==0) { + data-path = path; /* signal we found it */ + data-iter = *iter; + return TRUE; +diff -ur claws-mail-3.6.1.orig/src/addressbook_foldersel.c claws-mail-3.6.1/src/addressbook_foldersel.c +--- claws-mail-3.6.1.orig/src/addressbook_foldersel.c 2008-09-09 19:10:50.0 +0200 claws-mail-3.6.1/src/addressbook_foldersel.c 2008-11-14 14:27:12.0 +0100 +@@ -392,12 +392,19 @@ +corresponds to what we received */ + + if ( path != NULL ) { +- if ( g_utf8_collate(path, _(Any)) == 0 || strcasecmp(path, Any) ==0 || *path == '\0' ) ++ /* FIXME: Do we really need to recognize anY (and translated form)? */ ++ /* It's a bit more complicated than g_utf8_collate, but still much faster */ ++ char *tmp1, *tmp2; ++ tmp1 = g_utf8_casefold(path, -1); ++ tmp2 = g_utf8_casefold(_(Any), -1); /* FIXME: This should be done only once. */ ++ if ( g_strcmp0(tmp1, tmp2) == 0 || g_ascii_strcasecmp(path, Any) ==0 || *path == '\0' ) + /* consider Any (both translated or untranslated forms) and + as valid addressbook roots */ + folder_path_match.matched = TRUE; + else + folder_path_match.folder_path = g_strsplit( path, /, 256 ); ++ g_free(tmp1); ++ g_free(tmp2); + } + + addressbook_foldersel_load_data( addrIndex, folder_path_match ); +diff -ur claws-mail-3.6.1.orig/src/addrgather.c claws-mail-3.6.1/src/addrgather.c +--- claws-mail-3.6.1.orig/src/addrgather.c 2008-09-09 19:10:50.0 +0200 claws-mail-3.6.1/src/addrgather.c 2008-11-14 14:27:12.0 +0100 +@@ -507,7 +507,7 @@ + for (i = 0; i NUM_FIELDS; i++) { +
[oe] [meta-oe][PATCH 16/24] python-epydoc, python-gdata, python-ldap, python-webdav: import from meta-smartphone
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../recipes-devtools/python/python-epydoc_3.0.1.bb | 18 ++ .../recipes-devtools/python/python-gdata_1.2.4.bb | 18 ++ .../python/python-ldap/setup.cfg.patch | 14 ++ .../recipes-devtools/python/python-ldap_2.3.9.bb | 13 + .../recipes-devtools/python/python-webdav_0.1.2.bb | 19 +++ 5 files changed, 82 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-devtools/python/python-epydoc_3.0.1.bb create mode 100644 meta-oe/recipes-devtools/python/python-gdata_1.2.4.bb create mode 100644 meta-oe/recipes-devtools/python/python-ldap/setup.cfg.patch create mode 100644 meta-oe/recipes-devtools/python/python-ldap_2.3.9.bb create mode 100644 meta-oe/recipes-devtools/python/python-webdav_0.1.2.bb diff --git a/meta-oe/recipes-devtools/python/python-epydoc_3.0.1.bb b/meta-oe/recipes-devtools/python/python-epydoc_3.0.1.bb new file mode 100644 index 000..4ec0668 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-epydoc_3.0.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = Epydoc is a tool for generating API documentation for Python modules, based on their docstrings +SECTION = devel/python +LICENSE = MIT +LIC_FILES_CHKSUM = file://LICENSE.txt;md5=011c0d78eb6054d731c879132d7313f0 +HOMEPAGE = http://epydoc.sourceforge.net/; +SRCNAME = epydoc +DEPENDS += python +DEPENDS_virtclass-native += python-native + +SRC_URI = http://downloads.sourceforge.net/project/${SRCNAME}/${SRCNAME}/${PV}/${SRCNAME}-${PV}.tar.gz; +SRC_URI[md5sum] = cdd6f6c76dd8bab5e653a343a0544294 +SRC_URI[sha256sum] = d4e5c8d90937d01b05170f592c1fa9b29e9ed0498dfe7f0eb2a3af61725b6ad1 + +S = ${WORKDIR}/${SRCNAME}-${PV} + +inherit distutils + +BBCLASSEXTEND = native diff --git a/meta-oe/recipes-devtools/python/python-gdata_1.2.4.bb b/meta-oe/recipes-devtools/python/python-gdata_1.2.4.bb new file mode 100644 index 000..7351759 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-gdata_1.2.4.bb @@ -0,0 +1,18 @@ +DESCRIPTION = Google Data APIs Python Client Library +SECTION = devel/python +LICENSE = Apache-2.0 +LIC_FILES_CHKSUM = file://README.txt;md5=473bd4dff0ddca1f958244b2dc7a162c +HOMEPAGE = http://code.google.com/p/gdata-python-client/; + +inherit distutils + +SRC_URI = http://gdata-python-client.googlecode.com/files/gdata.py-${PV}.tar.gz; +SRC_URI[md5sum] = 521f33a377d64f8a6505ba119415b787 +SRC_URI[sha256sum] = fc5ddb8f76b17abd728721a0e0177ea35f55a70106f44dc9010b22eceb06abde + +S = ${WORKDIR}/gdata.py-${PV} + +FILES_${PN} += ${datadir} + +RDEPENDS_${PN} = python-elementtree + diff --git a/meta-oe/recipes-devtools/python/python-ldap/setup.cfg.patch b/meta-oe/recipes-devtools/python/python-ldap/setup.cfg.patch new file mode 100644 index 000..a703d34 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-ldap/setup.cfg.patch @@ -0,0 +1,14 @@ +--- python-ldap-2.3.9/setup.cfg.orig2009-08-13 11:07:23.0 +0200 python-ldap-2.3.9/setup.cfg 2009-08-13 11:07:37.0 +0200 +@@ -1,9 +1,9 @@ + [_ldap] + extra_objects = + extra_compile_args = +-libs = ldap_r lber sasl2 ssl crypto ++libs = ldap_r lber ssl crypto + library_dirs = /opt/openldap-RE24/lib +-include_dirs = /opt/openldap-RE24/include /usr/include/sasl ++include_dirs = /opt/openldap-RE24/include + + [egg_info] + tag_build = diff --git a/meta-oe/recipes-devtools/python/python-ldap_2.3.9.bb b/meta-oe/recipes-devtools/python/python-ldap_2.3.9.bb new file mode 100644 index 000..dfe1522 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-ldap_2.3.9.bb @@ -0,0 +1,13 @@ +DESCRIPTION = LDAP client API for Python, C wrapper module around OpenLDAP 2.x with an object-oriented API +SECTION = devel/python +LICENSE = Python-style +LIC_FILES_CHKSUM = file://LICENCE;md5=a41c82edffa04912007cae1d20cac555 +HOMEPAGE = http://www.python-ldap.org/; +DEPENDS = python openldap + +SRC_URI = http://pypi.python.org/packages/source/p/${PN}/${PN}-${PV}.tar.gz \ + file://setup.cfg.patch +SRC_URI[md5sum] = a9f9f16338288d118a1ae6266c993247 +SRC_URI[sha256sum] = 62f75b21c5ee744408c9d8b59878328b3bdf47899d30e8abf0c09b3ffb893ed4 + +inherit setuptools diff --git a/meta-oe/recipes-devtools/python/python-webdav_0.1.2.bb b/meta-oe/recipes-devtools/python/python-webdav_0.1.2.bb new file mode 100644 index 000..7a6437d --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-webdav_0.1.2.bb @@ -0,0 +1,19 @@ +DESCRIPTION = This project aims to provide an object-oriented Python WebDAV client-side library\ + based on Python`s standard httplib and Greg Stein`s davlib.\ + The client shall fully support RFCs 4918 (basic specification),\ + 3744 (access control), and 3253 (versioning). +SECTION = devel/python +LICENSE = Apache-2.0 +LIC_FILES_CHKSUM = file://src/webdav/WebdavClient.py;endline=15;md5=a1520fad859feb7b0d7f05277bc6ce48 +HOMEPAGE =
[oe] [meta-oe][PATCH 18/24] emacs: import from meta-smartphone
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../emacs-23.1/configure.in.lost.backslashes.patch | 24 + .../emacs/emacs-23.1/nostdlib-unwind.patch | 16 +++ .../emacs/emacs-23.1/use-qemu.patch| 107 meta-oe/recipes-support/emacs/emacs.inc| 68 + meta-oe/recipes-support/emacs/emacs_23.1.bb|8 ++ 5 files changed, 223 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-support/emacs/emacs-23.1/configure.in.lost.backslashes.patch create mode 100644 meta-oe/recipes-support/emacs/emacs-23.1/nostdlib-unwind.patch create mode 100644 meta-oe/recipes-support/emacs/emacs-23.1/use-qemu.patch create mode 100644 meta-oe/recipes-support/emacs/emacs.inc create mode 100644 meta-oe/recipes-support/emacs/emacs_23.1.bb diff --git a/meta-oe/recipes-support/emacs/emacs-23.1/configure.in.lost.backslashes.patch b/meta-oe/recipes-support/emacs/emacs-23.1/configure.in.lost.backslashes.patch new file mode 100644 index 000..2d29f17 --- /dev/null +++ b/meta-oe/recipes-support/emacs/emacs-23.1/configure.in.lost.backslashes.patch @@ -0,0 +1,24 @@ +pending upstream, fixed in 23.2 +http://debbugs.gnu.org/cgi-bin/bugreport.cgi?bug=5047 +https://bugzilla.redhat.com/show_bug.cgi?id=540921 +diff -up emacs-23.1/configure.in.cpp emacs-23.1/configure.in +--- emacs-23.1/configure.in.cpp2009-11-30 13:24:53.0 +0100 emacs-23.1/configure.in2009-11-30 13:25:45.0 +0100 +@@ -2983,7 +2983,7 @@ echo creating lib-src/Makefile + sed -e '1,/start of cpp stuff/d'\ + -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ +Makefile.c junk.c +- $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ ++ $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ + sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' junk2.c + cat junk1.c junk2.c Makefile.new + rm -f junk.c junk1.c junk2.c +@@ -2999,7 +2999,7 @@ echo creating src/Makefile + sed -e '1,/start of cpp stuff/d'\ + -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ +Makefile.c junk.c +- $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ ++ $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ + sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' junk2.c + cat junk1.c junk2.c Makefile.new + rm -f junk.c junk1.c junk2.c diff --git a/meta-oe/recipes-support/emacs/emacs-23.1/nostdlib-unwind.patch b/meta-oe/recipes-support/emacs/emacs-23.1/nostdlib-unwind.patch new file mode 100644 index 000..4200301 --- /dev/null +++ b/meta-oe/recipes-support/emacs/emacs-23.1/nostdlib-unwind.patch @@ -0,0 +1,16 @@ +Fix linking problem: +undefined reference to `__aeabi_unwind_cpp_pr0' +undefined reference to `__aeabi_unwind_cpp_pr1' +Index: emacs/src/Makefile.in +=== +--- emacs.orig/src/Makefile.in 2008-08-16 14:20:18.0 + emacs/src/Makefile.in 2008-08-16 14:51:25.0 + +@@ -443,7 +443,7 @@ +ask GCC explicitly where to find libgcc.a. */ + + #ifndef LINKER +-#define LINKER $(CC) -nostdlib ++#define LINKER $(CC) -nostdlib -lgcc_s + #endif + + #ifndef LIB_GCC diff --git a/meta-oe/recipes-support/emacs/emacs-23.1/use-qemu.patch b/meta-oe/recipes-support/emacs/emacs-23.1/use-qemu.patch new file mode 100644 index 000..255b07f --- /dev/null +++ b/meta-oe/recipes-support/emacs/emacs-23.1/use-qemu.patch @@ -0,0 +1,107 @@ +Index: emacs-23.1/leim/Makefile.in +=== +--- emacs-23.1.orig/leim/Makefile.in emacs-23.1/leim/Makefile.in +@@ -51,7 +51,7 @@ buildlisppath=${srcdir}/${dot}${dot}/lis + + # How to run Emacs. + RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \ +- ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte ++ ${QEMU} ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte + + # Subdirectories to be made if ${srcdir} is different from the current + # directory. +Index: emacs-23.1/lib-src/Makefile.in +=== +--- emacs-23.1.orig/lib-src/Makefile.in emacs-23.1/lib-src/Makefile.in +@@ -23,7 +23,7 @@ + SHELL = /bin/sh + + # Following ../lisp/Makefile.in. +-EMACS = ../src/emacs ++EMACS = ${QEMU} ../src/emacs + EMACSOPT = -batch --no-site-file --multibyte + + # Things `configure' will edit +@@ -371,7 +371,7 @@ TAGS: etags${EXEEXT} +clobbered too. */ + test-distrib${EXEEXT}: ${srcdir}/test-distrib.c + $(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c +- ./test-distrib ${srcdir}/testfile ++ ${QEMU} ./test-distrib ${srcdir}/testfile + + /* We need the following in order to create a getopt.h when the system +does not have one that works with the given compiler. */ +Index: emacs-23.1/lisp/Makefile.in +=== +---
[oe] [meta-oe][PATCH 20/24] liblockfile, libungif: import from oe-classic
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../liblockfile/liblockfile-1.06/configure.patch | 25 +++ .../liblockfile/liblockfile-1.06/glibc-2.4.patch | 70 .../liblockfile/liblockfile-1.06/install.patch | 48 + .../liblockfile/liblockfile-1.06/ldflags.patch | 21 ++ .../liblockfile/liblockfile_1.06.bb| 21 ++ .../recipes-extended/libungif/libungif_4.1.3.bb| 14 6 files changed, 199 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.06/configure.patch create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.06/glibc-2.4.patch create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.06/install.patch create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.06/ldflags.patch create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile_1.06.bb create mode 100644 meta-oe/recipes-extended/libungif/libungif_4.1.3.bb diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/configure.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/configure.patch new file mode 100644 index 000..ea13e11 --- /dev/null +++ b/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/configure.patch @@ -0,0 +1,25 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- liblockfile-1.05/./configure.in~configure liblockfile-1.05/./configure.in +@@ -1,4 +1,5 @@ +-AC_INIT(lockfile.c) ++AC_INIT ++AC_CONFIG_SRCDIR([lockfile.c]) + AC_CONFIG_HEADER(autoconf.h) + AC_REVISION($Revision: 1.0 $)dnl + +@@ -111,7 +112,8 @@ + AC_SUBST(INSTALL_TARGETS) + AC_SUBST(nfslockdir) + +-AC_OUTPUT(\ ++AC_CONFIG_FILES([\ + ./Makefile \ + ./maillock.h \ +-) ++]) ++AC_OUTPUT diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/glibc-2.4.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/glibc-2.4.patch new file mode 100644 index 000..e3c4aaa --- /dev/null +++ b/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/glibc-2.4.patch @@ -0,0 +1,70 @@ +The local function eaccess conflicts with a glibc function of the same name. +Rename the function so that this can be build under glibc 2.4, and older +revisions, without any problems. + +--- liblockfile-1.06/dotlockfile.c 2006/07/10 03:17:40 1.1 liblockfile-1.06/dotlockfile.c 2006/07/10 03:18:26 +@@ -42,7 +42,7 @@ + extern int optind; + #endif + +-extern int eaccess(char *, gid_t, struct stat *); ++extern int xeaccess(char *, gid_t, struct stat *); + + /* + *Sleep for an amout of time while regulary checking if +@@ -252,14 +252,14 @@ + return L_ERROR; + } + gid = getgid(); +- if (eaccess(dir, gid, st) 0) { ++ if (xeaccess(dir, gid, st) 0) { + if (errno == ENOENT) { + enoent: + if (!quiet) fprintf(stderr, + dotlockfile: %s: no such directory\n, dir); + return L_TMPLOCK; + } +- if ((r = eaccess(dir, getegid(), st) 0) errno == ENOENT) ++ if ((r = xeaccess(dir, getegid(), st) 0) errno == ENOENT) + goto enoent; + if (r 0 || !ismaillock(lockfile, pwd-pw_name)) { + if (!quiet) fprintf(stderr, +@@ -272,7 +272,7 @@ + /* +* Now we should be able to chdir() to the lock directory. +* When we stat(.), it should be the same as at the +- * eaccess() check or someone played symlink() games on us. ++ * xeaccess() check or someone played symlink() games on us. +*/ + if (chdir(dir) 0 || stat(., st2) 0) { + if (!quiet) fprintf(stderr, +--- liblockfile-1.06/lockfile.c2006/07/10 03:17:40 1.1 liblockfile-1.06/lockfile.c2006/07/10 03:18:26 +@@ -54,7 +54,7 @@ + #ifdef LIB + static + #endif +-int eaccess(char *fn, gid_t gid, struct stat *st) ++int xeaccess(char *fn, gid_t gid, struct stat *st) + { + struct stat tmp; + uid_t uid = geteuid(); +@@ -96,7 +96,7 @@ + *p = 0; + else + strcpy(dir, .); +- if (eaccess(dir, egid, NULL) = 0) { ++ if (xeaccess(dir, egid, NULL) = 0) { + free(dir); + return 0; + } +@@ -111,7 +111,7 @@ + return 0; + mailgid = st.st_gid; + } +- ret = eaccess(dir, mailgid, NULL) = 0; ++ ret = xeaccess(dir, mailgid, NULL) = 0; + free (dir); + return ret; + } diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/install.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/install.patch new file mode 100644 index 000..a9319ff --- /dev/null +++ b/meta-oe/recipes-extended/liblockfile/liblockfile-1.06/install.patch @@ -0,0 +1,48 @@ + +# +# Patch managed by
[oe] [meta-oe][PATCH 21/24] emacs: fix dso build
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../emacs/emacs-23.1/fix.dso.build.patch | 39 meta-oe/recipes-support/emacs/emacs_23.1.bb|4 ++- 2 files changed, 42 insertions(+), 1 deletions(-) create mode 100644 meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch diff --git a/meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch b/meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch new file mode 100644 index 000..0396c0c --- /dev/null +++ b/meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch @@ -0,0 +1,39 @@ +Upstream-Status: Backport + +from bzr changeset 99307 + +=== modified file 'ChangeLog' +--- ChangeLog 2010-01-12 05:11:05 + ChangeLog 2010-01-12 16:25:08 + +@@ -1,3 +1,7 @@ ++2010-01-12 Chong Yidong c...@stupidchicken.com ++ ++ * configure.in: Explicitly check for and link to -lXrender. ++ + 2010-01-12 Glenn Morris r...@gnu.org + + * INSTALL.BZR, README: Use bug-gnu-emacs rather than emacs-pretest-bug + +=== modified file 'configure.in' +--- configure.in 2010-01-04 05:35:18 + configure.in 2010-01-12 16:25:08 + +@@ -1984,12 +1984,17 @@ + if test x${with_xft} != xno; then + + PKG_CHECK_MODULES(XFT, xft = 0.13.0, , HAVE_XFT=no) +- if test $HAVE_XFT != no; then ++ ## Because xftfont.c uses XRenderQueryExtension, we also ++ ## need to link to -lXrender. ++ HAVE_XRENDER=no ++ AC_CHECK_LIB(Xrender, XRenderQueryExtension, HAVE_XRENDER=yes) ++ if test $HAVE_XFT != no test $HAVE_XRENDER != no; then + OLD_CPPFLAGS=$CPPFLAGS + OLD_CFLAGS=$CFLAGS + OLD_LIBS=$LIBS + CPPFLAGS=$CPPFLAGS $XFT_CFLAGS + CFLAGS=$CFLAGS $XFT_CFLAGS ++ XFT_LIBS=-lXrender $XFT_LIBS + LIBS=$XFT_LIBS $LIBS + AC_CHECK_HEADER(X11/Xft/Xft.h, + AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS)) + diff --git a/meta-oe/recipes-support/emacs/emacs_23.1.bb b/meta-oe/recipes-support/emacs/emacs_23.1.bb index fe134f8..fa7c872 100644 --- a/meta-oe/recipes-support/emacs/emacs_23.1.bb +++ b/meta-oe/recipes-support/emacs/emacs_23.1.bb @@ -3,6 +3,8 @@ require emacs.inc SRC_URI = ${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \ file://use-qemu.patch \ file://nostdlib-unwind.patch \ - file://configure.in.lost.backslashes.patch + file://configure.in.lost.backslashes.patch \ + file://fix.dso.build.patch \ + SRC_URI[tarball.md5sum] = a620d4452769d04ad8864d662f34f8dd SRC_URI[tarball.sha256sum] = a94cd46301f000d2d1dcd3fd7ef08ad952846d01ca5d4168b4ec3e38e857da47 -- 1.7.8.6 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 22/24] emacs: upgrade to 23.4
* package icons in PN * pass --with-crt-dir option to resolve crt* used from host system Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../emacs/emacs-23.4/nostdlib-unwind.patch | 16 +++ .../emacs/emacs-23.4/use-qemu.patch| 104 meta-oe/recipes-support/emacs/emacs.inc|4 +- meta-oe/recipes-support/emacs/emacs_23.4.bb| 10 ++ 4 files changed, 132 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-support/emacs/emacs-23.4/nostdlib-unwind.patch create mode 100644 meta-oe/recipes-support/emacs/emacs-23.4/use-qemu.patch create mode 100644 meta-oe/recipes-support/emacs/emacs_23.4.bb diff --git a/meta-oe/recipes-support/emacs/emacs-23.4/nostdlib-unwind.patch b/meta-oe/recipes-support/emacs/emacs-23.4/nostdlib-unwind.patch new file mode 100644 index 000..4200301 --- /dev/null +++ b/meta-oe/recipes-support/emacs/emacs-23.4/nostdlib-unwind.patch @@ -0,0 +1,16 @@ +Fix linking problem: +undefined reference to `__aeabi_unwind_cpp_pr0' +undefined reference to `__aeabi_unwind_cpp_pr1' +Index: emacs/src/Makefile.in +=== +--- emacs.orig/src/Makefile.in 2008-08-16 14:20:18.0 + emacs/src/Makefile.in 2008-08-16 14:51:25.0 + +@@ -443,7 +443,7 @@ +ask GCC explicitly where to find libgcc.a. */ + + #ifndef LINKER +-#define LINKER $(CC) -nostdlib ++#define LINKER $(CC) -nostdlib -lgcc_s + #endif + + #ifndef LIB_GCC diff --git a/meta-oe/recipes-support/emacs/emacs-23.4/use-qemu.patch b/meta-oe/recipes-support/emacs/emacs-23.4/use-qemu.patch new file mode 100644 index 000..c15207a --- /dev/null +++ b/meta-oe/recipes-support/emacs/emacs-23.4/use-qemu.patch @@ -0,0 +1,104 @@ +Upstream-Status: Inappropriate [embedded specific] + +diff -uNr emacs-23.4/Makefile.in emacs-23.4.new/Makefile.in +--- emacs-23.4/Makefile.in 2012-01-11 13:35:01.0 +0100 emacs-23.4.new/Makefile.in 2012-07-31 00:54:07.223590866 +0200 +@@ -336,7 +336,7 @@ + # all preloaded elisp files, and only then dump the actual src/emacs, which + # is not wrong, but is overkill in 99.99% of the cases. + src: Makefile FRC +- boot=bootstrap-emacs$(EXEEXT); \ ++ boot=${QEMU} bootstrap-emacs$(EXEEXT); \ + if [ ! -x src/$$boot ]; then \ + cd $@; $(MAKE) all $(MFLAGS) \ + CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ +diff -uNr emacs-23.4/leim/Makefile.in emacs-23.4.new/leim/Makefile.in +--- emacs-23.4/leim/Makefile.in2012-01-11 13:35:01.0 +0100 emacs-23.4.new/leim/Makefile.in2012-07-31 00:54:07.179590866 +0200 +@@ -51,7 +51,7 @@ + + # How to run Emacs. + RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \ +- ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte ++ ${QEMU} ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte + + # Subdirectories to be made if ${srcdir} is different from the current + # directory. +diff -uNr emacs-23.4/lib-src/Makefile.in emacs-23.4.new/lib-src/Makefile.in +--- emacs-23.4/lib-src/Makefile.in 2012-01-11 13:35:01.0 +0100 emacs-23.4.new/lib-src/Makefile.in 2012-07-31 00:54:07.180590866 +0200 +@@ -23,7 +23,7 @@ + SHELL = /bin/sh + + # Following ../lisp/Makefile.in. +-EMACS = ../src/emacs ++EMACS = ${QEMU} ../src/emacs + EMACSOPT = -batch --no-site-file --multibyte + + # Things `configure' will edit +@@ -372,7 +372,7 @@ +clobbered too. */ + test-distrib${EXEEXT}: ${srcdir}/test-distrib.c + $(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c +- ./test-distrib ${srcdir}/testfile ++ ${QEMU} ./test-distrib ${srcdir}/testfile + + /* We need the following in order to create a getopt.h when the system +does not have one that works with the given compiler. */ +diff -uNr emacs-23.4/lisp/Makefile.in emacs-23.4.new/lisp/Makefile.in +--- emacs-23.4/lisp/Makefile.in2012-01-11 13:35:01.0 +0100 emacs-23.4.new/lisp/Makefile.in2012-07-31 00:54:07.195590866 +0200 +@@ -26,8 +26,7 @@ + # You can specify a different executable on the make command line, + # e.g. make EMACS=../src/emacs + +-EMACS = ../src/emacs +- ++EMACS = ${QEMU} ../src/emacs + # Command line flags for Emacs. This must include --multibyte, + # otherwise some files will not compile. + +diff -uNr emacs-23.4/src/Makefile.in emacs-23.4.new/src/Makefile.in +--- emacs-23.4/src/Makefile.in 2012-01-12 11:27:54.0 +0100 emacs-23.4.new/src/Makefile.in 2012-07-31 00:55:30.344593847 +0200 +@@ -482,7 +482,7 @@ +this with the shell''s ``for'' construct. +Note that some people do not have '.' in their paths, so we must +use ./prefix-args. */ +-#define YMF_PASS_LDFLAGS(flags) `./prefix-args -Xlinker flags`
[oe] [meta-oe][PATCH 23/24] pixman: add patch to fix SEGFAULT when parsing auxv
* without this patch emacs won't build * temacs is executed in qemu and fails like this: qemu: uncaught target signal 11 (Segmentation fault) - core dumped Segmentation fault which is actually: Program received signal SIGSEGV, Segmentation fault. __GI_strncmp (s1=s1@entry=0x0, s2=s2@entry=0x40d68638 v7l, n=n@entry=3) at strncmp.c:64 64 strncmp.c: No such file or directory. (gdb) bt Backtrace stopped: previous frame identical to this frame (corrupt stack?) Signed-off-by: Martin Jansa martin.ja...@gmail.com --- ...lated-workarounds-in-cpu-features-detecti.patch | 121 .../xorg-lib/pixman_0.26.2.bbappend|6 +- 2 files changed, 125 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch diff --git a/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch new file mode 100644 index 000..b56e690 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch @@ -0,0 +1,121 @@ +From dad8537110c27b45795f8879a3e0a54aa77546b9 Mon Sep 17 00:00:00 2001 +From: Siarhei Siamashka siarhei.siamas...@nokia.com +Date: Tue, 11 Jan 2011 18:10:39 +0200 +Subject: [PATCH] ARM: qemu related workarounds in cpu features detection code + +Signed-off-by: Martin Jansa martin.ja...@gmail.com +--- + pixman/pixman-cpu.c | 67 +- + 1 files changed, 55 insertions(+), 12 deletions(-) + +diff --git a/pixman/pixman-cpu.c b/pixman/pixman-cpu.c +index aa9036f..a8f2494 100644 +--- a/pixman/pixman-cpu.c b/pixman/pixman-cpu.c +@@ -333,15 +333,30 @@ pixman_arm_read_auxv_or_cpu_features () + #include sys/types.h + #include sys/stat.h + #include sys/mman.h ++#include sys/utsname.h + #include fcntl.h + #include string.h + #include elf.h + ++/* ++ * The whole CPU capabilities detection is a bit ugly: when running in ++ * userspace qemu, we see /proc/self/auxv from the host system. To make ++ * everything even worse, the size of each value is 64-bit when running ++ * on a 64-bit host system. So the data is totally bogus because we expect ++ * 32-bit values. As AT_PLATFORM value is used as a pointer, it may cause ++ * segfault (null pointer dereference on x86-64 host). So in order to be ++ * on a safe side, we require that AT_PLATFORM value is found only once, ++ * and it has non-zero value (this is still not totally reliable for a big ++ * endian 64-bit host system running qemu and may theoretically fail). ++ */ + static void + pixman_arm_read_auxv_or_cpu_features () + { + int fd; + Elf32_auxv_t aux; ++uint32_t hwcap = 0; ++const char *plat = NULL; ++int plat_cnt = 0; + + fd = open (/proc/self/auxv, O_RDONLY); + if (fd = 0) +@@ -350,32 +365,60 @@ pixman_arm_read_auxv_or_cpu_features () + { + if (aux.a_type == AT_HWCAP) + { +- uint32_t hwcap = aux.a_un.a_val; +- /* hardcode these values to avoid depending on specific +- * versions of the hwcap header, e.g. HWCAP_NEON +- */ +- arm_has_vfp = (hwcap 64) != 0; +- arm_has_iwmmxt = (hwcap 512) != 0; +- /* this flag is only present on kernel 2.6.29 */ +- arm_has_neon = (hwcap 4096) != 0; ++ hwcap = aux.a_un.a_val; + } + else if (aux.a_type == AT_PLATFORM) + { +- const char *plat = (const char*) aux.a_un.a_val; +- if (strncmp (plat, v7l, 3) == 0) ++ plat = (const char*) aux.a_un.a_val; ++ plat_cnt++; ++ } ++ } ++ close (fd); ++ ++ if (plat == NULL || plat_cnt != 1 || *plat != 'v') ++ { ++ /* ++ * Something seems to be really wrong, most likely we are ++ * running under qemu. Let's use machine type from uname for ++ * CPU capabilities detection: ++ * http://www.mail-archive.com/qemu-devel at nongnu.org/msg22212.html ++ */ ++ struct utsname u; ++ hwcap = 0; /* clear hwcap, because it is bogus */ ++ if (uname (u) == 0) ++ { ++ if (strcmp (u.machine, armv7l) == 0) + { + arm_has_v7 = TRUE; + arm_has_v6 = TRUE; ++ hwcap |= 64; /* qemu is supposed to emulate vfp */ ++ hwcap |= 4096; /* qemu is supposed to emulate neon */ + } +- else if (strncmp (plat, v6l, 3) == 0) ++ else if (strcmp (u.machine, armv6l) == 0) + { + arm_has_v6 = TRUE; ++ hwcap |= 64; /* qemu is supposed to emulate vfp */ + } +
[oe] [meta-oe][PATCH 24/24] emacs: drop older version 23.1
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../emacs-23.1/configure.in.lost.backslashes.patch | 24 - .../emacs/emacs-23.1/fix.dso.build.patch | 39 --- .../emacs/emacs-23.1/nostdlib-unwind.patch | 16 --- .../emacs/emacs-23.1/use-qemu.patch| 107 meta-oe/recipes-support/emacs/emacs_23.1.bb| 10 -- meta-oe/recipes-support/emacs/emacs_23.4.bb|2 - 6 files changed, 0 insertions(+), 198 deletions(-) delete mode 100644 meta-oe/recipes-support/emacs/emacs-23.1/configure.in.lost.backslashes.patch delete mode 100644 meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch delete mode 100644 meta-oe/recipes-support/emacs/emacs-23.1/nostdlib-unwind.patch delete mode 100644 meta-oe/recipes-support/emacs/emacs-23.1/use-qemu.patch delete mode 100644 meta-oe/recipes-support/emacs/emacs_23.1.bb diff --git a/meta-oe/recipes-support/emacs/emacs-23.1/configure.in.lost.backslashes.patch b/meta-oe/recipes-support/emacs/emacs-23.1/configure.in.lost.backslashes.patch deleted file mode 100644 index 2d29f17..000 --- a/meta-oe/recipes-support/emacs/emacs-23.1/configure.in.lost.backslashes.patch +++ /dev/null @@ -1,24 +0,0 @@ -pending upstream, fixed in 23.2 -http://debbugs.gnu.org/cgi-bin/bugreport.cgi?bug=5047 -https://bugzilla.redhat.com/show_bug.cgi?id=540921 -diff -up emacs-23.1/configure.in.cpp emacs-23.1/configure.in emacs-23.1/configure.in.cpp2009-11-30 13:24:53.0 +0100 -+++ emacs-23.1/configure.in2009-11-30 13:25:45.0 +0100 -@@ -2983,7 +2983,7 @@ echo creating lib-src/Makefile - sed -e '1,/start of cpp stuff/d'\ - -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ -Makefile.c junk.c -- $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ -+ $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ - sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' junk2.c - cat junk1.c junk2.c Makefile.new - rm -f junk.c junk1.c junk2.c -@@ -2999,7 +2999,7 @@ echo creating src/Makefile - sed -e '1,/start of cpp stuff/d'\ - -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ -Makefile.c junk.c -- $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ -+ $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \ - sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' junk2.c - cat junk1.c junk2.c Makefile.new - rm -f junk.c junk1.c junk2.c diff --git a/meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch b/meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch deleted file mode 100644 index 0396c0c..000 --- a/meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch +++ /dev/null @@ -1,39 +0,0 @@ -Upstream-Status: Backport - -from bzr changeset 99307 - -=== modified file 'ChangeLog' ChangeLog 2010-01-12 05:11:05 + -+++ ChangeLog 2010-01-12 16:25:08 + -@@ -1,3 +1,7 @@ -+2010-01-12 Chong Yidong c...@stupidchicken.com -+ -+ * configure.in: Explicitly check for and link to -lXrender. -+ - 2010-01-12 Glenn Morris r...@gnu.org - - * INSTALL.BZR, README: Use bug-gnu-emacs rather than emacs-pretest-bug - -=== modified file 'configure.in' configure.in 2010-01-04 05:35:18 + -+++ configure.in 2010-01-12 16:25:08 + -@@ -1984,12 +1984,17 @@ - if test x${with_xft} != xno; then - - PKG_CHECK_MODULES(XFT, xft = 0.13.0, , HAVE_XFT=no) -- if test $HAVE_XFT != no; then -+ ## Because xftfont.c uses XRenderQueryExtension, we also -+ ## need to link to -lXrender. -+ HAVE_XRENDER=no -+ AC_CHECK_LIB(Xrender, XRenderQueryExtension, HAVE_XRENDER=yes) -+ if test $HAVE_XFT != no test $HAVE_XRENDER != no; then - OLD_CPPFLAGS=$CPPFLAGS - OLD_CFLAGS=$CFLAGS - OLD_LIBS=$LIBS - CPPFLAGS=$CPPFLAGS $XFT_CFLAGS - CFLAGS=$CFLAGS $XFT_CFLAGS -+ XFT_LIBS=-lXrender $XFT_LIBS - LIBS=$XFT_LIBS $LIBS - AC_CHECK_HEADER(X11/Xft/Xft.h, - AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS)) - diff --git a/meta-oe/recipes-support/emacs/emacs-23.1/nostdlib-unwind.patch b/meta-oe/recipes-support/emacs/emacs-23.1/nostdlib-unwind.patch deleted file mode 100644 index 4200301..000 --- a/meta-oe/recipes-support/emacs/emacs-23.1/nostdlib-unwind.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix linking problem: -undefined reference to `__aeabi_unwind_cpp_pr0' -undefined reference to `__aeabi_unwind_cpp_pr1' -Index: emacs/src/Makefile.in -=== emacs.orig/src/Makefile.in 2008-08-16 14:20:18.0 + -+++ emacs/src/Makefile.in 2008-08-16 14:51:25.0 + -@@ -443,7 +443,7 @@ -ask GCC explicitly where to find libgcc.a. */ - - #ifndef LINKER --#define LINKER $(CC) -nostdlib -+#define LINKER $(CC) -nostdlib -lgcc_s - #endif - - #ifndef LIB_GCC diff --git a/meta-oe/recipes-support/emacs/emacs-23.1/use-qemu.patch