commit: e109216778d4591a3d654613cc83a106f4b90278 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Wed Nov 2 20:41:21 2022 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Wed Nov 2 20:41:21 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1092167
sys-apps/qdirstat: drop 1.8 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> sys-apps/qdirstat/Manifest | 1 - sys-apps/qdirstat/files/qdirstat-1.8-musl.patch | 102 ------------------------ sys-apps/qdirstat/qdirstat-1.8.ebuild | 57 ------------- 3 files changed, 160 deletions(-) diff --git a/sys-apps/qdirstat/Manifest b/sys-apps/qdirstat/Manifest index 80e7cb096116..304bbc9d600e 100644 --- a/sys-apps/qdirstat/Manifest +++ b/sys-apps/qdirstat/Manifest @@ -1,2 +1 @@ DIST qdirstat-1.8.1.tar.gz 8726725 BLAKE2B 5592f6c551cd218faa6bc82433707c6eff531b142d2c5b11f85eb7212a57a4e0c9e8dcc58f76237dee45357628c7076da07849d134805d255dd10b27c5f330a0 SHA512 af7043d52154cfb148d7365eb24d3d728ad7ac03f9e0bd9e33bcd03d040793624f7eba0061c72ba53d4828c5a9f2e717663dc84e01d33ee4d471b7a6a1d7f7e1 -DIST qdirstat-1.8.tar.gz 8720791 BLAKE2B fd1da935e82c7cdb2880e3a1e2902627c7f3e2972d08ae83a7ca49c4f641c07184c791471fb7a62211660f6e9bfb6fd0dc309c26c0fcffa1cad98de029e2b384 SHA512 fb7b757cf08c6b6ec0c14be9b08b8b6784a36e100c3ac89dbaef176ef908e43c47c2788fc4002a5e5f7308c990518cb3a104166e12cec605ff1a586bd7a4af10 diff --git a/sys-apps/qdirstat/files/qdirstat-1.8-musl.patch b/sys-apps/qdirstat/files/qdirstat-1.8-musl.patch deleted file mode 100644 index e730352a8040..000000000000 --- a/sys-apps/qdirstat/files/qdirstat-1.8-musl.patch +++ /dev/null @@ -1,102 +0,0 @@ -From ca2c6c4a0a90ed467af9c4c73b918dd4bf720f2a Mon Sep 17 00:00:00 2001 -From: Stefan Hundhammer <stefan.hundham...@gmx.de> -Date: Wed, 9 Feb 2022 11:05:31 +0100 -Subject: [PATCH] Fixed GitHub issue #187: ALLPERMS not defined in libc-musl - ---- - src/BrokenLibc.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ - src/FileInfo.cpp | 1 + - src/FormatUtil.cpp | 1 + - src/src.pro | 3 ++- - 4 files changed, 49 insertions(+), 1 deletion(-) - create mode 100644 src/BrokenLibc.h - -diff --git a/src/BrokenLibc.h b/src/BrokenLibc.h -new file mode 100644 -index 00000000..8bdf2a84 ---- /dev/null -+++ b/src/BrokenLibc.h -@@ -0,0 +1,45 @@ -+/* -+ * File name: BrokenLibc.h -+ * Summary: Substitutes for common system-level defines -+ * License: GPL V2 - See file LICENSE for details. -+ * -+ * Author: Stefan Hundhammer <stefan.hundham...@gmx.de> -+ */ -+ -+#ifndef BrokenLibc_h -+#define BrokenLibc_h -+ -+// This contains common #defines that are present on modern systems, but -+// sometimes not on systems that insist to exchange known working subsystems -+// such as glibc with their own version, commonly because of the "not invented -+// here" syndrome. -+ -+ -+// Make sure the original defines are available regardless of include order -+ -+#include <sys/stat.h> // ALLPERMS -+ -+ -+#ifndef ALLPERMS -+# define ALLPERMS 07777 -+ -+// Uncomment for debugging: -+// # warning "Using ALLPERMS replacement" -+ -+// Not available in musl-libc used on Gentoo: -+// -+// https://github.com/shundhammer/qdirstat/issues/187 -+// -+// Original from Linux / glibc /usr/include/x86_64-linux-gnu/sys/stat.h : -+// -+// #define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */ -+// -+// But that might induce more complaints because any of S_IRWXU, S_IRWXG -+// etc. may also not be defined on such a system. So let's keep it simple. -+// If they also use a different bit pattern for those permissions, that's their -+// problem. -+#endif -+ -+ -+ -+#endif // BrokenLibc_h -diff --git a/src/FileInfo.cpp b/src/FileInfo.cpp -index 6be13a8d..d8195819 100644 ---- a/src/FileInfo.cpp -+++ b/src/FileInfo.cpp -@@ -26,6 +26,7 @@ - #include "SysUtil.h" - #include "Logger.h" - #include "Exception.h" -+#include "BrokenLibc.h" // ALLPERMS - - // Some filesystems (NTFS seems to be among them) may handle block fragments - // well. Don't report files as "sparse" files if the block size is only a few -diff --git a/src/FormatUtil.cpp b/src/FormatUtil.cpp -index 6c755d79..43ca9ec4 100644 ---- a/src/FormatUtil.cpp -+++ b/src/FormatUtil.cpp -@@ -11,6 +11,7 @@ - #include <QTextStream> - - #include "FormatUtil.h" -+#include "BrokenLibc.h" // ALLPERMS - - using namespace QDirStat; - -diff --git a/src/src.pro b/src/src.pro -index c9616462..50b51ca4 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -157,7 +157,8 @@ HEADERS = \ - ActionManager.h \ - AdaptiveTimer.h \ - Attic.h \ -- BreadcrumbNavigator.h \ -+ BreadcrumbNavigator.h \ -+ BrokenLibc.h \ - BucketsTableModel.h \ - BusyPopup.h \ - Cleanup.h \ diff --git a/sys-apps/qdirstat/qdirstat-1.8.ebuild b/sys-apps/qdirstat/qdirstat-1.8.ebuild deleted file mode 100644 index 62fb4a2c928d..000000000000 --- a/sys-apps/qdirstat/qdirstat-1.8.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qmake-utils xdg-utils - -DESCRIPTION="Qt-based directory statistics" -HOMEPAGE="https://github.com/shundhammer/qdirstat"; -SRC_URI="https://github.com/shundhammer/qdirstat/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND=" - dev-qt/qtgui:5 - dev-qt/qtcore:5 - dev-qt/qtwidgets:5 - sys-libs/zlib -" - -RDEPEND=" - ${DEPEND} - dev-lang/perl - dev-perl/URI -" - -PATCHES=( "${FILESDIR}/${PN}-1.8-musl.patch" ) - -src_prepare() { - default - - # Fix QA warning about incorrect use of doc path - sed -e "/doc.path/s/${PN}/${PF}/" -i doc/doc.pro doc/stats/stats.pro || die - - # Don't install compressed man pages - sed -e '/gzip/d' -e 's/.gz//g' -i man/man.pro || die -} - -src_configure() { - eqmake5 -} - -src_install() { - emake INSTALL_ROOT="${ED}" install -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -}
