From dfd7c8230bca447ee0b09dc11150181b0b3148e2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 14 Nov 2023 16:34:53 +0000 Subject: gentoo auto-resync : 14:11:2023 - 16:34:53 --- app-text/Manifest.gz | Bin 48932 -> 48765 bytes app-text/coolreader/Manifest | 4 - app-text/coolreader/coolreader-3.2.59-r4.ebuild | 71 -------------- .../coolreader/files/coolreader-wxwidgets.patch | 109 --------------------- app-text/coolreader/metadata.xml | 17 ---- 5 files changed, 201 deletions(-) delete mode 100644 app-text/coolreader/Manifest delete mode 100644 app-text/coolreader/coolreader-3.2.59-r4.ebuild delete mode 100644 app-text/coolreader/files/coolreader-wxwidgets.patch delete mode 100644 app-text/coolreader/metadata.xml (limited to 'app-text') diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz index 2996624afbd2..4b16d2fd6ea3 100644 Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest deleted file mode 100644 index efb20d3b2989..000000000000 --- a/app-text/coolreader/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX coolreader-wxwidgets.patch 3660 BLAKE2B f7f736e0b9aedffe80f8327e0e0090439bdb529dd4d3e69e9b60c77e815e53d3d9ced76442c174f180362a9a198133e12bd486c4fea139ee07066f2d424b20d9 SHA512 f33f90b9a7254dc20c42218e6fd6781ebbdef988b1c758748197b71a9fdb62e02cc3ce8bb465b9c462d5dc61e5cdcebc523110e1172d3208853bb0291d8017f7 -DIST coolreader-3.2.59.tar.gz 13596218 BLAKE2B a59d11aff93166de77add5d230539068172a81968414b9c38b6ca25f08bd7830b81c0b800055a4eefbd6bb1be94298bf74d240f981c928bd4514073d943bb33d SHA512 72fc05814ca4f6da5310f7b47fd7939bc1567e5dd7e7e75bc29e2b1436dc4901498622a770e89323581c3f0b3b9ec305050ca5917eceba4df4a07cff3e1748d6 -EBUILD coolreader-3.2.59-r4.ebuild 1949 BLAKE2B cec3bb701c3dd88a74405db4bda1b99715e9ae0fdbaeee9a9f571183914ee644623c48905985123ed00191478443ac012c4b242057c78f91616e26b4b6d00325 SHA512 227a8cc175bbb11eaf98fc9ddbf32c7f8ef81defb2edcbf1075f5843e3ac2a32d4a9fb4542aa7dc5c30b845b1ccafcf01f7ed6cd9560e67fe1dc371b80814199 -MISC metadata.xml 630 BLAKE2B e179265deb3518a96cea13ec64fb83105edd9475bd6c9c47462e804d3f1ab3b4bfdc3b1f8911d1724a11f667d74fa506877e9e7340e5b6565702e8479cf71982 SHA512 b7eed2a628b86440649977391e0fb18ba3422b66f54a46ec60ab39cb9f4ed997b8efeae51c2efadb152d93841d05ff3c00303269a7368e93c0bf2d55d2b1645e 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 -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 @@ - - - - - grozin@gentoo.org - - - 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. - - - Use x11-libs/wxGTK instead of Qt5 - - - buggins/coolreader - - -- cgit v1.2.3