commit: a5fdd4f9c0355a052fde6ca69560283fc2225ed6 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Sep 26 19:46:50 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Sep 26 19:50:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5fdd4f9
media-gfx/kgraphviewer: update EAPI 7 -> 8, HighDpi, drop obsolete dep Drop obsolete blocker. Upstream commits: 9961c92736abfc6d0aedea9c4e7c679e1fd564d2 7b214252ec5f486912944d987581f207c7b03681 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/kgraphviewer-2.4.3-highdpi.patch | 24 ++++ .../files/kgraphviewer-2.4.3-obsolete-dep.patch | 121 +++++++++++++++++++++ .../kgraphviewer/kgraphviewer-2.4.3-r2.ebuild | 43 ++++++++ 3 files changed, 188 insertions(+) diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch new file mode 100644 index 000000000000..8b31d40fb157 --- /dev/null +++ b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch @@ -0,0 +1,24 @@ +From 9961c92736abfc6d0aedea9c4e7c679e1fd564d2 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <[email protected]> +Date: Mon, 7 Mar 2022 19:49:21 +0100 +Subject: [PATCH] Enable highdpi pixmaps + +--- + src/main.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/main.cpp b/src/main.cpp +index 32ad115..271e61f 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -38,6 +38,7 @@ + + int main(int argc, char **argv) + { ++ QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); + QApplication app(argc, argv); + + KLocalizedString::setApplicationDomain("kgraphviewer"); +-- +GitLab + diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch new file mode 100644 index 000000000000..76fa878bc364 --- /dev/null +++ b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch @@ -0,0 +1,121 @@ +From a6f0587d8cbbb246c33423d19f2aabf6ea9d7417 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <[email protected]> +Date: Sun, 8 May 2022 16:59:25 +0200 +Subject: [PATCH] Remove pointless/broken icons + +The distribute-horizontal-page icon doesn't serve any apparent purpose + +The portrait/landscape icons don't exist in any theme + +(cherry picked from commit 7b214252ec5f486912944d987581f207c7b03681) +--- + CMakeLists.txt | 1 - + src/part/CMakeLists.txt | 2 +- + src/part/KgvPageLayoutSize.cpp | 10 ---------- + src/part/simpleprintingpagesetup.cpp | 4 ---- + src/part/simpleprintingpagesetupbase.ui | 10 ---------- + 5 files changed, 1 insertion(+), 26 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fd715d2..238a9dd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -27,7 +27,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS + DocTools + Parts + WidgetsAddons +- IconThemes + ) + + find_package(Boost 1.36 REQUIRED) +diff --git a/src/part/CMakeLists.txt b/src/part/CMakeLists.txt +index 0e70be8..922e5c5 100644 +--- a/src/part/CMakeLists.txt ++++ b/src/part/CMakeLists.txt +@@ -64,7 +64,7 @@ ki18n_wrap_ui(kgraphviewerlib_LIB_SRCS ${kgraphviewerprinting_UI} ) + + add_library(kgraphviewerlib ${kgraphviewerlib_LIB_SRCS}) + +-target_link_libraries(kgraphviewerlib Qt5::Core Qt5::Svg Qt5::PrintSupport Qt5::Svg KF5::WidgetsAddons KF5::IconThemes KF5::XmlGui KF5::I18n KF5::Parts ${graphviz_LIBRARIES}) ++target_link_libraries(kgraphviewerlib Qt5::Core Qt5::Svg Qt5::PrintSupport Qt5::Svg KF5::WidgetsAddons KF5::XmlGui KF5::I18n KF5::Parts ${graphviz_LIBRARIES}) + + set_target_properties(kgraphviewerlib PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${KGRAPHVIEWER_SOVERSION} OUTPUT_NAME kgraphviewer ) + +diff --git a/src/part/KgvPageLayoutSize.cpp b/src/part/KgvPageLayoutSize.cpp +index bb8b3d1..4053a20 100644 +--- a/src/part/KgvPageLayoutSize.cpp ++++ b/src/part/KgvPageLayoutSize.cpp +@@ -42,7 +42,6 @@ + #include <QHBoxLayout> + #include <QGridLayout> + #include <QPixmap> +-#include <KIconTheme> + #include "klocalizedstring.h" + + KgvPageLayoutSize::KgvPageLayoutSize( +@@ -148,19 +147,10 @@ KgvPageLayoutSize::KgvPageLayoutSize( + // m_orientGroup->setInsideSpacing( KDialog::spacingHint() ); + grid1->addWidget( m_orientGroup, 2, 0 ); + +- const int iconSize = KIconTheme(KIconTheme::current()).defaultSize(KIconLoader::Small); +- QLabel* lbPortrait = new QLabel( m_orientGroup ); +- lbPortrait->setPixmap( QPixmap( QIcon::fromTheme( "koPortrait" ).pixmap(iconSize, iconSize) ) ); +- lbPortrait->setMaximumWidth( lbPortrait->pixmap()->width() ); +- lay3->addWidget(lbPortrait); + QRadioButton* rbPortrait = new QRadioButton( i18n("&Portrait"), m_orientGroup ); + lay3->addWidget(rbPortrait); + m_orientButtons.addButton(rbPortrait); + +- QLabel* lbLandscape = new QLabel( m_orientGroup ); +- lbLandscape->setPixmap( QPixmap( QIcon::fromTheme( "koLandscape" ).pixmap(iconSize, iconSize) ) ); +- lbLandscape->setMaximumWidth( lbLandscape->pixmap()->width() ); +- lay3->addWidget(lbLandscape); + QRadioButton* rbLandscape = new QRadioButton( i18n("La&ndscape"), m_orientGroup ); + lay3->addWidget(rbLandscape); + m_orientGroup->setLayout(lay3); +diff --git a/src/part/simpleprintingpagesetup.cpp b/src/part/simpleprintingpagesetup.cpp +index 9882fbf..cd707b9 100644 +--- a/src/part/simpleprintingpagesetup.cpp ++++ b/src/part/simpleprintingpagesetup.cpp +@@ -57,7 +57,6 @@ + #include <QPixmap> + #include <QVBoxLayout> + #include <klocalizedstring.h> +-#include <KIconTheme> + #include <iostream> + + namespace KGraphViewer +@@ -109,9 +108,6 @@ KGVSimplePrintingPageSetup::KGVSimplePrintingPageSetup( + connect(m_contents->printPreviewButton, &QPushButton::clicked, + this, &KGVSimplePrintingPageSetup::slotPrintPreview); + +- m_contents->iconLabel->setFixedWidth(32+6); +- const int iconSize = KIconTheme(KIconTheme::current()).defaultSize(KIconLoader::Small); +- m_contents->iconLabel->setPixmap(QIcon::fromTheme("distribute-horizontal-page").pixmap(iconSize, iconSize)); + m_contents->headerTitleFontButton->setText(i18n("Font...")); + m_contents->headerTitleFontButton->setWhatsThis(i18n("Changes font for title text.")); + connect(m_contents->headerTitleFontButton, &QPushButton::clicked, +diff --git a/src/part/simpleprintingpagesetupbase.ui b/src/part/simpleprintingpagesetupbase.ui +index ddc6ee0..719a7d6 100644 +--- a/src/part/simpleprintingpagesetupbase.ui ++++ b/src/part/simpleprintingpagesetupbase.ui +@@ -157,16 +157,6 @@ + </item> + </layout> + </item> +- <item> +- <widget class="QLabel" name="iconLabel"> +- <property name="text"> +- <string/> +- </property> +- <property name="alignment"> +- <set>Qt::AlignVCenter</set> +- </property> +- </widget> +- </item> + <item> + <widget class="QGroupBox" name="groupBox4"> + <property name="title"> +-- +2.37.3 + diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild new file mode 100644 index 000000000000..51254ef0da56 --- /dev/null +++ b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org + +DESCRIPTION="Graphviz dot graph file viewer" +HOMEPAGE="https://apps.kde.org/kgraphviewer"; +[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + +LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="" + +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=media-gfx/graphviz-2.30 +" +DEPEND="${RDEPEND} + dev-libs/boost +" + +PATCHES=( + "${FILESDIR}/${P}-set-startupwmclass.patch" + "${FILESDIR}/${P}-highdpi.patch" + "${FILESDIR}/${P}-obsolete-dep.patch" +)
