* [gentoo-commits] repo/gentoo:master commit in: app-text/kchmviewer/, app-text/kchmviewer/files/, profiles/
@ 2025-04-29 20:15 Andreas Sturmlechner
0 siblings, 0 replies; only message in thread
From: Andreas Sturmlechner @ 2025-04-29 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 3e2fbb84ecb3fda99f616dde438b48893c0860b2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 29 14:39:47 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 29 20:14:54 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e2fbb84
app-text/kchmviewer: treeclean
Closes: https://bugs.gentoo.org/823008 (pkgremoved)
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-text/kchmviewer/Manifest | 1 -
...viewer-8.0-custom-url-scheme-registration.patch | 59 ----------------------
.../files/kchmviewer-8.0-no-qtwebkit.patch | 28 ----------
.../files/kchmviewer-8.0-underlinking.patch | 30 -----------
app-text/kchmviewer/kchmviewer-8.0.ebuild | 47 -----------------
app-text/kchmviewer/metadata.xml | 11 ----
profiles/package.mask | 5 --
7 files changed, 181 deletions(-)
diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
deleted file mode 100644
index c3c46af89a36..000000000000
--- a/app-text/kchmviewer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kchmviewer-8.0.tar.gz 311899 BLAKE2B f317dcc17fa88f30a4a1867b59b16bdc78457b46f4f3d3b78bd5d9d50745bf2d2329df170568c7814a02814a77b319bbd1d9f8edc3c1da0071a6ce64965b26bf SHA512 28ae8ee8a6f4a9be2e8a9666f6326906e04f34ad80a363697fc7e5bfbc745e6671884add3f57b6a1264f2056428cb0a31504da9c69a0bede0c3b485a08e75048
diff --git a/app-text/kchmviewer/files/kchmviewer-8.0-custom-url-scheme-registration.patch b/app-text/kchmviewer/files/kchmviewer-8.0-custom-url-scheme-registration.patch
deleted file mode 100644
index 144d673b2b17..000000000000
--- a/app-text/kchmviewer/files/kchmviewer-8.0-custom-url-scheme-registration.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 9ac73e7ad15de08aab6b1198115be2eb44da7afe Mon Sep 17 00:00:00 2001
-From: George Yunaev <gyunaev@ulduzsoft.com>
-Date: Fri, 21 May 2021 15:57:21 -0700
-Subject: [PATCH] Custom URL scheme registration needs to be applied once per
- https://doc.qt.io/qt-5/qwebengineurlschemehandler.html
-
----
- src/viewwindow_webengine.cpp | 20 +++++++++++++-------
- src/viewwindow_webengine.h | 3 ---
- 2 files changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/src/viewwindow_webengine.cpp b/src/viewwindow_webengine.cpp
-index 631d84d..34f3396 100644
---- a/src/viewwindow_webengine.cpp
-+++ b/src/viewwindow_webengine.cpp
-@@ -63,16 +63,22 @@ ViewWindow::ViewWindow( QWidget * parent )
- m_contextMenuLink = 0;
- m_storedScrollbarPosition = -1; // see header
-
-- // Use our network emulation layer. I don't know if we transfer the ownership when we install it,
-- // so we create one per page. May be unnecessary.
-- m_provider = new DataProvider_QWebEngine( this );
--
-- page()->profile()->installUrlSchemeHandler( EBook_CHM::urlScheme(), m_provider );
-- page()->profile()->installUrlSchemeHandler( EBook_EPUB::urlScheme(), m_provider );
--
- // All links are going through us
- //page()->setLinkDelegationPolicy( QWebPage::DelegateAllLinks );
-
-+ // This needs to be done only once
-+ static bool providerInstalled = false;
-+
-+ if ( !providerInstalled )
-+ {
-+ // Use our network emulation layer. We do not transfer the ownership when we install it. See https://doc.qt.io/qt-5/qwebengineurlschemehandler.html
-+ DataProvider_QWebEngine * provider = new DataProvider_QWebEngine( 0 );
-+
-+ QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( EBook_CHM::urlScheme(), provider );
-+ QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( EBook_EPUB::urlScheme(), provider );
-+ providerInstalled = true;
-+ }
-+
- connect( this, SIGNAL( loadFinished(bool)), this, SLOT( onLoadFinished(bool)) );
-
- // Search results highlighter
-diff --git a/src/viewwindow_webengine.h b/src/viewwindow_webengine.h
-index 0adea31..3e96690 100644
---- a/src/viewwindow_webengine.h
-+++ b/src/viewwindow_webengine.h
-@@ -128,9 +128,6 @@ class ViewWindow : public QWebEngineView
- // It is set to -1 if no scrollbar position has been set and the page is not loaded yet
- // It is set to 0 if no scrollbar position has been set and the page is loaded already
- int m_storedScrollbarPosition;
--
-- // Data provider
-- DataProvider_QWebEngine * m_provider;
- };
-
- #endif // VIEWWINDOW_WEBENGINE_H
diff --git a/app-text/kchmviewer/files/kchmviewer-8.0-no-qtwebkit.patch b/app-text/kchmviewer/files/kchmviewer-8.0-no-qtwebkit.patch
deleted file mode 100644
index 18360c897821..000000000000
--- a/app-text/kchmviewer/files/kchmviewer-8.0-no-qtwebkit.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a4a3984465cb635822953350c571950ae726b539 Mon Sep 17 00:00:00 2001
-From: George Yunaev <gyunaev@ulduzsoft.com>
-Date: Sun, 23 May 2021 15:01:24 -0700
-Subject: [PATCH] Only add Webkit stuff to QT if we're compiling under 5.6.
- Thanks to @u-235 for reporting.
-
----
- src/src.pro | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/src/src.pro b/src/src.pro
-index f502259..e75d6a9 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -60,12 +60,7 @@ FORMS += tab_bookmarks.ui \
- toolbareditor.ui
- RESOURCES += resources/images.qrc
-
--QT += webkit \
-- xml \
-- network \
-- widgets \
-- webkitwidgets \
-- printsupport
-+QT += xml network widgets printsupport
-
- linux-g++*:{
- LIBS += -lX11
diff --git a/app-text/kchmviewer/files/kchmviewer-8.0-underlinking.patch b/app-text/kchmviewer/files/kchmviewer-8.0-underlinking.patch
deleted file mode 100644
index b4ed3b500c8d..000000000000
--- a/app-text/kchmviewer/files/kchmviewer-8.0-underlinking.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e3b09edbbae17ad19661a7514afe5a9d84ca0ffa Mon Sep 17 00:00:00 2001
-From: George Yunaev <gyunaev@ulduzsoft.com>
-Date: Sun, 23 May 2021 15:03:06 -0700
-Subject: [PATCH] Adding support for old single-pass gcc linker which requires
- a specific order of libraries. Thanks to @u-235 for reporting and patch.
-
----
- src/src.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/src.pro b/src/src.pro
-index e75d6a9..14c31a1 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -40,7 +40,6 @@ SOURCES += config.cpp \
- textencodings.cpp \
- treeitem_toc.cpp \
- treeitem_index.cpp
--LIBS += -lchm -lzip
- TARGET = ../bin/kchmviewer
- CONFIG += threads \
- warn_on \
-@@ -106,6 +105,7 @@ unix:!macx: {
- LIBS += ../lib/libebook/libebook.a
- POST_TARGETDEPS += ../lib/libebook/libebook.a
- }
-+LIBS += -lchm -lzip
-
- greaterThan(QT_MAJOR_VERSION, 4) {
- # Qt 5
diff --git a/app-text/kchmviewer/kchmviewer-8.0.ebuild b/app-text/kchmviewer/kchmviewer-8.0.ebuild
deleted file mode 100644
index 1e58bfae7105..000000000000
--- a/app-text/kchmviewer/kchmviewer-8.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg
-
-DESCRIPTION="Feature rich chm file viewer, based on Qt"
-HOMEPAGE="https://www.ulduzsoft.com/kchmviewer/"
-SRC_URI="https://github.com/gyunaev/${PN}/archive/refs/tags/RELEASE_${PV/./_}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/kchmviewer-RELEASE_8_0"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-DEPEND="
- dev-libs/chmlib
- dev-libs/libzip:=
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwebengine:5[widgets]
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-underlinking.patch"
- "${FILESDIR}/${P}-custom-url-scheme-registration.patch"
- "${FILESDIR}/${P}-no-qtwebkit.patch"
-)
-
-src_configure() {
- eqmake5
-}
-
-src_install() {
- dodoc ChangeLog DBUS-bindings FAQ README
- doicon packages/kchmviewer.png
- dobin bin/kchmviewer
- domenu packages/kchmviewer.desktop
-}
diff --git a/app-text/kchmviewer/metadata.xml b/app-text/kchmviewer/metadata.xml
deleted file mode 100644
index 59f7e66a3fa5..000000000000
--- a/app-text/kchmviewer/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">gyunaev/kchmviewer</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index e5ceca43b1ba..e3038bd9aaa8 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -161,11 +161,6 @@ media-gfx/xloadimage
# Removal on 2025-04-30. Bug #926666
media-video/jellyfin-media-player
-# Andreas Sturmlechner <asturm@gentoo.org> (2025-04-02)
-# No release since 2021, no commit in 3 years, depends on Qt5WebEngine.
-# Use app-text/uchmviewer instead. Removal on 2025-04-30. Bug #823008
-app-text/kchmviewer
-
# Ionen Wolkens <ionen@gentoo.org> (2025-04-02)
# Masked for testing the new .0 version and leave time for packages
# to catch up on support if needed. May or may keep masked until 6.9.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2025-04-29 20:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-04-29 20:15 [gentoo-commits] repo/gentoo:master commit in: app-text/kchmviewer/, app-text/kchmviewer/files/, profiles/ Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox