From: "Alexander Kanavin" <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Subject: [PATCH 16/33] libsecret: update 0.20.3 -> 0.20.4
Date: Wed, 28 Oct 2020 22:05:41 +0100 [thread overview]
Message-ID: <20201028210558.21070-16-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20201028210558.21070-1-alex.kanavin@gmail.com>
Drop the patch as it is merged upstream.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../0001-meson-add-option-introspection.patch | 137 ------------------
...ibsecret_0.20.3.bb => libsecret_0.20.4.bb} | 5 +-
2 files changed, 1 insertion(+), 141 deletions(-)
delete mode 100644 meta/recipes-gnome/libsecret/files/0001-meson-add-option-introspection.patch
rename meta/recipes-gnome/libsecret/{libsecret_0.20.3.bb => libsecret_0.20.4.bb} (81%)
diff --git a/meta/recipes-gnome/libsecret/files/0001-meson-add-option-introspection.patch b/meta/recipes-gnome/libsecret/files/0001-meson-add-option-introspection.patch
deleted file mode 100644
index 51ee66f42b..0000000000
--- a/meta/recipes-gnome/libsecret/files/0001-meson-add-option-introspection.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-meson: add option introspection
-
-Add an option 'introspection' for meson which could control whether
-build GIR files or not.
-
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/53]
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
----
- libsecret/meson.build | 86 ++++++++++++++++++++++---------------------
- meson.build | 1 +
- meson_options.txt | 1 +
- 3 files changed, 46 insertions(+), 42 deletions(-)
-
-diff --git a/libsecret/meson.build b/libsecret/meson.build
-index 759b5ef..2ee8850 100644
---- a/libsecret/meson.build
-+++ b/libsecret/meson.build
-@@ -104,50 +104,52 @@ libsecret_dep = declare_dependency(
- )
-
- # GObject Introspection
--libsecret_gir_sources = [
-- 'secret-attributes.c',
-- 'secret-attributes.h',
-- 'secret-backend.c',
-- 'secret-backend.h',
-- 'secret-collection.c',
-- 'secret-collection.h',
-- 'secret-item.c',
-- 'secret-item.h',
-- 'secret-methods.c',
-- 'secret-password.c',
-- 'secret-password.h',
-- 'secret-paths.c',
-- 'secret-paths.h',
-- 'secret-prompt.c',
-- 'secret-prompt.h',
-- 'secret-retrievable.c',
-- 'secret-retrievable.h',
-- 'secret-schema.c',
-- 'secret-schema.h',
-- 'secret-schemas.c',
-- 'secret-schemas.h',
-- 'secret-service.c',
-- 'secret-service.h',
-- 'secret-types.h',
-- 'secret-value.c',
-- 'secret-value.h',
--]
--libsecret_gir_sources += version_h
--libsecret_gir_sources += _enums_generated
--
--libsecret_gir = gnome.generate_gir(libsecret,
-- sources: libsecret_gir_sources,
-- namespace: 'Secret',
-- nsversion: api_version_major,
-- export_packages: 'libsecret-@0@'.format(api_version_major),
-- includes: [ 'GObject-2.0', 'Gio-2.0' ],
-- header: 'libsecret/secret.h',
-- extra_args: [ '-D SECRET_COMPILATION'],
-- install: true,
--)
-+if with_gir
-+ libsecret_gir_sources = [
-+ 'secret-attributes.c',
-+ 'secret-attributes.h',
-+ 'secret-backend.c',
-+ 'secret-backend.h',
-+ 'secret-collection.c',
-+ 'secret-collection.h',
-+ 'secret-item.c',
-+ 'secret-item.h',
-+ 'secret-methods.c',
-+ 'secret-password.c',
-+ 'secret-password.h',
-+ 'secret-paths.c',
-+ 'secret-paths.h',
-+ 'secret-prompt.c',
-+ 'secret-prompt.h',
-+ 'secret-retrievable.c',
-+ 'secret-retrievable.h',
-+ 'secret-schema.c',
-+ 'secret-schema.h',
-+ 'secret-schemas.c',
-+ 'secret-schemas.h',
-+ 'secret-service.c',
-+ 'secret-service.h',
-+ 'secret-types.h',
-+ 'secret-value.c',
-+ 'secret-value.h',
-+ ]
-+ libsecret_gir_sources += version_h
-+ libsecret_gir_sources += _enums_generated
-+
-+ libsecret_gir = gnome.generate_gir(libsecret,
-+ sources: libsecret_gir_sources,
-+ namespace: 'Secret',
-+ nsversion: api_version_major,
-+ export_packages: 'libsecret-@0@'.format(api_version_major),
-+ includes: [ 'GObject-2.0', 'Gio-2.0' ],
-+ header: 'libsecret/secret.h',
-+ extra_args: [ '-D SECRET_COMPILATION'],
-+ install: true,
-+ )
-+endif
-
- # Vapi
--if with_vapi
-+if with_vapi and with_gir
- libsecret_vapi = gnome.generate_vapi('libsecret-@0@'.format(api_version_major),
- sources: libsecret_gir[0],
- metadata_dirs: meson.source_root() / 'libsecret',
-diff --git a/meson.build b/meson.build
-index a26d046..d22e008 100644
---- a/meson.build
-+++ b/meson.build
-@@ -22,6 +22,7 @@ with_gcrypt = get_option('gcrypt')
- enable_debug = get_option('debugging')
- with_vapi = get_option('vapi')
- with_gtkdoc = get_option('gtk_doc')
-+with_gir = get_option('introspection')
-
- # Some variables
- config_h_dir = include_directories('.')
-diff --git a/meson_options.txt b/meson_options.txt
-index c1fda5d..445aeb0 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -3,3 +3,4 @@ option('gcrypt', type: 'boolean', value: true, description: 'With gcrypt and tra
- option('debugging', type: 'boolean', value: false, description: 'Turn debugging on/off')
- option('vapi', type: 'boolean', value: true, description: 'Create VAPI file.')
- option('gtk_doc', type: 'boolean', value: true, description: 'Build reference documentation using gtk-doc')
-+option('introspection', type: 'boolean', value: true, description: 'Create GIR file.')
---
-2.17.1
-
diff --git a/meta/recipes-gnome/libsecret/libsecret_0.20.3.bb b/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb
similarity index 81%
rename from meta/recipes-gnome/libsecret/libsecret_0.20.3.bb
rename to meta/recipes-gnome/libsecret/libsecret_0.20.4.bb
index 533015a1e4..96f6460181 100644
--- a/meta/recipes-gnome/libsecret/libsecret_0.20.3.bb
+++ b/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb
@@ -13,10 +13,7 @@ inherit gnomebase gtk-doc vala gobject-introspection manpages
DEPENDS += "glib-2.0 libgcrypt gettext-native"
-SRC_URI += "file://0001-meson-add-option-introspection.patch"
-
-SRC_URI[archive.md5sum] = "47c3fdfeb111a87b509ad271e4a6f496"
-SRC_URI[archive.sha256sum] = "4fcb3c56f8ac4ab9c75b66901fb0104ec7f22aa9a012315a14c0d6dffa5290e4"
+SRC_URI[archive.sha256sum] = "325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28"
GTKDOC_MESON_OPTION = 'gtk_doc'
--
2.29.0
next prev parent reply other threads:[~2020-10-28 21:06 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-28 21:05 [PATCH 01/33] systemd-boot: upgrade 246.2 -> 246.6 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 02/33] glib-2.0: upgrade 2.64.5 -> 2.66.1 Alexander Kanavin
2020-10-29 3:51 ` [OE-core] " Khem Raj
2020-10-29 9:55 ` Alexander Kanavin
2020-10-29 20:13 ` Khem Raj
2020-10-28 21:05 ` [PATCH 03/33] cmake: update 3.18.2 -> 3.18.4 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 04/33] python3-pygobject: upgrade 3.36.1 -> 3.38.0 Alexander Kanavin
2020-10-28 21:56 ` [OE-core] " Khem Raj
2020-10-29 9:49 ` Alexander Kanavin
2020-10-29 20:12 ` Khem Raj
2020-10-28 21:05 ` [PATCH 05/33] libdazzle: upgrade 3.36.0 " Alexander Kanavin
2020-10-28 21:05 ` [PATCH 06/33] gobject-introspection: upgrade 1.64.1 -> 1.66.1 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 07/33] json-glib: upgrade 1.4.4 -> 1.6.0 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 08/33] ovmf: update edk2-stable202005 -> edk2-stable202008 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 09/33] gnu-config: update to latest revision Alexander Kanavin
2020-10-28 21:05 ` [PATCH 10/33] file: enable all built-in compression checkers Alexander Kanavin
2020-10-28 21:05 ` [PATCH 11/33] rpm: update 4.15.1 -> 4.16.0 Alexander Kanavin
2020-10-31 22:30 ` [OE-core] " Khem Raj
2020-10-28 21:05 ` [PATCH 12/33] elfutils: update 0.180 -> 0.181 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 13/33] ghostscript: update 9.52 -> 9.53.3 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 14/33] ltp: update 20200515 -> 20200930 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 15/33] gsettings-desktop-schemas: update 3.36.1 -> 3.38.0 Alexander Kanavin
2020-10-28 21:05 ` Alexander Kanavin [this message]
2020-10-28 21:05 ` [PATCH 17/33] mesa: update 20.1.8 -> 20.2.1 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 18/33] xf86-video-vesa: update 2.4.0 -> 2.5.0 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 19/33] lttng-modules: update 2.12.2 -> 2.12.3 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 20/33] webkitgtk: update 2.28.4 -> 2.30.1 Alexander Kanavin
2020-11-06 2:42 ` [PATCH] webkitgtk: fix opengl PACKAGECONFIG Martin Jansa
2020-11-06 3:38 ` [PATCH] webkitgtk: fix build with x11 enabled Martin Jansa
2020-10-28 21:05 ` [PATCH 21/33] dos2unix: update 7.4.1 -> 7.4.2 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 22/33] gnutls: update 3.16.4 -> 3.16.5 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 23/33] libcap: update 2.43 -> 2.44 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 24/33] vte: update 0.60.3 -> 0.62.1 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 25/33] libhandy: upgrade 0.0.13 -> 1.0.0 Alexander Kanavin
2020-10-28 22:09 ` [OE-core] " Khem Raj
2020-10-29 9:49 ` Alexander Kanavin
2020-10-28 21:05 ` [PATCH 26/33] libportal: add a recipe Alexander Kanavin
2020-10-28 21:05 ` [PATCH 27/33] epiphany: upgrade 3.36.4 -> 3.38.1 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 28/33] gtk-doc: upgrade 1.32 -> 1.33.0 Alexander Kanavin
2020-10-28 21:05 ` [PATCH 29/33] rpm: adjust MIPS64 N32 support Alexander Kanavin
2020-10-28 21:05 ` [PATCH 30/33] apt: remove host contamination with gtest Alexander Kanavin
2020-10-28 21:05 ` [PATCH 31/33] opkg-utils: correct priority matching in update-alternatives Alexander Kanavin
2020-10-28 21:05 ` [PATCH 32/33] libxml2: add a patch to fix python 3.9 support Alexander Kanavin
2020-10-28 21:05 ` [PATCH 33/33] python: update 3.8.5 -> 3.9.0 Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201028210558.21070-16-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox