mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-08 16:00:32 +00:00
gparted: update 1.4.0 -> 1.5.0
- Remove unneeded patches - Keep buildable without polkit after gettext migration Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
-33
@@ -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
|
|
||||||
|
|
||||||
@@ -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>
|
|
||||||
+6
-5
@@ -3,17 +3,15 @@ HOMEPAGE = "http://gparted.org/index.php"
|
|||||||
LICENSE = "GPL-2.0-only"
|
LICENSE = "GPL-2.0-only"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
|
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}"
|
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
|
||||||
|
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \
|
${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \
|
||||||
file://0001-Install-polkit-action-unconditionally-executable-pke.patch \
|
${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'file://0001-Install-polkit-action-unconditionally-executable-pke.patch', '', d)} \
|
||||||
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_URI = "https://sourceforge.net/projects/gparted/files/gparted/"
|
||||||
UPSTREAM_CHECK_REGEX = "gparted-(?P<pver>\d+\.(\d+)+(\.\d+)+)"
|
UPSTREAM_CHECK_REGEX = "gparted-(?P<pver>\d+\.(\d+)+(\.\d+)+)"
|
||||||
@@ -27,6 +25,9 @@ DEPENDS += " \
|
|||||||
parted \
|
parted \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}"
|
||||||
|
PACKAGECONFIG[polkit] = ",,polkit"
|
||||||
|
|
||||||
FILES:${PN} += " \
|
FILES:${PN} += " \
|
||||||
${datadir}/appdata \
|
${datadir}/appdata \
|
||||||
${datadir}/icons \
|
${datadir}/icons \
|
||||||
Reference in New Issue
Block a user