libnotify: upgrade 0.7.8 -> 0.7.9 / port to meson
PATCH 1/2 libnotify: upgrade 0.7.8 -> 0.7.9 / port to meson
From [1]:
New in 0.7.9
============
* Fixed linking in darwin [Iain, Marco; !5]
* Added man page for notify-send [Jan; !6]
* Dropped autotools [Jan; !11]
[1] http://ftp.gnome.org/pub/gnome/sources/libnotify/0.7/libnotify-0.7.9.news
---
.../{libnotify_0.7.8.bb => libnotify_0.7.9.bb} | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
rename meta/recipes-gnome/libnotify/{libnotify_0.7.8.bb => libnotify_0.7.9.bb} (59%)meta/recipes-gnome/libnotify/libnotify_0.7.9.bb renamed from meta/recipes-gnome/libnotify/libnotify_0.7.8.bb +11 -3
@@ -7,12 +7,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" DEPENDS = "dbus gtk+3 glib-2.0" -inherit gnomebase gtk-doc features_check gobject-introspection +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gtk-doc features_check gobject-introspection manpages # depends on gtk+3 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI[archive.md5sum] = "babb4b07b5f21bef42a386d3d7019599" -SRC_URI[archive.sha256sum] = "69209e0b663776a00c7b6c0e560302a8dbf66b2551d55616304f240bba66e18c" +SRC_URI[archive.md5sum] = "ccd9c53364174cc8d13e18a1988faa76" +SRC_URI[archive.sha256sum] = "66c0517ed16df7af258e83208faaf5069727dfd66995c4bbc51c16954d674761" + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GTKDOC_MESON_OPTION = 'gtk_doc' + +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native" # there were times, we had two versions of libnotify (oe-core libnotify:0.6.x / # meta-gnome libnotify3: 0.7.x)
Signature · 1 line
2.21.1
PATCH 2/2 libsecret: upgrade 0.20.1 -> 0.20.2 / port to meson
From [1]:
0.20.2
* secret-file-collection: force little-endian in GVariant [!49, #42]
* Prefer g_info() over g_message() [!48, #40]
* meson: Don't specify shared_library() [!47]
* docs: Make sure to set install: true [!46]
[1] http://ftp.gnome.org/pub/gnome/sources/libsecret/0.20/libsecret-0.20.2.news
---
...an-subdir-only-if-manpage-is-enabled.patch | 30 +++++++++++++++++++
...ibsecret_0.20.1.bb => libsecret_0.20.2.bb} | 20 ++++++++-----
2 files changed, 42 insertions(+), 8 deletions(-)
create mode 100644 meta/recipes-gnome/libsecret/libsecret/0001-docs-Add-man-subdir-only-if-manpage-is-enabled.patch
rename meta/recipes-gnome/libsecret/{libsecret_0.20.1.bb => libsecret_0.20.2.bb} (59%)meta/recipes-gnome/libsecret/libsecret/0001-docs-Add-man-subdir-only-if-manpage-is-enabled.patch new file +30 -0
@@ -0,0 +1,30 @@ +From a2037bfcf14a0b5b81f5160b69b5ff94a6096584 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> +Date: Thu, 19 Mar 2020 01:42:22 +0100 +Subject: [PATCH] docs: Add man subdir only if manpage is enabled +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/51] + +Signed-off-by: Andreas Müller <[email protected]> +--- + docs/meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/docs/meson.build b/docs/meson.build +index cc8d964..aa7cfbc 100644 +--- a/docs/meson.build ++++ b/docs/meson.build +@@ -1,4 +1,6 @@ +-subdir('man') ++if with_manpage ++ subdir('man') ++endif + if with_gtkdoc + subdir('reference/libsecret') + endif +-- +2.21.1 +
meta/recipes-gnome/libsecret/libsecret_0.20.2.bb renamed from meta/recipes-gnome/libsecret/libsecret_0.20.1.bb +12 -8
@@ -7,21 +7,25 @@ LICENSE = "LGPLv2.1" BUGTRACKER = "https://gitlab.gnome.org/GNOME/libsecret/issues" LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6" +GNOMEBASEBUILDCLASS = "meson" + inherit gnomebase gtk-doc vala gobject-introspection manpages DEPENDS += "glib-2.0 libgcrypt gettext-native" -PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" +SRC_URI[archive.md5sum] = "f24f82e49d360ff742901d6c387e2bc9" +SRC_URI[archive.sha256sum] = "81e9143833785cdcf96c1da5d0357a8bcf0cd2b0119f15aa0cae775d1f19ffc3" +SRC_URI += "file://0001-docs-Add-man-subdir-only-if-manpage-is-enabled.patch" + +GTKDOC_MESON_OPTION = 'gtk_doc' -SRC_URI[archive.md5sum] = "d2dd660a8d502099317bc8af9f30302e" -SRC_URI[archive.sha256sum] = "57f73e94ec6263a17a077fb809cf8cf424637a897a7f15b4eec42ce4aef52447" +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" + +PACKAGECONFIG[manpages] = "-Dmanpage=true,-Dmanpage=false,libxslt-native xmlto-native" # http://errors.yoctoproject.org/Errors/Details/20228/ ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" ARM_INSTRUCTION_SET_armv6 = "arm" - -# vapigen.m4 bundled with the tarball does not yet have our cross-compilation fixes -do_configure_prepend() { - rm -f ${S}/build/m4/vapigen.m4 -}
Signature · 1 line
2.21.1
Re: [PATCH 2/2] libsecret: upgrade 0.20.1 -> 0.20.2 / port to meson
Quoted 97 lines · Andreas Müller
From [1]:
0.20.2
* secret-file-collection: force little-endian in GVariant [!49, #42]
* Preferg_info()overg_message()[!48, #40]
* meson: Don't specifyshared_library()[!47]
* docs: Make sure to set install: true [!46][1] http://ftp.gnome.org/pub/gnome/sources/libsecret/0.20/libsecret-0.20.2.news
Signed-off-by Andreas Müller <[email protected]>--- ...an-subdir-only-if-manpage-is-enabled.patch | 30 +++++++++++++++++++ ...ibsecret_0.20.1.bb => libsecret_0.20.2.bb} | 20 ++++++++----- 2 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 meta/recipes-gnome/libsecret/libsecret/0001-docs-Add-man-subdir-only-if-manpage-is-enabled.patch rename meta/recipes-gnome/libsecret/{libsecret_0.20.1.bb => libsecret_0.20.2.bb} (59%)meta/recipes-gnome/libsecret/libsecret/0001-docs-Add-man-subdir-only-if-manpage-is-enabled.patch new file +30
-0@@ -0,0 +1,30 @@ +From a2037bfcf14a0b5b81f5160b69b5ff94a6096584 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> +Date: Thu, 19 Mar 2020 01:42:22 +0100 +Subject: [PATCH] docs: Add man subdir only if manpage is enabled +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/51] + +Signed-off-by: Andreas Müller <[email protected]> +--- + docs/meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/docs/meson.build b/docs/meson.build +index cc8d964..aa7cfbc 100644 +--- a/docs/meson.build ++++ b/docs/meson.build +@@ -1,4 +1,6 @@ +-subdir('man') ++if with_manpage ++ subdir('man') ++endif + if with_gtkdoc + subdir('reference/libsecret') + endif +-- +2.21.1 +meta/recipes-gnome/libsecret/libsecret_0.20.2.bb renamed from meta/recipes-gnome/libsecret/libsecret_0.20.1.bb +12
-9@@ -7,21 +7,25 @@ LICENSE = "LGPLv2.1" BUGTRACKER = "https://gitlab.gnome.org/GNOME/libsecret/issues" LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6" +GNOMEBASEBUILDCLASS = "meson" + inherit gnomebase gtk-doc vala gobject-introspection manpages DEPENDS += "glib-2.0 libgcrypt gettext-native" -PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" +SRC_URI[archive.md5sum] = "f24f82e49d360ff742901d6c387e2bc9" +SRC_URI[archive.sha256sum] = "81e9143833785cdcf96c1da5d0357a8bcf0cd2b0119f15aa0cae775d1f19ffc3" +SRC_URI += "file://0001-docs-Add-man-subdir-only-if-manpage-is-enabled.patch" + +GTKDOC_MESON_OPTION = 'gtk_doc' -SRC_URI[archive.md5sum] = "d2dd660a8d502099317bc8af9f30302e" -SRC_URI[archive.sha256sum] = "57f73e94ec6263a17a077fb809cf8cf424637a897a7f15b4eec42ce4aef52447" +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" + +PACKAGECONFIG[manpages] = "-Dmanpage=true,-Dmanpage=false,libxslt-native xmlto-native" # http://errors.yoctoproject.org/Errors/Details/20228/ ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" ARM_INSTRUCTION_SET_armv6 = "arm" - -# vapigen.m4 bundled with the tarball does not yet have our cross-compilation fixes -do_configure_prepend() { - rm -f ${S}/build/m4/vapigen.m4 -} --
Quoted 2 lines
2.21.1
Ping?
Quoted 48 lines · Andreas Müller
From [1]:
New in 0.7.9
============
* Fixed linking in darwin [Iain, Marco; !5]
* Added man page for notify-send [Jan; !6]
* Dropped autotools [Jan; !11][1] http://ftp.gnome.org/pub/gnome/sources/libnotify/0.7/libnotify-0.7.9.news
Signed-off-by Andreas Müller <[email protected]>--- .../{libnotify_0.7.8.bb => libnotify_0.7.9.bb} | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) rename meta/recipes-gnome/libnotify/{libnotify_0.7.8.bb => libnotify_0.7.9.bb} (59%)meta/recipes-gnome/libnotify/libnotify_0.7.9.bb renamed from meta/recipes-gnome/libnotify/libnotify_0.7.8.bb +11
-4@@ -7,12 +7,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" DEPENDS = "dbus gtk+3 glib-2.0" -inherit gnomebase gtk-doc features_check gobject-introspection +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gtk-doc features_check gobject-introspection manpages # depends on gtk+3 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI[archive.md5sum] = "babb4b07b5f21bef42a386d3d7019599" -SRC_URI[archive.sha256sum] = "69209e0b663776a00c7b6c0e560302a8dbf66b2551d55616304f240bba66e18c" +SRC_URI[archive.md5sum] = "ccd9c53364174cc8d13e18a1988faa76" +SRC_URI[archive.sha256sum] = "66c0517ed16df7af258e83208faaf5069727dfd66995c4bbc51c16954d674761" + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GTKDOC_MESON_OPTION = 'gtk_doc' + +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native" # there were times, we had two versions of libnotify (oe-core libnotify:0.6.x / # meta-gnome libnotify3: 0.7.x) --
Quoted 2 lines
2.21.1
Ping?
Quoted 9 lines · Andreas M?ller
Quoted 7 lines · Andreas Müller
From [1]:
New in 0.7.9
============
* Fixed linking in darwin [Iain, Marco; !5]
* Added man page for notify-send [Jan; !6]
* Dropped autotools [Jan; !11]
Quoted 7 lines
Quoted 6 lines
[1]
http://ftp.gnome.org/pub/gnome/sources/libnotify/0.7/libnotify-0.7.9.newsSigned-off-by Andreas Müller <[email protected]>Ping?
We're at feature freeze and stabilisation for 3.1. I've already taken a number of things I probably shouldn't at this stage but changing software over to meson poses far too much risk at this point in the release so this cannot go in, sorry.
Cheers,
Richard
Quoted 19 lines · Richard Purdie
Quoted 9 lines · Andreas M?ller
Quoted 7 lines · Andreas Müller
From [1]:
New in 0.7.9
============
* Fixed linking in darwin [Iain, Marco; !5]
* Added man page for notify-send [Jan; !6]
* Dropped autotools [Jan; !11]Quoted 7 lines
Quoted 6 lines
[1]
http://ftp.gnome.org/pub/gnome/sources/libnotify/0.7/libnotify-0.7.9.newsSigned-off-by Andreas Müller <[email protected]>Ping?
Quoted 8 lines
We're at feature freeze and stabilisation for 3.1. I've already taken a number of things I probably shouldn't at this stage but changing software over to meson poses far too much risk at this point in the release so this cannot go in, sorry.
Cheers,
Richard
Ahh - ok - sorry
Andreas