* [gentoo-commits] repo/gentoo:master commit in: kde-apps/filelight/, kde-apps/filelight/files/
@ 2021-04-24 13:47 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2021-04-24 13:47 UTC (permalink / raw
To: gentoo-commits
commit: a2cfd5c4a66c1e05a63a410cce1bbce6745bb518
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 24 10:05:08 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 24 13:46:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2cfd5c4
kde-apps/filelight: 21.04.0 version bump
Fix build with IUSE=-handbook
Reported-by: ivanich (#gentoo-kde in IRC)
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/filelight/Manifest | 1 +
kde-apps/filelight/filelight-21.04.0.ebuild | 37 ++++++++++++++++++++++
.../filelight-21.04.0-kdoctools_install.patch | 28 ++++++++++++++++
3 files changed, 66 insertions(+)
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index 5fd4f9cce7b..64a09207501 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1 +1,2 @@
DIST filelight-20.12.3.tar.xz 671244 BLAKE2B 0de8b3fddba934d1d6cbd014fa7185f16e0736cf1623cda4efba938a958f5134d71f24ee37d4f9753e5c1edf3e5025b0fbc326f55d1e4922ec5b1a0a7d4a58de SHA512 3a30181a95deb4eb8f9f5cc435658bfa9f5d6406a4756d80535de6783c5ab86c31f874cfa86f56b9a687a72b249d73fcdaa7066e99a548301f648b0abe5b2bb9
+DIST filelight-21.04.0.tar.xz 679032 BLAKE2B 4d3537a189f1fe0c0412e2415f8d364f8517af954bc034bc8e7f87cf77821997316131b4fb30c0fa106c5300f37fa4914321e7cde0368c16e0ccf1dc4f6b9955 SHA512 c87e1ec0a9401ad6e85e6074e59c02cc5c4dca8de98e698bf7dc761036db27bb38eaed914d0302109c5bee26b5776aa4d493114107e2f3ec6130b3078d73fd89
diff --git a/kde-apps/filelight/filelight-21.04.0.ebuild b/kde-apps/filelight/filelight-21.04.0.ebuild
new file mode 100644
index 00000000000..7ae7ae95813
--- /dev/null
+++ b/kde-apps/filelight/filelight-21.04.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.80.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
+HOMEPAGE="https://apps.kde.org/en/filelight
+https://utils.kde.org/projects/filelight/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-kdoctools_install.patch" )
diff --git a/kde-apps/filelight/files/filelight-21.04.0-kdoctools_install.patch b/kde-apps/filelight/files/filelight-21.04.0-kdoctools_install.patch
new file mode 100644
index 00000000000..e9d4c6444f6
--- /dev/null
+++ b/kde-apps/filelight/files/filelight-21.04.0-kdoctools_install.patch
@@ -0,0 +1,28 @@
+From 0db4a8c6b941800d0616e726ebf3f2e751f2293d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 24 Apr 2021 11:34:46 +0200
+Subject: [PATCH] Hide kdoctools_install() behind KF5DocTools_FOUND conditional
+
+The dependency is optional in this package so the macro call must be too.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b8c5c73..72e80dc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -56,5 +56,7 @@ if (KF5DocTools_FOUND)
+ endif()
+
+ ki18n_install(po)
+-kdoctools_install(po)
++if (KF5DocTools_FOUND)
++ kdoctools_install(po)
++endif()
+ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
+--
+2.31.1
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/filelight/, kde-apps/filelight/files/
@ 2021-05-13 12:33 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2021-05-13 12:33 UTC (permalink / raw
To: gentoo-commits
commit: 766ee4dabc214be5596aeb43143ad2eea5248356
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 11:44:33 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 13 12:24:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=766ee4da
kde-apps/filelight: drop 21.04.0*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/filelight/Manifest | 1 -
kde-apps/filelight/filelight-21.04.0.ebuild | 37 ----------------------
.../filelight-21.04.0-kdoctools_install.patch | 28 ----------------
3 files changed, 66 deletions(-)
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index c5fe3551a54..f0ae6e88b64 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,3 +1,2 @@
DIST filelight-20.12.3.tar.xz 671244 BLAKE2B 0de8b3fddba934d1d6cbd014fa7185f16e0736cf1623cda4efba938a958f5134d71f24ee37d4f9753e5c1edf3e5025b0fbc326f55d1e4922ec5b1a0a7d4a58de SHA512 3a30181a95deb4eb8f9f5cc435658bfa9f5d6406a4756d80535de6783c5ab86c31f874cfa86f56b9a687a72b249d73fcdaa7066e99a548301f648b0abe5b2bb9
-DIST filelight-21.04.0.tar.xz 679032 BLAKE2B 4d3537a189f1fe0c0412e2415f8d364f8517af954bc034bc8e7f87cf77821997316131b4fb30c0fa106c5300f37fa4914321e7cde0368c16e0ccf1dc4f6b9955 SHA512 c87e1ec0a9401ad6e85e6074e59c02cc5c4dca8de98e698bf7dc761036db27bb38eaed914d0302109c5bee26b5776aa4d493114107e2f3ec6130b3078d73fd89
DIST filelight-21.04.1.tar.xz 678996 BLAKE2B c6ad89f9c6c69ca990222ed3a7b9b99c2a27924c4af72d86ed9804cd0172c3ec4482c003c7ece86ea51d96a34476aba43f2582068f246ffe8a83c8093b960b94 SHA512 d865e951e19b6170ea5dc4f03203cfbb9914bf903d64d5cf400be63e0d1093b6ff4d49d2546eaae638a0aca61247e972660c81fcb5bd200a9ad0f1b468f4f487
diff --git a/kde-apps/filelight/filelight-21.04.0.ebuild b/kde-apps/filelight/filelight-21.04.0.ebuild
deleted file mode 100644
index 7ae7ae95813..00000000000
--- a/kde-apps/filelight/filelight-21.04.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
-HOMEPAGE="https://apps.kde.org/en/filelight
-https://utils.kde.org/projects/filelight/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-kdoctools_install.patch" )
diff --git a/kde-apps/filelight/files/filelight-21.04.0-kdoctools_install.patch b/kde-apps/filelight/files/filelight-21.04.0-kdoctools_install.patch
deleted file mode 100644
index e9d4c6444f6..00000000000
--- a/kde-apps/filelight/files/filelight-21.04.0-kdoctools_install.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0db4a8c6b941800d0616e726ebf3f2e751f2293d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 24 Apr 2021 11:34:46 +0200
-Subject: [PATCH] Hide kdoctools_install() behind KF5DocTools_FOUND conditional
-
-The dependency is optional in this package so the macro call must be too.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b8c5c73..72e80dc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -56,5 +56,7 @@ if (KF5DocTools_FOUND)
- endif()
-
- ki18n_install(po)
--kdoctools_install(po)
-+if (KF5DocTools_FOUND)
-+ kdoctools_install(po)
-+endif()
- feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
---
-2.31.1
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/filelight/, kde-apps/filelight/files/
@ 2022-07-14 20:32 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-07-14 20:32 UTC (permalink / raw
To: gentoo-commits
commit: 1f253042a8653e56b1cc6ae0df2d896d38cd7ecb
Author: Alfred Persson Forsberg <cat <AT> catcream <DOT> org>
AuthorDate: Tue Jun 21 22:50:33 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 20:32:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f253042
kde-apps/filelight: fix build and running on musl
Filelight has two issues with musl. One is a SIGSEGV regarding the
sincos implementation and the other is S_BLKSIZE not being defined.
*1: The SIGSEGV is resolved upstream and with this patch musl will just use the native sincos.
*2: DEV_BSIZE is the exact same thing as S_BLKSIZE, so use that instead.
The DEV_BSIZE issue is PR:ed upstreamed but there are issues with it since Windows does not have sys/param.h.
https://invent.kde.org/utilities/filelight/-/merge_requests/42/
https://invent.kde.org/utilities/filelight/-/merge_requests/39/
Signed-off-by: Alfred Persson Forsberg <cat <AT> catcream.org>
squash
Closes: https://github.com/gentoo/gentoo/pull/26029
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/filelight/filelight-22.04.3.ebuild | 5 ++
.../filelight-22.04.3-fix_musl_dev_bsize.patch | 66 +++++++++++++++++++
.../files/filelight-22.04.3-fix_sincos_impl.patch | 75 ++++++++++++++++++++++
3 files changed, 146 insertions(+)
diff --git a/kde-apps/filelight/filelight-22.04.3.ebuild b/kde-apps/filelight/filelight-22.04.3.ebuild
index f0a32cd6e429..611ae666b1ee 100644
--- a/kde-apps/filelight/filelight-22.04.3.ebuild
+++ b/kde-apps/filelight/filelight-22.04.3.ebuild
@@ -18,6 +18,11 @@ SLOT="5"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
+PATCHES=(
+ "${FILESDIR}"/${PN}-22.04.3-fix_musl_dev_bsize.patch
+ "${FILESDIR}"/${PN}-22.04.3-fix_sincos_impl.patch
+)
+
DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
diff --git a/kde-apps/filelight/files/filelight-22.04.3-fix_musl_dev_bsize.patch b/kde-apps/filelight/files/filelight-22.04.3-fix_musl_dev_bsize.patch
new file mode 100644
index 000000000000..1b428b0582f5
--- /dev/null
+++ b/kde-apps/filelight/files/filelight-22.04.3-fix_musl_dev_bsize.patch
@@ -0,0 +1,66 @@
+https://invent.kde.org/utilities/filelight/-/merge_requests/42
+https://invent.kde.org/utilities/filelight/-/merge_requests/42/diffs?commit_id=f35d454513f2fc39fea0a5af7c94977c1ffb37aa
+
+DEV_BSIZE and S_BLKSIZE represent the same thing, but S_BLKSIZE isn't defined in musl libc, so use DEV_BSIZE instead.
+---
+ autotests/directoryIteratorTest.cpp | 8 ++++----
+ src/posixWalker.cpp | 2 +-
+ src/posixWalker.h | 1 +
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/autotests/directoryIteratorTest.cpp b/autotests/directoryIteratorTest.cpp
+index d50c32b..fece8dd 100644
+--- a/autotests/directoryIteratorTest.cpp
++++ b/autotests/directoryIteratorTest.cpp
+@@ -60,9 +60,9 @@ private Q_SLOTS:
+ #ifdef Q_OS_WINDOWS
+ QCOMPARE(file.size, 7682);
+ #elif defined(Q_OS_FREEBSD)
+- QCOMPARE(file.size, 1 * S_BLKSIZE);
++ QCOMPARE(file.size, 1 * DEV_BSIZE);
+ #else
+- QCOMPARE(file.size, 16 * S_BLKSIZE);
++ QCOMPARE(file.size, 16 * DEV_BSIZE);
+ #endif
+
+ if (withSymlink) {
+@@ -83,9 +83,9 @@ private Q_SLOTS:
+ #ifdef Q_OS_WINDOWS
+ QCOMPARE(symlink.size, 7682);
+ #elif defined(Q_OS_FREEBSD)
+- QCOMPARE(file.size, 1 * S_BLKSIZE);
++ QCOMPARE(file.size, 1 * DEV_BSIZE);
+ #else
+- QCOMPARE(symlink.size, 16 * S_BLKSIZE);
++ QCOMPARE(symlink.size, 16 * DEV_BSIZE);
+ #endif
+ }
+ }
+diff --git a/src/posixWalker.cpp b/src/posixWalker.cpp
+index be6935f..6538408 100644
+--- a/src/posixWalker.cpp
++++ b/src/posixWalker.cpp
+@@ -99,7 +99,7 @@ void POSIXWalker::next()
+ S_ISFIFO(statbuf.st_mode) || S_ISSOCK(statbuf.st_mode);
+ m_entry.isDir = S_ISDIR(statbuf.st_mode);
+ m_entry.isFile = S_ISREG(statbuf.st_mode);
+- m_entry.size = statbuf.st_blocks * S_BLKSIZE;
++ m_entry.size = statbuf.st_blocks * DEV_BSIZE;
+ break;
+ }
+ }
+diff --git a/src/posixWalker.h b/src/posixWalker.h
+index 4a78d52..ba72a98 100644
+--- a/src/posixWalker.h
++++ b/src/posixWalker.h
+@@ -7,6 +7,7 @@
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/param.h>
+ #include <unistd.h>
+
+ #include <cerrno>
+--
+2.35.1
+
diff --git a/kde-apps/filelight/files/filelight-22.04.3-fix_sincos_impl.patch b/kde-apps/filelight/files/filelight-22.04.3-fix_sincos_impl.patch
new file mode 100644
index 000000000000..1c33e0d2e234
--- /dev/null
+++ b/kde-apps/filelight/files/filelight-22.04.3-fix_sincos_impl.patch
@@ -0,0 +1,75 @@
+https://invent.kde.org/utilities/filelight/-/merge_requests/42
+https://invent.kde.org/utilities/filelight/-/commit/861afa5fb0d2a839d7e83f7df644952219b84a3c
+
+Instead of hardcoding knowledege about glibc versions, check for the
+presence of sincos with CMake.
+
+Commit 93577e2a4927cf1640e8ac7153cd22ff54180bba wrongly added a
+SINCOS_H_IMPLEMENTATION macro instead of making it a static inline
+function or similar, so remove that as well.
+---
+ src/CMakeLists.txt | 6 ++++++
+ src/radialMap/map.cpp | 1 -
+ src/radialMap/sincos.h | 10 ++--------
+ 3 files changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5634ff9..7007297 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -9,6 +9,12 @@ ecm_setup_version(${PROJECT_VERSION}
+ VARIABLE_PREFIX FILELIGHT
+ VERSION_HEADER version.h)
+
++include(CheckCXXSymbolExists)
++check_cxx_symbol_exists(sincos "math.h" HAVE_SINCOS)
++if (HAVE_SINCOS)
++ add_definitions(-DHAVE_SINCOS)
++endif()
++
+ add_library(filelightInternal STATIC fileTree.cpp directoryIterator.cpp)
+ if (WIN32)
+ target_sources(filelightInternal PRIVATE windowsWalker.cpp)
+diff --git a/src/radialMap/map.cpp b/src/radialMap/map.cpp
+index b60d1da..b6bb55b 100644
+--- a/src/radialMap/map.cpp
++++ b/src/radialMap/map.cpp
+@@ -20,7 +20,6 @@
+ #include "radialMap.h" // defines
+
+ #include "Config.h"
+-#define SINCOS_H_IMPLEMENTATION (1)
+ #include "sincos.h"
+ #include "widget.h"
+
+diff --git a/src/radialMap/sincos.h b/src/radialMap/sincos.h
+index 142504b..986a899 100644
+--- a/src/radialMap/sincos.h
++++ b/src/radialMap/sincos.h
+@@ -10,21 +10,15 @@
+
+ #include <math.h>
+
+-#if !defined(__GLIBC__) || (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1)
++#ifndef HAVE_SINCOS
+
+ #include <qmath.h>
+
+-void
+-sincos(double angleRadians, double *Sin, double *Cos);
+-
+-#ifdef SINCOS_H_IMPLEMENTATION
+-void
+-sincos(double angleRadians, double *Sin, double *Cos)
++static inline void sincos(double angleRadians, double *Sin, double *Cos)
+ {
+ *Sin = qSin(angleRadians);
+ *Cos = qCos(angleRadians);
+ }
+-#endif
+
+ #endif
+
+--
+2.35.1
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-14 20:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-13 12:33 [gentoo-commits] repo/gentoo:master commit in: kde-apps/filelight/, kde-apps/filelight/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-07-14 20:32 Andreas Sturmlechner
2021-04-24 13:47 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox