diff options
| -rw-r--r-- | meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch | 30 | ||||
| -rw-r--r-- | meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb (renamed from meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb) | 6 |
2 files changed, 33 insertions, 3 deletions
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 0000000000..aae200e27e --- /dev/null +++ b/meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | Subject: [PATCH] BCache_Info.cc: use posix basename | ||
| 2 | |||
| 3 | gnu 'basename' is undeclared for cplusplus if using musl. Use posix basename instead. | ||
| 4 | |||
| 5 | fdebug-prefix-map=TOPDIR/build/tmp/work/cortexa57-yoe-linux-musl/gparted/1.4.0-r0/ | ||
| 6 | recipe-sysroot-native=-fvisibility-inlines-hidden -c -o Dialog_Disklabel.o ../../ | ||
| 7 | gparted-1.4.0/src/Dialog_Disklabel.cc ../../gparted-1.4.0/src/BCache_Info.cc:52:33: | ||
| 8 | |||
| 9 | error: use of undeclared identifier 'basename'; did you mean 'g_basename'? | ||
| 10 | return "/dev/" + Glib::ustring(basename(buf)); | ||
| 11 | ^~~~~~~~ | ||
| 12 | g_basename | ||
| 13 | |||
| 14 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
| 15 | |||
| 16 | Upstream-Status: Submitted | ||
| 17 | |||
| 18 | https://gitlab.gnome.org/GNOME/gparted/-/merge_requests/99 | ||
| 19 | |||
| 20 | --- a/src/BCache_Info.cc 2022-03-02 22:04:17.000000000 +0100 | ||
| 21 | +++ b/src/BCache_Info.cc 2022-04-09 15:02:56.932218665 +0200 | ||
| 22 | @@ -17,7 +17,7 @@ | ||
| 23 | |||
| 24 | #include "BCache_Info.h" | ||
| 25 | |||
| 26 | -#include <string.h> // GNU version of basename() | ||
| 27 | +#include <libgen.h> // POSIX version of basename() | ||
| 28 | #include <unistd.h> | ||
| 29 | #include <glibmm/ustring.h> | ||
| 30 | #include <glibmm/fileutils.h> | ||
diff --git a/meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb b/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb index d1a9759303..6f774904b7 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" | |||
| 3 | LICENSE = "GPL-2.0-only" | 3 | LICENSE = "GPL-2.0-only" |
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
| 5 | 5 | ||
| 6 | inherit features_check autotools pkgconfig python3native gnome-help gtk-icon-cache | 6 | inherit autotools pkgconfig python3native gnome-help gtk-icon-cache |
| 7 | 7 | ||
| 8 | REQUIRED_DISTRO_FEATURES = "x11" | ||
| 9 | 8 | ||
| 10 | SRC_URI = " \ | 9 | SRC_URI = " \ |
| 11 | ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ | 10 | ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ |
| 12 | file://0001-Install-polkit-action-unconditionally-executable-pke.patch \ | 11 | file://0001-Install-polkit-action-unconditionally-executable-pke.patch \ |
| 13 | file://0001-Do-not-use-NULL-where-boolean-is-expected.patch \ | 12 | file://0001-Do-not-use-NULL-where-boolean-is-expected.patch \ |
| 13 | file://0001-use-posix-basename.patch \ | ||
| 14 | " | 14 | " |
| 15 | SRC_URI[sha256sum] = "5eee2e6d74b15ef96b13b3a2310c868ed2298e03341021e7d12a5a98a1d1e109" | 15 | SRC_URI[sha256sum] = "e5293a792e53fdbeba29c4a834113cd9603d0d639330da931a468bf3687887be" |
| 16 | 16 | ||
| 17 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gparted/files/gparted/" | 17 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gparted/files/gparted/" |
| 18 | UPSTREAM_CHECK_REGEX = "gparted-(?P<pver>\d+\.(\d+)+(\.\d+)+)" | 18 | UPSTREAM_CHECK_REGEX = "gparted-(?P<pver>\d+\.(\d+)+(\.\d+)+)" |
