From 868407c65d79e82e83c37f7c32bef9a2e2bc4cd5 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 4 Nov 2019 13:24:47 -0500 Subject: meta-openembedded: subtree update:c986cbed93..e0daf6f8e0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian Bunk (19): lldpd: Upgrade 1.0.3 -> 1.0.4 usrsctp: Upgrade to a more recent git snapshot cim-schema: Remove duplicate file dovecot: Upgrade 2.2.36.3 -> 2.2.36.4 flashrom: Upgrade 1.0 -> 1.1 doxygen: Upgrade 1.8.15 -> 1.8.16 nodejs: Upgrade 10.16.3 -> 10.17.0 php: Upgrade 7.3.9 -> 7.3.11 libdivecomputer: Upgrade to 0.6.0 libnss-nisplus: Upgrade to the latest upstream git pegtl: Upgrade 2.1.4 -> 2.8.1 openwsman: Upgrade 2.6.9 -> 2.6.11 cgdb: Upgrade 0.6.8 -> 0.7.1 packagegroup-meta-networking: Exclude nonbuilding recipes with musl xf86-input-tslib: Upgrade 0.0.6 -> 0.0.7 libmicrohttpd: Upgrade 0.9.66 -> 0.9.67 poco: Upgrade 1.9.0 -> 1.9.4 libgphoto2: Remove obsolete HAL files mdns: Mark as incompatible with musl Andreas Müller (5): unicode-ucd: initial add 12.1.0 unicode-ucd: Set correct SUMMARY and HOMEPAGE colord: initial add 1.4.4 colord-gtk: initial add 0.2.0 ibus: initial add 1.5.21 André Draszik (3): nodejs: allow use of system c-ares (and make default) libuv: update to 1.33.1 nodejs: allow use of system libuv (and make default) Carlos Rafael Giani (1): opencv: Enable pkg-config .pc file generation Khem Raj (5): miniupnpd: Update to 2.1.20191006 miniupnpd: Build config.h before full build poco: Fix build on risc-v python-docutils: Upgrade to 0.15.2 iwd: Use python3 variant of docutils during build Luca Boccassi (1): dbus-broker: build with libaudit if selinux is enabled Martin Siegumfeldt (1): libiio: add python3 packageconfig Paul Eggleton (1): python3-pillow: update to 6.2.1 Slater, Joseph (2): syslog-ng: add volatile directory init for systemd syslog-ng: change conf files to version 3.19 Trevor Gamblin (4): python-priority: add recipe python-h2: add recipe python-hyperframe: add recipe python-hpack: add recipe Yi Zhao (1): freeradius: set CLEANBROKEN Zang Ruochen (22): poppler: upgrade 0.80.0 -> 0.82.0 gmime: upgrade 3.2.3 -> 3.2.4 autofs: upgrade 5.1.5 -> 5.1.6 python-simplejson: enable native and nativesdk python-dnspython: upgrade 1.15.0 -> 1.16.0 python-engineio: upgrade 3.9.3 -> 3.10.0 python-evdev: upgrade 0.7.0 -> 1.2.0 python-future: upgrade 0.16.0 -> 0.18.2 python-intervals: upgrade 1.5.4 -> 1.10.0 python-isort: upgrade 4.3.4 -> 4.3.21 python-javaobj-py3: upgrade 0.2.4 -> 0.3.0 python-lazy-object-proxy: upgrade 1.3.1 -> 1.4.3 python-parse: upgrade 1.8.4 -> 1.12.1 python-pathlib2: upgrade 2.3.4 -> 2.3.5 python-periphery: upgrade 1.1.1 -> 2.0.0 python-pint: upgrade 0.8.1 -> 0.9 python-progress: upgrade 1.4 -> 1.5 python-prompt-toolkit: upgrade 2.0.4 -> 2.0.10 python-pybind11: upgrade 2.2.3 -> 2.4.3 python-pycryptodome: upgrade 3.4.11 -> 3.9.0 python-pyexpect: upgrade 1.0.17 -> 1.0.19 python-pyfirmata: upgrade 1.0.3 -> 1.1.0 Zheng Ruoqin (23): pure-ftpd: upgrade 1.0.47 -> 1.0.49 grpc: upgrade 1.24.1 -> 1.24.3 corosync: upgrade 2.4.4 -> 2.4.5 dhcpcd: upgrade 8.0.2 -> 8.1.1 iscsi-initiator-utils: upgrade 2.0.877 -> 2.0.878 znc: upgrade 1.7.4 -> 1.7.5 babeld: upgrade 1.8.4 -> 1.9.1 htpdate: upgrade 1.2.1 -> 1.2.2 nbd: upgrade 3.19 -> 3.20 unbound: upgrade 1.9.2 -> 1.9.4 wireshark: upgrade 3.0.3 -> 3.0.6 mtr: upgrade 0.92 -> 0.93 libowfat: upgrade 0.31 -> 0.32 iozone3: upgrade 484 -> 487 libhugetlbfs: upgrade 2.21 -> 2.22 phoronix-test-suite: upgrade 8.8.1 -> 9.0.1 lmsensors: upgrade 3.5.0 -> 3.6.0 paho-mqtt-c: upgrade 1.3.0 -> 1.3.1 rtorrent: upgrade 0.9.7 -> 0.9.8 zabbix: upgrade 4.2.6 -> 4.2.7 iwd: upgrade 0.20 -> 0.23 libtorrent: upgrade 0.13.7 -> 0.13.8 ledmon: upgrade to 0.93 Change-Id: I66f0f395da9087e46899cf882e36d9cc50718c62 Signed-off-by: Brad Bishop --- .../recipes-support/colord-gtk/colord-gtk_0.2.0.bb | 21 ++++++++++++ .../meta-gnome/recipes-support/ibus/ibus-native.bb | 34 +++++++++++++++++++ .../meta-gnome/recipes-support/ibus/ibus.bb | 37 ++++++++++++++++++++ .../meta-gnome/recipes-support/ibus/ibus.inc | 36 ++++++++++++++++++++ ...y-to-start-dbus-we-do-not-have-dbus-lauch.patch | 39 ++++++++++++++++++++++ 5 files changed, 167 insertions(+) create mode 100644 meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-support/ibus/ibus-native.bb create mode 100644 meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb create mode 100644 meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc create mode 100644 meta-openembedded/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch (limited to 'meta-openembedded/meta-gnome/recipes-support') diff --git a/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb b/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb new file mode 100644 index 0000000000..c960b99c44 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "GTK support library for colord" +HOMEPAGE = "https://www.freedesktop.org/software/colord/" +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" + +inherit meson gobject-introspection gettext gtk-doc distro_features_check + +DEPENDS = " \ + gtk+3 \ + colord \ +" + +SRC_URI = "http://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "66d048803c8b89e5e63da4b461484933" +SRC_URI[sha256sum] = "2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717" + +EXTRA_OEMESON = "-Dman=false" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus-native.bb b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus-native.bb new file mode 100644 index 0000000000..ca65114c4d --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus-native.bb @@ -0,0 +1,34 @@ +require ${BPN}.inc + +inherit native + +DEPENDS += " \ + glib-2.0-native \ + dbus-native \ + iso-codes \ +" + +PACKAGECONFIG = "" + +# for allarch iso-codes +EXTRA_NATIVE_PKGCONFIG_PATH = ":${RECIPE_SYSROOT}${datadir_native}/pkgconfig" +# for allarch unicode-ucd - just to make configure happy +EXTRA_OECONF += "--with-ucd-dir=${RECIPE_SYSROOT}${datadir_native}/unicode/ucd" + +do_compile() { + cd src + # seems by moving to src we break dependency tracking so build what's + # necessary step by step + oe_runmake ibusenumtypes.h + oe_runmake ibusmarshalers.h + oe_runmake ibusenumtypes.c + oe_runmake unicode-parser +} + +do_install() { + install -d ${D}/${libdir} + install -m 755 ${S}/src/.libs/libibus-*.so* ${D}/${libdir} + + install -d ${D}/${bindir} + install -m 755 ${S}/src/.libs/unicode-parser ${D}/${bindir} +} diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb new file mode 100644 index 0000000000..caec455b6d --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb @@ -0,0 +1,37 @@ +require ${BPN}.inc + +DEPENDS += " \ + ${BPN}-native \ + glib-2.0-native \ + glib-2.0 \ + dbus \ + iso-codes \ +" + +inherit gtk-icon-cache bash-completion + +# for unicode-ucd +EXTRA_OECONF += "--with-ucd-dir=${STAGING_DATADIR}/unicode/ucd" + +PACKAGECONFIG ??= " \ + dconf vala \ + ${@bb.utils.contains_any('DISTRO_FEATURES', [ 'wayland', 'x11' ], 'gtk3', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ +" + +do_configure_prepend() { + # run native unicode-parser + sed -i 's:$(builddir)/unicode-parser:unicode-parser:g' ${S}/src/Makefile.am +} + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/GConf \ + ${datadir}/glib-2.0 \ + ${libdir}/gtk-3.0 \ +" + +FILES_${PN}-dev += " \ + ${datadir}/gettext \ +" + diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc new file mode 100644 index 0000000000..0f4ae7d04b --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc @@ -0,0 +1,36 @@ +SUMMARY = "Intelligent Input Bus for Linux/Unix" +HOMEPAGE = "https://github.com/ibus/ibus/wiki" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala + +PV = "1.5.21" + +DEPENDS = "unicode-ucd" + +SRC_URI = " \ + git://github.com/ibus/ibus.git \ + file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \ +" +SRCREV = "ae0040c73466bb6e78fce5e669a55fcce6ffd16d" +S = "${WORKDIR}/git" + +PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase" +PACKAGECONFIG[dconf] = "--enable-dconf,--disable-dconf,dconf" +PACKAGECONFIG[gtk2] = "--enable-gtk2,--disable-gtk2,gtk+" +PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3" +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland" +PACKAGECONFIG[vala] = "--enable-vala,--disable-vala" +PACKAGECONFIG[x11] = "--enable-xim --enable-ui,--disable-xim --disable-ui,virtual/libx11" + +EXTRA_OECONF = " \ + --disable-tests \ + --disable-emoji-dict \ + --disable-python2 \ +" + +do_configure_prepend() { + touch ${S}/ChangeLog + touch ${S}/ABOUT-NLS +} diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch new file mode 100644 index 0000000000..3701d19f5c --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch @@ -0,0 +1,39 @@ +From f567bcbc2108d722faa90afeb03d3a3bcdf5f58b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 10 May 2019 14:30:08 +0200 +Subject: [PATCH] Do not try to start dbus - we do not have dbus-lauch +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller +--- + data/dconf/make-dconf-override-db.sh | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh +index 9c650e97..02fbf059 100755 +--- a/data/dconf/make-dconf-override-db.sh ++++ b/data/dconf/make-dconf-override-db.sh +@@ -12,10 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache" + export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas" + mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME $GSETTINGS_SCHEMA_DIR + +-eval `dbus-launch --sh-syntax` +- +-trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR +- + # in case that schema is not installed on the system + glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD" + +@@ -46,5 +42,3 @@ for schema in $schemas; do + done + + rm -rf $TMPDIR +- +-kill $DBUS_SESSION_BUS_PID +-- +2.20.1 + -- cgit v1.2.3