diff options
Diffstat (limited to 'kde-plasma/kdeplasma-addons')
| -rw-r--r-- | kde-plasma/kdeplasma-addons/Manifest | 5 | ||||
| -rw-r--r-- | kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.5-fix-potd.patch | 64 | ||||
| -rw-r--r-- | kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild (renamed from kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.4.ebuild) | 5 | ||||
| -rw-r--r-- | kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5.ebuild | 75 |
4 files changed, 70 insertions, 79 deletions
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest index c6fbd47da711..761d5da10739 100644 --- a/kde-plasma/kdeplasma-addons/Manifest +++ b/kde-plasma/kdeplasma-addons/Manifest @@ -1,8 +1,7 @@ AUX kdeplasma-addons-5.19.3-kross-optional.patch 1956 BLAKE2B 922b8e73147439a706a37fcec29dcf7fb424e8ceaa8bfa1e4e54ca6c5851cf937318ee91654bf5cb352b80076aa90c9063ec07b02c7fbade8613f3d560178e86 SHA512 f9c87b27b0e8d020519259fda8df118266dd11b589873a3a8a5b4bcdf1e77e65fad29334aee80717cfe208c54021d39caee36533d144538bd80b5c1618cd36b4 +AUX kdeplasma-addons-5.19.5-fix-potd.patch 2485 BLAKE2B cddf302e5956c3c215c51c08e3358083b02d27038b6e46a345881f2ae4b38c7af3f0012ca300fbe9697bcc15165d09bd0596f91f743dc6cc6bc7f4b286a85951 SHA512 5ef0b40c381bdda5a701240e4622df2044ccb68093b2d0853671db9d6de7274f28723b799d4552e2a99d35e67c232d26a0e1a24939bf02c155366c050a0bce6f DIST kdeplasma-addons-5.18.5.tar.xz 623872 BLAKE2B 684c9e569575024fe96d6043a91e6a810db69205e3867db9840442b901c120db4f0dacb09540a145f5ae90b5fc6fcd934e26a3d4435e9d23eb374f4e5ca1e391 SHA512 7baa84335af5afc1af2cd47134863961df7a43c719bdde180754aa0b5a83975c3d5fb79435b523589751029f0fbb1751fae90db5db8e42c995c9dd24578cbeb6 -DIST kdeplasma-addons-5.19.4.tar.xz 628036 BLAKE2B c0d3417eb2ac722dd6a93a667214dccacb305893c1054c3b85124e862d530fbd09827ea23f475cdf0cb754bd6fb54cde7c0fa1b7238d67efab472abf9d7cebb7 SHA512 01e43e573b0d1fc1cb62ae469d93974405138e3139a1973a0e78b42f46221feb58efa389e527fb81941df91807da7dc22d56d2b419c652af3af872660c661f12 DIST kdeplasma-addons-5.19.5.tar.xz 629136 BLAKE2B 992df5d362aca213531cb96b8d01a3c2792ed91562d4f6a7f71e8b50ba6ee28cbd6501b75c7c91923b6afcb13fdf1b385189f718d8cebb482d1cedd040f67d94 SHA512 93de717c623605ceb9fdcedecdf656030b6e9bc360ce834ea918403f64f250029e9a2406bddc0b324e4738006d4ca155bc509f4a7d40c073a2aefb2017db9731 EBUILD kdeplasma-addons-5.18.5.ebuild 1752 BLAKE2B 010e42c867df1157c15996b23f68cbaf268508a53842c76caff7831975f60c9a3099798e9579167bd093584d690390ce9d43524ec3e7aba12a7c3d94c70ec2f4 SHA512 253c8e7abef4701ba3ec136ea225a4c181491056cf66ff3a4114522a041d6bcf36bd14da939d3e3979d793de50e845207dd4f9453b0a5d9335668373f79c479c -EBUILD kdeplasma-addons-5.19.4.ebuild 2081 BLAKE2B 3018fc8e512e02f71ee65085e25057195867859496ccc8d6109312bca00a6900295a5503692614c4ed754279ab1da71bedf5de9f03ef71d6e2710ec4980da90e SHA512 5319dc917c35b10fa957f183b10c0dd4cc29003120290d3dbb68f95ae856a620d2fd71cfed0b2369aac2dc34052d75b6a9a13a53143101f0774fc2371022ae34 -EBUILD kdeplasma-addons-5.19.5.ebuild 2081 BLAKE2B 3018fc8e512e02f71ee65085e25057195867859496ccc8d6109312bca00a6900295a5503692614c4ed754279ab1da71bedf5de9f03ef71d6e2710ec4980da90e SHA512 5319dc917c35b10fa957f183b10c0dd4cc29003120290d3dbb68f95ae856a620d2fd71cfed0b2369aac2dc34052d75b6a9a13a53143101f0774fc2371022ae34 +EBUILD kdeplasma-addons-5.19.5-r1.ebuild 2153 BLAKE2B 89416f80a529fd1ab2ceb6359fe53fbfee8feca5af0a06ff8d55a1170ebaed10f1e3fb8bb3087e0026cd6527c3d5841aead4821770c990da82a6bd4f3e30cd7d SHA512 bb465fe76aea7ab07e58d81ac2fd87d946b71c6c622d88d355aa490c30a1dc33870826b3cd6e2aa73a0d330b0d1269a5aef6fa2f559ae6c27366423bf467e530 MISC metadata.xml 567 BLAKE2B 5009c2a6fd74956562b1b3b33322a457a0d295ae472f89208c3756d9847aed9f7b501d0a7e135e95c1a455a57f65876dca71e94446043b9b7d3dc551d58da854 SHA512 2e2fdba9c39b93e082b24d38b1134245e682b07a99b587c9eb6060aae318dd10d08af661880df478a1a97a23c46f1259a4753b9b6169af6af75babfbccf1c7ce diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.5-fix-potd.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.5-fix-potd.patch new file mode 100644 index 000000000000..8cc7f7fb91a0 --- /dev/null +++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.5-fix-potd.patch @@ -0,0 +1,64 @@ +From d5f9e6af9f9cda210b15d5c10b370006c86bd7ad Mon Sep 17 00:00:00 2001 +From: Guo Yunhe <i@guoyunhe.me> +Date: Thu, 23 Apr 2020 22:36:34 +0300 +Subject: [PATCH] Fix POTD in lock screen + +Summary: +2. Flickr and APOD(NASA) providers cannot cache pictures in `PNG` but +`JPEG` works. So I simply changed the cache format to `JPEG`. Most POTD +are photos. JPEG saves more spaces. + +Subscribers: plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D29140 + +Merge Request: https://invent.kde.org/plasma/kdeplasma-addons/-/merge_requests/3 + +BUG: 389962 + +FIXED-IN: 5.20 + +* asturm 2020-09-04: Backported to 5.19.5, including merged commits e7c51a04 and +* e6472153, shortened summary to relevant bits, dropped unrelated hunks. +--- + dataengines/potd/PoTD-list.txt | 1 + + dataengines/potd/cachedprovider.cpp | 14 +++---- + 2 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/dataengines/potd/PoTD-list.txt b/dataengines/potd/PoTD-list.txt +index 53b0fe02a..c74316614 100644 +--- a/dataengines/potd/PoTD-list.txt ++++ b/dataengines/potd/PoTD-list.txt +@@ -5,6 +5,7 @@ LIST OF POSSIBLE PROVIDERS + http://antwrp.gsfc.nasa.gov/apod/astropix.html + Each day can be reached via the URL http://antwrp.gsfc.nasa.gov/apod/apYYMMDD.html + where YY is the 2 digits year, MM is the 2 digits month and DD is the 2 digits day. ++Note: sometimes, the webpage shows a YouTube video and picture cannot be fetched. + + * Flickr Interestingness ---------------------------- DONE + http://www.flickr.com/explore/interesting/ +diff --git a/dataengines/potd/cachedprovider.cpp b/dataengines/potd/cachedprovider.cpp +index 476a7c253..d6fb63fe9 100644 +--- a/dataengines/potd/cachedprovider.cpp ++++ b/dataengines/potd/cachedprovider.cpp +@@ -51,13 +51,13 @@ SaveImageThread::SaveImageThread(const QString &identifier, const QImage &image) + void SaveImageThread::run() + { + const QString path = CachedProvider::identifierToPath( m_identifier ); +- m_image.save(path, "PNG"); ++ m_image.save(path, "JPEG"); + emit done( m_identifier, path, m_image ); + } + + QString CachedProvider::identifierToPath( const QString &identifier ) + { +- const QString dataDir = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QLatin1String("/plasma_engine_potd/"); ++ const QString dataDir = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1String("/plasma_engine_potd/"); + QDir d; + d.mkpath(dataDir); + return dataDir + identifier; +-- +GitLab + diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.4.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild index 0b16be6fcc80..509b4e256841 100644 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.4.ebuild +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild @@ -53,7 +53,10 @@ RDEPEND="${DEPEND} >=kde-plasma/plasma-workspace-${PVCUT}:5 " -PATCHES=( "${FILESDIR}/${PN}-5.19.3-kross-optional.patch" ) +PATCHES=( + "${FILESDIR}/${P}-fix-potd.patch" # in Plasma/5.20 + "${FILESDIR}/${PN}-5.19.3-kross-optional.patch" # downstream patch +) src_configure() { local mycmakeargs=( diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5.ebuild deleted file mode 100644 index 0b16be6fcc80..000000000000 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.71.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.14.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Extra Plasma applets and engines" - -LICENSE="GPL-2 LGPL-2" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="+comic share webengine" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kholidays-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kunitconversion-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 - comic? ( >=kde-frameworks/kross-${KFMIN}:5 ) - share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) - webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 ) -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-plasma/plasma-workspace-${PVCUT}:5 -" - -PATCHES=( "${FILESDIR}/${PN}-5.19.3-kross-optional.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package comic KF5Kross) - $(cmake_use_find_package share KF5Purpose) - $(cmake_use_find_package webengine Qt5WebEngine) - ) - - ecm_src_configure -} - -pkg_postinst() { - ecm_pkg_postinst - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - has_version sys-fs/quota || \ - elog "For using disk quota applet, install sys-fs/quota." - fi -} |