| Message ID | 20230221200625.494020-1-f_l_k@t-online.de |
|---|---|
| State | Under Review |
| Headers | show |
| Series | [meta-gnome] gparted: update 1.4.0 -> 1.5.0 | expand |
sent again because of an error message during mail delivery Am Di, 21. Feb 2023 um 21:06:25 +0100 schrieb Markus Volk <f_l_k@t-online.de>: > - Remove unneeded patches > > Signed-off-by: Markus Volk <f_l_k@t-online.de > <mailto:f_l_k@t-online.de>> > --- > ...t-use-NULL-where-boolean-is-expected.patch | 33 > ------------------- > .../files/0001-use-posix-basename.patch | 30 ----------------- > .../{gparted_1.4.0.bb => gparted_1.5.0.bb} | 6 ++-- > 3 files changed, 2 insertions(+), 67 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 > rename meta-gnome/recipes-extended/gparted/{gparted_1.4.0.bb => > gparted_1.5.0.bb} (78%) > > 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 1b0d24024..000000000 > --- > 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 <raj.khem@gmail.com <mailto:raj.khem@gmail.com>> > -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<PedPartitionFlag>( NULL ) ) ; > -| > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > -| 1 error generated. > - > -Upstream-Status: Pending > -Signed-off-by: Khem Raj <raj.khem@gmail.com > <mailto:raj.khem@gmail.com>> > ---- > - 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<PedPartitionFlag>( NULL ) ) ; > -+ for ( PedPartitionFlag flag = ped_partition_flag_next( > static_cast<PedPartitionFlag>( 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 aae200e27..000000000 > --- > 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 <f_l_k@t-online.de > <mailto:f_l_k@t-online.de>> > - > -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 <string.h> // GNU version of basename() > -+#include <libgen.h> // POSIX version of basename() > - #include <unistd.h> > - #include <glibmm/ustring.h> > - #include <glibmm/fileutils.h> > diff --git a/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb > b/meta-gnome/recipes-extended/gparted/gparted_1.5.0.bb > similarity index 78% > rename from meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb > rename to meta-gnome/recipes-extended/gparted/gparted_1.5.0.bb > index dde5a02ab..be7a96ea8 100644 > --- a/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb > +++ b/meta-gnome/recipes-extended/gparted/gparted_1.5.0.bb > @@ -3,17 +3,15 @@ HOMEPAGE = "http://gparted.org/index.php" > LICENSE = "GPL-2.0-only" > LIC_FILES_CHKSUM = > "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" > <file://copying;md5=94d55d512a9ba36caa9b7df079bae19f/> > > -inherit autotools pkgconfig python3native gnome-help gtk-icon-cache > features_check > +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 > \ > > file://0001-Install-polkit-action-unconditionally-executable-pke.patch > <file://0001-install-polkit-action-unconditionally-executable-pke.patch/> > \ > - file://0001-Do-not-use-NULL-where-boolean-is-expected.patch > <file://0001-do-not-use-null-where-boolean-is-expected.patch/> \ > - file://0001-use-posix-basename.patch > <file://0001-use-posix-basename.patch/> \ > " > -SRC_URI[sha256sum] = > "e5293a792e53fdbeba29c4a834113cd9603d0d639330da931a468bf3687887be" > +SRC_URI[sha256sum] = > "3c95ea26a944083ff1d9b17639b1e2ad9758df225dc751ff407b2a6aa092a8de" > > UPSTREAM_CHECK_URI = > "<https://sourceforge.net/projects/gparted/files/gparted/>" > UPSTREAM_CHECK_REGEX = "gparted-(?P<pver>\d+\.(\d+)+(\.\d+)+)" > -- > 2.34.1 >
seeing failures with arm/clang - https://errors.yoctoproject.org/Errors/Details/695674/ On Tue, Feb 21, 2023 at 12:08 PM Markus Volk <f_l_k@t-online.de> wrote: > > sent again because of an error message during mail delivery > > Am Di, 21. Feb 2023 um 21:06:25 +0100 schrieb Markus Volk <f_l_k@t-online.de>: > > - Remove unneeded patches Signed-off-by: Markus Volk <f_l_k@t-online.de> --- ...t-use-NULL-where-boolean-is-expected.patch | 33 ------------------- .../files/0001-use-posix-basename.patch | 30 ----------------- .../{gparted_1.4.0.bb => gparted_1.5.0.bb} | 6 ++-- 3 files changed, 2 insertions(+), 67 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 rename meta-gnome/recipes-extended/gparted/{gparted_1.4.0.bb => gparted_1.5.0.bb} (78%) 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 1b0d24024..000000000 --- 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 <raj.khem@gmail.com> -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<PedPartitionFlag>( NULL ) ) ; -| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -| 1 error generated. - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - 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<PedPartitionFlag>( NULL ) ) ; -+ for ( PedPartitionFlag flag = ped_partition_flag_next( static_cast<PedPartitionFlag>( 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 aae200e27..000000000 --- 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 <f_l_k@t-online.de> - -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 <string.h> // GNU version of basename() -+#include <libgen.h> // POSIX version of basename() - #include <unistd.h> - #include <glibmm/ustring.h> - #include <glibmm/fileutils.h> diff --git a/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb b/meta-gnome/recipes-extended/gparted/gparted_1.5.0.bb similarity index 78% rename from meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb rename to meta-gnome/recipes-extended/gparted/gparted_1.5.0.bb index dde5a02ab..be7a96ea8 100644 --- a/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb +++ b/meta-gnome/recipes-extended/gparted/gparted_1.5.0.bb @@ -3,17 +3,15 @@ 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 +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 \ 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" +SRC_URI[sha256sum] = "3c95ea26a944083ff1d9b17639b1e2ad9758df225dc751ff407b2a6aa092a8de" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gparted/files/gparted/" UPSTREAM_CHECK_REGEX = "gparted-(?P<pver>\d+\.(\d+)+(\.\d+)+)" > -- > 2.34.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#101197): https://lists.openembedded.org/g/openembedded-devel/message/101197 > Mute This Topic: https://lists.openembedded.org/mt/97117595/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
A hard dependency on polkit was introduced. v2 should fix it Am Mi, 22. Feb 2023 um 01:05:16 -0800 schrieb Khem Raj <raj.khem@gmail.com>: > seeing failures with arm/clang - > <https://errors.yoctoproject.org/Errors/Details/695674/> > > On Tue, Feb 21, 2023 at 12:08 PM Markus Volk <f_l_k@t-online.de > <mailto:f_l_k@t-online.de>> wrote: >> >> sent again because of an error message during mail delivery >> >> Am Di, 21. Feb 2023 um 21:06:25 +0100 schrieb Markus Volk >> <f_l_k@t-online.de <mailto:f_l_k@t-online.de>>: >> >> - Remove unneeded patches Signed-off-by: Markus Volk >> <f_l_k@t-online.de <mailto:f_l_k@t-online.de>> --- >> ...t-use-NULL-where-boolean-is-expected.patch | 33 >> ------------------- .../files/0001-use-posix-basename.patch | 30 >> ----------------- .../{gparted_1.4.0.bb => gparted_1.5.0.bb} | 6 >> ++-- 3 files changed, 2 insertions(+), 67 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 >> rename meta-gnome/recipes-extended/gparted/{gparted_1.4.0.bb => >> gparted_1.5.0.bb} (78%) 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 1b0d24024..000000000 --- >> 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 <raj.khem@gmail.com> -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<PedPartitionFlag>( NULL ) ) ; >> -| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -| 1 error generated. - >> -Upstream-Status: Pending -Signed-off-by: Khem Raj >> <raj.khem@gmail.com> ---- - 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<PedPartitionFlag>( NULL ) ) ; -+ for ( PedPartitionFlag >> flag = ped_partition_flag_next( static_cast<PedPartitionFlag>( 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 aae200e27..000000000 --- >> 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 <f_l_k@t-online.de> - >> -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 <string.h> // GNU >> version of basename() -+#include <libgen.h> // POSIX version of >> basename() - #include <unistd.h> - #include <glibmm/ustring.h> - >> #include <glibmm/fileutils.h> diff --git >> a/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb >> b/meta-gnome/recipes-extended/gparted/gparted_1.5.0.bb similarity >> index 78% rename from >> meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb rename to >> meta-gnome/recipes-extended/gparted/gparted_1.5.0.bb index >> dde5a02ab..be7a96ea8 100644 --- >> a/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb +++ >> b/meta-gnome/recipes-extended/gparted/gparted_1.5.0.bb @@ -3,17 >> +3,15 @@ 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 +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 >> \ >> 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" >> +SRC_URI[sha256sum] = >> "3c95ea26a944083ff1d9b17639b1e2ad9758df225dc751ff407b2a6aa092a8de" >> UPSTREAM_CHECK_URI = >> "https://sourceforge.net/projects/gparted/files/gparted/" >> UPSTREAM_CHECK_REGEX = "gparted-(?P<pver>\d+\.(\d+)+(\.\d+)+)" >> -- >> 2.34.1 >> >> >> >> > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#101202): > <https://lists.openembedded.org/g/openembedded-devel/message/101202> > Mute This Topic: <https://lists.openembedded.org/mt/97117595/3618223> > Group Owner: openembedded-devel+owner@lists.openembedded.org > <mailto:openembedded-devel+owner@lists.openembedded.org> > Unsubscribe: > <https://lists.openembedded.org/g/openembedded-devel/unsub> > [f_l_k@t-online.de <mailto:f_l_k@t-online.de>] > -=-=-=-=-=-=-=-=-=-=-=- >
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 1b0d24024..000000000 --- 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 <raj.khem@gmail.com> -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<PedPartitionFlag>( NULL ) ) ; -| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -| 1 error generated. - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - 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<PedPartitionFlag>( NULL ) ) ; -+ for ( PedPartitionFlag flag = ped_partition_flag_next( static_cast<PedPartitionFlag>( 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 aae200e27..000000000 --- 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 <f_l_k@t-online.de> - -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 <string.h> // GNU version of basename() -+#include <libgen.h> // POSIX version of basename() - #include <unistd.h> - #include <glibmm/ustring.h> - #include <glibmm/fileutils.h> diff --git a/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb b/meta-gnome/recipes-extended/gparted/gparted_1.5.0.bb similarity index 78% rename from meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb rename to meta-gnome/recipes-extended/gparted/gparted_1.5.0.bb index dde5a02ab..be7a96ea8 100644 --- a/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb +++ b/meta-gnome/recipes-extended/gparted/gparted_1.5.0.bb @@ -3,17 +3,15 @@ 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 +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 \ 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" +SRC_URI[sha256sum] = "3c95ea26a944083ff1d9b17639b1e2ad9758df225dc751ff407b2a6aa092a8de" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gparted/files/gparted/" UPSTREAM_CHECK_REGEX = "gparted-(?P<pver>\d+\.(\d+)+(\.\d+)+)"
- Remove unneeded patches Signed-off-by: Markus Volk <f_l_k@t-online.de> --- ...t-use-NULL-where-boolean-is-expected.patch | 33 ------------------- .../files/0001-use-posix-basename.patch | 30 ----------------- .../{gparted_1.4.0.bb => gparted_1.5.0.bb} | 6 ++-- 3 files changed, 2 insertions(+), 67 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 rename meta-gnome/recipes-extended/gparted/{gparted_1.4.0.bb => gparted_1.5.0.bb} (78%)