diff --git a/meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch b/meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch new file mode 100644 index 00000000000..aae200e27ef --- /dev/null +++ b/meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch @@ -0,0 +1,30 @@ +Subject: [PATCH] BCache_Info.cc: use posix basename + +gnu 'basename' is undeclared for cplusplus if using musl. Use posix basename instead. + +fdebug-prefix-map=TOPDIR/build/tmp/work/cortexa57-yoe-linux-musl/gparted/1.4.0-r0/ +recipe-sysroot-native=-fvisibility-inlines-hidden -c -o Dialog_Disklabel.o ../../ +gparted-1.4.0/src/Dialog_Disklabel.cc ../../gparted-1.4.0/src/BCache_Info.cc:52:33: + +error: use of undeclared identifier 'basename'; did you mean 'g_basename'? + return "/dev/" + Glib::ustring(basename(buf)); + ^~~~~~~~ + g_basename + +Signed-off-by: Markus Volk + +Upstream-Status: Submitted + +https://gitlab.gnome.org/GNOME/gparted/-/merge_requests/99 + +--- a/src/BCache_Info.cc 2022-03-02 22:04:17.000000000 +0100 ++++ b/src/BCache_Info.cc 2022-04-09 15:02:56.932218665 +0200 +@@ -17,7 +17,7 @@ + + #include "BCache_Info.h" + +-#include // GNU version of basename() ++#include // POSIX version of basename() + #include + #include + #include diff --git a/meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb b/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb similarity index 83% rename from meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb rename to meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb index d1a97593038..6f774904b70 100644 --- a/meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb +++ b/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb @@ -3,16 +3,16 @@ HOMEPAGE = "http://gparted.org/index.php" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -inherit features_check autotools pkgconfig python3native gnome-help gtk-icon-cache +inherit autotools pkgconfig python3native gnome-help gtk-icon-cache -REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ file://0001-Install-polkit-action-unconditionally-executable-pke.patch \ file://0001-Do-not-use-NULL-where-boolean-is-expected.patch \ + file://0001-use-posix-basename.patch \ " -SRC_URI[sha256sum] = "5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109" +SRC_URI[sha256sum] = "e5293a792e53fdbeba29c4a834113cd9603d0d639330da931a468bf3687887be" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gparted/files/gparted/" UPSTREAM_CHECK_REGEX = "gparted-(?P\d+\.(\d+)+(\.\d+)+)"