[gentoo-commits] repo/gentoo:master commit in: media-video/kmplayer/, media-video/kmplayer/files/, profiles/

2020-12-21 Thread Andreas Sturmlechner 
commit: fc32539aa516730646f3267811730da3197ba439
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec 21 09:09:26 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 21 09:09:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc32539a

media-video/kmplayer: Remove last-rited package

Signed-off-by: Andreas Sturmlechner  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..000
--- 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..000
--- 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 
-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 
-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..000
--- 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 
-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 
-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
-+++

[gentoo-commits] repo/gentoo:master commit in: media-video/kmplayer/, media-video/kmplayer/files/

2018-04-17 Thread Andreas Sturmlechner 
commit: 03964a3d059896a735c44e5636a37958165ce4ff
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr 17 10:10:44 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr 17 12:02:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03964a3d

media-video/kmplayer: Fix build with Qt 5.11_beta3

Package-Manager: Portage-2.3.29, Repoman-2.3.9

 .../files/kmplayer-0.12.0b-qt-5.11b3.patch | 29 ++
 media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild|  3 ++-
 2 files changed, 31 insertions(+), 1 deletion(-)

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
new file mode 100644
index 000..8c91fa6c2ff
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch
@@ -0,0 +1,29 @@
+From 66b262c344deb6ac4924966a584e8aeb3d899180 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+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/kmplayer-0.12.0b-r1.ebuild 
b/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild
index 3c55fbb6562..bb6d4b92d3e 100644
--- a/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild
+++ b/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -61,6 +61,7 @@ PATCHES=(
"${FILESDIR}"/${P}-cmake.patch
"${FILESDIR}"/${P}-desktop.patch
"${FILESDIR}"/${P}-qt-5.9.patch
+   "${FILESDIR}"/${P}-qt-5.11b3.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: media-video/kmplayer/, media-video/kmplayer/files/

2017-11-25 Thread Andreas Sturmlechner 
commit: 8fd49ffe76fa579aa86de0fb62fef54d2b27e4e0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 25 15:59:28 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 25 16:09:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fd49ffe

media-video/kmplayer: Fix desktop file, cmake warnings

Reported-by:  email.cz>
Closes: https://bugs.gentoo.org/638798
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-video/kmplayer/Manifest  |  2 +-
 .../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-schedulerepaint.patch   | 61 ++
 media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild| 95 ++
 7 files changed, 323 insertions(+), 1 deletion(-)

diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index bbaf660c05e..e5889b7e636 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -1 +1 @@
-DIST kmplayer-0.12.0b.tar.bz2 599496 SHA256 
5e98cea9bd958860d90003d37037172a95ed8b699133e8f1e6033147aaefed73 SHA512 
d34c496d0c24c6d5c1bb675b83fac60da5c9672e4076aed72bac2e9b333e88d031076e7e386ec7b61ae8ece88870f6187c61f483f425aa78edd1e443c7f2e882
 WHIRLPOOL 
4ce75858bd6f385572f1c39e1aef47ad9526986b8c99de228d9e77168e804b2aeeca2933bb95c8be0f3a2200154473fd99a02af2d449a3861c845715f772570c
+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
new file mode 100644
index 000..a99b1149f8c
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-0.12.0b-cmake.patch
@@ -0,0 +1,50 @@
+From 2a5df7b875a8c5acb99be05baf84e5c9800d52a3 Mon Sep 17 00:00:00 2001
+From: Pino Toscano 
+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 
+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
new file mode 100644
index 000..c84944effc2
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-0.12.0b-desktop.patch
@@ -0,0 +1,47 @@
+From 2126d76b8f16381e576de779b94b5b4555e562c2 Mon Sep 17 00:00:00 2001
+From: Luigi Toscano 
+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 
+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

[gentoo-commits] repo/gentoo:master commit in: media-video/kmplayer/, media-video/kmplayer/files/

2017-10-21 Thread Andreas Sturmlechner 
commit: 47d05368ae4b256e97cc0fd155004c07f05e3b27
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 21 08:53:41 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 21 08:54:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47d05368

media-video/kmplayer: Fix build with Qt-5.9, bug #634942

Package-Manager: Portage-2.3.12, Repoman-2.3.3

 .../kmplayer/files/kmplayer-0.12.0b-qt-5.9.patch   | 42 ++
 media-video/kmplayer/kmplayer-0.12.0b.ebuild   |  7 ++--
 2 files changed, 46 insertions(+), 3 deletions(-)

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
new file mode 100644
index 000..80f3bee6ee8
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.9.patch
@@ -0,0 +1,42 @@
+From 3def65075c09af4961cd399e8e78ed78cca72e65 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bauer 
+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/kmplayer-0.12.0b.ebuild 
b/media-video/kmplayer/kmplayer-0.12.0b.ebuild
index dff58d1dbff..91517704d76 100644
--- a/media-video/kmplayer/kmplayer-0.12.0b.ebuild
+++ b/media-video/kmplayer/kmplayer-0.12.0b.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=6
 
-EGIT_BRANCH="0.12"
 KDE_HANDBOOK="true"
 inherit kde5
 
@@ -55,13 +54,15 @@ RDEPEND="${CDEPEND}
!media-video/kmplayer:4
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.9.patch" )
+
 src_prepare() {
+   kde5_src_prepare
+
if use npp; then
sed -i src/kmplayer_part.desktop \
-e ":^MimeType: s:=:=application/x-shockwave-flash;:" || die
fi
-
-   kde5_src_prepare
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: media-video/kmplayer/, media-video/kmplayer/files/

2016-10-19 Thread Johannes Huber 
commit: 1626c7afe7f4cd7e46bbc9b87f31d3962a134620
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Oct 19 19:51:26 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Oct 19 19:51:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1626c7af

media-video/kmplayer: Remove slot 4

Package-Manager: portage-2.3.2

 media-video/kmplayer/Manifest  |  2 -
 .../kmplayer/files/kmplayer-0.11.3d-cmake34.patch  | 14 -
 .../files/kmplayer-0.11.3d-kdelibs-4.14.11.patch   | 66 
 media-video/kmplayer/files/kmplayer-flash.patch| 12 
 media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild| 70 --
 media-video/kmplayer/kmplayer-0.11.5.ebuild| 67 -
 6 files changed, 231 deletions(-)

diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index 5d6e7b3..972dd98 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -1,3 +1 @@
-DIST kmplayer-0.11.3d.tar.bz2 573173 SHA256 
7ebecbc906edcc13e1ae94f4791da80ed4ef73164ef6b81d76c71708c39a6bfb SHA512 
c2f0fa1864eecd9a0bf3039639aad41bc36bc6ff8742a8e9714c6df72dd4ee63f80c36036a0582ee8464b48ce22eb96814600ddb199c61fda0b87cfd4c457797
 WHIRLPOOL 
1a651d1dee10b0ee3609055d645835b4b19e5acf47df39a7773d297749407ea49c893e154f77013469ee4c23724c55ae8c2032b5ca00ddf8f560eb5feb8d1f12
-DIST kmplayer-0.11.5.tar.bz2 684467 SHA256 
074afea4187b1e5d2899940da558f584e0145fa6a3e9a5eca5c028d4ba516c09 SHA512 
15b53eb3c9d1ac867bf762c8f7aa02bc3ecc813116db7b2aa87b2f9f3f0fc50c3fae5514dd92b18baf6fe16fe2f79ca7e9b64ea4fae13e341e5817be6e0ea729
 WHIRLPOOL 
6efc74f908c93d784c6e29c4052065c2f0bfb3be9353e8887a3f3008298ad10aa3f92751ed024be9e44161023ccbadbc69579c8d0bd50139c733b8fea7ec67db
 DIST kmplayer-0.12.0a.tar.bz2 596374 SHA256 
b1cc05f1942882e34d013ab363e553e4ec87af6c9c7ef9755db2b8fa4b8930d8 SHA512 
4ae24621ab54706ba323e9b345f4bc6876d3b7b84eef8edc9d07351e336dc940a3d314c394470ce3a85ebfcc77cb7fe6eedb96ca382b2a81f6d95ecff1f3f875
 WHIRLPOOL 
eb45b40177e82ec45234a11b62f1ae3c3dd8989ab6d7bf0b8968e601ed32b976a1061223aee37de0d4544f5431bd9614dac3e8fb2f4d19685b1050b7b768ca9d

diff --git a/media-video/kmplayer/files/kmplayer-0.11.3d-cmake34.patch 
b/media-video/kmplayer/files/kmplayer-0.11.3d-cmake34.patch
deleted file mode 100644
index a22136c..
--- a/media-video/kmplayer/files/kmplayer-0.11.3d-cmake34.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix build with >=cmake-3.4
-
-Gentoo-bug: 568430
-
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,6 +59,7 @@
- endif(NOT WIN32)
- 
- 
-+include(CheckIncludeFiles)
- check_include_files(stdint.h HAVE_STDINT_H)
- 
- configure_file (config-kmplayer.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-kmplayer.h )

diff --git a/media-video/kmplayer/files/kmplayer-0.11.3d-kdelibs-4.14.11.patch 
b/media-video/kmplayer/files/kmplayer-0.11.3d-kdelibs-4.14.11.patch
deleted file mode 100644
index f6206c2..
--- a/media-video/kmplayer/files/kmplayer-0.11.3d-kdelibs-4.14.11.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 4be412db53ce6342103836163c7b809f36d88a03 Mon Sep 17 00:00:00 2001
-From: David Faure 
-Date: Sun, 26 Jul 2015 17:29:49 +0200
-Subject: [PATCH] set cmake_min_req to 2.8.9 to match kdelibs4 policy; fix
- build accordingly
-
-(working around the lack of ${KDE4_KMEDIAPLAYER_LIBS})
-
-CCMAIL: kde-buildsys...@kde.org

- CMakeLists.txt | 1 +
- src/CMakeLists.txt | 8 +---
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 43d78ab..ff94308 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,3 +1,4 @@
-+cmake_minimum_required(VERSION 2.8.9)
- project(kmplayer)
- 
- cmake_policy(VERSION 2.6)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 01180df..ac230ef 100644
 a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -13,7 +13,7 @@ IF (KMPLAYER_WITH_CAIRO)
- MESSAGE("have cairo cflags:${optionalCFlags} 
ldflags:${optionalLinkFlags}")
- endif (KMPLAYER_WITH_CAIRO)
- 
--add_definitions(-DQT3_SUPPORT -DKDE3_SUPPORT 
-DKMPLAYER_VERSION_STRING=\\"${KMPLAYER_VERSION_STRING}\\")
-+add_definitions(-DQT3_SUPPORT -DKDE3_SUPPORT 
-DKMPLAYER_VERSION_STRING="\\\"${KMPLAYER_VERSION_STRING}\\\"")
- 
- ADD_DEFINITIONS(${CAIROCFlags})
- 
-@@ -73,6 +73,7 @@ SET_TARGET_PROPERTIES(kmplayercommon PROPERTIES COMPILE_FLAGS
- "${CAIROCflags} ${GLibDBusCflags}")
- 
- target_link_libraries(kmplayercommon
-+   LINK_PRIVATE
-   ${CAIROLinkFlags}
-   ${GLibDBusLinkFlags}
-   ${KDE4_KPARTS_LIBS}
-@@ -81,7 +82,7 @@ target_link_libraries(kmplayercommon
-   ${X11_X11_LIB}
-   ${EXPAT_LIBRARIES}
-   ${KDE4_SOLID_LIBS}
--  kmediaplayer
-+  ${KDE4_TARGET_PREFIX}kmediaplayer
- )
- 
- install(TARGETS kmplayercommon ${INSTALL_TARGETS_DEFAULT_ARGS} )
-@@ -93,7 +94,8 @@ set(kmplayerpart_SRCS kmplayer_part.cpp)
- kde4_add_plugin(kmplayerpart WITH_PREFIX ${kmplayerpart_SRCS})
- 
- target_link_libraries(kmplayerpart
--  kmplayercommon

[gentoo-commits] repo/gentoo:master commit in: media-video/kmplayer/, media-video/kmplayer/files/

2015-12-25 Thread Michael Palimaka 
commit: 12e5670ffac6478ecc99d404ceeec365d4ebb2b1
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Dec 25 18:55:20 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Dec 25 18:56:13 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12e5670f

media-video/kmplayer: add patch to solve build failure with >=dev-util/cmake-3.4

Gentoo-bug: 568430

Package-Manager: portage-2.2.26

 media-video/kmplayer/files/kmplayer-0.11.3d-cmake34.patch | 14 ++
 media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild   |  5 -
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/media-video/kmplayer/files/kmplayer-0.11.3d-cmake34.patch 
b/media-video/kmplayer/files/kmplayer-0.11.3d-cmake34.patch
new file mode 100644
index 000..a22136c
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-0.11.3d-cmake34.patch
@@ -0,0 +1,14 @@
+Fix build with >=cmake-3.4
+
+Gentoo-bug: 568430
+
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -59,6 +59,7 @@
+ endif(NOT WIN32)
+ 
+ 
++include(CheckIncludeFiles)
+ check_include_files(stdint.h HAVE_STDINT_H)
+ 
+ configure_file (config-kmplayer.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-kmplayer.h )

diff --git a/media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild 
b/media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild
index 971fd37..84a1c41 100644
--- a/media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild
+++ b/media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild
@@ -38,7 +38,10 @@ RDEPEND="${DEPEND}
media-video/mplayer
 "
 
-PATCHES=( "${FILESDIR}/${P}-kdelibs-4.14.11.patch" )
+PATCHES=(
+   "${FILESDIR}/${P}-cmake34.patch"
+   "${FILESDIR}/${P}-kdelibs-4.14.11.patch"
+)
 
 src_prepare() {
use npp && epatch "${FILESDIR}/${PN}-flash.patch"