From b66f69b0a4c7dc41d8ce8d1fd939fa11c6508e2f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 5 May 2022 07:05:40 +0200 Subject: libhandy: update 1.5.0 -> 1.6.2 Doc generation has been migrated to gi-docgen from gtk-doc. (From OE-Core rev: b6b3ff25ee3bf22d9b3d873924afb53d3fb59ddc) Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- .../libhandy/0001-Add-private-headers.patch | 37 ---------------------- meta/recipes-gnome/libhandy/libhandy_1.5.0.bb | 30 ------------------ meta/recipes-gnome/libhandy/libhandy_1.6.2.bb | 27 ++++++++++++++++ 3 files changed, 27 insertions(+), 67 deletions(-) delete mode 100644 meta/recipes-gnome/libhandy/libhandy/0001-Add-private-headers.patch delete mode 100644 meta/recipes-gnome/libhandy/libhandy_1.5.0.bb create mode 100644 meta/recipes-gnome/libhandy/libhandy_1.6.2.bb (limited to 'meta/recipes-gnome') diff --git a/meta/recipes-gnome/libhandy/libhandy/0001-Add-private-headers.patch b/meta/recipes-gnome/libhandy/libhandy/0001-Add-private-headers.patch deleted file mode 100644 index 7b2a512738..0000000000 --- a/meta/recipes-gnome/libhandy/libhandy/0001-Add-private-headers.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e7c3e8fa00f6a68b2e0629db5ee115e641ea710e Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Wed, 8 Dec 2021 07:35:52 +0000 -Subject: [PATCH] Add private headers - -After the commit(8157ecc Separate public and private enums) introduced, -there comes a race as below: - | In file included from ../git/src/hdy-settings.c:11: - | ../git/src/hdy-settings-private.h:16:10: fatal error: hdy-enums-private.h: No such file or directory - | 16 | #include "hdy-enums-private.h" - -So also add private headers like private sources to libhandy_sources to -fix the issue. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/796] - -Signed-off-by: Mingli Yu ---- - src/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/meson.build b/src/meson.build -index d087323..6f11f27 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -64,7 +64,7 @@ hdy_private_enums = gnome.mkenums('hdy-enums-private', - ) - - libhandy_public_sources += [hdy_public_enums[0]] --libhandy_private_sources += [hdy_private_enums[0]] -+libhandy_private_sources += hdy_private_enums - libhandy_generated_headers += [hdy_public_enums[1]] - - src_headers = [ --- -2.32.0 - diff --git a/meta/recipes-gnome/libhandy/libhandy_1.5.0.bb b/meta/recipes-gnome/libhandy/libhandy_1.5.0.bb deleted file mode 100644 index 722593dfb1..0000000000 --- a/meta/recipes-gnome/libhandy/libhandy_1.5.0.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "A library full of GTK+ widgets for mobile phones" -DESCRIPTION = "Library with GTK widgets for mobile phones. Libhandy provides \ -GTK widgets and GObjects to ease developing applications for mobile phones. \ -It was developed by Purism (and used by several official GNOME projects) \ -to extend Gtk by providing mobile-friendly widgets and make the creation of \ -responsive apps easier." -HOMEPAGE = "https://gitlab.gnome.org/GNOME/libhandy" -BUGTRACKER = "https://gitlab.gnome.org/GNOME/libhandy/-/issues" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=master \ - file://0001-Add-private-headers.patch \ -" -SRCREV = "8fa8306a79215fc6ebf2483145da98bf9b2495ab" -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.(\d*[02468])+(\.\d+))" -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}" diff --git a/meta/recipes-gnome/libhandy/libhandy_1.6.2.bb b/meta/recipes-gnome/libhandy/libhandy_1.6.2.bb new file mode 100644 index 0000000000..8d9904637f --- /dev/null +++ b/meta/recipes-gnome/libhandy/libhandy_1.6.2.bb @@ -0,0 +1,27 @@ +SUMMARY = "A library full of GTK+ widgets for mobile phones" +DESCRIPTION = "Library with GTK widgets for mobile phones. Libhandy provides \ +GTK widgets and GObjects to ease developing applications for mobile phones. \ +It was developed by Purism (and used by several official GNOME projects) \ +to extend Gtk by providing mobile-friendly widgets and make the creation of \ +responsive apps easier." +HOMEPAGE = "https://gitlab.gnome.org/GNOME/libhandy" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/libhandy/-/issues" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=libhandy-1-6" +SRCREV = "f050453109db05621b9a47b9931fe1b571905e67" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.(\d*[02468])+(\.\d+))" +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + +inherit meson gobject-introspection vala gettext gi-docgen features_check pkgconfig + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +DEPENDS += "gtk+3" + +PACKAGES =+ "${PN}-examples" +FILES:${PN}-examples = "${bindir}" -- cgit v1.2.3-54-g00ecf