bugfix collection
cover bugfix collection
The following changes since commit ae2926ef202541014cde7c91a9ff75ed8b4eb390:
freerdp: Bump SRCREV to 1.0.2 snapshot of 2012-10-30 (2012-11-02 20:00:15 +0100)
are available in the git repository at:
[email protected]:schnitzeltony-oe-meta/meta-openembedded.git bugfixes
Andreas Müller (6):
lighttpd: move systemd appends since recipe is in oe-core
gvfs: fix build
gvfs-gdu-volume-monitor: fix build after oe-core's libexecdir transition
gnome-desktop: copy omf.make from ${STAGING_DATADIR_NATIVE} instead ${STAGING_DATADIR}
xarchiver: no RDEPENDS on unzip / busybox's unzip is good enough
thunar: add xfce4-panel to dependencies to ensure trash-plugin (tpa) is build
.../gnome-desktop/gnome-desktop_2.32.1.bb | 4 ++--
.../gvfs/gvfs-gdu-volume-monitor_1.8.2.bb | 6 ++++--
meta-gnome/recipes-gnome/gvfs/gvfs.inc | 3 ++-
.../lighttpd/lighttpd/lighttpd.service | 0
.../lighttpd/lighttpd_1.4.31.bbappend | 0
.../recipes-apps/xarchiver/xarchiver_0.5.2.bb | 4 ++--
meta-xfce/recipes-xfce/thunar/thunar_1.4.0.bb | 3 ++-
7 files changed, 12 insertions(+), 8 deletions(-)
rename meta-systemd/{meta-oe => oe-core}/recipes-extended/lighttpd/lighttpd/lighttpd.service (100%)
rename meta-systemd/{meta-oe => oe-core}/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend (100%)Signature · 1 line
1.7.6.5
PATCH 1/6 lighttpd: move systemd appends since recipe is in oe-core
---
.../lighttpd/lighttpd/lighttpd.service | 0
.../lighttpd/lighttpd_1.4.31.bbappend | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename meta-systemd/{meta-oe => oe-core}/recipes-extended/lighttpd/lighttpd/lighttpd.service (100%)
rename meta-systemd/{meta-oe => oe-core}/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend (100%)meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd/lighttpd.service renamed from meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd/lighttpd.service +0 -0
meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend renamed from meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend +0 -0
Signature · 1 line
1.7.6.5
PATCH 2/6 gvfs: fix build
In reply to Andreas Müllererror message was for build from scratch and latest heads:
| 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/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/gvfs-1.8.2-r7.0/gvfs-1.8.2' | ERROR: Function failed: do_qa_configure
--- meta-gnome/recipes-gnome/gvfs/gvfs.inc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
meta-gnome/recipes-gnome/gvfs/gvfs.inc +2 -1
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" inherit gnome -INC_PR = "r7" +INC_PR = "r8" SRC_URI[archive.md5sum] = "402f94b187b197b403d25c85caeb9562" SRC_URI[archive.sha256sum] = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345"
@@ -14,6 +14,7 @@ EXTRA_OECONF = "--disable-samba \ --with-samba-includes=${STAGING_INCDIR} \ --with-samba-libs=${STAGING_LIBDIR} \ --with-archive-includes=${STAGING_INCDIR} \ + --with-archive-libs=${STAGING_LIBDIR} \ " FILES_${PN} += "${datadir}/dbus-1/services/*"
Signature · 1 line
1.7.6.5
PATCH 3/6 gvfs-gdu-volume-monitor: fix build after oe-core's libexecdir transition
In reply to Andreas Müllertests:
* buildhistory check with libexecdir = /usr/libexec
* run test with libexecdir = /usr/lib/${BPN}
--- .../gvfs/gvfs-gdu-volume-monitor_1.8.2.bb | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb +4 -2
@@ -4,7 +4,7 @@ BPN = "gvfs" DEPENDS = "gvfs gnome-disk-utility" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" # we need gdu files only: reduce files to delete in libexecdir EXTRA_OECONF += "--disable-gphoto2"
@@ -13,7 +13,9 @@ do_install_append() { rm -rf ${D}${sysconfdir} rm -rf ${D}${bindir} rm -rf ${D}${includedir} - rm -rf ${D}${libdir} + rm -rf ${D}${libdir}/gio + rm -rf ${D}${libdir}/lib* + rmdir --ignore-fail-on-non-empty ${D}${libdir} rm -rf ${D}${datadir}/gvfs/mounts rm -rf ${D}${datadir}/glib-2.0 rm -rf ${D}${datadir}/GConf
Signature · 1 line
1.7.6.5
PATCH 4/6 gnome-desktop: copy omf.make from ${STAGING_DATADIR_NATIVE} instead ${STAGING_DATADIR}
In reply to Andreas Müller* omf.make is installed by gnome-common
* oe-core gnomebase.bbclass adds gnome-common-native to DEPENDS
* error message was:
| DEBUG: Executing shell function do_configure
| cp: cannot stat `/home/andreas/tmp/oe-core-eglibc/sysroots/overo/usr/share/gnome-common/data/omf.make': No such file or directory
--- .../gnome-desktop/gnome-desktop_2.32.1.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb +2 -2
@@ -4,7 +4,7 @@ LICENSE = "GPLv2 & LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" -PR = "r5" +PR = "r6" inherit gnome pkgconfig
@@ -16,7 +16,7 @@ DEPENDS += "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils" EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs" do_configure_prepend () { - cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} + cp ${STAGING_DATADIR_NATIVE}/gnome-common/data/omf.make ${S} sed -i -e s:^#!@PYTHON@:#!${bindir}/python: ${S}/gnome-about/gnome-about.in }
Signature · 1 line
1.7.6.5
PATCH 5/6 xarchiver: no RDEPENDS on unzip / busybox's unzip is good enough
In reply to Andreas Müller--- .../recipes-apps/xarchiver/xarchiver_0.5.2.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
meta-xfce/recipes-apps/xarchiver/xarchiver_0.5.2.bb +2 -2
@@ -1,7 +1,7 @@ DESCRIPTION = "Lightweight, desktop independent GTK+ archive manager" HOMEPAGE = "http://xarchiver.sourceforge.net" SECTION = "x11" -PR = "r2" +PR = "r3" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
@@ -14,4 +14,4 @@ SRC_URI[sha256sum] = "cea932ff9d505969201fd502470bbebbc5726ab3d6765e142fc8295aa6 inherit gettext pkgconfig autotools gtk-icon-cache -RRECOMMENDS_${PN} = "lzop zip tar bzip2 unzip" +RRECOMMENDS_${PN} = "lzop zip tar bzip2"
Signature · 1 line
1.7.6.5
Re: [meta-gnome/meta-oe/meta-xfce 5/6] xarchiver: no RDEPENDS on unzip / busybox's unzip is good enough
Quoted 26 lines · Andreas Müller
Signed-off-by Andreas Müller <[email protected]>--- .../recipes-apps/xarchiver/xarchiver_0.5.2.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)meta-xfce/recipes-apps/xarchiver/xarchiver_0.5.2.bb +2
-3@@ -1,7 +1,7 @@ DESCRIPTION = "Lightweight, desktop independent GTK+ archive manager" HOMEPAGE = "http://xarchiver.sourceforge.net" SECTION = "x11" -PR = "r2" +PR = "r3" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"@@ -14,4 +14,4 @@ SRC_URI[sha256sum] = "cea932ff9d505969201fd502470bbebbc5726ab3d6765e142fc8295aa6 inherit gettext pkgconfig autotools gtk-icon-cache -RRECOMMENDS_${PN} = "lzop zip tar bzip2 unzip" +RRECOMMENDS_${PN} = "lzop zip tar bzip2" --
Quoted 2 lines
1.7.6.5
Damn - this one should not go in !!! Send V2..
Sorry
Andreas
PATCH 6/6 thunar: add xfce4-panel to dependencies to ensure trash-plugin (tpa) is build
In reply to Andreas Müller--- meta-xfce/recipes-xfce/thunar/thunar_1.4.0.bb | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
meta-xfce/recipes-xfce/thunar/thunar_1.4.0.bb +2 -1
@@ -2,7 +2,8 @@ DESCRIPTION = "File manager for the Xfce Desktop Environment" SECTION = "x11" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "exo glib-2.0 gtk+ gdk-pixbuf libxfce4util libxfce4ui libsm dbus-glib startup-notification libnotify" +DEPENDS = "exo glib-2.0 gtk+ gdk-pixbuf libxfce4util libxfce4ui libsm dbus-glib startup-notification libnotify xfce4-panel" +PR = "r1" inherit xfce
Signature · 1 line
1.7.6.5