diff options
Diffstat (limited to 'poky/meta/recipes-gnome')
-rw-r--r-- | poky/meta/recipes-gnome/epiphany/epiphany_3.36.1.bb (renamed from poky/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb) | 6 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-set-internal-vapi-dependencies.patch | 45 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/gcr/gcr_3.36.0.bb | 1 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/libdazzle/libdazzle_3.36.0.bb (renamed from poky/meta/recipes-gnome/libdazzle/libdazzle_3.34.1.bb) | 4 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/libhandy/libhandy_git.bb | 21 |
5 files changed, 72 insertions, 5 deletions
diff --git a/poky/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb b/poky/meta/recipes-gnome/epiphany/epiphany_3.36.1.bb index ddb4c2794..8146983ae 100644 --- a/poky/meta/recipes-gnome/epiphany/epiphany_3.34.4.bb +++ b/poky/meta/recipes-gnome/epiphany/epiphany_3.36.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \ gsettings-desktop-schemas libxml2-native \ - glib-2.0 glib-2.0-native json-glib libdazzle" + glib-2.0 glib-2.0-native json-glib libdazzle libhandy" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings features_check upstream-version-is-even gettext mime-xdg @@ -14,8 +14,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0002-help-meson.build-disable-the-use-of-yelp.patch \ " -SRC_URI[archive.md5sum] = "a559f164bb7d6cbeceb348648076830b" -SRC_URI[archive.sha256sum] = "60e190fc07ec7e33472e60c7e633e04004f7e277a0ffc5e9cd413706881e598d" +SRC_URI[archive.md5sum] = "d66416d0be97ec7789564473337bfe57" +SRC_URI[archive.sha256sum] = "f6f233fb43c6318476d4594707b3fdd5b4127b5e35263e73fbcad8895db8efb6" FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" diff --git a/poky/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-set-internal-vapi-dependencies.patch b/poky/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-set-internal-vapi-dependencies.patch new file mode 100644 index 000000000..b484a1b22 --- /dev/null +++ b/poky/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-set-internal-vapi-dependencies.patch @@ -0,0 +1,45 @@ +From ebb77dad4563b882b449cbc5e882f36ac8c2de71 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 11 May 2020 22:19:16 +0000 +Subject: [PATCH] meson.build: correctly set internal vapi dependencies + +If they are set as strings, meson will supply the right +arguments to vapigen, but will not set the ninja dependencies +to ensure they get built first, and so races will occur: +https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1881/steps/8/logs/step1b + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/55] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + gcr/meson.build | 2 +- + ui/meson.build | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gcr/meson.build b/gcr/meson.build +index 254a933..199452f 100644 +--- a/gcr/meson.build ++++ b/gcr/meson.build +@@ -203,7 +203,7 @@ if get_option('introspection') + + gcr_vapi = gnome.generate_vapi('gcr-@0@'.format(gcr_major_version), + sources: gcr_gir[0], +- packages: [ 'glib-2.0', 'gio-2.0', 'gck-@0@'.format(gck_major_version) ], ++ packages: [ 'glib-2.0', 'gio-2.0', gck_vapi ], + metadata_dirs: meson.current_source_dir(), + vapi_dirs: [ + build_root / 'gck', +diff --git a/ui/meson.build b/ui/meson.build +index 5ca3753..477412d 100644 +--- a/ui/meson.build ++++ b/ui/meson.build +@@ -174,8 +174,8 @@ if get_option('introspection') + packages: [ + 'glib-2.0', + 'gio-2.0', +- 'gck-@0@'.format(gck_major_version), +- 'gcr-@0@'.format(gcr_major_version), ++ gck_vapi, ++ gcr_vapi, + 'gtk+-3.0' + ], + metadata_dirs: meson.current_source_dir(), diff --git a/poky/meta/recipes-gnome/gcr/gcr_3.36.0.bb b/poky/meta/recipes-gnome/gcr/gcr_3.36.0.bb index 4fe3b2fff..a3325b50b 100644 --- a/poky/meta/recipes-gnome/gcr/gcr_3.36.0.bb +++ b/poky/meta/recipes-gnome/gcr/gcr_3.36.0.bb @@ -17,6 +17,7 @@ inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even # depends on gtk+3, but also x11 through gtk+-x11 REQUIRED_DISTRO_FEATURES = "x11" +SRC_URI += " file://0001-meson.build-correctly-set-internal-vapi-dependencies.patch" SRC_URI[archive.md5sum] = "adc65563b6b458507b9a578a8b68fb61" SRC_URI[archive.sha256sum] = "aaf9bed017a2263c6145c89a1a84178f9f40f238426463e4ae486694ef5f6601" diff --git a/poky/meta/recipes-gnome/libdazzle/libdazzle_3.34.1.bb b/poky/meta/recipes-gnome/libdazzle/libdazzle_3.36.0.bb index 1c8b2c86e..25ccee2e2 100644 --- a/poky/meta/recipes-gnome/libdazzle/libdazzle_3.34.1.bb +++ b/poky/meta/recipes-gnome/libdazzle/libdazzle_3.36.0.bb @@ -12,8 +12,8 @@ inherit gnomebase upstream-version-is-even vala features_check gobject-introspec DEPENDS = "glib-2.0-native glib-2.0 gtk+3" -SRC_URI[archive.md5sum] = "e796a92dd3f529616ed388c15208359b" -SRC_URI[archive.sha256sum] = "3d981cbb9d9bb87bfaff7bfd44d9847223b3ef81e69225e4d1f6ac725a669505" +SRC_URI[archive.md5sum] = "154be45a6aac020e7d59f477bd7cafcf" +SRC_URI[archive.sha256sum] = "82b31bbf550fc62970c78bf7f9d55e5fae5b8ea13b24fe2d13c8c6039409d958" GIR_MESON_OPTION = 'with_introspection' diff --git a/poky/meta/recipes-gnome/libhandy/libhandy_git.bb b/poky/meta/recipes-gnome/libhandy/libhandy_git.bb new file mode 100644 index 000000000..64258941e --- /dev/null +++ b/poky/meta/recipes-gnome/libhandy/libhandy_git.bb @@ -0,0 +1,21 @@ +SUMMARY = "A library full of GTK+ widgets for mobile phones" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "git://source.puri.sm/Librem5/${BPN}.git;protocol=https" +SRCREV = "7a193d7692c9c76a1a94f17c4d30b585f77d177c" +S = "${WORKDIR}/git" +PV = "0.0.13" + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GTKDOC_MESON_OPTION = 'gtk_doc' + +inherit meson gobject-introspection vala gettext gtk-doc features_check + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +DEPENDS += "gtk+3" + +PACKAGES =+ "${PN}-examples" +FILES_${PN}-examples = "${bindir}" |