From de48345d9970a79725cfaad93faafedcad03c50d Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 19 Mar 2024 13:22:53 +0100 Subject: [PATCH] qdirstat: update to 1.9. --- .../0001-Fix-build-with-musl-libc-266.patch | 38 +++++++++++++++++++ .../qdirstat/patches/fix-allperms-musl.patch | 26 ------------- srcpkgs/qdirstat/template | 6 +-- 3 files changed, 41 insertions(+), 29 deletions(-) create mode 100644 srcpkgs/qdirstat/patches/0001-Fix-build-with-musl-libc-266.patch delete mode 100644 srcpkgs/qdirstat/patches/fix-allperms-musl.patch diff --git a/srcpkgs/qdirstat/patches/0001-Fix-build-with-musl-libc-266.patch b/srcpkgs/qdirstat/patches/0001-Fix-build-with-musl-libc-266.patch new file mode 100644 index 00000000000000..761dd4b1472a93 --- /dev/null +++ b/srcpkgs/qdirstat/patches/0001-Fix-build-with-musl-libc-266.patch @@ -0,0 +1,38 @@ +From 7162c0af5651b8283d57de2bc4ca0e7fda10db80 Mon Sep 17 00:00:00 2001 +From: Stefan Hundhammer +Date: Tue, 19 Mar 2024 15:36:26 +0100 +Subject: [PATCH] Fix build with musl libc (#266) + +--- + src/DirTreeCache.cpp | 1 + + src/SystemFileChecker.cpp | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/src/DirTreeCache.cpp b/src/DirTreeCache.cpp +index 2fda17a..932ba39 100644 +--- a/src/DirTreeCache.cpp ++++ b/src/DirTreeCache.cpp +@@ -18,6 +18,7 @@ + #include "FormatUtil.h" + #include "Logger.h" + #include "Exception.h" ++#include "BrokenLibc.h" // ALLPERMS + + #define KB 1024LL + #define MB (1024LL*1024) +diff --git a/src/SystemFileChecker.cpp b/src/SystemFileChecker.cpp +index a1bbd8a..6440c15 100644 +--- a/src/SystemFileChecker.cpp ++++ b/src/SystemFileChecker.cpp +@@ -7,6 +7,8 @@ + */ + + ++#include // uid_t ++ + #include "SystemFileChecker.h" + #include "DirInfo.h" + +-- +2.44.0 + diff --git a/srcpkgs/qdirstat/patches/fix-allperms-musl.patch b/srcpkgs/qdirstat/patches/fix-allperms-musl.patch deleted file mode 100644 index b7ab4bc8b35f84..00000000000000 --- a/srcpkgs/qdirstat/patches/fix-allperms-musl.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d802c86efdb754ad226e0ea5ce55029abb800adb Mon Sep 17 00:00:00 2001 -From: lemmi -Date: Wed, 22 Sep 2021 10:01:40 +0200 -Subject: [PATCH] ALLPERMS isn't specified in POSIX so musl doesn't define it - ---- - src/FormatUtil.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/FormatUtil.h b/src/FormatUtil.h -index dee739e..a7f6a46 100644 ---- a/src/FormatUtil.h -+++ b/src/FormatUtil.h -@@ -9,6 +9,9 @@ - #ifndef FormatUtil_h - #define FormatUtil_h - -+#ifndef ALLPERMS -+#define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) -+#endif - - #include - #include --- -2.33.0 - diff --git a/srcpkgs/qdirstat/template b/srcpkgs/qdirstat/template index b305f233a63f5f..22c6fcab62832a 100644 --- a/srcpkgs/qdirstat/template +++ b/srcpkgs/qdirstat/template @@ -1,7 +1,7 @@ # Template file for 'qdirstat' pkgname=qdirstat -version=1.8.1 -revision=2 +version=1.9 +revision=1 build_style=qmake hostmakedepends="qt5-qmake qt5-host-tools" makedepends="zlib-devel qt5-devel" @@ -11,7 +11,7 @@ license="GPL-2.0-only" homepage="https://github.com/shundhammer/qdirstat" changelog="https://github.com/shundhammer/qdirstat/releases" distfiles="https://github.com/shundhammer/qdirstat/archive/${version}.tar.gz" -checksum=f41212ddeb7fab86bad43cf65cb7fbd044f4c08fc0b167f8e9eaa384e0c1561b +checksum=5a9abda2dbdca3d012d1d9ce7a601abf89e2af77d677f1e5d613f53fb7ad19ff post_install() { vman man/qdirstat.1