diff options
| -rw-r--r-- | app-text/coolreader/files/coolreader-wxwidgets.patch | 109 | ||||
| -rw-r--r-- | dev-python/patch-ng/metadata.xml | 25 | ||||
| -rw-r--r-- | dev-python/patch-ng/patch-ng-1.17.4.ebuild | 11 |
3 files changed, 127 insertions, 18 deletions
diff --git a/app-text/coolreader/files/coolreader-wxwidgets.patch b/app-text/coolreader/files/coolreader-wxwidgets.patch new file mode 100644 index 000000000000..aac02864b0e4 --- /dev/null +++ b/app-text/coolreader/files/coolreader-wxwidgets.patch @@ -0,0 +1,109 @@ +From 2040a15d2a23ee4d16af8f2294e1593fa267e8d9 Mon Sep 17 00:00:00 2001 +From: Aleksey Chernov <valexlin@gmail.com> +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/dev-python/patch-ng/metadata.xml b/dev-python/patch-ng/metadata.xml index 66cb7dee1ee9..b8d42c6fc9b0 100644 --- a/dev-python/patch-ng/metadata.xml +++ b/dev-python/patch-ng/metadata.xml @@ -1,16 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>azamat.hackimov@gmail.com</email> - <name>Azamat H. Hackimov</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <upstream> - <remote-id type="pypi">patch-ng</remote-id> - <remote-id type="github">conan-io/python-patch-ng</remote-id> - </upstream> + <maintainer type="person" proxied="yes"> + <email>azamat.hackimov@gmail.com</email> + <name>Azamat H. Hackimov</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <stabilize-allarches/> + <upstream> + <remote-id type="pypi">patch-ng</remote-id> + <remote-id type="github">conan-io/python-patch-ng</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-python/patch-ng/patch-ng-1.17.4.ebuild b/dev-python/patch-ng/patch-ng-1.17.4.ebuild index ccbdec8387b8..ba2038b565a1 100644 --- a/dev-python/patch-ng/patch-ng-1.17.4.ebuild +++ b/dev-python/patch-ng/patch-ng-1.17.4.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit distutils-r1 DESCRIPTION="Library to parse and apply unified diffs, fork of dev-python/patch" HOMEPAGE="https://github.com/conan-io/python-patch-ng https://pypi.org/project/patch-ng/" SRC_URI="https://github.com/conan-io/python-patch-ng/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/python-${P}" LICENSE="MIT" SLOT="0" @@ -16,8 +17,6 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" distutils_enable_tests unittest -S="${WORKDIR}/python-${P}" - python_test() { - "${EPYTHON}" -m unittest tests/run_tests.py || die "Tests failed under ${EPYTHON}" + "${EPYTHON}" -m unittest -v tests/run_tests.py || die "Tests failed under ${EPYTHON}" } |