From 93c3acf56fcecefef579497263e98c15b6b0e34a Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 29 Oct 2019 09:48:15 -0400 Subject: meta-openembedded: subtree update:18506b797b..c986cbed93 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian Bunk (7): gpsd: Backport a memory leak fix gpsd: Stop depending on chrpath-native klibc: Upgrade 2.0.6 -> 2.0.7 gerbera: Upgrade 1.3.0 -> 1.3.2 gstd: Fix the version number webrtc-audio-processing: Upgrade 0.3 -> 0.3.1 vlc: Upgrade 3.0.6 -> 3.0.8 Andreas Müller (15): itstool: rework native shebang and add class to make native itstool work yelp-tools: use itstools.bbclass yelp-xsl: use itstool.bbclass yelp: use itstool.bbclass gnome-help.bbclass: Handle gnome-help files with new distro feature 'helpfiles' zenity: rework recipe dconf: extend to native build for upcoming gdm dconf-editor: upgrade 3.32.0 -> 3.34.0 gtksourceview4: upgrade 4.2.0 -> 4.4.0 gnome-menus3: upgrade 3.10.1 -> 3.32.0 gnome-desktop3: upgrade 3.34.0 -> 3.34.1 gnome-bluetooth: upgrade 3.32.1 -> 3.34.0 gspell: upgrade 1.8.1 -> 1.8.2 gnome-system-monitor: upgrade 3.32.0 -> 3.32.1 network-manager-applet: upgrade 1.8.22 -> 1.8.23 / build with meson / cleanup Luca Boccassi (4): dbus-broker: 19 -> 21 dbus-broker: backport patches from master dbus-broker: build with SELinux if it's enabled via DISTRO_FEATURES dbus-broker: add patch to fix build with musl libc Trevor Gamblin (1): rsyslog: upgrade from v8.1908.0 to v8.1910.0 Zang Ruochen (4): python-bitarray: upgrade 0.8.3 -> 1.0.1 python-can: upgrade 2.2.1 -> 3.3.2 python-daemonize: upgrade 2.4.7 -> 2.5.0 xmlsec1: upgrade 1.2.28 -> 1.2.29 Zheng Ruoqin (2): keepalived: upgrade 2.0.16 -> 2.0.19 postfix: upgrade 3.4.5 -> 3.4.7 Change-Id: Ibff272f163bb42473022825cfb17a284a0019e83 Signed-off-by: Brad Bishop --- .../meta-gnome/classes/gnome-help.bbclass | 69 ++++++++++++++++++++++ .../network-manager-applet_1.8.22.bb | 44 -------------- .../network-manager-applet_1.8.24.bb | 29 +++++++++ .../recipes-gnome/dconf/dconf-editor_3.32.0.bb | 17 ------ .../recipes-gnome/dconf/dconf-editor_3.34.2.bb | 17 ++++++ .../meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb | 4 ++ .../gnome-bluetooth/gnome-bluetooth_3.32.1.bb | 22 ------- .../gnome-bluetooth/gnome-bluetooth_3.34.0.bb | 22 +++++++ .../gnome-desktop/gnome-desktop3_3.34.0.bb | 36 ----------- .../gnome-desktop/gnome-desktop3_3.34.1.bb | 36 +++++++++++ .../gnome-menus/gnome-menus3_3.10.1.bb | 21 ------- .../gnome-menus/gnome-menus3_3.32.0.bb | 18 ++++++ ...Do-not-build-help-we-do-not-have-yelp-yet.patch | 30 ---------- .../gnome-system-monitor_3.32.0.bb | 34 ----------- .../gnome-system-monitor_3.32.1.bb | 32 ++++++++++ .../recipes-gnome/gspell/gspell_1.8.1.bb | 11 ---- .../recipes-gnome/gspell/gspell_1.8.2.bb | 11 ++++ .../gtksourceview/gtksourceview4_4.2.0.bb | 21 ------- .../gtksourceview/gtksourceview4_4.4.0.bb | 26 ++++++++ .../recipes-gnome/yelp/yelp-tools_3.32.2.bb | 3 +- .../recipes-gnome/yelp/yelp-xsl_3.34.0.bb | 9 ++- .../meta-gnome/recipes-gnome/yelp/yelp_3.34.0.bb | 3 +- .../zenity/0001-build-don-t-generate-manual.patch | 50 ---------------- .../recipes-gnome/zenity/zenity_3.32.0.bb | 12 ++-- 24 files changed, 277 insertions(+), 300 deletions(-) create mode 100644 meta-openembedded/meta-gnome/classes/gnome-help.bbclass delete mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.22.bb create mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.32.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.34.2.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.1.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.32.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.1.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.1.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.2.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.2.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.4.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity/0001-build-don-t-generate-manual.patch (limited to 'meta-openembedded/meta-gnome') diff --git a/meta-openembedded/meta-gnome/classes/gnome-help.bbclass b/meta-openembedded/meta-gnome/classes/gnome-help.bbclass new file mode 100644 index 0000000000..967091ba45 --- /dev/null +++ b/meta-openembedded/meta-gnome/classes/gnome-help.bbclass @@ -0,0 +1,69 @@ +# Class to pack gnome help files or delete them during install +# There are the following cases: +# +# if 'helpfiles' not in DISTRO_FEATURES +# delete all help contants during install +# else +# if PACKAGE_NO_HELP_SPLIT == 1 +# pack all help files to ${PN}-help +# else +# pack all help files to ${PN}-help- + +FILES_${PN}-help = "${datadir}/*/translations" + +# Dummy to get yelp build & PACKAGE_NO_HELP_SPLIT set 1 +PACKAGES_append = " ${PN}-help" +FILES_${PN}-help = "${datadir}/help" +RRECOMMENDS_${PN}-help = "${@bb.utils.contains('DISTRO_FEATURES','helpfiles','yelp','',d)}" + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES','helpfiles','false','true',d)}; then + rm -rf ${D}${datadir}/help/* + fi +} + +python gnome_do_split_help() { + if bb.utils.contains('DISTRO_FEATURES', 'helpfiles', False, True, d): + return + + if (d.getVar('PACKAGE_NO_HELP_SPLIT') == '1'): + # all help files go to ${ + bb.debug(1, "package requested not splitting help-files") + return + + packages = (d.getVar('PACKAGES') or "").split() + datadir = d.getVar('datadir') + dvar = d.getVar('PKGD') + pn = d.getVar('PN') + + if pn + '-help' in packages: + packages.remove(pn + '-help') + + helpdir = os.path.join(dvar + datadir, 'help') + + if not cpath.isdir(helpdir): + bb.warn("No help files in this package - remove gnome-help from inherit?") + return + + helps = os.listdir(helpdir) + + summary = d.getVar('SUMMARY') or pn + description = d.getVar('DESCRIPTION') or "" + locale_section = d.getVar('LOCALE_SECTION') + mlprefix = d.getVar('MLPREFIX') or "" + for l in sorted(helps): + ln = legitimize_package_name(l) + pkg = pn + '-help-' + ln + packages.append(pkg) + d.setVar('FILES_' + pkg, os.path.join(datadir, 'help', l)) + d.setVar('RRECOMMENDS_' + pkg, '%syelp' % mlprefix) + d.setVar('SUMMARY_' + pkg, '%s - %s help' % (summary, l)) + d.setVar('DESCRIPTION_' + pkg, '%s This package contains language help files for the %s locale.' % (description, l)) + if locale_section: + d.setVar('SECTION_' + pkg, locale_section) + + d.setVar('PACKAGES', ' '.join(packages)) +} + +PACKAGESPLITFUNCS_prepend = "gnome_do_split_help " + diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.22.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.22.bb deleted file mode 100644 index 37f512a73c..0000000000 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.22.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "GTK+ applet for NetworkManager" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -DEPENDS = "gtk+3 libnotify libsecret networkmanager \ - libgnome-keyring iso-codes nss \ - intltool-native \ -" - -GNOMEBASEBUILDCLASS = "autotools-brokensep" -inherit distro_features_check gnomebase gsettings gtk-icon-cache gobject-introspection gettext - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.md5sum] = "e0373f4c0d0637716e6e385799a9080f" -SRC_URI[archive.sha256sum] = "ebef1c1050ff6d94cad060e8d259f2a88ae159cf83ca75cb71d9f76867877eed" - -PACKAGECONFIG[modemmanager] = "--with-wwan,--without-wwan,modemmanager" -PACKAGECONFIG[mobile-provider-info] = "--enable-mobile-broadband-provider-info,--disable-mobile-broadband-provider-info,mobile-broadband-provider-info,mobile-broadband-provider-info" -PACKAGECONFIG ??= "" - -EXTRA_OECONF = " \ - --without-selinux \ -" - -# gobject-introspection related -GI_DATA_ENABLED_libc-musl = "False" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/src/libnma/.libs" -} - -RDEPENDS_${PN} =+ "networkmanager" - -FILES_${PN} += " \ - ${datadir}/nm-applet/ \ - ${datadir}/libnma/wifi.ui \ - ${datadir}/metainfo \ -" - -# musl builds generate gir files which otherwise go un-packaged -FILES_${PN}-dev += " \ - ${datadir}/gir-1.0 \ -" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb new file mode 100644 index 0000000000..90390e15f8 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb @@ -0,0 +1,29 @@ +SUMMARY = "GTK+ applet for NetworkManager" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +DEPENDS = "gtk+3 libnotify libsecret networkmanager iso-codes nss" + +GNOMEBASEBUILDCLASS = "meson" +inherit distro_features_check gnomebase gsettings gtk-doc gtk-icon-cache gobject-introspection gettext + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.md5sum] = "5c1bf351fde5adc12200345550516050" +SRC_URI[archive.sha256sum] = "118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf" + +GTKDOC_MESON_OPTION = "gtk_doc" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr" +PACKAGECONFIG[modemmanager] = "-Dwwan=true, -Dwwan=false, modemmanager" +PACKAGECONFIG[mobile-provider-info] = "-Dmobile_broadband_provider_info=true, -Dmobile_broadband_provider_info=false, mobile-broadband-provider-info,mobile-broadband-provider-info" +PACKAGECONFIG[selinux] = "-Dselinux=true, -Dselinux=false, libselinux" + +RDEPENDS_${PN} =+ "networkmanager" + +FILES_${PN} += " \ + ${datadir}/nm-applet/ \ + ${datadir}/libnma/wifi.ui \ + ${datadir}/metainfo \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.32.0.bb deleted file mode 100644 index 999ed041af..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.32.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Configuration editor for dconf" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = "dconf gtk+3" - -inherit gnomebase vala gettext gsettings bash-completion - -SRC_URI[archive.md5sum] = "331a3603c0f8a9913e3a3c0f178b5310" -SRC_URI[archive.sha256sum] = "f19d1332ac27e23ef3dc2ed07ba4e4646d9d7f05e2e78748aa525a1320adbaba" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ -" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.34.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.34.2.bb new file mode 100644 index 0000000000..699511f7aa --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.34.2.bb @@ -0,0 +1,17 @@ +SUMMARY = "Configuration editor for dconf" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = "dconf gtk+3" + +inherit gnomebase vala gettext gsettings bash-completion + +SRC_URI[archive.md5sum] = "2907205ad1a0e2774c981932cb7ff25b" +SRC_URI[archive.sha256sum] = "cecc2a5cb44af68be80e970e83fb9e3e92e2a74df7c90b63324e6da19a929d5f" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb index ef549432e8..3c3802f34b 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb @@ -16,8 +16,12 @@ SRC_URI += "file://fix-meson-0.52.patch" # I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl EXTRA_OEMESON = "-Dman=false" +# no bash-completion for native +EXTRA_OEMESON_append_class-native = "-Dbash_completion=false" FILES_${PN} += " \ ${datadir}/dbus-1 \ ${libdir}/gio/modules/*.so \ " + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb deleted file mode 100644 index 3c4438e7e7..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "GNOME bluetooth manager" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ - file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ -" - -SECTION = "x11/gnome" - -DEPENDS = "udev gtk+3 libnotify libcanberra bluez5" - -GNOMEBASEBUILDCLASS = "meson" -GTKDOC_MESON_OPTION = "gtk_doc" - -inherit gnomebase gtk-icon-cache gtk-doc gobject-introspection upstream-version-is-even - -# gtk-icon-cache bbclass will take care of this for us. -EXTRA_OEMESON = "-Dicon_update=false" - -SRC_URI[archive.md5sum] = "5b3d66f564a5067ea154750cdb6d850d" -SRC_URI[archive.sha256sum] = "6441cafd313af94fba28b701698074f97d693b9023788a74e8e6f16f817ba1aa" - -RDEPENDS_${PN} += "bluez5" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.0.bb new file mode 100644 index 0000000000..ae6587be1e --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "GNOME bluetooth manager" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ + file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ +" + +SECTION = "x11/gnome" + +DEPENDS = "udev gtk+3 libnotify libcanberra bluez5" + +GNOMEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk_doc" + +inherit gnomebase gtk-icon-cache gtk-doc gobject-introspection upstream-version-is-even + +# gtk-icon-cache bbclass will take care of this for us. +EXTRA_OEMESON = "-Dicon_update=false" + +SRC_URI[archive.md5sum] = "0c567e124a52e8ddc31c8bed0c3e57a1" +SRC_URI[archive.sha256sum] = "e867e67423e1dc78c56c2ea11dec066ce0254238d559e4777c80fa2935eb6baf" + +RDEPENDS_${PN} += "bluez5" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.0.bb deleted file mode 100644 index 77aa3fb615..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.0.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "GNOME library for reading .desktop files" -SECTION = "x11/gnome" -LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -BPN = "gnome-desktop" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase pkgconfig upstream-version-is-even gobject-introspection distro_features_check - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" - -SRC_URI[archive.md5sum] = "3149bbd12eaf6f4420b1a999131ec470" -SRC_URI[archive.sha256sum] = "8d331ee655c1d56b2b97562a07c7a7598ff6706a11ff1cdce97423ebc6b62426" - -SRC_URI += " \ - file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ - file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ -" - -DEPENDS += "itstool-native gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" - -inherit distro_features_check gtk-doc -REQUIRED_DISTRO_FEATURES += "x11" - -GTKDOC_MESON_OPTION = "gtk_doc" -EXTRA_OEMESON = "-Ddesktop_docs=false" - -PACKAGES =+ "libgnome-desktop3" -FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" - -RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.1.bb new file mode 100644 index 0000000000..0e3cf5b597 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.1.bb @@ -0,0 +1,36 @@ +SUMMARY = "GNOME library for reading .desktop files" +SECTION = "x11/gnome" +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +BPN = "gnome-desktop" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspection distro_features_check + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" + +SRC_URI[archive.md5sum] = "357b4e63960830c1399d3341d05746ea" +SRC_URI[archive.sha256sum] = "c1dbeb5666dad27166c769e48e2ab41dd5ed74718ea35eb57c8488790662dc5a" + +SRC_URI += " \ + file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ + file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ +" + +DEPENDS += "gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" + +inherit distro_features_check gtk-doc +REQUIRED_DISTRO_FEATURES += "x11" + +GTKDOC_MESON_OPTION = "gtk_doc" +EXTRA_OEMESON = "-Ddesktop_docs=false" + +PACKAGES =+ "libgnome-desktop3" +FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" + +RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb deleted file mode 100644 index 647ae914ff..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "GNOME menus" -SECTION = "x11/gnome" -LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -DEPENDS = "python libxml2 gconf popt gtk+3 intltool-native gnome-common-native" - -inherit distro_features_check gnomebase pkgconfig python-dir pythonnative gobject-introspection - -REQUIRED_DISTRO_FEATURES = "x11" - -BPN = "gnome-menus" - -SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BPN}-${PV}.tar.xz" - -SRC_URI[md5sum] = "6db025e79e2b69f39fc7aa0753f43081" -SRC_URI[sha256sum] = "46950aba274c1ad58234374fa9b235258650737307f3bc396af48eb983668a71" - -FILES_${PN} += "${datadir}/desktop-directories/" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.32.0.bb new file mode 100644 index 0000000000..b6d212a27e --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.32.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "GNOME menus" +SECTION = "x11/gnome" +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +DEPENDS = "python libxml2 popt gtk+3 gnome-common-native" + +inherit distro_features_check gnomebase gettext pkgconfig gobject-introspection upstream-version-is-even + +REQUIRED_DISTRO_FEATURES = "x11" + +BPN = "gnome-menus" + +SRC_URI[archive.md5sum] = "4262208c13f266d9ada7d356aada9e1b" +SRC_URI[archive.sha256sum] = "c850c64b2074265fe59e099a340b8689cf3dd4658dc9feddd2ab5e95f1a74b74" + +FILES_${PN} += "${datadir}/desktop-directories/" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch deleted file mode 100644 index f2e720e9e6..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c6649fdcfb2f44807089741557f8e527ab9751e4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sun, 24 Mar 2019 02:46:07 +0100 -Subject: [PATCH] Do not build help - we do not have yelp yet -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [embedded-specific] - -Signed-off-by: Andreas Müller ---- - meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/meson.build b/meson.build -index d60ced7..6a0ab4b 100644 ---- a/meson.build -+++ b/meson.build -@@ -183,7 +183,6 @@ subdir('data') - subdir('po') - subdir('scripts') - subdir('src') --subdir('help') - - - message('\n'.join(['', --- -2.20.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb deleted file mode 100644 index 8930e1222a..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Gnome system monitor" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS = " \ - itstool-native \ - gnome-common-native \ - libxml2-native \ - glib-2.0-native \ - gtkmm3 \ - libgtop \ - librsvg \ - polkit \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gconf gtk-icon-cache distro_features_check gettext - -REQUIRED_DISTRO_FEATURES = "x11 polkit" - -SRC_URI[archive.md5sum] = "6c2c5c5bf8f15d3e6985faacbd3055dd" -SRC_URI[archive.sha256sum] = "af00c4a42dd1db17d9abe88edb11c7751b20982db1a8a2a467bab206fd8a77e3" -SRC_URI += "file://0001-Do-not-build-help-we-do-not-have-yelp-yet.patch" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" - -RRECOMMENDS_${PN} = "adwaita-icon-theme" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ -" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.1.bb new file mode 100644 index 0000000000..a9cbf22d77 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.1.bb @@ -0,0 +1,32 @@ +SUMMARY = "Gnome system monitor" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = " \ + gnome-common-native \ + libxml2-native \ + glib-2.0-native \ + gtkmm3 \ + libgtop \ + librsvg \ + polkit \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gnome-help itstool gtk-icon-cache distro_features_check gettext upstream-version-is-even + +REQUIRED_DISTRO_FEATURES = "x11 polkit" + +SRC_URI[archive.md5sum] = "37356a1b8c20939adc6f47f739d2e49a" +SRC_URI[archive.sha256sum] = "48c131335091bd927862f40ef56400f997981df2acfc82abea662bf91a1ea4f1" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" + +RRECOMMENDS_${PN} = "adwaita-icon-theme" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.1.bb deleted file mode 100644 index 9de298c418..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "spell adds spell-checking to a GTK+ applications" -HOMEPAGE = "https://wiki.gnome.org/Projects/gspell" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=8c2e1ec1540fb3e0beb68361344cba7e" - -DEPENDS = "gtk+3 iso-codes enchant2" - -inherit gnomebase gettext gobject-introspection - -SRC_URI[archive.md5sum] = "8269918ea5ff798e49943e7daf6a32b9" -SRC_URI[archive.sha256sum] = "819a1d23c7603000e73f5e738bdd284342e0cd345fb0c7650999c31ec741bbe5" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.2.bb new file mode 100644 index 0000000000..128a89f5d7 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.2.bb @@ -0,0 +1,11 @@ +SUMMARY = "gspell adds spell-checking to a GTK+ applications" +HOMEPAGE = "https://wiki.gnome.org/Projects/gspell" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=8c2e1ec1540fb3e0beb68361344cba7e" + +DEPENDS = "gtk+3 iso-codes enchant2" + +inherit gnomebase gettext gobject-introspection + +SRC_URI[archive.md5sum] = "4f857382bc9d8d4afe1e67e5b5b9dbff" +SRC_URI[archive.sha256sum] = "bb9195c3a95bacf556d0203e9691f7489e0d3bc5ae1e5a440c89b2f2435d3ed6" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.2.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.2.0.bb deleted file mode 100644 index 10deaffb8a..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.2.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Portable C library for multiline text editing" -HOMEPAGE = "http://projects.gnome.org/gtksourceview/" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" - -DEPENDS = "gtk+3 libxml2 intltool-native gnome-common-native glib-2.0-native" - -PNAME = "gtksourceview" - -S = "${WORKDIR}/${PNAME}-${PV}" - -inherit gnomebase lib_package gettext distro_features_check gtk-doc gobject-introspection - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/4.2/${PNAME}-${PV}.tar.xz" -SRC_URI[md5sum] = "c9e6913c2fd30ca2fcdd71482faf8b99" -SRC_URI[sha256sum] = "c431eb234dc83c7819e58f77dd2af973252c7750da1c9d125ddc94268f94f675" - -FILES_${PN} += "${datadir}/gtksourceview-4" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.4.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.4.0.bb new file mode 100644 index 0000000000..63bbb2547d --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.4.0.bb @@ -0,0 +1,26 @@ +SUMMARY = "Portable C library for multiline text editing" +HOMEPAGE = "http://projects.gnome.org/gtksourceview/" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +DEPENDS = "gtk+3 libxml2 intltool-native gnome-common-native glib-2.0-native" + +PNAME = "gtksourceview" + +S = "${WORKDIR}/${PNAME}-${PV}" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase lib_package gettext distro_features_check gtk-doc gobject-introspection vala + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/4.4/${PNAME}-${PV}.tar.xz" +SRC_URI[md5sum] = "5c47e314517692f2622a0b724c65e628" +SRC_URI[sha256sum] = "9ddb914aef70a29a66acd93b4f762d5681202e44094d2d6370e51c9e389e689a" + +GIR_MESON_OPTION = 'gir' +GTKDOC_MESON_OPTION = "gtk_doc" + +FILES_${PN} += "${datadir}/gtksourceview-4" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb index 6a6397cee6..af2bab3804 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb @@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = " \ file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ " -inherit gnomebase +inherit gnomebase itstool DEPENDS += " \ libxslt-native \ libxml2-native \ - itstool-native \ yelp-xsl \ " diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.34.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.34.0.bb index 17994414e0..20052cf16e 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.34.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.34.0.bb @@ -6,13 +6,16 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343 \ " -inherit gnomebase gettext +inherit gnomebase gettext itstool -DEPENDS += "libxml2 itstool-native" +DEPENDS += "libxml2" SRC_URI[archive.md5sum] = "f8c4e777aee8b055251c333ef48a0cd0" SRC_URI[archive.sha256sum] = "e8063aee67d1df634f3d062f1c28130b2dabb3c0c66396b1af90388f34e14ee2" -RDEPENDS_${PN} += "libxml2 itstool" +RDEPENDS_${PN}_append_class-target = " libxml2 itstool" + +# ensure our native consumers are forced to inherit itstool +RDEPENDS_${PN}_append_class-native = " libxml2" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_3.34.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_3.34.0.bb index 13c4e52bf3..f6311965e0 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_3.34.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_3.34.0.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING;md5=6e1b9cb787e76d7e6946887a65caa754 \ " -inherit gnomebase autotools-brokensep gsettings gettext gtk-doc +inherit gnomebase itstool autotools-brokensep gsettings gettext gtk-doc SRC_URI[archive.md5sum] = "776e29bd16424c8712cbf340cfe6429b" SRC_URI[archive.sha256sum] = "e3d6527c5963d73206891b32f1f23363164be57de248555513bd0be77a7bd045" @@ -12,7 +12,6 @@ SRC_URI[archive.sha256sum] = "e3d6527c5963d73206891b32f1f23363164be57de248555513 DEPENDS += " \ libxml2-native \ glib-2.0-native \ - itstool-native \ gtk+3 \ appstream-glib \ libxslt \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity/0001-build-don-t-generate-manual.patch b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity/0001-build-don-t-generate-manual.patch deleted file mode 100644 index 4885486673..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity/0001-build-don-t-generate-manual.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 38eeb345fdfca0298b11427aa942b68e627ba10e Mon Sep 17 00:00:00 2001 -From: Bartosz Golaszewski -Date: Thu, 12 Sep 2019 13:14:55 +0200 -Subject: [PATCH] build: don't generate manual - -We don't have yelp in yocto and even if we did it would pull in -webkitgtk just to generate help. Just remove the manual generation -altogether. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Bartosz Golaszewski ---- - Makefile.am | 3 +-- - configure.ac | 5 ----- - 2 files changed, 1 insertion(+), 7 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 81ae6a7..bd073dd 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -4,8 +4,7 @@ AM_CPPFLAGS = src - SUBDIRS = \ - src \ - po \ -- data \ -- help -+ data - - EXTRA_DIST = \ - autogen.sh \ -diff --git a/configure.ac b/configure.ac -index 5dccdb0..f88b2c0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -115,11 +115,6 @@ GETTEXT_PACKAGE=zenity - AC_SUBST([GETTEXT_PACKAGE]) - AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext domain]) - --# ******************************* --# User manual --# ******************************* --YELP_HELP_INIT -- - # ******************************* - - AC_SUBST([AM_CPPFLAGS]) --- -2.21.0 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb index 295288bfbc..0384a5c5c3 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb @@ -4,19 +4,17 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" -inherit distro_features_check gnomebase gettext +inherit gnomebase itstool gnome-help distro_features_check gettext -DEPENDS = "gtk+3" +DEPENDS = " \ + yelp-tools-native \ + gtk+3 \ +" REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ - file://0001-build-don-t-generate-manual.patch \ -" - SRC_URI[archive.md5sum] = "ba2b2a13248773b4ec0fd323d95e6d5a" SRC_URI[archive.sha256sum] = "e786e733569c97372c3ef1776e71be7e7599ebe87e11e8ad67dcc2e63a82cd95" -GNOME_COMPRESS_TYPE="xz" do_install_append() { # Remove gdialog compatibility helper - we don't want to pull in perl -- cgit v1.2.3