From f579a914541569efcf39b12d74368af6c2e506ee Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Fri, 8 Apr 2022 11:13:35 +0200 Subject: [PATCH] gparted: update to v1.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - remove x11 features-check because there aren't dependencies that would explicilty require x11 as a DISTRO_FEATURE - replace basename() by g_path_get_basename() to fix up musl build ============================ GParted 1.4.0 (2022-03-28) ============================ Release Notes ------------- This release of GParted includes enhancements, bug fixes and language translation updates. * Add labelling of mounted btrfs, ext2/3/4 and xfs file systems * Fix detection of mount points for encrypted file systems * Fix crash scrolling quickly in the drive selection combobox * Add bcache detection * Add JBD external EXT3/4 journal detection Bug Fixes --------- * Add labelling of mounted btrfs, ext2/3/4 and xfs file systems (#163, !87) * Fix detection of mount points for encrypted file systems (#162, !88) * Fix unmount error when unmounting below a bind mount point (!89) * Fix crash scrolling quickly in the drive selection combobox (#165, !91) * Add initial Indonesian translation of help (!90) * Add accessibility relations for screen readers like Orca (!92) * Fix partition creation at sector 2048 if partition before it (#172, !93) * Make more getter methods use return-by-constant-reference (!94) * Check copy destination instead of source (!95) * Add bcache detection (#183, !96) * Add JBD external EXT3/4 journal detection (#89, !97) * Fix translation of DocBook markup tag of the GParted Manual (!98) Code Credits ------------ Code enhancements are courtesy of Movie Ma, Pascal Engélibert, and Mike Fleetwood. Translations (new/updated) -------------------------- cs(Marek Černocký), da(Alan Mortensen), eu(Asier Sarasua Garmendia), fur(Fabio Tomat), he(Yaron Shahrabani), hr(Goran Vidović), hu(Balázs Úr), id(Andika Triwidada), it(Milo Casagrande), ko(Seong-ho Cho), lt(Aurimas Černius), lv(Rūdolfs Mazurs), nb(Kjell Cato Heskjestad), nl(Nathan Follens), pa(A S Alam), pt(Hugo Carvalho), ru(Aleksandr Melman, Sergej A), sk(Dušan Kazik), sl(Matej Urbančič), sr(Мирослав Николић), zh_CN(Luming Zh) Dependencies (new/updated) -------------------------- * n/a Signed-off-by: Markus Volk Signed-off-by: Khem Raj --- .../files/0001-replace-gnu-basename.patch | 50 +++++++++++++++++++ .../{gparted_1.3.1.bb => gparted_1.4.0.bb} | 6 +-- 2 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 meta-gnome/recipes-extended/gparted/files/0001-replace-gnu-basename.patch rename meta-gnome/recipes-extended/gparted/{gparted_1.3.1.bb => gparted_1.4.0.bb} (83%) diff --git a/meta-gnome/recipes-extended/gparted/files/0001-replace-gnu-basename.patch b/meta-gnome/recipes-extended/gparted/files/0001-replace-gnu-basename.patch new file mode 100644 index 00000000000..48e06b6c596 --- /dev/null +++ b/meta-gnome/recipes-extended/gparted/files/0001-replace-gnu-basename.patch @@ -0,0 +1,50 @@ +From 3ed0d96c0d6d4fd8a12742232d841ed5e77bfe11 Mon Sep 17 00:00:00 2001 +From: Markus Volk +Date: Fri, 8 Apr 2022 09:31:32 +0200 +Subject: [PATCH] BCache_Info.cc: replace basename by glibs g_path_get_basename + +'basename' is undeclared for cplusplus if using musl. Use g_path_get_basename +instead for better portability. + +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 +--- + src/BCache_Info.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/BCache_Info.cc b/src/BCache_Info.cc +index 129a5178..e1ec51b2 100644 +--- a/src/BCache_Info.cc ++++ b/src/BCache_Info.cc +@@ -17,7 +17,6 @@ + + #include "BCache_Info.h" + +-#include // GNU version of basename() + #include + #include + #include +@@ -49,7 +48,7 @@ Glib::ustring BCache_Info::get_bcache_device(const Glib::ustring& device_path, c + return Glib::ustring(""); + buf[len] = '\0'; + +- return "/dev/" + Glib::ustring(basename(buf)); ++ return "/dev/" + Glib::ustring(g_path_get_basename(buf)); + } + + +-- +2.25.1 + 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..a4b653cebb1 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-replace-gnu-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+)+)"