diff options
Diffstat (limited to 'meta-openembedded/meta-gnome')
20 files changed, 328 insertions, 51 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/folks/folks_0.15.5.bb b/meta-openembedded/meta-gnome/recipes-connectivity/folks/folks_0.15.5.bb index 51620bba8e..ad61ee610c 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/folks/folks_0.15.5.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/folks/folks_0.15.5.bb @@ -8,8 +8,9 @@ DEPENDS = " \ " GNOMEBASEBUILDCLASS = "meson" -EXTRA_OEMESON += "-Dtests=false" +EXTRA_OEMESON += "-Dtests=false -Db_lto=false " +CFLAGS:append:toolchain-clang = " -Wno-error=implicit-function-declaration" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" GIR_MESON_OPTION = "" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary_40.0.bb b/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary_40.0.bb index 4b454dc02d..3ff0a412e2 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary_40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary_40.0.bb @@ -52,6 +52,10 @@ PACKAGECONFIG[tnef] = "-Dtnef=enabled,-Dtnef=disabled,libytnef" PACKAGECONFIG[valadoc] = "-Dvaladoc=enabled,-Dvaladoc=disabled" PACKAGECONFIG ??= "" +# rfc822/rfc822-message.c:2097:12: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'gboolean' (aka 'int') [-Wint-conversion] +#| return NULL; +#| ^~~~ +CFLAGS:append:toolchain-clang = " -Wno-error=int-conversion" FILES:${PN} += "${datadir}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.0.bb index afec302cb4..fed29da0fc 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.0.bb @@ -19,3 +19,10 @@ EXTRA_OEMESON = " \ PACKAGES =+ "${PN}-python3" FILES:${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" RDEPENDS:${PN}-python3 = "${PN}" + +PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess" +src_package_preprocess () { + # Trim build paths from comments in generated sources to ensure reproducibility + sed -i -e "s,${B}/../${BPN}-${PV}/${BPN}/,,g" \ + ${B}/gexiv2/gexiv2-enums.cpp +} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.4.bb index cf73f823c8..75e1244f8f 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.4.bb @@ -26,7 +26,7 @@ inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.sha256sum] = "c37a2a07f77d4816b261e6c2086a056ed9767c3881dfabc826f4f82f6e1aa302" +SRC_URI[archive.sha256sum] = "1d6fcf1cdb6cc9923ab334a2c0bc37a2c1bba9d18de153d484eedc04f3c0bcdc" BT_PULSE_PACKS = " \ pulseaudio-lib-bluez5-util \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_43.0.bb index c14e57c7c0..50fd034af5 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_42.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_43.0.bb @@ -16,7 +16,7 @@ inherit gnomebase gtk-icon-cache gettext features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.sha256sum] = "cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc" +SRC_URI[archive.sha256sum] = "81c6bffb06d5332346e00eaecaec1bdcfd617c51dfd95bcd058d6c76c76dd2b9" FILES:${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_42.1.bb index a30303cd8c..5937e74423 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_42.1.bb @@ -21,7 +21,7 @@ inherit gnomebase gsettings features_check gettext ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI[archive.sha256sum] = "a3d24db08ee2fdf240fbbf0971a98c8ee295aa0e1a774537f4ea938038a3b931" +SRC_URI[archive.sha256sum] = "c7f4d040cc76a6b7fe67e08ef9106911c3c80d40fc88cbfc8e2684a4c946e3e6" SRC_URI += " \ file://0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch \ file://musl.patch \ @@ -41,6 +41,7 @@ FILES:${PN} += " \ ${datadir}/xdg-desktop-portal \ ${base_libdir}/security/*${SOLIBSDEV} \ ${libdir}/pkcs11/gnome-keyring-pkcs11.so \ + ${systemd_user_unitdir} \ " # fix | gnome-keyring-daemon: insufficient process capabilities, unsecure memory might get used pkg_postinst:${PN} () { diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.2.0.bb index 44d18f596b..7a1f86a73d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.2.0.bb @@ -11,7 +11,7 @@ DEPENDS = " \ inherit gnomebase gobject-introspection gtk-doc vala features_check -SRC_URI[archive.sha256sum] = "fcc6d56669d33ac3d030098d7571d8045a02e18dc083b49a5a5a6325068e6b58" +SRC_URI[archive.sha256sum] = "322f3e1be39ba67981d9fe7228a85818eccaa2ed0aa42bcafe263af881c6460c" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop/0001-Pass-correct-parameter.patch b/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop/0001-Pass-correct-parameter.patch new file mode 100644 index 0000000000..5ea8eed516 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop/0001-Pass-correct-parameter.patch @@ -0,0 +1,29 @@ +From e969ac59335d3fb1cd228f8e7c4f6c2dda4fa536 Mon Sep 17 00:00:00 2001 +From: Avinash Sonawane <rootkea@gmail.com> +Date: Mon, 20 Dec 2021 13:33:42 +0530 +Subject: [PATCH] Pass correct parameter + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libgtop/-/merge_requests/35] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/daemon/main.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/daemon/main.c b/src/daemon/main.c +index b51addf..eaee3b3 100644 +--- a/src/daemon/main.c ++++ b/src/daemon/main.c +@@ -222,8 +222,9 @@ handle_parent_connection (int s) + 0, NULL); + break; + case GLIBTOP_CMND_PROC_IO: ++ memcpy (&pid, parameter, sizeof (pid_t)); + glibtop_get_proc_io_l +- (server, &resp->u.data.proc_io, parameter); ++ (server, &resp->u.data.proc_io, pid); + do_output (s, resp, _offset_data (proc_io), + 0, NULL); + break; +-- +2.37.2 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb index 2e60264e04..fa95e0bee0 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb @@ -6,7 +6,9 @@ inherit gnomebase lib_package gtk-doc gobject-introspection gettext upstream-ver ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI += "file://0001-fix-compile-error-for-cross-compile.patch" +SRC_URI += "file://0001-fix-compile-error-for-cross-compile.patch \ + file://0001-Pass-correct-parameter.patch \ + " SRC_URI[archive.sha256sum] = "78f3274c0c79c434c03655c1b35edf7b95ec0421430897fb1345a98a265ed2d4" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Provide-parameter-prototype-for-functions-without-pa.patch b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Provide-parameter-prototype-for-functions-without-pa.patch new file mode 100644 index 0000000000..6c743d8ce7 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Provide-parameter-prototype-for-functions-without-pa.patch @@ -0,0 +1,94 @@ +From 76f1625bae95212ec6d4bc1bd1c8ff1232150c48 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 29 Aug 2022 13:14:09 -0700 +Subject: [PATCH] Provide parameter prototype for functions without parameter + +Fixes build with clang-15 with -Wstrict-prototypes + +src/nautilus-toolbar.c:1205:22: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] +nautilus_toolbar_new () + ^ + void + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/nautilus/-/commit/95d35aedf68f0398a6ee9e0b0af9ce80528fdc22] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/nautilus-file-undo-manager.c | 4 ++-- + src/nautilus-list-model.c | 2 +- + src/nautilus-starred-directory.c | 2 +- + src/nautilus-toolbar.c | 2 +- + src/nautilus-view-model.c | 2 +- + 5 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/nautilus-file-undo-manager.c b/src/nautilus-file-undo-manager.c +index 2a886176f..f2d1eebcf 100644 +--- a/src/nautilus-file-undo-manager.c ++++ b/src/nautilus-file-undo-manager.c +@@ -258,13 +258,13 @@ nautilus_file_undo_manager_get_state (void) + + + gboolean +-nautilus_file_undo_manager_is_operating () ++nautilus_file_undo_manager_is_operating (void) + { + return undo_singleton->is_operating; + } + + NautilusFileUndoManager * +-nautilus_file_undo_manager_get () ++nautilus_file_undo_manager_get (void) + { + return undo_singleton; + } +diff --git a/src/nautilus-list-model.c b/src/nautilus-list-model.c +index 7e2aeeeee..741007105 100644 +--- a/src/nautilus-list-model.c ++++ b/src/nautilus-list-model.c +@@ -1625,7 +1625,7 @@ nautilus_list_model_get_drag_view (NautilusListModel *model, + } + + GtkTargetList * +-nautilus_list_model_get_drag_target_list () ++nautilus_list_model_get_drag_target_list (void) + { + GtkTargetList *target_list; + +diff --git a/src/nautilus-starred-directory.c b/src/nautilus-starred-directory.c +index fd41418a4..07ed62693 100644 +--- a/src/nautilus-starred-directory.c ++++ b/src/nautilus-starred-directory.c +@@ -556,7 +556,7 @@ nautilus_starred_directory_class_init (NautilusFavoriteDirectoryClass *klass) + } + + NautilusFavoriteDirectory * +-nautilus_starred_directory_new () ++nautilus_starred_directory_new (void) + { + NautilusFavoriteDirectory *self; + +diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c +index 5fe4e63a4..15a696827 100644 +--- a/src/nautilus-toolbar.c ++++ b/src/nautilus-toolbar.c +@@ -1202,7 +1202,7 @@ nautilus_toolbar_class_init (NautilusToolbarClass *klass) + } + + GtkWidget * +-nautilus_toolbar_new () ++nautilus_toolbar_new (void) + { + return g_object_new (NAUTILUS_TYPE_TOOLBAR, + NULL); +diff --git a/src/nautilus-view-model.c b/src/nautilus-view-model.c +index 84c40302d..2935809ae 100644 +--- a/src/nautilus-view-model.c ++++ b/src/nautilus-view-model.c +@@ -190,7 +190,7 @@ compare_data_func (gconstpointer a, + } + + NautilusViewModel * +-nautilus_view_model_new () ++nautilus_view_model_new (void) + { + return g_object_new (NAUTILUS_TYPE_VIEW_MODEL, NULL); + } diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.2.bb index f9c2ed020b..a0f928ce25 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.2.bb @@ -21,6 +21,7 @@ inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check def gnome_verdir(v): return oe.utils.trim_version(v, 1) +SRC_URI += " file://0001-Provide-parameter-prototype-for-functions-without-pa.patch" SRC_URI[archive.sha256sum] = "99212d2eb75996f181728ad04a2e2d86f2577b064e68a34c8b81a7037df4ccb2" REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch new file mode 100644 index 0000000000..1332a95827 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch @@ -0,0 +1,41 @@ +From 6f6d7e3995c370b8121206a7f9cc0d234553bbfe Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Thu, 15 Sep 2022 16:35:39 +0900 +Subject: [PATCH] Set header file to a fixed path instead of a host path. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> +--- + src/libtracker-miner/tracker-miner-enum-types.c.template | 2 +- + .../tracker-miners-enum-types.c.template | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libtracker-miner/tracker-miner-enum-types.c.template b/src/libtracker-miner/tracker-miner-enum-types.c.template +index 7be7a01..46a4dc9 100644 +--- a/src/libtracker-miner/tracker-miner-enum-types.c.template ++++ b/src/libtracker-miner/tracker-miner-enum-types.c.template +@@ -7,7 +7,7 @@ + + /*** BEGIN file-production ***/ + /* enumerations from "@basename@" */ +-#include "@filename@" ++#include "tracker-miner-enums.h" + /*** END file-production ***/ + + +diff --git a/src/libtracker-miners-common/tracker-miners-enum-types.c.template b/src/libtracker-miners-common/tracker-miners-enum-types.c.template +index c712dda..cb449e2 100644 +--- a/src/libtracker-miners-common/tracker-miners-enum-types.c.template ++++ b/src/libtracker-miners-common/tracker-miners-enum-types.c.template +@@ -7,7 +7,7 @@ + + /*** BEGIN file-production ***/ + /* enumerations from "@basename@" */ +-#include "@filename@" ++#include "tracker-enums.h" + /*** END file-production ***/ + + +-- +2.25.1 diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb index 2847635b6d..92039a2a68 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb @@ -15,7 +15,10 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection vala bash-completion features_check -SRC_URI += "file://0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch" +SRC_URI += "file://0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch \ + file://0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch \ + " + SRC_URI[archive.sha256sum] = "44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47" # gobject-introspection is mandatory and cannot be configured diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.3.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.4.0.bb index 91d90dde2a..ed0fbb6f01 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.3.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.4.0.bb @@ -22,7 +22,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check python3native -SRC_URI[archive.sha256sum] = "4094f704e338f2247fa6b94633279cfd07f7e952bb24627128fab78edb242464" +SRC_URI[archive.sha256sum] = "b3b380c9571d7c7423b5f401e4a2f2d78de47143b035eb2c1281e2423c59218b" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_42.1.bb index 54a6aa6163..ba2536443f 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_42.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_42.1.bb @@ -10,7 +10,7 @@ inherit gnomebase gettext itstool DEPENDS += "libxml2" -SRC_URI[archive.sha256sum] = "29b273cc0bd16efb6e983443803f1e9fdc03511e5c4ff6348fd30a604d4dc846" +SRC_URI[archive.sha256sum] = "238be150b1653080ce139971330fd36d3a26595e0d6a040a2c030bf3d2005bcd" RDEPENDS:${PN}:append:class-target = " libxml2 itstool" diff --git a/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.18.bb b/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.18.bb index 45a28ed967..c56e9e3dd9 100644 --- a/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.18.bb +++ b/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.18.bb @@ -17,7 +17,7 @@ DEPENDS = " \ libstemmer \ " -inherit meson gobject-introspection gettext bash-completion pkgconfig +inherit meson gobject-introspection gettext bash-completion pkgconfig manpages SRC_URI = "https://people.freedesktop.org/~hughsient/${BPN}/releases/${BP}.tar.xz" SRC_URI[sha256sum] = "ca1ed22e3bde3912cb903aaa7de085d55771da454f1c0573fd9608e1de9c4002" @@ -26,6 +26,9 @@ EXTRA_OEMESON = " \ -Drpm=false \ " +PACKAGECONFIG ?= "" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,docbook-xml-dtd4-native docbook-xsl-stylesheets-native libxslt-native" + FILES:${PN} += "${libdir}/asb-plugins-5" FILES:${PN}-dev += " \ diff --git a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-docs-Disable-building.patch b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-docs-Disable-building.patch new file mode 100644 index 0000000000..add2872cca --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-docs-Disable-building.patch @@ -0,0 +1,29 @@ +From e6bdf74a424652c4f9a38457c7fa93a2051157f5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 30 Aug 2022 13:09:07 -0700 +Subject: [PATCH] docs: Disable building + +It needs linuxdoc-tools which we do not have in OE anymore + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + docs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/Makefile.am b/docs/Makefile.am +index daa2288..b355185 100644 +--- a/docs/Makefile.am ++++ b/docs/Makefile.am +@@ -8,7 +8,7 @@ CLEANFILES = $(man_MANS) $(SGML_OUTPUTS) + EXTRA_DIST = attributes.txt libuser.conf.5.in rfc2307.txt sgml/libuser.sgml \ + $(SGML_OUTPUTS) + +-all: sgml/libuser.txt sgml/libuser.html ++all: + + libuser.conf.5: $(srcdir)/libuser.conf.5.in Makefile + sed 's,@sysconfdir\@,$(sysconfdir),g' \ +-- +2.37.2 + diff --git a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch deleted file mode 100644 index 7c47df22e4..0000000000 --- a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a4857911ece5ebfcdef42aee4c070eb216f39597 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> -Date: Fri, 13 May 2016 11:40:13 -0500 -Subject: [PATCH] modules/files.c: parse_field fix string formating in - g_warnings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -[YOCTO #9547] - -Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> - -Upstream-Status: Pending ---- - modules/files.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/files.c b/modules/files.c -index 4ef0a57..35eafc9 100644 ---- a/modules/files.c -+++ b/modules/files.c -@@ -534,7 +534,7 @@ parse_field(const struct format_specifier *format, GValue *value, - string, &err); - if (ret == FALSE) { - g_assert(err != NULL); -- g_warning(lu_strerror(err)); -+ g_warning(lu_strerror(err), NULL); - lu_error_free(&err); - } - return ret; --- -2.1.4 - diff --git a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0003-python-Compilation-warnings-update.patch b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0003-python-Compilation-warnings-update.patch new file mode 100644 index 0000000000..45d6952150 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0003-python-Compilation-warnings-update.patch @@ -0,0 +1,84 @@ +From acd7b051993d501f4b5e3a593e0f18d1336ba2de Mon Sep 17 00:00:00 2001 +From: Tomas Halman <thalman@redhat.com> +Date: Wed, 21 Jul 2021 15:36:59 +0200 +Subject: [PATCH] python: Compilation warnings update + +The compilation produces few warnings about discard const qualifier +and pointer to int conversion. This patch fixes the const qualifiers +and replaces the tp_print inicialization in PyTypeObject with 0 instead +of NULL + +Upstream-Status: Backport [https://pagure.io/libuser/c/3cb7ea54e7b50da6ea313a0e7c7187c8aa5e6ee9?branch=master] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + python/admin.c | 2 +- + python/ent.c | 8 ++++---- + python/misc.c | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/python/admin.c b/python/admin.c +index 83595af..e92fca4 100644 +--- a/python/admin.c ++++ b/python/admin.c +@@ -1512,7 +1512,7 @@ PyTypeObject AdminType = { + sizeof(struct libuser_admin), /* tp_basicsize */ + 0, /* tp_itemsize */ + libuser_admin_destroy, /* tp_dealloc */ +- NULL, /* tp_print */ ++ 0, /* tp_print */ + NULL, /* tp_getattr */ + NULL, /* tp_setattr */ + NULL, /* tp_compare */ +diff --git a/python/ent.c b/python/ent.c +index ee712d2..fc3d654 100644 +--- a/python/ent.c ++++ b/python/ent.c +@@ -255,7 +255,7 @@ libuser_convert_to_value(PyObject *item, GValue *value) + static int + libuser_entity_setattro(PyObject *self, PyObject *attr_name, PyObject *value) + { +- char *name; ++ const char *name; + struct libuser_entity *me; + PyObject *list; + struct lu_ent *copy; +@@ -616,7 +616,7 @@ static PyObject * + libuser_entity_get_item(PyObject *self, PyObject *item) + { + struct libuser_entity *me; +- char *attr; ++ const char *attr; + + DEBUG_ENTRY; + me = (struct libuser_entity *)self; +@@ -664,7 +664,7 @@ static int + libuser_entity_set_item(PyObject *self, PyObject *item, PyObject *args) + { + struct libuser_entity *me; +- char *attr = NULL; ++ const char *attr = NULL; + Py_ssize_t i, size; + int ret; + GValue value; +@@ -800,7 +800,7 @@ PyTypeObject EntityType = { + sizeof(struct libuser_entity), /* tp_basicsize */ + 0, /* tp_itemsize */ + libuser_entity_destroy, /* tp_dealloc */ +- NULL, /* tp_print */ ++ 0, /* tp_print */ + NULL, /* tp_getattr */ + NULL, /* tp_setattr */ + NULL, /* tp_compare */ +diff --git a/python/misc.c b/python/misc.c +index c4ce819..810a846 100644 +--- a/python/misc.c ++++ b/python/misc.c +@@ -488,7 +488,7 @@ PyTypeObject PromptType = { + sizeof(struct libuser_prompt), /* tp_basicsize */ + 0, /* tp_itemsize */ + libuser_prompt_destroy, /* tp_dealloc */ +- NULL, /* tp_print */ ++ 0, /* tp_print */ + NULL, /* tp_getattr */ + NULL, /* tp_setattr */ + NULL, /* tp_compare */ diff --git a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.63.bb index 22ddd10a63..e191e115a3 100644 --- a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb +++ b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.63.bb @@ -12,22 +12,34 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ SECTION = "base" SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.xz \ + file://0001-docs-Disable-building.patch \ file://0002-remove-unused-execinfo.h.patch \ - file://0001-modules-files.c-parse_field-fix-string-formating-in-.patch \ + file://0003-python-Compilation-warnings-update.patch \ " -SRC_URI[md5sum] = "63e5e5c551e99dc5302b40b80bd6d4f2" -SRC_URI[sha256sum] = "a58ff4fabb01a25043b142185a33eeea961109dd60d4b40b6a9df4fa3cace20b" +SRC_URI[sha256sum] = "8dc377255452a68e82c4837ba22c3ee4ae3658971bf0f2ef67ed0b77fc497f91" -DEPENDS = "popt libpam glib-2.0 python3" +DEPENDS = "bison-native popt libpam glib-2.0 python3" -inherit features_check -REQUIRED_DISTRO_FEATURES = "pam" +inherit autotools features_check gettext python3native python3-dir pkgconfig gtk-doc -inherit autotools gettext python3native python3-dir pkgconfig gtk-doc +REQUIRED_DISTRO_FEATURES = "pam" EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" +GTKDOC_DOCDIR = "${S}/docs/reference" + +# run autopoint since it needs ABOUT-NLS and admin/config.rpath from gettext +#EXTRA_AUTORECONF:remove = "--exclude=autopoint" + +do_configure:prepend() { + install -d ${S}/admin -d ${S}/m4 + touch ${S}/ABOUT-NLS ${S}/admin/config.rpath + cd ${S} + bison lib/getdate.y -o lib/getdate.c + cd - +} + PACKAGES += "${PN}-python " FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" |