From 4c1c28489c942b1a003d104ac47583fca87b84bb Mon Sep 17 00:00:00 2001 From: John Date: Sat, 8 Apr 2023 00:47:48 +0200 Subject: [PATCH] gparted: update to 1.5.0. --- .../gparted/patches/fix_musl_basename.patch | 58 ------------------- srcpkgs/gparted/template | 9 +-- 2 files changed, 5 insertions(+), 62 deletions(-) delete mode 100644 srcpkgs/gparted/patches/fix_musl_basename.patch diff --git a/srcpkgs/gparted/patches/fix_musl_basename.patch b/srcpkgs/gparted/patches/fix_musl_basename.patch deleted file mode 100644 index 607580d8177e4a..00000000000000 --- a/srcpkgs/gparted/patches/fix_musl_basename.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 45c00927b72319f00855c7feaf4dcf109b3e4414 Mon Sep 17 00:00:00 2001 -From: Markus Volk -Date: Fri, 8 Apr 2022 08:58:46 +0000 -Subject: [PATCH] Use POSIX basename() in BCache_Info.cc (!99) - -Musl libc [1][2] doesn't implement the GNU variant of basename() [3][4], -obtained via #include . Therefore GParted fails to build on -such distributions: - - fdebug-prefix-map=TOPDIR/build/tmp/work/cortexa57-yoe-linux-musl/gparted/1.4.0-r0/recipe-sysroot-native=-fvisibility-inlines-hidden -c -o ../../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 - -Fix by using the POSIX implementation of basename() [5] instead, -obtained via #include , which musl libc does implement [6]. -Note that the POSIX implementation of basename() is allowed to modify -the string passed to it. This is okay because -BCache_Info::get_bcache_device() is using a modifiable local character -buffer. - -[1] musl libc - https://musl.libc.org/ -[2] Projects using musl - https://wiki.musl-libc.org/projects-using-musl.html -[3] The GNU C Library, 5.10 Finding Tokens in a String - https://www.gnu.org/software/libc/manual/html_node/Finding-Tokens-in-a-String.html -[4] basename(3) - Linux manual page - https://man7.org/linux/man-pages/man3/basename.3.html -[5] POSIX basename() - https://pubs.opengroup.org/onlinepubs/009695399/functions/basename.html -[6] musl source, basename.c - http://git.musl-libc.org/cgit/musl/tree/src/misc/basename.c - -Closes !99 - Fix undeclared identifier 'basename' build failure with - musl libc ---- - src/BCache_Info.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/BCache_Info.cc b/src/BCache_Info.cc -index 129a5178..aecc9ef1 100644 ---- a/src/BCache_Info.cc -+++ b/src/BCache_Info.cc -@@ -17,7 +17,7 @@ - - #include "BCache_Info.h" - --#include // GNU version of basename() -+#include // POSIX version of basename() - #include - #include - #include --- -GitLab - diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template index d671afacf5b085..9b42f25a0d004e 100644 --- a/srcpkgs/gparted/template +++ b/srcpkgs/gparted/template @@ -1,6 +1,6 @@ # Template file for 'gparted' pkgname=gparted -version=1.4.0 +version=1.5.0 revision=1 build_style=gnu-configure configure_args="--enable-libparted-dmraid" @@ -13,11 +13,12 @@ maintainer="teldra " license="GPL-2.0-or-later" homepage="https://gparted.sourceforge.io" distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz" -checksum=e5293a792e53fdbeba29c4a834113cd9603d0d639330da931a468bf3687887be +checksum=3c95ea26a944083ff1d9b17639b1e2ad9758df225dc751ff407b2a6aa092a8de +disable_parallel_check=true -# Some tests are known to fail since 1.1.0 +# Some tests are known to fail in CI since 1.1.0 # This disables these: -export GTEST_FILTER='-PipeCaptureTest.ReadEmbeddedNULCharacter:PipeCaptureTest.ReadNULByteInMiddleOfMultiByteUTF8Character:BlockSpecialTest.NamedBlockSpecialObjectBlockDevice:BlockSpecialTest.TwoNamedBlockSpecialObjectBlockDevices:BlockSpecialTest.NamedBlockSpecialObjectBySymlinkMatches' +export GTEST_FILTER='-BlockSpecialTest.NamedBlockSpecialObjectBlockDevice:BlockSpecialTest.TwoNamedBlockSpecialObjectBlockDevices:BlockSpecialTest.NamedBlockSpecialObjectBySymlinkMatches' pre_configure() { sed -i "s:@bindir@/gparted %f:@bindir@/gparted-pkexec %f:g" gparted.desktop.in.in