mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-04-07 03:10:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

media-video/mediaelch: Fix qt6 build

Browse Source 
Closes https://bugs.gentoo.org/969498

Signed-off-by: Alexander Weber <web.alexander@web.de>
This commit is contained in:
Alexander Weber
2026-02-02 13:05:08 +01:00
parent e86fbc7cb3
commit e44fac073f
5 changed files with 77 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media-video/mediaelch/Manifest
View File

@@ -1,2 +1 @@
DIST mediaelch-2.10.6.tar.gz 3300733 BLAKE2B f0db7f9c8bd4b88664180024ed9e64c56218c8c975c6f35c1031434958f0ddf0654116e463d5f3d927087a42a06279dd0d77de3220ef6d9460db9f277efc6fe5 SHA512 c8d83396b31b95388a19c30d9e7fe657ce125a87cd362da5eb7b97edefcf7b25dde5a6f3e1d527225847404b386c38739c525079b3c754da8ccbead38eb99d0d
DIST mediaelch-2.12.0.tar.gz 3365121 BLAKE2B 6847290c64eeba74cdf2d60e8cc2ccb0c819bdee11aaaf7477a914f5ca1526dd303be50593191b77d6130bbe3b0f07d54c9f4c5d9e848628574bcfc9fb850af1 SHA512 b347c313a12e325abe8c5e67cffc53a91fdb87236fb0dca9c8fc4bdd01db3e0028c694ce2766314e38e73df138e2078dd54191593d6c0519f2f719f65c3dda69

73
media-video/mediaelch/files/2.12.0-1878.patch Normal file
View File

@@ -0,0 +1,73 @@
From 89ebf98dd13c365ce7ffaaece6fdd3329cf62c9f Mon Sep 17 00:00:00 2001
From: "Jason E. Hale" <jhale@FreeBSD.org>
Date: Mon, 21 Apr 2025 04:34:17 -0400
Subject: [PATCH] Fix build with Qt 6.9
Implicit conversions were disabled for the QChar() constructor in Qt 6.9.
---
src/ui/small_widgets/MusicTreeView.cpp | 4 ++--
src/ui/small_widgets/TvShowTreeView.cpp | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/ui/small_widgets/MusicTreeView.cpp b/src/ui/small_widgets/MusicTreeView.cpp
index a41a89a9bb..244a70ec7e 100644
--- a/src/ui/small_widgets/MusicTreeView.cpp
+++ b/src/ui/small_widgets/MusicTreeView.cpp
@@ -36,7 +36,7 @@ void MusicTreeView::drawBranches(QPainter* painter,
QColor textColor = option.palette.color(textColorRole);
const int drawSize = qRound(rect.height() * 0.85);
- QString text = isExpanded(index) ? QChar(icon_angle_down) : QChar(icon_angle_right);
+ QString text = isExpanded(index) ? QChar(static_cast<uint>(icon_angle_down)) : QChar(static_cast<uint>(icon_angle_right));
painter->save();
painter->setPen(textColor);
@@ -198,7 +198,7 @@ int MusicTreeView::drawNewIcon(QPainter* painter,
int drawSize = qRound(iconRect.width() * 1.0);
painter->setPen(isSelected ? QColor(255, 255, 255) : QColor(58, 135, 173));
painter->setFont(Manager::instance()->iconFont()->font(drawSize));
- painter->drawText(iconRect, QString(QChar(icon_star)), QTextOption(Qt::AlignCenter | Qt::AlignVCenter));
+ painter->drawText(iconRect, QString(QChar(static_cast<uint>(icon_star))), QTextOption(Qt::AlignCenter | Qt::AlignVCenter));
#endif
return 20;
diff --git a/src/ui/small_widgets/TvShowTreeView.cpp b/src/ui/small_widgets/TvShowTreeView.cpp
index a0f6f05395..5f6a9a5c87 100644
--- a/src/ui/small_widgets/TvShowTreeView.cpp
+++ b/src/ui/small_widgets/TvShowTreeView.cpp
@@ -36,7 +36,7 @@ void TvShowTreeView::drawBranches(QPainter* painter,
QColor textColor = option.palette.color(textColorRole);
const int drawSize = qRound(rect.height() * 0.85);
- QString text = isExpanded(index) ? QChar(icon_angle_down) : QChar(icon_angle_right);
+ QString text = isExpanded(index) ? QChar(static_cast<uint>(icon_angle_down)): QChar(static_cast<uint>(icon_angle_right));
painter->save();
painter->setPen(textColor);
@@ -195,7 +195,7 @@ void TvShowTreeView::drawEpisodeRow(QPainter* painter,
painter->setPen(isSelected ? QColor(255, 255, 255) : QColor(248, 148, 6));
painter->setFont(Manager::instance()->iconFont()->font(drawSize));
painter->drawText(
- iconRect, QString(QChar(icon_refresh_cloud)), QTextOption(Qt::AlignCenter | Qt::AlignVCenter));
+ iconRect, QString(QChar(static_cast<uint>(icon_refresh_cloud))), QTextOption(Qt::AlignCenter | Qt::AlignVCenter));
#endif
itemIndent += 20;
}
@@ -212,7 +212,7 @@ void TvShowTreeView::drawEpisodeRow(QPainter* painter,
int drawSize = qRound(iconRect.width() * 1.0);
painter->setPen(isSelected ? QColor(255, 255, 255) : QColor(241, 96, 106));
painter->setFont(Manager::instance()->iconFont()->font(drawSize));
- painter->drawText(iconRect, QString(QChar(icon_attention)), QTextOption(Qt::AlignCenter | Qt::AlignVCenter));
+ painter->drawText(iconRect, QString(QChar(static_cast<uint>(icon_attention))), QTextOption(Qt::AlignCenter | Qt::AlignVCenter));
#endif
itemIndent += 20;
}
@@ -263,7 +263,7 @@ int TvShowTreeView::drawNewIcon(QPainter* painter,
int drawSize = qRound(iconRect.width() * 1.0);
painter->setPen(isSelected ? QColor(255, 255, 255) : QColor(58, 135, 173));
painter->setFont(Manager::instance()->iconFont()->font(drawSize));
- painter->drawText(iconRect, QString(QChar(icon_star)), QTextOption(Qt::AlignCenter | Qt::AlignVCenter));
+ painter->drawText(iconRect, QString(QChar(static_cast<uint>(icon_star))), QTextOption(Qt::AlignCenter | Qt::AlignVCenter));
#endif
return 20;

75
media-video/mediaelch/mediaelch-2.10.6.ebuild
View File

@@ -1,75 +0,0 @@
# Copyright 2021-223 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake
DESCRIPTION="Video metadata scraper"
HOMEPAGE="https://www.mediaelch.de/"
MY_PN=MediaElch
if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/Komet/$MY_PN"
EGIT_BRANCH="master"
EGIT_SUBMODULES=()
inherit git-r3
S="${WORKDIR}/${PN}-9999"
else
RESTRICT="mirror"
SRC_URI="https://github.com/Komet/$MY_PN/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
S=$WORKDIR/${MY_PN}-${PV}
fi
LICENSE="LGPL-3"
SLOT="0"
IUSE="debug qt5 +qt6 lto"
REQUIRED_USE="|| ( qt5 qt6 )"
DEPEND=">dev-libs/quazip-1.3[qt5?,qt6]
qt5? (
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5
dev-qt/qtmultimedia:5[widgets]
dev-qt/qtopengl:5
dev-qt/qtsql:5
dev-qt/qtsvg:5
dev-qt/qtxmlpatterns:5
)
qt6? (
dev-qt/qt5compat:6
dev-qt/qtbase:6[concurrent,gui,opengl,sql,widgets,xml]
dev-qt/qtdeclarative:6
dev-qt/qtmultimedia:6
dev-qt/qtsvg:6
dev-qt/qttools:6
)
media-video/ffmpeg
media-video/mediainfo"
src_configure() {
local mycmakeargs=(
"-DUSE_EXTERN_QUAZIP=ON"
"-DDISABLE_UPDATER=ON"
)
if use debug; then
CMAKE_BUILD_TYPE=Debug
mycmakeargs+=("-DSANITIZE_ADDRESS=on")
CXXFLAGS+=("-fsanitize=address")
fi
mycmakeargs+=("-DCMAKE_C_FLAGS=${CFLAGS}")
mycmakeargs+=("-DCMAKE_CXX_FLAGS=${CXXFLAGS}")
use qt5 && mycmakeargs+=("-DMEDIAELCH_FORCE_QT5=ON")
use qt6 && mycmakeargs+=("-DMEDIAELCH_FORCE_QT6=ON")
use lto && mycmakeargs+=("-DENABLE_LTO=ON")
cmake_src_configure
}

4
media-video/mediaelch/mediaelch-2.12.0.ebuild → media-video/mediaelch/mediaelch-2.12.0-r1.ebuild
View File

@@ -28,7 +28,7 @@ SLOT="0"
IUSE="debug qt5 +qt6 lto"
REQUIRED_USE="|| ( qt5 qt6 )"
DEPEND=">dev-libs/quazip-1.3[qt5?,qt6]
DEPEND="dev-libs/quazip[qt5?,qt6]
qt5? (
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
@@ -54,6 +54,8 @@ DEPEND=">dev-libs/quazip-1.3[qt5?,qt6]
RDEPEND="$DEPEND"
PATCHES="${FILESDIR}/2.12.0-1878.patch"
src_configure() {
local mycmakeargs=(
"-DUSE_EXTERN_QUAZIP=ON"

2
media-video/mediaelch/mediaelch-9999.ebuild
View File

@@ -28,7 +28,7 @@ SLOT="0"
IUSE="debug qt5 +qt6 lto"
REQUIRED_USE="|| ( qt5 qt6 )"
DEPEND=">dev-libs/quazip-1.3[qt5?,qt6]
DEPEND="dev-libs/quazip[qt5?,qt6]
qt5? (
dev-qt/qtconcurrent:5
dev-qt/qtcore:5