From 737d77c48e7a44edec53697b23c109cef0bd9298 Mon Sep 17 00:00:00 2001 From: brl Date: Fri, 26 Jan 2018 20:07:32 -0500 Subject: [PATCH] various fixes for build in docker --- meta-citadel/recipes-desktop/gjs/gjs.inc | 2 ++ .../gnome-autoar/gnome-autoar_0.2.2.bb | 4 +++ .../gnome-terminal/gnome-terminal.inc | 3 +- .../network-manager-applet.inc | 4 +++ .../recipes-support/itstool/itstool_2.0.4.bb | 31 +++---------------- 5 files changed, 16 insertions(+), 28 deletions(-) diff --git a/meta-citadel/recipes-desktop/gjs/gjs.inc b/meta-citadel/recipes-desktop/gjs/gjs.inc index 3e4c2f3..a50ccaf 100644 --- a/meta-citadel/recipes-desktop/gjs/gjs.inc +++ b/meta-citadel/recipes-desktop/gjs/gjs.inc @@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e7436dd55d7c05a5fa18f8cab10b3a6b \ inherit gnomebase gettext gobject-introspection +export GI_DATADIR="${STAGING_DATADIR}/gobject-introspection-1.0" + DEPENDS = "glib-2.0 gobject-introspection cairo gtk+3 mozjs52 glib-2.0-native" EXTRA_OECONF = "--without-dbus-tests" diff --git a/meta-citadel/recipes-desktop/gnome-autoar/gnome-autoar_0.2.2.bb b/meta-citadel/recipes-desktop/gnome-autoar/gnome-autoar_0.2.2.bb index 1a7bb28..7a29f65 100644 --- a/meta-citadel/recipes-desktop/gnome-autoar/gnome-autoar_0.2.2.bb +++ b/meta-citadel/recipes-desktop/gnome-autoar/gnome-autoar_0.2.2.bb @@ -9,6 +9,10 @@ SRC_URI[archive.sha256sum] = "e1fe2c06eed30305c38bf0939c72b0e51b4716658e2663a0cf DEPENDS = "glib-2.0 gtk+3 glib-2.0-native gnome-common autoconf-archive libarchive" +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs" +} + inherit gnomebase gobject-introspection vala EXTRA_OECONF = "" diff --git a/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal.inc b/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal.inc index 12b07fb..95ca9a5 100644 --- a/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal.inc +++ b/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal.inc @@ -21,7 +21,8 @@ FILES_${PN}-doc += "\ ${datadir}/help \ " -inherit gettext gnome +# python3native is needed to run itstool during build +inherit gettext gnome python3native EXTRA_OECONF = "--disable-search-provider --without-nautilus-extension --disable-gterminal" diff --git a/meta-citadel/recipes-desktop/network-manager-applet/network-manager-applet.inc b/meta-citadel/recipes-desktop/network-manager-applet/network-manager-applet.inc index abf2448..eb92d04 100644 --- a/meta-citadel/recipes-desktop/network-manager-applet/network-manager-applet.inc +++ b/meta-citadel/recipes-desktop/network-manager-applet/network-manager-applet.inc @@ -7,5 +7,9 @@ DEPENDS = "gcr iso-codes networkmanager libgudev gtk+3 intltool-native modemmana inherit gettext gobject-introspection gnome +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/src/libnma/.libs:${B}/src/utils/.libs:${B}/src/wireless-security/.libs:${B}/src/libnm-gtk/.libs" +} + EXTRA_OECONF = "--without-selinux --without-team --enable-introspection --with-libnm-gtk" diff --git a/meta-citadel/recipes-support/itstool/itstool_2.0.4.bb b/meta-citadel/recipes-support/itstool/itstool_2.0.4.bb index f9f7874..b91a3e4 100644 --- a/meta-citadel/recipes-support/itstool/itstool_2.0.4.bb +++ b/meta-citadel/recipes-support/itstool/itstool_2.0.4.bb @@ -1,18 +1,5 @@ SUMMARY = "XML to PO and back again using W3C ITS rules" HOMEPAGE = "http://itstool.org/" -# WARNING: the following LICENSE and LIC_FILES_CHKSUM values are best guesses - it is -# your responsibility to verify that the values are complete and correct. -# -# The following license files were not able to be identified and are -# represented as "Unknown" below, you will need to check them yourself: -# COPYING -# -# NOTE: multiple licenses have been detected; they have been separated with & -# in the LICENSE value for now since it is a reasonable assumption that all -# of the licenses apply. If instead there is a choice between the multiple -# licenses then you should change the value to separate the licenses with | -# instead of &. If there is any doubt, check the accompanying documentation -# to determine which situation is applicable. LICENSE = "Unknown & GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=59c57b95fd7d0e9e238ebbc7ad47c5a5 \ file://COPYING.GPL3;md5=d32239bcb673463ab874e80d47fae504" @@ -23,20 +10,10 @@ SRC_URI[sha256sum] = "97c208b51da33e0b553e830b92655f8deb9132f8fbe9a646771f95c332 inherit distutils python3native setuptools3 -# WARNING: the following rdepends are determined through basic analysis of the -# python sources, and might not be 100% accurate. +do_configure_prepend() { + sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/itstool.in + sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/itstool +} RDEPENDS_${PN} += "python-core" BBCLASSEXTEND = "native" -# WARNING: We were unable to map the following python package/module -# dependencies to the bitbake packages which include them: -# __future__ -# gettext -# hashlib -# io -# libxml2 -# optparse -# os -# re - -