diff options
author | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-12-30 11:45:34 +0000 |
---|---|---|
committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-12-30 11:45:34 +0000 |
commit | 34c596e2660d2351eaa515bd7d80ad964095df5e (patch) | |
tree | d4dcdb94ed994d335791f641248964591ab51935 /multimedia/kmplayer/files | |
parent | 2e74e68f03c0e6e3db66626c12af46a7b88a5512 (diff) |
Notes
Diffstat (limited to 'multimedia/kmplayer/files')
-rw-r--r-- | multimedia/kmplayer/files/patch-git_2126d7 | 24 | ||||
-rw-r--r-- | multimedia/kmplayer/files/patch-git_3def65 | 42 | ||||
-rw-r--r-- | multimedia/kmplayer/files/patch-git_7dafda | 34 | ||||
-rw-r--r-- | multimedia/kmplayer/files/patch-src_viewarea.cpp | 11 |
4 files changed, 111 insertions, 0 deletions
diff --git a/multimedia/kmplayer/files/patch-git_2126d7 b/multimedia/kmplayer/files/patch-git_2126d7 new file mode 100644 index 000000000000..4c50c0a04a51 --- /dev/null +++ b/multimedia/kmplayer/files/patch-git_2126d7 @@ -0,0 +1,24 @@ +From 2126d76b8f16381e576de779b94b5b4555e562c2 Mon Sep 17 00:00:00 2001 +From: Luigi Toscano <luigi.toscano@tiscali.it> +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 +--- src/kmplayer.desktop ++++ src/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 +-- +cgit v1.1 + diff --git a/multimedia/kmplayer/files/patch-git_3def65 b/multimedia/kmplayer/files/patch-git_3def65 new file mode 100644 index 000000000000..f4b9670fe977 --- /dev/null +++ b/multimedia/kmplayer/files/patch-git_3def65 @@ -0,0 +1,42 @@ +From 3def65075c09af4961cd399e8e78ed78cca72e65 Mon Sep 17 00:00:00 2001 +From: Wolfgang Bauer <wbauer@tmo.at> +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 +--- src/kmplayer_part.h ++++ 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 v1.1 + diff --git a/multimedia/kmplayer/files/patch-git_7dafda b/multimedia/kmplayer/files/patch-git_7dafda new file mode 100644 index 000000000000..8bc9f4423df7 --- /dev/null +++ b/multimedia/kmplayer/files/patch-git_7dafda @@ -0,0 +1,34 @@ +From 7dafda636033d23436ea72c45967af78f54d76fb Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 17 Apr 2018 12:07:04 +0200 +Subject: Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) + +Test Plan: Built fine with Qt 5.11_beta3. + +Reviewers: pino, vriezen + +Differential Revision: https://phabricator.kde.org/D12272 +--- + 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 +--- src/CMakeLists.txt ++++ 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}) + +-- +cgit v1.1 + diff --git a/multimedia/kmplayer/files/patch-src_viewarea.cpp b/multimedia/kmplayer/files/patch-src_viewarea.cpp new file mode 100644 index 000000000000..43d5a4301e54 --- /dev/null +++ b/multimedia/kmplayer/files/patch-src_viewarea.cpp @@ -0,0 +1,11 @@ +--- src/viewarea.cpp.orig 2018-12-22 19:33:17 UTC ++++ src/viewarea.cpp +@@ -2535,7 +2535,7 @@ void VideoOutput::useIndirectWidget (bool inderect) { + if (!m_plain_window) { + xcb_screen_t* scr = m_view->viewArea()->d->screen_of_display(connection, QX11Info::appScreen()); + m_plain_window = xcb_generate_id(connection); +- uint32_t values[] = { scr->black_pixel, m_input_mask }; ++ uint32_t values[] = { scr->black_pixel, static_cast<uint32_t>(m_input_mask) }; + #if QT_VERSION >= 0x050600 + int devicew = (int)(width() * devicePixelRatioF()); + int deviceh = (int)(height() * devicePixelRatioF()); |