Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/qdirstat/files/, sys-apps/qdirstat/
Date: Wed, 02 Nov 2022 20:42:16
Message-Id: 1667421681.e109216778d4591a3d654613cc83a106f4b90278.conikost@gentoo
1 commit: e109216778d4591a3d654613cc83a106f4b90278
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 2 20:41:21 2022 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 2 20:41:21 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1092167
7
8 sys-apps/qdirstat: drop 1.8
9
10 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
11
12 sys-apps/qdirstat/Manifest | 1 -
13 sys-apps/qdirstat/files/qdirstat-1.8-musl.patch | 102 ------------------------
14 sys-apps/qdirstat/qdirstat-1.8.ebuild | 57 -------------
15 3 files changed, 160 deletions(-)
16
17 diff --git a/sys-apps/qdirstat/Manifest b/sys-apps/qdirstat/Manifest
18 index 80e7cb096116..304bbc9d600e 100644
19 --- a/sys-apps/qdirstat/Manifest
20 +++ b/sys-apps/qdirstat/Manifest
21 @@ -1,2 +1 @@
22 DIST qdirstat-1.8.1.tar.gz 8726725 BLAKE2B 5592f6c551cd218faa6bc82433707c6eff531b142d2c5b11f85eb7212a57a4e0c9e8dcc58f76237dee45357628c7076da07849d134805d255dd10b27c5f330a0 SHA512 af7043d52154cfb148d7365eb24d3d728ad7ac03f9e0bd9e33bcd03d040793624f7eba0061c72ba53d4828c5a9f2e717663dc84e01d33ee4d471b7a6a1d7f7e1
23 -DIST qdirstat-1.8.tar.gz 8720791 BLAKE2B fd1da935e82c7cdb2880e3a1e2902627c7f3e2972d08ae83a7ca49c4f641c07184c791471fb7a62211660f6e9bfb6fd0dc309c26c0fcffa1cad98de029e2b384 SHA512 fb7b757cf08c6b6ec0c14be9b08b8b6784a36e100c3ac89dbaef176ef908e43c47c2788fc4002a5e5f7308c990518cb3a104166e12cec605ff1a586bd7a4af10
24
25 diff --git a/sys-apps/qdirstat/files/qdirstat-1.8-musl.patch b/sys-apps/qdirstat/files/qdirstat-1.8-musl.patch
26 deleted file mode 100644
27 index e730352a8040..000000000000
28 --- a/sys-apps/qdirstat/files/qdirstat-1.8-musl.patch
29 +++ /dev/null
30 @@ -1,102 +0,0 @@
31 -From ca2c6c4a0a90ed467af9c4c73b918dd4bf720f2a Mon Sep 17 00:00:00 2001
32 -From: Stefan Hundhammer <Stefan.Hundhammer@×××.de>
33 -Date: Wed, 9 Feb 2022 11:05:31 +0100
34 -Subject: [PATCH] Fixed GitHub issue #187: ALLPERMS not defined in libc-musl
35 -
36 ----
37 - src/BrokenLibc.h | 45 +++++++++++++++++++++++++++++++++++++++++++++
38 - src/FileInfo.cpp | 1 +
39 - src/FormatUtil.cpp | 1 +
40 - src/src.pro | 3 ++-
41 - 4 files changed, 49 insertions(+), 1 deletion(-)
42 - create mode 100644 src/BrokenLibc.h
43 -
44 -diff --git a/src/BrokenLibc.h b/src/BrokenLibc.h
45 -new file mode 100644
46 -index 00000000..8bdf2a84
47 ---- /dev/null
48 -+++ b/src/BrokenLibc.h
49 -@@ -0,0 +1,45 @@
50 -+/*
51 -+ * File name: BrokenLibc.h
52 -+ * Summary: Substitutes for common system-level defines
53 -+ * License: GPL V2 - See file LICENSE for details.
54 -+ *
55 -+ * Author: Stefan Hundhammer <Stefan.Hundhammer@×××.de>
56 -+ */
57 -+
58 -+#ifndef BrokenLibc_h
59 -+#define BrokenLibc_h
60 -+
61 -+// This contains common #defines that are present on modern systems, but
62 -+// sometimes not on systems that insist to exchange known working subsystems
63 -+// such as glibc with their own version, commonly because of the "not invented
64 -+// here" syndrome.
65 -+
66 -+
67 -+// Make sure the original defines are available regardless of include order
68 -+
69 -+#include <sys/stat.h> // ALLPERMS
70 -+
71 -+
72 -+#ifndef ALLPERMS
73 -+# define ALLPERMS 07777
74 -+
75 -+// Uncomment for debugging:
76 -+// # warning "Using ALLPERMS replacement"
77 -+
78 -+// Not available in musl-libc used on Gentoo:
79 -+//
80 -+// https://github.com/shundhammer/qdirstat/issues/187
81 -+//
82 -+// Original from Linux / glibc /usr/include/x86_64-linux-gnu/sys/stat.h :
83 -+//
84 -+// #define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */
85 -+//
86 -+// But that might induce more complaints because any of S_IRWXU, S_IRWXG
87 -+// etc. may also not be defined on such a system. So let's keep it simple.
88 -+// If they also use a different bit pattern for those permissions, that's their
89 -+// problem.
90 -+#endif
91 -+
92 -+
93 -+
94 -+#endif // BrokenLibc_h
95 -diff --git a/src/FileInfo.cpp b/src/FileInfo.cpp
96 -index 6be13a8d..d8195819 100644
97 ---- a/src/FileInfo.cpp
98 -+++ b/src/FileInfo.cpp
99 -@@ -26,6 +26,7 @@
100 - #include "SysUtil.h"
101 - #include "Logger.h"
102 - #include "Exception.h"
103 -+#include "BrokenLibc.h" // ALLPERMS
104 -
105 - // Some filesystems (NTFS seems to be among them) may handle block fragments
106 - // well. Don't report files as "sparse" files if the block size is only a few
107 -diff --git a/src/FormatUtil.cpp b/src/FormatUtil.cpp
108 -index 6c755d79..43ca9ec4 100644
109 ---- a/src/FormatUtil.cpp
110 -+++ b/src/FormatUtil.cpp
111 -@@ -11,6 +11,7 @@
112 - #include <QTextStream>
113 -
114 - #include "FormatUtil.h"
115 -+#include "BrokenLibc.h" // ALLPERMS
116 -
117 - using namespace QDirStat;
118 -
119 -diff --git a/src/src.pro b/src/src.pro
120 -index c9616462..50b51ca4 100644
121 ---- a/src/src.pro
122 -+++ b/src/src.pro
123 -@@ -157,7 +157,8 @@ HEADERS = \
124 - ActionManager.h \
125 - AdaptiveTimer.h \
126 - Attic.h \
127 -- BreadcrumbNavigator.h \
128 -+ BreadcrumbNavigator.h \
129 -+ BrokenLibc.h \
130 - BucketsTableModel.h \
131 - BusyPopup.h \
132 - Cleanup.h \
133
134 diff --git a/sys-apps/qdirstat/qdirstat-1.8.ebuild b/sys-apps/qdirstat/qdirstat-1.8.ebuild
135 deleted file mode 100644
136 index 62fb4a2c928d..000000000000
137 --- a/sys-apps/qdirstat/qdirstat-1.8.ebuild
138 +++ /dev/null
139 @@ -1,57 +0,0 @@
140 -# Copyright 1999-2022 Gentoo Authors
141 -# Distributed under the terms of the GNU General Public License v2
142 -
143 -EAPI=8
144 -
145 -inherit qmake-utils xdg-utils
146 -
147 -DESCRIPTION="Qt-based directory statistics"
148 -HOMEPAGE="https://github.com/shundhammer/qdirstat"
149 -SRC_URI="https://github.com/shundhammer/qdirstat/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
150 -
151 -LICENSE="GPL-2"
152 -SLOT="0"
153 -KEYWORDS="amd64 x86"
154 -
155 -DEPEND="
156 - dev-qt/qtgui:5
157 - dev-qt/qtcore:5
158 - dev-qt/qtwidgets:5
159 - sys-libs/zlib
160 -"
161 -
162 -RDEPEND="
163 - ${DEPEND}
164 - dev-lang/perl
165 - dev-perl/URI
166 -"
167 -
168 -PATCHES=( "${FILESDIR}/${PN}-1.8-musl.patch" )
169 -
170 -src_prepare() {
171 - default
172 -
173 - # Fix QA warning about incorrect use of doc path
174 - sed -e "/doc.path/s/${PN}/${PF}/" -i doc/doc.pro doc/stats/stats.pro || die
175 -
176 - # Don't install compressed man pages
177 - sed -e '/gzip/d' -e 's/.gz//g' -i man/man.pro || die
178 -}
179 -
180 -src_configure() {
181 - eqmake5
182 -}
183 -
184 -src_install() {
185 - emake INSTALL_ROOT="${ED}" install
186 -}
187 -
188 -pkg_postinst() {
189 - xdg_desktop_database_update
190 - xdg_icon_cache_update
191 -}
192 -
193 -pkg_postrm() {
194 - xdg_desktop_database_update
195 - xdg_icon_cache_update
196 -}