commit: 8392c14d61f4cb4467b2d2e4b02218fce56e6a40 Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Tue Nov 14 10:19:51 2023 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Tue Nov 14 10:20:11 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8392c14d
app-text/coolreader: treeclean Closes: https://bugs.gentoo.org/915634 Closes: https://bugs.gentoo.org/913470 Closes: https://bugs.gentoo.org/854894 Closes: https://bugs.gentoo.org/632678 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> app-text/coolreader/Manifest | 1 - app-text/coolreader/coolreader-3.2.59-r4.ebuild | 71 -------------- .../coolreader/files/coolreader-wxwidgets.patch | 109 --------------------- app-text/coolreader/metadata.xml | 17 ---- profiles/package.mask | 7 -- 5 files changed, 205 deletions(-) diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest deleted file mode 100644 index 0519c8007033..000000000000 --- a/app-text/coolreader/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST coolreader-3.2.59.tar.gz 13596218 BLAKE2B a59d11aff93166de77add5d230539068172a81968414b9c38b6ca25f08bd7830b81c0b800055a4eefbd6bb1be94298bf74d240f981c928bd4514073d943bb33d SHA512 72fc05814ca4f6da5310f7b47fd7939bc1567e5dd7e7e75bc29e2b1436dc4901498622a770e89323581c3f0b3b9ec305050ca5917eceba4df4a07cff3e1748d6 diff --git a/app-text/coolreader/coolreader-3.2.59-r4.ebuild b/app-text/coolreader/coolreader-3.2.59-r4.ebuild deleted file mode 100644 index 9f5dcc61edec..000000000000 --- a/app-text/coolreader/coolreader-3.2.59-r4.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -WX_GTK_VER="3.0-gtk3" -PLOCALES="bg cs de es hu pl ru uk" -inherit cmake plocale wxwidgets xdg - -CR_PV=$(ver_rs 3 '-') -SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-cr${CR_PV}" - -DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)" -HOMEPAGE="https://github.com/buggins/coolreader/"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="wxwidgets" - -CDEPEND="sys-libs/zlib - app-arch/zstd:= - media-libs/libpng:0 - media-libs/libjpeg-turbo - media-libs/freetype - dev-libs/fribidi - media-libs/fontconfig - media-libs/harfbuzz:= - dev-libs/libunibreak:= - dev-libs/libutf8proc:= - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) - !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )" -BDEPEND="${CDEPEND} - !wxwidgets? ( dev-qt/linguist-tools:5 )" -RDEPEND="${CDEPEND} - wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )" - -PATCHES=( "${FILESDIR}"/${PN}-wxwidgets.patch ) - -src_prepare() { - cmake_src_prepare - xdg_environment_reset - - # locales - plocale_find_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts' - sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(plocale_get_locales))|" \ - -i "${S}"/cr3qt/CMakeLists.txt \ - || die "sed CMakeLists.txt failed" -} - -src_configure() { - CMAKE_USE_DIR="${S}" - CMAKE_BUILD_TYPE="Release" - if use wxwidgets; then - setup-wxwidgets - local mycmakeargs=(-DGUI=WX) - else - local mycmakeargs=(-DGUI=QT5) - fi - cmake_src_configure -} - -src_install() { - cmake_src_install - if ! use wxwidgets; then - mv "${D}"/usr/share/doc/cr3/changelog.gz "${D}"/usr/share/doc/${PF}/ || die "mv changelog.gz failed" - rmdir "${D}"/usr/share/doc/cr3 || die "rmdir doc/cr3 failed" - gunzip "${D}"/usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed" - gunzip "${D}"/usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed" - fi -} diff --git a/app-text/coolreader/files/coolreader-wxwidgets.patch b/app-text/coolreader/files/coolreader-wxwidgets.patch deleted file mode 100644 index aac02864b0e4..000000000000 --- a/app-text/coolreader/files/coolreader-wxwidgets.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 2040a15d2a23ee4d16af8f2294e1593fa267e8d9 Mon Sep 17 00:00:00 2001 -From: Aleksey Chernov <[email protected]> -Date: Thu, 9 Sep 2021 10:41:38 +0400 -Subject: [PATCH] Fixed wxWidgets build failure: compilation error due to API - change. Introduced in c47cab44799475a48230312b8e97cd7a71edddb0. - ---- - cr3wx/src/view.cpp | 82 ++++++++++++++++++++++++++++++++++------------ - 1 file changed, 61 insertions(+), 21 deletions(-) - -diff --git a/cr3wx/src/view.cpp b/cr3wx/src/view.cpp -index df2a264f7f..2ee30f9421 100644 ---- a/cr3wx/src/view.cpp -+++ b/cr3wx/src/view.cpp -@@ -307,33 +307,73 @@ void cr3view::OnTimer(wxTimerEvent& event) - } - } - --void cr3view::Paint() -+static bool getBatteryState(int& state, int& chargingConn, int& level) - { -- //printf("cr3view::Paint() \n"); -- int battery_state = -1; - #ifdef _WIN32 -+ // update battery state - SYSTEM_POWER_STATUS bstatus; - BOOL pow = GetSystemPowerStatus(&bstatus); -- if (bstatus.BatteryFlag & 128) -- pow = FALSE; -- if (bstatus.ACLineStatus!=0 || bstatus.BatteryLifePercent==255) -- pow = FALSE; -- if ( pow ) -- battery_state = bstatus.BatteryLifePercent; -+ if (pow) { -+ state = CR_BATTERY_STATE_DISCHARGING; -+ if (bstatus.BatteryFlag & 128) -+ state = CR_BATTERY_STATE_NO_BATTERY; // no system battery -+ else if (bstatus.BatteryFlag & 8) -+ state = CR_BATTERY_STATE_CHARGING; // charging -+ chargingConn = CR_BATTERY_CHARGER_NO; -+ if (bstatus.ACLineStatus==1) -+ chargingConn = CR_BATTERY_CHARGER_AC; // AC power charging connected -+ if (bstatus.BatteryLifePercent>=0 && bstatus.BatteryLifePercent<=100) -+ level = bstatus.BatteryLifePercent; -+ return true; -+ } -+ return false; - #else -- if ( ::wxGetPowerType() == wxPOWER_BATTERY ) { -- int n = ::wxGetBatteryState(); -- if ( n == wxBATTERY_NORMAL_STATE ) -- battery_state = 100; -- else if ( n == wxBATTERY_LOW_STATE ) -- battery_state = 50; -- else if ( n == wxBATTERY_CRITICAL_STATE ) -- battery_state = 0; -- else if ( n == wxBATTERY_SHUTDOWN_STATE ) -- battery_state = 0; -- }; -+ wxPowerType wxpwrtype = wxGetPowerType(); -+ switch (wxpwrtype) { -+ case wxPOWER_SOCKET: -+ state = CR_BATTERY_STATE_CHARGING; -+ chargingConn = CR_BATTERY_CHARGER_AC; -+ break; -+ case wxPOWER_BATTERY: -+ state = CR_BATTERY_STATE_DISCHARGING; -+ chargingConn = CR_BATTERY_CHARGER_NO; -+ break; -+ default: -+ state = CR_BATTERY_STATE_NO_BATTERY; -+ chargingConn = CR_BATTERY_CHARGER_NO; -+ break; -+ } -+ wxBatteryState wxbatstate = wxGetBatteryState(); -+ switch (wxbatstate) { -+ case wxBATTERY_NORMAL_STATE: -+ level = 100; -+ break; -+ case wxBATTERY_LOW_STATE: -+ level = 50; -+ break; -+ case wxBATTERY_CRITICAL_STATE: -+ level = 5; -+ break; -+ case wxBATTERY_SHUTDOWN_STATE: -+ level = 0; -+ break; -+ default: -+ level = 0; -+ break; -+ } -+ return true; - #endif -- getDocView()->setBatteryState( battery_state ); -+} -+ -+void cr3view::Paint() -+{ -+ //printf("cr3view::Paint() \n"); -+ int battery_state; -+ int charging_conn; -+ int charge_level; -+ if (getBatteryState(battery_state, charging_conn, charge_level)) { -+ getDocView()->setBatteryState( battery_state, charging_conn, charge_level ); -+ } - //_docview->Draw(); - UpdateScrollBar(); - Refresh( FALSE ); diff --git a/app-text/coolreader/metadata.xml b/app-text/coolreader/metadata.xml deleted file mode 100644 index 5db08561fc93..000000000000 --- a/app-text/coolreader/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - </maintainer> - <longdescription lang="en"> - A fast and small cross-platform XML/CSS based eBook reader for desktops and handheld devices. - Supported formats: FB2, TXT, RTF, DOC, TCR, HTML, EPUB, CHM, PDB, MOBI. - </longdescription> - <use> - <flag name="wxwidgets">Use <pkg>x11-libs/wxGTK</pkg> instead of Qt5</flag> - </use> - <upstream> - <remote-id type="github">buggins/coolreader</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 7c7fe5cee11f..8c67f983aa3b 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -273,13 +273,6 @@ media-video/dvd9to5 media-video/dvdrip media-video/transcode -# Andrey Grozin <[email protected]> (2023-10-12) -# The last upstream tag in 2021 -# There is an active fork: app-text/crqt-ng and app-text/crwx-ng -# Bug https://bugs.gentoo.org/915634 -# Removal on 2023-11-11 -app-text/coolreader - # Sam James <[email protected]> (2023-10-06) # Breaks building scipy: https://github.com/cython/cython/issues/5748 =dev-python/cython-3.0.3
