From 434127fe02221685bd9d59cd195bc45371cd9344 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Wed, 22 Feb 2023 11:33:03 +0100 Subject: gparted: update 1.4.0 -> 1.5.0 - Remove unneeded patches - Keep buildable without polkit after gettext migration Signed-off-by: Markus Volk Signed-off-by: Khem Raj --- ...Do-not-use-NULL-where-boolean-is-expected.patch | 33 ---------------- .../gparted/files/0001-use-posix-basename.patch | 30 --------------- .../recipes-extended/gparted/gparted_1.4.0.bb | 43 --------------------- .../recipes-extended/gparted/gparted_1.5.0.bb | 44 ++++++++++++++++++++++ 4 files changed, 44 insertions(+), 106 deletions(-) delete mode 100644 meta-gnome/recipes-extended/gparted/files/0001-Do-not-use-NULL-where-boolean-is-expected.patch delete mode 100644 meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch delete mode 100644 meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb create mode 100644 meta-gnome/recipes-extended/gparted/gparted_1.5.0.bb diff --git a/meta-gnome/recipes-extended/gparted/files/0001-Do-not-use-NULL-where-boolean-is-expected.patch b/meta-gnome/recipes-extended/gparted/files/0001-Do-not-use-NULL-where-boolean-is-expected.patch deleted file mode 100644 index 1b0d24024b..0000000000 --- a/meta-gnome/recipes-extended/gparted/files/0001-Do-not-use-NULL-where-boolean-is-expected.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9af84e1c08a2159c10baf13244e2c8a7d7e837e9 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 27 Jan 2022 23:02:20 -0800 -Subject: [PATCH] Do not use NULL where boolean is expected - -Fixes -src/GParted_Core.cc:73:57: error: static_cast from 'nullptr_t' to 'PedPartitionFlag' (aka '_PedPartitionFlag') is not allowed -| for ( PedPartitionFlag flag = ped_partition_flag_next( static_cast( NULL ) ) ; -| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -| 1 error generated. - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - src/GParted_Core.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc -index f7ac970..3290c66 100644 ---- a/src/GParted_Core.cc -+++ b/src/GParted_Core.cc -@@ -70,7 +70,7 @@ GParted_Core::GParted_Core() - ped_exception_set_handler( ped_exception_handler ) ; - - //get valid flags ... -- for ( PedPartitionFlag flag = ped_partition_flag_next( static_cast( NULL ) ) ; -+ for ( PedPartitionFlag flag = ped_partition_flag_next( static_cast( false ) ) ; - flag ; - flag = ped_partition_flag_next( flag ) ) - flags .push_back( flag ) ; --- -2.35.0 - 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 deleted file mode 100644 index aae200e27e..0000000000 --- a/meta-gnome/recipes-extended/gparted/files/0001-use-posix-basename.patch +++ /dev/null @@ -1,30 +0,0 @@ -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.4.0.bb b/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb deleted file mode 100644 index dde5a02abb..0000000000 --- a/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "A partition editor to graphically manage disk partitions " -HOMEPAGE = "http://gparted.org/index.php" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit autotools pkgconfig python3native gnome-help gtk-icon-cache features_check - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -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] = "e5293a792e53fdbeba29c4a834113cd9603d0d639330da931a468bf3687887be" - -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gparted/files/gparted/" -UPSTREAM_CHECK_REGEX = "gparted-(?P\d+\.(\d+)+(\.\d+)+)" - -DEPENDS += " \ - glib-2.0-native \ - yelp-tools-native \ - intltool-native \ - glib-2.0 \ - gtkmm3 \ - parted \ -" - -FILES:${PN} += " \ - ${datadir}/appdata \ - ${datadir}/icons \ -" - -PACKAGES += "${PN}-polkit" -FILES:${PN}-polkit = "${datadir}/polkit-1" - -RDEPENDS:${PN} = " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', '${PN}-polkit', '', d)} \ - dosfstools \ - mtools \ - e2fsprogs \ -" diff --git a/meta-gnome/recipes-extended/gparted/gparted_1.5.0.bb b/meta-gnome/recipes-extended/gparted/gparted_1.5.0.bb new file mode 100644 index 0000000000..fdfb1ef47f --- /dev/null +++ b/meta-gnome/recipes-extended/gparted/gparted_1.5.0.bb @@ -0,0 +1,44 @@ +SUMMARY = "A partition editor to graphically manage disk partitions " +HOMEPAGE = "http://gparted.org/index.php" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit autotools pkgconfig python3native gettext gnome-help gtk-icon-cache features_check + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ + ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'file://0001-Install-polkit-action-unconditionally-executable-pke.patch', '', d)} \ +" +SRC_URI[sha256sum] = "3c95ea26a944083ff1d9b17639b1e2ad9758df225dc751ff407b2a6aa092a8de" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gparted/files/gparted/" +UPSTREAM_CHECK_REGEX = "gparted-(?P\d+\.(\d+)+(\.\d+)+)" + +DEPENDS += " \ + glib-2.0-native \ + yelp-tools-native \ + intltool-native \ + glib-2.0 \ + gtkmm3 \ + parted \ +" + +PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}" +PACKAGECONFIG[polkit] = ",,polkit" + +FILES:${PN} += " \ + ${datadir}/appdata \ + ${datadir}/icons \ +" + +PACKAGES += "${PN}-polkit" +FILES:${PN}-polkit = "${datadir}/polkit-1" + +RDEPENDS:${PN} = " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', '${PN}-polkit', '', d)} \ + dosfstools \ + mtools \ + e2fsprogs \ +" -- cgit v1.2.3-54-g00ecf