Skip to content

Commit 5fff35d

Browse files
schnitzeltonyrpurdie
authored andcommitted
libsecret: upgrade 0.20.1 -> 0.20.3 / port to meson
>From [1]: 0.20.3 * secret-file-backend: Fix use-after-free in flatpak [!52] * docs: Add man subdir only if manpage is enabled [!51] >From [2]: 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.3.news [2] http://ftp.gnome.org/pub/gnome/sources/libsecret/0.20/libsecret-0.20.2.news Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
1 parent 7d051f2 commit 5fff35d

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

meta/recipes-gnome/libsecret/libsecret_0.20.1.bb renamed to meta/recipes-gnome/libsecret/libsecret_0.20.3.bb

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,24 @@ LICENSE = "LGPLv2.1"
77
BUGTRACKER = "https://gitlab.gnome.org/GNOME/libsecret/issues"
88
LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6"
99

10+
GNOMEBASEBUILDCLASS = "meson"
11+
1012
inherit gnomebase gtk-doc vala gobject-introspection manpages
1113

1214
DEPENDS += "glib-2.0 libgcrypt gettext-native"
1315

14-
PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native"
16+
SRC_URI[archive.md5sum] = "47c3fdfeb111a87b509ad271e4a6f496"
17+
SRC_URI[archive.sha256sum] = "4fcb3c56f8ac4ab9c75b66901fb0104ec7f22aa9a012315a14c0d6dffa5290e4"
18+
19+
GTKDOC_MESON_OPTION = 'gtk_doc'
1520

16-
SRC_URI[archive.md5sum] = "d2dd660a8d502099317bc8af9f30302e"
17-
SRC_URI[archive.sha256sum] = "57f73e94ec6263a17a077fb809cf8cf424637a897a7f15b4eec42ce4aef52447"
21+
# gobject-introspection is mandatory and cannot be configured
22+
REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
23+
UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
24+
25+
PACKAGECONFIG[manpages] = "-Dmanpage=true,-Dmanpage=false,libxslt-native xmlto-native"
1826

1927
# http://errors.yoctoproject.org/Errors/Details/20228/
2028
ARM_INSTRUCTION_SET_armv4 = "arm"
2129
ARM_INSTRUCTION_SET_armv5 = "arm"
2230
ARM_INSTRUCTION_SET_armv6 = "arm"
23-
24-
# vapigen.m4 bundled with the tarball does not yet have our cross-compilation fixes
25-
do_configure_prepend() {
26-
rm -f ${S}/build/m4/vapigen.m4
27-
}

0 commit comments

Comments
 (0)