gentoo auto-resync : 03:12:2022 - 14:59:58

4 files changed, 0 insertions, 185 deletions

diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index 317713dc5f01..a4e89b2802c6 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,7 +1,3 @@
-AUX filelight-22.04.3-fix_musl_dev_bsize.patch 2186 BLAKE2B 744fbb84ce78fbc7341a2028762b6d2bafd20def112e1ddb374d931750bdccb85bb66feebff702984032efb9ab5394ec8ebfa30ae30b037f2e59bb4da3a65d33 SHA512 9635c447e531a6ec96ccc977f5067d534eae9b1e3df217be48c4b138faac60d29c949d08d423e28c1434fe955499991284ee32a9983d52c9ca1bcb8d56bb7e94
-AUX filelight-22.04.3-fix_sincos_impl.patch 2108 BLAKE2B 6f01b643f89944086871cda67cfc4323467719be410ef523dd9b808401492d0203a5917d567c2bd9a0e9bccdbf5b8d2599cecf20fffcb600d06ad50c2a748ef2 SHA512 651c5e129b42675e2440655b27e1a9849385a1e6e7f0fbba09cdbc6ce57873d129b9a76b0134af5d54fa2467cbf2612491d7a151161965035403082ab40298e6
-DIST filelight-22.04.3.tar.xz 692604 BLAKE2B d8c443c3b0ea7aed6971b7b1ca6cdeab5dc186fdf45f24fd05d1c12a8a358aaf7b0e47916a71791c13d02f89818e11043a83d3dd4a3fa6da9a2cb69bdbf42004 SHA512 ff42c1dd7b8bd92c9f8c7d958428d5616b6fafb059ef72f22e3d774c614c05576529ac2ba3840222c35d0c700ea60d58baf233cd1d77e17845f8051b7e591b48
 DIST filelight-22.08.3.tar.xz 698924 BLAKE2B c186c06597b1ed6026b3fb51e3fc33806fc45896453c3f089d2b1bcd7eb4a4942ac8f8f6ca6c82517203b3b280353da0541d7f8d9070afda50164bbaeb652fcd SHA512 e63cb351a67a0b16f835138ec4fc8420743bf67f5d3794181891ac1a113ebee78d3a349c9b3da47abee93fbd2bd07488206e3378b795c6198038168f2f0b0585
-EBUILD filelight-22.04.3.ebuild 1060 BLAKE2B 6ce1da28703b4adcae2adb3b122abb3104e99f289ba8772bfaeeb9c6984df8f6b03719efba5ae166af77d726ad987c35a80990150487508517dd8d57dec4f973 SHA512 51522a25935fda334a29edf931621c2dd7d3ae638cae436fc31efbeb3c968eb4cbe1892e7cd853b9501270ee6543da72441d20a8c3a807aded8dff187a754989
 EBUILD filelight-22.08.3.ebuild 1225 BLAKE2B 5729f35e596f3160e0efebebc8f56cd51a8ad32a87f259dd07aac1d37fb97847906e64fc9f4f4129cde15943ad05aae1f770a666b1a5b98a252485b831bafd6b SHA512 a6b66eed2434c0b383388ae302cd46f4183bfe5ec4854f32972ec31563c566a62a4bda09bb42f0d89f1fc2bcde0c39afbee668464f2248683fc713a467e0f0b4
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/filelight/filelight-22.04.3.ebuild b/kde-apps/filelight/filelight-22.04.3.ebuild
deleted file mode 100644
index a94f6be54538..000000000000
--- a/kde-apps/filelight/filelight-22.04.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.92.0
-QTMIN=5.15.4
-inherit ecm gear.kde.org
-
-DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
-HOMEPAGE="https://apps.kde.org/filelight/
-https://utils.kde.org/projects/filelight/"
-
-LICENSE="GPL-2" # TODO: CHECK
-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
-	>=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}"
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
deleted file mode 100644
index 1b428b0582f5..000000000000
--- a/kde-apps/filelight/files/filelight-22.04.3-fix_musl_dev_bsize.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-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
deleted file mode 100644
index 1c33e0d2e234..000000000000
--- a/kde-apps/filelight/files/filelight-22.04.3-fix_sincos_impl.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-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
-