commit: fc32539aa516730646f3267811730da3197ba439 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Dec 21 09:09:26 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Dec 21 09:09:26 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc32539a
media-video/kmplayer: Remove last-rited package Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-video/kmplayer/Manifest | 1 - .../kmplayer/files/kmplayer-0.12.0b-cmake.patch | 50 -------------- .../kmplayer/files/kmplayer-0.12.0b-desktop.patch | 47 ------------- .../files/kmplayer-0.12.0b-devpixelratio.patch | 36 ---------- .../kmplayer/files/kmplayer-0.12.0b-qfile.patch | 33 --------- .../files/kmplayer-0.12.0b-qt-5.11b3.patch | 29 -------- .../kmplayer/files/kmplayer-0.12.0b-qt-5.9.patch | 42 ------------ .../files/kmplayer-0.12.0b-schedulerepaint.patch | 61 ----------------- media-video/kmplayer/kmplayer-0.12.0b-r4.ebuild | 78 ---------------------- media-video/kmplayer/metadata.xml | 12 ---- profiles/package.mask | 5 -- 11 files changed, 394 deletions(-) diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest deleted file mode 100644 index e5889b7e636..00000000000 --- a/media-video/kmplayer/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kmplayer-0.12.0b.tar.bz2 599496 BLAKE2B c27b54cf05c52ffbb78c8f623b7cab066901f647c14364da1de2fcedd96329439521ad329fc15be58491b570de17fd151c95f266738e049501a5a22ba8dd9c93 SHA512 d34c496d0c24c6d5c1bb675b83fac60da5c9672e4076aed72bac2e9b333e88d031076e7e386ec7b61ae8ece88870f6187c61f483f425aa78edd1e443c7f2e882 diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-cmake.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-cmake.patch deleted file mode 100644 index a99b1149f8c..00000000000 --- a/media-video/kmplayer/files/kmplayer-0.12.0b-cmake.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 2a5df7b875a8c5acb99be05baf84e5c9800d52a3 Mon Sep 17 00:00:00 2001 -From: Pino Toscano <[email protected]> -Date: Sat, 13 May 2017 18:57:15 +0200 -Subject: cmake: fix endif syntax - -it does not match the if condition, so just remove it (also to ease -reading it) ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 057fcc4..14a55d2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -81,7 +81,7 @@ add_subdirectory(src) - add_subdirectory(icons) - if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc" AND KF5DocTools_VERSION) - add_subdirectory(doc) --endif(KF5DocTools_VERSION) -+endif() - add_subdirectory(data) - - if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") - -From 41a284a0f5f728556280b9f942961631566ad7ff Mon Sep 17 00:00:00 2001 -From: Pino Toscano <[email protected]> -Date: Sat, 13 May 2017 19:04:47 +0200 -Subject: cmake: use NO_POLICY_SCOPE for KDECompilerSettings - -just like done for all the other projects ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 14a55d2..5a58a35 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -15,7 +15,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_D - - include(KDEInstallDirs) - include(KDECMakeSettings) --include(KDECompilerSettings) -+include(KDECompilerSettings NO_POLICY_SCOPE) - include(ECMInstallIcons) - #include(ECMSetupVersion) - include(FeatureSummary) --- -cgit v0.11.2 diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-desktop.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-desktop.patch deleted file mode 100644 index c84944effc2..00000000000 --- a/media-video/kmplayer/files/kmplayer-0.12.0b-desktop.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2126d76b8f16381e576de779b94b5b4555e562c2 Mon Sep 17 00:00:00 2001 -From: Luigi Toscano <[email protected]> -Date: Sat, 13 May 2017 21:13:43 +0200 -Subject: Fix .desktop: Qt5 apps accept qwindowtitle, not caption - ---- - src/org.kde.kmplayer.desktop | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/org.kde.kmplayer.desktop b/src/org.kde.kmplayer.desktop -index fcc5255..2b5435c 100644 ---- a/src/org.kde.kmplayer.desktop -+++ b/src/org.kde.kmplayer.desktop -@@ -1,6 +1,6 @@ - [Desktop Entry] - Type=Application --Exec=kmplayer -caption %c %i %U -+Exec=kmplayer -qwindowtitle %c %i %U - Icon=kmplayer - X-DocPath=kmplayer/index.html - Comment=KDE interface for MPlayer - -From 6b7757397c6181664d58d0a9e09cc329f279cc72 Mon Sep 17 00:00:00 2001 -From: Luigi Toscano <[email protected]> -Date: Sat, 13 May 2017 21:13:36 +0200 -Subject: Add org namespace to the desktop file - -Required by the Desktop Entry Specification for desktop file -with Type=Application. ---- - src/CMakeLists.txt | 2 +- - src/kmplayer_part.desktop | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 7a05382..f675d9a 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -122,7 +122,7 @@ install(TARGETS kdeinit_kmplayer ${INSTALL_TARGETS_DEFAULT_ARGS} ) - - install(TARGETS kmplayer ${INSTALL_TARGETS_DEFAULT_ARGS}) - --install(FILES kmplayer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -+install(FILES org.kde.kmplayer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) - - #qt5_add_dbus_interface(kmplayer_SRCS org.kde.Konqueror.Main.xml kmplayer_interface) - diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-devpixelratio.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-devpixelratio.patch deleted file mode 100644 index 0dea98084e3..00000000000 --- a/media-video/kmplayer/files/kmplayer-0.12.0b-devpixelratio.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 93fa2c2587fa8b2f1b0da4ab7f7f2978f105fac2 Mon Sep 17 00:00:00 2001 -From: Koos Vriezen <[email protected]> -Date: Sun, 30 Oct 2016 12:58:05 +0100 -Subject: Update pixel_device_ratio before painting instead on app startup - -Only used for adding a few pixels to text bounds. So if dragging the app -from a low res to a hires display, that could cause text being tuncated. ---- - src/viewarea.cpp | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/viewarea.cpp b/src/viewarea.cpp -index e407c95..77a260f 100644 ---- a/src/viewarea.cpp -+++ b/src/viewarea.cpp -@@ -1892,9 +1892,6 @@ KDE_NO_CDTOR_EXPORT ViewArea::ViewArea (QWidget *, View * view, bool paint_bg) - m_minimal (false), - m_updaters_enabled (true), - m_paint_background (paint_bg) { --#if QT_VERSION >= 0x050600 -- pixel_device_ratio = devicePixelRatioF(); --#endif - if (!paint_bg) - setAttribute (Qt::WA_NoSystemBackground, true); - QPalette palette; -@@ -2030,6 +2027,7 @@ KDE_NO_EXPORT void ViewArea::mouseMoveEvent (QMouseEvent * e) { - - KDE_NO_EXPORT void ViewArea::syncVisual () { - #if QT_VERSION >= 0x050600 -+ pixel_device_ratio = devicePixelRatioF(); - int w = (int)(width() * devicePixelRatioF()); - int h = (int)(height() * devicePixelRatioF()); - #else --- -cgit v0.11.2 - diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-qfile.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-qfile.patch deleted file mode 100644 index 32b645cd0a0..00000000000 --- a/media-video/kmplayer/files/kmplayer-0.12.0b-qfile.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7dce8e00c8e48cc08d3cc39909681643aa36ed62 Mon Sep 17 00:00:00 2001 -From: Luigi Toscano <[email protected]> -Date: Mon, 8 May 2017 18:07:40 +0200 -Subject: Use QFile to copy a file instead of /bin/cp - -The code has been there probably way before QFile gained the copy -functionality. ---- - src/kmplayerpartbase.cpp | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/src/kmplayerpartbase.cpp b/src/kmplayerpartbase.cpp -index fd7b363..f718496 100644 ---- a/src/kmplayerpartbase.cpp -+++ b/src/kmplayerpartbase.cpp -@@ -124,12 +124,8 @@ PartBase::PartBase (QWidget * wparent, QObject * parent, KSharedConfigPtr config - QString bmfile = KStandardDirs::locate ("data", "kmplayer/bookmarks.xml"); - QString localbmfile = KStandardDirs::locateLocal ("data", "kmplayer/bookmarks.xml"); - if (localbmfile != bmfile) { -- QProcess p; -- QStringList args; -- args << QFile::encodeName (bmfile) << QFile::encodeName (localbmfile); -- p.start ("/bin/cp", args); -- kDebug () << "cp " << args.join (" "); -- p.waitForFinished (); -+ bool bmfileCopied = QFile(bmfile).copy(localbmfile); -+ kDebug() << "bookmarks.xml copied successfully?" << bmfileCopied; - } - m_bookmark_manager = KBookmarkManager::managerForFile (localbmfile, "kmplayer"); - m_bookmark_owner = new BookmarkOwner (this); --- -cgit v0.11.2 - diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch deleted file mode 100644 index 8c91fa6c2ff..00000000000 --- a/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 66b262c344deb6ac4924966a584e8aeb3d899180 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Tue, 17 Apr 2018 12:07:04 +0200 -Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) - ---- - src/CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index f675d9a..57af1ed 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -161,9 +161,9 @@ qt5_add_dbus_adaptor(kphononplayer_SRCS org.kde.kmplayer.streamslave.xml - - add_executable(kphononplayer ${kphononplayer_SRCS}) - --qt5_use_modules(kphononplayer Core DBus Widgets X11Extras) -- --target_link_libraries(kphononplayer Phonon::phonon4qt5 ${XCB_LIBRARIES}) -+target_link_libraries(kphononplayer Phonon::phonon4qt5 ${XCB_LIBRARIES} -+ Qt5::Core Qt5::DBus Qt5::Widgets Qt5::X11Extras -+) - - install(TARGETS kphononplayer ${INSTALL_TARGETS_DEFAULT_ARGS}) - --- -2.17.0 - diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.9.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.9.patch deleted file mode 100644 index 80f3bee6ee8..00000000000 --- a/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.9.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3def65075c09af4961cd399e8e78ed78cca72e65 Mon Sep 17 00:00:00 2001 -From: Wolfgang Bauer <[email protected]> -Date: Wed, 11 Oct 2017 22:16:02 +0200 -Subject: Fix build with Qt 5.9 - -Summary: -moc 5.9 errors out when building: -Error: Plugin Metadata file "" could not be opened: file to open is a directory - -Same issue and fix as https://phabricator.kde.org/D5392 for khtml. - -CCBUG: 377490 - -Test Plan: builds fine now with Qt 5.9.0rc and also earlier versions. - -Reviewers: vriezen, pino - -Reviewed By: pino - -Subscribers: pino - -Differential Revision: https://phabricator.kde.org/D5985 ---- - src/kmplayer_part.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kmplayer_part.h b/src/kmplayer_part.h -index f90f85d..0fddbaa 100644 ---- a/src/kmplayer_part.h -+++ b/src/kmplayer_part.h -@@ -36,7 +36,7 @@ namespace KMPlayer { - - class KMPlayerFactory : public KPluginFactory { - Q_OBJECT -- Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory" FILE "") -+ Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory") - Q_INTERFACES(KPluginFactory) - public: - KMPlayerFactory(); --- -cgit v0.11.2 - diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-schedulerepaint.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-schedulerepaint.patch deleted file mode 100644 index 02bf9f38b56..00000000000 --- a/media-video/kmplayer/files/kmplayer-0.12.0b-schedulerepaint.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 5517262a2a328518dd42a8aa0e37a34152a06282 Mon Sep 17 00:00:00 2001 -From: Koos Vriezen <[email protected]> -Date: Sun, 30 Oct 2016 12:50:03 +0100 -Subject: scheduleRepaint should be called with pixel coordinates - ---- - src/viewarea.cpp | 31 ++++++++++++++++++++++++++----- - 1 file changed, 26 insertions(+), 5 deletions(-) - -diff --git a/src/viewarea.cpp b/src/viewarea.cpp -index 24f68cf..e4df941 100644 ---- a/src/viewarea.cpp -+++ b/src/viewarea.cpp -@@ -2117,9 +2117,20 @@ KDE_NO_EXPORT void ViewArea::syncVisual () { - - KDE_NO_EXPORT void ViewArea::paintEvent (QPaintEvent * pe) { - #ifdef KMPLAYER_WITH_CAIRO -- if (surface->node) -- scheduleRepaint (IRect (pe->rect ().x (), pe->rect ().y (), pe->rect ().width (), pe->rect ().height ())); -- else -+ if (surface->node) { -+#if QT_VERSION >= 0x050600 -+ int x = (int)(pe->rect().x() * devicePixelRatioF()); -+ int y = (int)(pe->rect().y() * devicePixelRatioF()); -+ int w = (int)(pe->rect().width() * devicePixelRatioF()); -+ int h = (int)(pe->rect().height() * devicePixelRatioF()); -+#else -+ int x = pe->rect().x(); -+ int y = pe->rect().y(); -+ int w = pe->rect().width(); -+ int h = pe->rect().height(); -+#endif -+ scheduleRepaint(IRect(x, y, w, h)); -+ } else - #endif - if (m_fullscreen || m_paint_background) - { -@@ -2647,8 +2658,18 @@ void VideoOutput::setGeometry (const IRect &rect) { - void VideoOutput::setAspect (float a) { - m_aspect = a; - QRect r = geometry (); -- m_view->viewArea ()->scheduleRepaint ( -- IRect (r.x (), r.y (), r.width (), r.height ())); -+#if QT_VERSION >= 0x050600 -+ int x = (int)(r.x() * devicePixelRatioF()); -+ int y = (int)(r.y() * devicePixelRatioF()); -+ int w = (int)(r.width() * devicePixelRatioF()); -+ int h = (int)(r.height() * devicePixelRatioF()); -+#else -+ int x = r.x(); -+ int y = r.y(); -+ int w = r.width(); -+ int h = r.height(); -+#endif -+ m_view->viewArea()->scheduleRepaint(IRect(x, y, w, h)); - } - - KDE_NO_EXPORT void VideoOutput::map () { --- -cgit v0.11.2 - diff --git a/media-video/kmplayer/kmplayer-0.12.0b-r4.ebuild b/media-video/kmplayer/kmplayer-0.12.0b-r4.ebuild deleted file mode 100644 index 6feb296bfb3..00000000000 --- a/media-video/kmplayer/kmplayer-0.12.0b-r4.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="true" -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm kde.org - -DESCRIPTION="Video player plugin for Konqueror and basic MPlayer frontend" -HOMEPAGE="https://kmplayer.kde.org https://apps.kde.org/en/kmplayer"; - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-2)/${P}.tar.bz2" - KEYWORDS="amd64 x86" -fi - -LICENSE="GPL-2 FDL-1.2 LGPL-2.1" -SLOT="5" -IUSE="cairo" - -BDEPEND="sys-devel/gettext" -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdelibs4support-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kmediaplayer-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=media-libs/phonon-4.11.0 - x11-libs/libX11 - x11-libs/libxcb - cairo? ( x11-libs/cairo[X,xcb(+)] ) -" -RDEPEND="${DEPEND} - media-video/mplayer -" - -PATCHES=( - "${FILESDIR}"/${P}-schedulerepaint.patch - "${FILESDIR}"/${P}-devpixelratio.patch - "${FILESDIR}"/${P}-qfile.patch - "${FILESDIR}"/${P}-cmake.patch - "${FILESDIR}"/${P}-desktop.patch - "${FILESDIR}"/${P}-qt-5.9.patch - "${FILESDIR}"/${P}-qt-5.11b3.patch -) - -src_prepare() { - # Prerequisite for ${P}-desktop.patch: - mv src/kmplayer.desktop src/org.kde.kmplayer.desktop || die - ecm_src_prepare -} - -src_configure() { - # 0.12: expat build broken, check in later releases - local mycmakeargs=( - -DKMPLAYER_BUILT_WITH_EXPAT=OFF - -DKMPLAYER_BUILT_WITH_NPP=OFF - -DKMPLAYER_BUILT_WITH_CAIRO=$(usex cairo) - ) - ecm_src_configure -} diff --git a/media-video/kmplayer/metadata.xml b/media-video/kmplayer/metadata.xml deleted file mode 100644 index e68bcea066c..00000000000 --- a/media-video/kmplayer/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo KDE Project</name> - </maintainer> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Video project</name> - </maintainer> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index ca7266954de..a63c809b309 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -287,11 +287,6 @@ dev-libs/libmissing # #697444, #699320, #708058, #746230, Removal in 30 days. games-emulation/fakenes -# Andreas Sturmlechner <[email protected]> (2020-11-21) -# Dead upstream, depends on deprecated kde-frameworks/kmediaplayer -# Masked for removal in 30 days. -media-video/kmplayer - # Michał Górny <[email protected]> (2020-11-19) # These packages are maintained by the Python project, or have # no maintainer. They have not been ported to Python 3.8 yet.
