gparted: update to 1.5.0.
This commit is contained in:
parent
4136486128
commit
2e639450f9
2 changed files with 5 additions and 62 deletions
|
@ -1,58 +0,0 @@
|
||||||
From 45c00927b72319f00855c7feaf4dcf109b3e4414 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Markus Volk <f_l_k@t-online.de>
|
|
||||||
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 <string.h>. 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 <libgen.h>, 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 <string.h> // GNU version of basename()
|
|
||||||
+#include <libgen.h> // POSIX version of basename()
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <glibmm/ustring.h>
|
|
||||||
#include <glibmm/fileutils.h>
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'gparted'
|
# Template file for 'gparted'
|
||||||
pkgname=gparted
|
pkgname=gparted
|
||||||
version=1.4.0
|
version=1.5.0
|
||||||
revision=1
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--enable-libparted-dmraid"
|
configure_args="--enable-libparted-dmraid"
|
||||||
|
@ -13,11 +13,12 @@ maintainer="teldra <teldra@rotce.de>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="https://gparted.sourceforge.io"
|
homepage="https://gparted.sourceforge.io"
|
||||||
distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
|
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:
|
# 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() {
|
pre_configure() {
|
||||||
sed -i "s:@bindir@/gparted %f:@bindir@/gparted-pkexec %f:g" gparted.desktop.in.in
|
sed -i "s:@bindir@/gparted %f:@bindir@/gparted-pkexec %f:g" gparted.desktop.in.in
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue