1 |
commit: e3d7631520847864da828e5cf82ee49257afc80b |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 27 13:19:24 2015 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 27 13:19:42 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d76315 |
7 |
|
8 |
media-video/kmplayer: backport patch from upstream fixing build with kde-base/kdelibs-4.14.11. |
9 |
|
10 |
Gentoo-bug: 558928 |
11 |
|
12 |
Package-Manager: portage-2.2.20.1 |
13 |
|
14 |
.../files/kmplayer-0.11.3d-kdelibs-4.14.11.patch | 66 ++++++++++++++++++++++ |
15 |
media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild | 2 + |
16 |
2 files changed, 68 insertions(+) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 0000000..f6206c2 |
21 |
--- /dev/null |
22 |
+++ b/media-video/kmplayer/files/kmplayer-0.11.3d-kdelibs-4.14.11.patch |
23 |
@@ -0,0 +1,66 @@ |
24 |
+From 4be412db53ce6342103836163c7b809f36d88a03 Mon Sep 17 00:00:00 2001 |
25 |
+From: David Faure <faure@×××.org> |
26 |
+Date: Sun, 26 Jul 2015 17:29:49 +0200 |
27 |
+Subject: [PATCH] set cmake_min_req to 2.8.9 to match kdelibs4 policy; fix |
28 |
+ build accordingly |
29 |
+ |
30 |
+(working around the lack of ${KDE4_KMEDIAPLAYER_LIBS}) |
31 |
+ |
32 |
+CCMAIL: kde-buildsystem@×××.org |
33 |
+--- |
34 |
+ CMakeLists.txt | 1 + |
35 |
+ src/CMakeLists.txt | 8 +++++--- |
36 |
+ 2 files changed, 6 insertions(+), 3 deletions(-) |
37 |
+ |
38 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
39 |
+index 43d78ab..ff94308 100644 |
40 |
+--- a/CMakeLists.txt |
41 |
++++ b/CMakeLists.txt |
42 |
+@@ -1,3 +1,4 @@ |
43 |
++cmake_minimum_required(VERSION 2.8.9) |
44 |
+ project(kmplayer) |
45 |
+ |
46 |
+ cmake_policy(VERSION 2.6) |
47 |
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
48 |
+index 01180df..ac230ef 100644 |
49 |
+--- a/src/CMakeLists.txt |
50 |
++++ b/src/CMakeLists.txt |
51 |
+@@ -13,7 +13,7 @@ IF (KMPLAYER_WITH_CAIRO) |
52 |
+ MESSAGE("have cairo cflags:${optionalCFlags} ldflags:${optionalLinkFlags}") |
53 |
+ endif (KMPLAYER_WITH_CAIRO) |
54 |
+ |
55 |
+-add_definitions(-DQT3_SUPPORT -DKDE3_SUPPORT -DKMPLAYER_VERSION_STRING=\\"${KMPLAYER_VERSION_STRING}\\") |
56 |
++add_definitions(-DQT3_SUPPORT -DKDE3_SUPPORT -DKMPLAYER_VERSION_STRING="\\\"${KMPLAYER_VERSION_STRING}\\\"") |
57 |
+ |
58 |
+ ADD_DEFINITIONS(${CAIROCFlags}) |
59 |
+ |
60 |
+@@ -73,6 +73,7 @@ SET_TARGET_PROPERTIES(kmplayercommon PROPERTIES COMPILE_FLAGS |
61 |
+ "${CAIROCflags} ${GLibDBusCflags}") |
62 |
+ |
63 |
+ target_link_libraries(kmplayercommon |
64 |
++ LINK_PRIVATE |
65 |
+ ${CAIROLinkFlags} |
66 |
+ ${GLibDBusLinkFlags} |
67 |
+ ${KDE4_KPARTS_LIBS} |
68 |
+@@ -81,7 +82,7 @@ target_link_libraries(kmplayercommon |
69 |
+ ${X11_X11_LIB} |
70 |
+ ${EXPAT_LIBRARIES} |
71 |
+ ${KDE4_SOLID_LIBS} |
72 |
+- kmediaplayer |
73 |
++ ${KDE4_TARGET_PREFIX}kmediaplayer |
74 |
+ ) |
75 |
+ |
76 |
+ install(TARGETS kmplayercommon ${INSTALL_TARGETS_DEFAULT_ARGS} ) |
77 |
+@@ -93,7 +94,8 @@ set(kmplayerpart_SRCS kmplayer_part.cpp) |
78 |
+ kde4_add_plugin(kmplayerpart WITH_PREFIX ${kmplayerpart_SRCS}) |
79 |
+ |
80 |
+ target_link_libraries(kmplayerpart |
81 |
+- kmplayercommon kmediaplayer |
82 |
++ kmplayercommon |
83 |
++ ${KDE4_TARGET_PREFIX}kmediaplayer |
84 |
+ ${KDE4_KPARTS_LIBS} |
85 |
+ ${KDE4_KDEUI_LIBS} |
86 |
+ ${QT_QT3SUPPORT_LIBRARY} |
87 |
+-- |
88 |
+2.4.6 |
89 |
+ |
90 |
|
91 |
diff --git a/media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild b/media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild |
92 |
index f9dc8fb..1aa27fa 100644 |
93 |
--- a/media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild |
94 |
+++ b/media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild |
95 |
@@ -38,6 +38,8 @@ RDEPEND="${DEPEND} |
96 |
media-video/mplayer |
97 |
" |
98 |
|
99 |
+PATCHES=( "${FILESDIR}/${P}-kdelibs-4.14.11.patch" ) |
100 |
+ |
101 |
src_prepare() { |
102 |
use npp && epatch "${FILESDIR}/${PN}-flash.patch" |
103 |
sed -e '/add_subdirectory(icons)/d' \ |