* [gentoo-commits] repo/gentoo:master commit in: sys-block/gparted/files/, sys-block/gparted/
@ 2019-05-18 23:09 Mart Raudsepp
0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2019-05-18 23:09 UTC (permalink / raw
To: gentoo-commits
commit: 8d4ae26dab175bf8ff612850b40d7c72085f24b7
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 23:07:23 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat May 18 23:07:23 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d4ae26d
sys-block/gparted: remove old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
sys-block/gparted/Manifest | 2 -
sys-block/gparted/files/gparted-pkexec | 2 -
.../gparted/files/org.gentoo.pkexec.gparted.policy | 22 ------
sys-block/gparted/gparted-0.29.0.ebuild | 88 ----------------------
sys-block/gparted/gparted-0.32.0.ebuild | 85 ---------------------
5 files changed, 199 deletions(-)
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index ea8a446c52e..726d98ff0e4 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,3 +1 @@
-DIST gparted-0.29.0.tar.gz 3751292 BLAKE2B 3feeb5abe01cdef5a14efb1bbe229d1ae167a087a5488eacd00577eb16f4038563e21144e15b38113b1cdca0b53455a036f9f5ac594b2633d579ecdfdf7b1d8e SHA512 ea01a5b98f8a70d229eb81b58e46b5f0037e909cf72043e7364812ca77b32ee4bad0d215699a08f1b6fcacc31cece3a3058b6178e7bf2df6ba63b11ee64e2f8f
-DIST gparted-0.32.0.tar.gz 3880559 BLAKE2B bdd3dd636fd651af06623cdaca828f199a42048d270674c5d5c29a1b99f34fb3a903fa9499bd141ef58a3455d0b861af01b9ed44d9cdba10629e20e5b5114715 SHA512 ea05c387031d0e5ac7f8fa582d9b15881336d72ed2e04a8515217bedccea763491e8d093f9ed3f47fc6c648412a2dca7fff1735e70d897beb065e6b3e698ad43
DIST gparted-0.33.0.tar.gz 3917056 BLAKE2B 7d5eed87701f8c1f8125103a1b25fd58378aadee7faf3bba05f19ea94a6670687b190eb070cee792a205245dc7e5828caca7358cc59792adc8372c9907341772 SHA512 07b3f8ef355ce6c3302ed4747b9f542f1e231555c5ef39e758ee9a658bb14c9db2742af7f472a866bd122eb1ad9b2d45fd921484abb4ee319df1f15a74829f32
diff --git a/sys-block/gparted/files/gparted-pkexec b/sys-block/gparted/files/gparted-pkexec
deleted file mode 100644
index 4405cf42a1c..00000000000
--- a/sys-block/gparted/files/gparted-pkexec
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-pkexec "/usr/sbin/gparted" "$@"
diff --git a/sys-block/gparted/files/org.gentoo.pkexec.gparted.policy b/sys-block/gparted/files/org.gentoo.pkexec.gparted.policy
deleted file mode 100644
index 566712ce2b4..00000000000
--- a/sys-block/gparted/files/org.gentoo.pkexec.gparted.policy
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-<policyconfig>
-
- <vendor>Gentoo</vendor>
- <vendor_url>http://www.gentoo.org/</vendor_url>
-
- <action id="org.gentoo.pkexec.gparted">
- <message>Authentication is required to run the GParted Partition Editor</message>
- <icon_name>gparted</icon_name>
- <defaults>
- <allow_any>auth_admin</allow_any>
- <allow_inactive>auth_admin</allow_inactive>
- <allow_active>auth_admin</allow_active>
- </defaults>
- <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gparted</annotate>
- <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
- </action>
-
-</policyconfig>
diff --git a/sys-block/gparted/gparted-0.29.0.ebuild b/sys-block/gparted/gparted-0.29.0.ebuild
deleted file mode 100644
index 4249a8da87d..00000000000
--- a/sys-block/gparted/gparted-0.29.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Gnome Partition Editor"
-HOMEPAGE="http://gparted.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="btrfs cryptsetup dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 udf xfs"
-
-COMMON_DEPEND="
- >=dev-cpp/glibmm-2.14:2
- >=dev-cpp/gtkmm-2.22:2.4
- >=dev-libs/glib-2:2
- >=sys-block/parted-3.2:=
-"
-RDEPEND="${COMMON_DEPEND}
- !policykit? (
- kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) )
- policykit? ( sys-auth/polkit )
-
- >=sys-apps/util-linux-2.20
- >=sys-fs/e2fsprogs-1.41
- btrfs? ( sys-fs/btrfs-progs )
- cryptsetup? ( sys-fs/cryptsetup )
- dmraid? (
- >=sys-fs/lvm2-2.02.45
- sys-fs/dmraid
- sys-fs/multipath-tools )
- f2fs? ( sys-fs/f2fs-tools )
- fat? (
- sys-fs/dosfstools
- sys-fs/mtools )
- hfs? (
- sys-fs/diskdev_cmds
- virtual/udev
- sys-fs/hfsutils )
- jfs? ( sys-fs/jfsutils )
- mdadm? ( sys-fs/mdadm )
- ntfs? ( >=sys-fs/ntfs3g-2011.4.12[ntfsprogs] )
- reiserfs? ( sys-fs/reiserfsprogs )
- reiser4? ( sys-fs/reiser4progs )
- udf? ( sys-fs/udftools )
- xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/gnome-doc-utils
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_prepare() {
- sed -i -e 's:Exec=@gksuprog@ :Exec=:' gparted.desktop.in.in || die
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --enable-doc \
- --enable-online-resize \
- GKSUPROG=$(type -P true)
-}
-
-src_install() {
- gnome2_src_install
-
- local _ddir="${D}"/usr/share/applications
-
- if use policykit; then
- sed -i -e 's:/usr/sbin/gparted %f:gparted-pkexec:' "${_ddir}"/gparted.desktop
- insinto /usr/share/polkit-1/actions/
- doins "${FILESDIR}"/org.gentoo.pkexec.gparted.policy
- dobin "${FILESDIR}"/gparted-pkexec
- else
- if use kde; then
- cp "${_ddir}"/gparted{,-kde}.desktop
- sed -i -e 's:Exec=:Exec=kdesu :' "${_ddir}"/gparted-kde.desktop
- echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop
- fi
- fi
-}
diff --git a/sys-block/gparted/gparted-0.32.0.ebuild b/sys-block/gparted/gparted-0.32.0.ebuild
deleted file mode 100644
index ae34b4d6f99..00000000000
--- a/sys-block/gparted/gparted-0.32.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Gnome Partition Editor"
-HOMEPAGE="https://gparted.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="btrfs cryptsetup dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 udf wayland xfs"
-
-COMMON_DEPEND="
- !policykit? (
- kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) )
- policykit? ( >=sys-auth/polkit-0.102 )
- >=dev-cpp/glibmm-2.45.40:2
- >=dev-cpp/gtkmm-2.22:2.4
- >=dev-libs/glib-2:2
- >=sys-block/parted-3.2:=
- >=dev-libs/libsigc++-2.5.1:2
-"
-RDEPEND="${COMMON_DEPEND}
- >=sys-apps/util-linux-2.20
- >=sys-fs/e2fsprogs-1.41
- btrfs? ( sys-fs/btrfs-progs )
- cryptsetup? ( sys-fs/cryptsetup )
- dmraid? (
- >=sys-fs/lvm2-2.02.45
- sys-fs/dmraid
- sys-fs/multipath-tools )
- f2fs? ( sys-fs/f2fs-tools )
- fat? (
- sys-fs/dosfstools
- sys-fs/mtools )
- hfs? (
- sys-fs/diskdev_cmds
- virtual/udev
- sys-fs/hfsutils )
- jfs? ( sys-fs/jfsutils )
- mdadm? ( sys-fs/mdadm )
- ntfs? ( >=sys-fs/ntfs3g-2011.4.12[ntfsprogs] )
- reiserfs? ( sys-fs/reiserfsprogs )
- reiser4? ( sys-fs/reiser4progs )
- udf? ( sys-fs/udftools )
- wayland? ( x11-apps/xhost )
- xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/gnome-doc-utils
- >=dev-util/intltool-0.36.0
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_configure() {
- gnome2_src_configure \
- --enable-doc \
- --enable-online-resize \
- $(use_enable wayland xhost-root) \
- GKSUPROG=kdesu \
- ac_cv_prog_have_scrollkeeper_update=no
-}
-
-src_install() {
- gnome2_src_install
-
- local _ddir="${D}"/usr/share/applications
- local _bdir="${D}"/usr/bin
-
- if ! use policykit; then
- if use kde; then
- cp "${_ddir}"/gparted{,-kde}.desktop || die
- cp "${_bdir}"/gparted{,-kde} || die
- sed -i -e '/Exec/ s:gparted:gparted-kde:' "${_ddir}"/gparted-kde.desktop || die
- echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop || die
- fi
- else
- sed -i -e 's:kdesu::' "${_bdir}"/gparted || die
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/gparted/files/, sys-block/gparted/
@ 2022-05-18 20:38 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-05-18 20:38 UTC (permalink / raw
To: gentoo-commits
commit: 1a536e7e575df3fb58dd7d6cf56ec0809718a796
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 20:37:37 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 18 20:37:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a536e7e
sys-block/gparted: fix build with musl
Revbump as switching to POSIX basename could in theory (but as per
patch, shouldn't) change runtime behaviour for glibc.
Closes: https://bugs.gentoo.org/837794
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/gparted-1.4.0-musl-basename.patch | 53 ++++++++++++
sys-block/gparted/gparted-1.4.0-r1.ebuild | 95 ++++++++++++++++++++++
2 files changed, 148 insertions(+)
diff --git a/sys-block/gparted/files/gparted-1.4.0-musl-basename.patch b/sys-block/gparted/files/gparted-1.4.0-musl-basename.patch
new file mode 100644
index 000000000000..eeba8867ed42
--- /dev/null
+++ b/sys-block/gparted/files/gparted-1.4.0-musl-basename.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gparted/-/merge_requests/99.patch
+https://bugs.gentoo.org/837794
+
+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
+--- 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
diff --git a/sys-block/gparted/gparted-1.4.0-r1.ebuild b/sys-block/gparted/gparted-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..4fa2d910bc99
--- /dev/null
+++ b/sys-block/gparted/gparted-1.4.0-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2 optfeature virtualx
+
+DESCRIPTION="Partition editor for graphically managing your disk partitions"
+HOMEPAGE="https://gparted.org/ https://gitlab.gnome.org/GNOME/gparted/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="kde policykit wayland"
+
+DEPEND="
+ !policykit? (
+ kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) )
+ policykit? ( >=sys-auth/polkit-0.102 )
+ >=dev-cpp/glibmm-2.56.1:2
+ >=dev-cpp/gtkmm-3.24:3.0
+ >=dev-libs/glib-2.58.3-r1:2
+ >=sys-block/parted-3.2:=
+ >=dev-libs/libsigc++-2.10.1:2
+"
+RDEPEND="${DEPEND}
+ >=sys-apps/util-linux-2.33.2
+ wayland? ( x11-apps/xhost )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.1.2
+ >=dev-util/intltool-0.51.0-r2
+ dev-util/itstool
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.1-musl-nullptr.patch
+ "${FILESDIR}"/${PN}-1.4.0-musl-basename.patch
+)
+
+src_configure() {
+ gnome2_src_configure \
+ --enable-doc \
+ --enable-online-resize \
+ $(use_enable wayland xhost-root) \
+ GKSUPROG=kdesu \
+ ac_cv_prog_have_scrollkeeper_update=no
+}
+
+src_install() {
+ gnome2_src_install
+
+ local _ddir="${D}"/usr/share/applications
+ local _bdir="${D}"/usr/bin
+
+ if ! use policykit; then
+ if use kde; then
+ cp "${_ddir}"/gparted{,-kde}.desktop || die
+ cp "${_bdir}"/gparted{,-kde} || die
+ sed -i -e '/Exec/ s:gparted:gparted-kde:' "${_ddir}"/gparted-kde.desktop || die
+ echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop || die
+ fi
+ else
+ sed -i -e 's:kdesu::' "${_bdir}"/gparted || die
+ fi
+
+ mv "${ED}"/usr/share/{appdata,metainfo}
+}
+
+src_test() {
+ virtx emake check
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ optfeature_header
+ optfeature "BTRFS support" sys-fs/btrfs-progs
+ optfeature "DMRAID support" sys-fs/dmraid sys-fs/multipath-tools
+ optfeature "Encrypted device / LUKS support" sys-fs/cryptsetup
+ optfeature "exFAT support" sys-fs/exfatprogs
+ optfeature "EXT2/EXT3/EXT4 support" sys-fs/e2fsprogs
+ optfeature "F2FS support" sys-fs/f2fs-tools
+ optfeature "FAT support" sys-fs/dosfstools sys-fs/mtools
+ optfeature "HFS support" sys-fs/diskdev_cmds sys-fs/hfsutils virtual/udev
+ optfeature "JFS support" sys-fs/jfsutils
+ optfeature "MDADM support" sys-fs/mdadm
+ optfeature "NTFS support" sys-fs/ntfs3g[ntfsprogs]
+ optfeature "Reiser4 support" sys-fs/reiser4progs
+ optfeature "ReiserFS support" sys-fs/reiserfsprogs
+ optfeature "UDF support" sys-fs/udftools
+ optfeature "XFS support" sys-fs/xfsprogs sys-fs/xfsdump
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/gparted/files/, sys-block/gparted/
@ 2023-04-02 0:57 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2023-04-02 0:57 UTC (permalink / raw
To: gentoo-commits
commit: 01f68e259e0eac9e1517ce6c833b058eecadacd4
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 2 00:33:42 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 2 00:56:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01f68e25
sys-block/gparted: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
sys-block/gparted/Manifest | 1 -
.../gparted/files/gparted-1.3.1-musl-nullptr.patch | 51 ------------
.../files/gparted-1.4.0-musl-basename.patch | 53 ------------
sys-block/gparted/gparted-1.4.0-r1.ebuild | 95 ----------------------
4 files changed, 200 deletions(-)
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index 9cb29a891c24..1fe416d375a5 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,2 +1 @@
-DIST gparted-1.4.0.tar.gz 4308426 BLAKE2B 834782196e7cfe5c5553200743cbbaf700e59ef01076919d16138e736ebbbb16185ec68cd27546f1ff851ff742c51fc170a0f6596e9b014684b8be1d29acfea9 SHA512 20f94622fc1a2727f1fc9bb39ea9f04f14af06b0ff7e47c2149730d5eb339089b0d3c21cd3c9ce6f971e955a9f6ab89cc32fd5b7545a5e340b451297d87e8f39
DIST gparted-1.5.0.tar.gz 5416965 BLAKE2B 034fcbfde4b74f99769f5bff27ec7a84f7f6cf8e37d944aa7bce61d0421f02711d77bc695667ea34523b066c6f925437e24d34c5b172fe56be5ce23f99283f53 SHA512 af32358bc470d30c38cdf688e8f940548c7361808fbc7712dc79ef6d196e3bfbf9c9e0ee499729e78d4b782ed1f52ea1f55c983e9afe8fc3fea765078ffbddad
diff --git a/sys-block/gparted/files/gparted-1.3.1-musl-nullptr.patch b/sys-block/gparted/files/gparted-1.3.1-musl-nullptr.patch
deleted file mode 100644
index 2a4f648db609..000000000000
--- a/sys-block/gparted/files/gparted-1.3.1-musl-nullptr.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://gitlab.gnome.org/GNOME/gparted/-/commit/3d4b1c1e7b33f229efd254fb0cc06660af627ea0
-https://bugs.gentoo.org/838466
-
-From: Dominika Liberda <ja@sdomi.pl>
-Date: Sun, 10 Apr 2022 21:09:56 +0200
-Subject: [PATCH] Fix NULL == 0 assumption in call to ped_partition_flag_next()
- (!100)
-
-GParted fails to build on Alpine Linux Edge (development tree for the
-next release) like this:
-
- GParted_Core.cc: In constructor 'GParted::GParted_Core::GParted_Core()':
- GParted_Core.cc:75:64: error: invalid 'static_cast' from type 'std::nullptr_t' to type 'PedPartitionFlag'
- 75 | for ( PedPartitionFlag flag = ped_partition_flag_next( static_cast<PedPartitionFlag>( NULL ) ) ;
- | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The code is failing to compile now because musl libc 1.2.3 has became
-more C++11 strict [1][2] by defining NULL [3] as nullptr [4] rather than
-as 0. The parameter to ped_partition_flag_next() [5] should always have
-been numeral 0 cast to an enumeration and never the NULL pointer.
-
-Fixes this commit [6] from 2004-12-27 which changed the parameter from 0
-to NULL.
-
-[1] define NULL as nullptr when used in C++11 or later
- https://git.musl-libc.org/cgit/musl/commit?id=98e688a9da5e7b2925dda17a2d6820dddf1fb28
-[2] NULL vs nullptr (Why was it replaced?) [duplicate]
- https://stackoverflow.com/questions/20509734/null-vs-nullptr-why-was-it-replaced
-[3] C++ reference, NULL
- https://en.cppreference.com/w/cpp/types/NULL
-[4] C++ reference, nullptr
- https://en.cppreference.com/w/cpp/language/nullptr
-[5] libparted Documentation, ped_partition_flag_next()
- https://www.gnu.org/software/parted/api/group__PedPartition.html#g0ce9ce4247b320011bc8e9d957c8cdbb
-[6] Added cylsize to Device and made Operation contain a Device instead
- commit 174f0cff77c5799a713954a22b2c54306d03036c
-
-Closes !100 - Fix NULL == 0 assumption in call to
- ped_partition_flag_next()
---- a/src/GParted_Core.cc
-+++ b/src/GParted_Core.cc
-@@ -72,7 +72,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>( 0 ) ) ;
- flag ;
- flag = ped_partition_flag_next( flag ) )
- flags .push_back( flag ) ;
-GitLab
diff --git a/sys-block/gparted/files/gparted-1.4.0-musl-basename.patch b/sys-block/gparted/files/gparted-1.4.0-musl-basename.patch
deleted file mode 100644
index eeba8867ed42..000000000000
--- a/sys-block/gparted/files/gparted-1.4.0-musl-basename.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://gitlab.gnome.org/GNOME/gparted/-/merge_requests/99.patch
-https://bugs.gentoo.org/837794
-
-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
---- 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
diff --git a/sys-block/gparted/gparted-1.4.0-r1.ebuild b/sys-block/gparted/gparted-1.4.0-r1.ebuild
deleted file mode 100644
index 4afb483a97e0..000000000000
--- a/sys-block/gparted/gparted-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2 optfeature virtualx
-
-DESCRIPTION="Partition editor for graphically managing your disk partitions"
-HOMEPAGE="https://gparted.org/ https://gitlab.gnome.org/GNOME/gparted/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
-IUSE="kde policykit wayland"
-
-DEPEND="
- !policykit? (
- kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) )
- policykit? ( >=sys-auth/polkit-0.102 )
- >=dev-cpp/glibmm-2.56.1:2
- >=dev-cpp/gtkmm-3.24:3.0
- >=dev-libs/glib-2.58.3-r1:2
- >=sys-block/parted-3.2:=
- >=dev-libs/libsigc++-2.10.1:2
-"
-RDEPEND="${DEPEND}
- >=sys-apps/util-linux-2.33.2
- wayland? ( x11-apps/xhost )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.1.2
- >=dev-util/intltool-0.51.0-r2
- dev-util/itstool
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3.1-musl-nullptr.patch
- "${FILESDIR}"/${PN}-1.4.0-musl-basename.patch
-)
-
-src_configure() {
- gnome2_src_configure \
- --enable-doc \
- --enable-online-resize \
- $(use_enable wayland xhost-root) \
- GKSUPROG=kdesu \
- ac_cv_prog_have_scrollkeeper_update=no
-}
-
-src_install() {
- gnome2_src_install
-
- local _ddir="${D}"/usr/share/applications
- local _bdir="${D}"/usr/bin
-
- if ! use policykit; then
- if use kde; then
- cp "${_ddir}"/gparted{,-kde}.desktop || die
- cp "${_bdir}"/gparted{,-kde} || die
- sed -i -e '/Exec/ s:gparted:gparted-kde:' "${_ddir}"/gparted-kde.desktop || die
- echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop || die
- fi
- else
- sed -i -e 's:kdesu::' "${_bdir}"/gparted || die
- fi
-
- mv "${ED}"/usr/share/{appdata,metainfo}
-}
-
-src_test() {
- virtx emake check
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- optfeature_header
- optfeature "BTRFS support" sys-fs/btrfs-progs
- optfeature "DMRAID support" sys-fs/dmraid sys-fs/multipath-tools
- optfeature "Encrypted device / LUKS support" sys-fs/cryptsetup
- optfeature "exFAT support" sys-fs/exfatprogs
- optfeature "EXT2/EXT3/EXT4 support" sys-fs/e2fsprogs
- optfeature "F2FS support" sys-fs/f2fs-tools
- optfeature "FAT support" sys-fs/dosfstools sys-fs/mtools
- optfeature "HFS support" sys-fs/diskdev_cmds sys-fs/hfsutils virtual/udev
- optfeature "JFS support" sys-fs/jfsutils
- optfeature "MDADM support" sys-fs/mdadm
- optfeature "NTFS support" sys-fs/ntfs3g[ntfsprogs]
- optfeature "Reiser4 support" sys-fs/reiser4progs
- optfeature "ReiserFS support" sys-fs/reiserfsprogs
- optfeature "UDF support" sys-fs/udftools
- optfeature "XFS support" sys-fs/xfsprogs sys-fs/xfsdump
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/gparted/files/, sys-block/gparted/
@ 2025-07-04 20:40 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2025-07-04 20:40 UTC (permalink / raw
To: gentoo-commits
commit: c5557b753931feb5b8309f54e229780cd23694b1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 4 20:40:17 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 4 20:40:17 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5557b75
sys-block/gparted: actually apply the patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-block/gparted/files/gparted-1.6.0-handle-failing-pixbuf.patch | 3 ---
sys-block/gparted/gparted-1.6.0-r2.ebuild | 4 ++++
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/sys-block/gparted/files/gparted-1.6.0-handle-failing-pixbuf.patch b/sys-block/gparted/files/gparted-1.6.0-handle-failing-pixbuf.patch
index 5b4cf0b0f487..05ad8a523a57 100644
--- a/sys-block/gparted/files/gparted-1.6.0-handle-failing-pixbuf.patch
+++ b/sys-block/gparted/files/gparted-1.6.0-handle-failing-pixbuf.patch
@@ -32,9 +32,6 @@ builtin copies of the stock icons instead. It is unknown how the
reported managed to trigger this crash. The only known way to reproduce
this crash is by changing the GParted source code to request a
non-existent stock icon. This change was used:
- --- a/src/Win_GParted.cc
- +++ b/src/Win_GParted.cc
- @@ -743,8 +743,9 @@ void Win_GParted::refresh_combo_devices()
{
//combo...
treerow = *( liststore_devices ->append() ) ;
diff --git a/sys-block/gparted/gparted-1.6.0-r2.ebuild b/sys-block/gparted/gparted-1.6.0-r2.ebuild
index 40235e7a54ce..21b291d56ee3 100644
--- a/sys-block/gparted/gparted-1.6.0-r2.ebuild
+++ b/sys-block/gparted/gparted-1.6.0-r2.ebuild
@@ -37,6 +37,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.0-handle-failing-pixbuf.patch
+)
+
src_configure() {
gnome2_src_configure \
--enable-doc \
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-07-04 20:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-04 20:40 [gentoo-commits] repo/gentoo:master commit in: sys-block/gparted/files/, sys-block/gparted/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-04-02 0:57 Matt Turner
2022-05-18 20:38 Sam James
2019-05-18 23:09 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox