From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 34B7B15808B for ; Wed, 9 Feb 2022 12:36:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33F8DE08A2; Wed, 9 Feb 2022 12:36:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5EA97E08A2 for ; Wed, 9 Feb 2022 12:36:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2DBB8342C97 for ; Wed, 9 Feb 2022 12:36:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B7F9A2CB for ; Wed, 9 Feb 2022 12:36:49 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1644410078.1d4d614e35253dfa2d748e5386d4040da9ecc0fd.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/qdirstat/, sys-apps/qdirstat/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/qdirstat/files/qdirstat-1.8-musl.patch sys-apps/qdirstat/qdirstat-1.8.ebuild X-VCS-Directories: sys-apps/qdirstat/files/ sys-apps/qdirstat/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 1d4d614e35253dfa2d748e5386d4040da9ecc0fd X-VCS-Branch: master Date: Wed, 9 Feb 2022 12:36:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d154c842-30d6-4869-a344-49f27dc95237 X-Archives-Hash: 002efe554092e4879368a43b00785bac commit: 1d4d614e35253dfa2d748e5386d4040da9ecc0fd Author: Conrad Kostecki gentoo org> AuthorDate: Wed Feb 9 12:34:38 2022 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Wed Feb 9 12:34:38 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d4d614e sys-apps/qdirstat: fix build with musl Closes: https://bugs.gentoo.org/832904 Signed-off-by: Conrad Kostecki gentoo.org> sys-apps/qdirstat/files/qdirstat-1.8-musl.patch | 102 ++++++++++++++++++++++++ sys-apps/qdirstat/qdirstat-1.8.ebuild | 4 +- 2 files changed, 105 insertions(+), 1 deletion(-) diff --git a/sys-apps/qdirstat/files/qdirstat-1.8-musl.patch b/sys-apps/qdirstat/files/qdirstat-1.8-musl.patch new file mode 100644 index 000000000000..e730352a8040 --- /dev/null +++ b/sys-apps/qdirstat/files/qdirstat-1.8-musl.patch @@ -0,0 +1,102 @@ +From ca2c6c4a0a90ed467af9c4c73b918dd4bf720f2a Mon Sep 17 00:00:00 2001 +From: Stefan Hundhammer +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 ++ */ ++ ++#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 // 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 + + #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 index 64ab49423bd4..62fb4a2c928d 100644 --- a/sys-apps/qdirstat/qdirstat-1.8.ebuild +++ b/sys-apps/qdirstat/qdirstat-1.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -26,6 +26,8 @@ RDEPEND=" dev-perl/URI " +PATCHES=( "${FILESDIR}/${PN}-1.8-musl.patch" ) + src_prepare() { default