1 |
reavertm 10/11/28 18:12:32 |
2 |
|
3 |
Modified: ChangeLog phonon-kde-4.5.3.ebuild |
4 |
phonon-kde-4.4.5.ebuild |
5 |
Log: |
6 |
Backport small patch from 4.5 branch to fix phonon-4.4.3 compatibility, bug 346951. |
7 |
|
8 |
(Portage version: 2.2.0_alpha6/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.71 kde-base/phonon-kde/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/phonon-kde/ChangeLog?rev=1.71&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/phonon-kde/ChangeLog?rev=1.71&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/phonon-kde/ChangeLog?r1=1.70&r2=1.71 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v |
20 |
retrieving revision 1.70 |
21 |
retrieving revision 1.71 |
22 |
diff -u -r1.70 -r1.71 |
23 |
--- ChangeLog 28 Nov 2010 02:24:58 -0000 1.70 |
24 |
+++ ChangeLog 28 Nov 2010 18:12:32 -0000 1.71 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for kde-base/phonon-kde |
27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.70 2010/11/28 02:24:58 reavertm Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.71 2010/11/28 18:12:32 reavertm Exp $ |
30 |
+ |
31 |
+ 28 Nov 2010; Maciej Mrozowski <reavertm@g.o> |
32 |
+ phonon-kde-4.4.5.ebuild, phonon-kde-4.5.3.ebuild, |
33 |
+ +files/phonon-kde-4.5.3-duplicated-definitions.patch: |
34 |
+ Backport small patch from 4.5 branch to fix phonon-4.4.3 compatibility, |
35 |
+ bug 346951. |
36 |
|
37 |
14 Nov 2010; Andreas K. Huettel <dilfridge@g.o> |
38 |
phonon-kde-4.5.3.ebuild: |
39 |
|
40 |
|
41 |
|
42 |
1.5 kde-base/phonon-kde/phonon-kde-4.5.3.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.5.3.ebuild?rev=1.5&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.5.3.ebuild?rev=1.5&content-type=text/plain |
46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.5.3.ebuild?r1=1.4&r2=1.5 |
47 |
|
48 |
Index: phonon-kde-4.5.3.ebuild |
49 |
=================================================================== |
50 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.5.3.ebuild,v |
51 |
retrieving revision 1.4 |
52 |
retrieving revision 1.5 |
53 |
diff -u -r1.4 -r1.5 |
54 |
--- phonon-kde-4.5.3.ebuild 28 Nov 2010 02:24:59 -0000 1.4 |
55 |
+++ phonon-kde-4.5.3.ebuild 28 Nov 2010 18:12:32 -0000 1.5 |
56 |
@@ -1,6 +1,6 @@ |
57 |
# Copyright 1999-2010 Gentoo Foundation |
58 |
# Distributed under the terms of the GNU General Public License v2 |
59 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.5.3.ebuild,v 1.4 2010/11/28 02:24:59 reavertm Exp $ |
60 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.5.3.ebuild,v 1.5 2010/11/28 18:12:32 reavertm Exp $ |
61 |
|
62 |
EAPI="3" |
63 |
|
64 |
@@ -21,6 +21,10 @@ |
65 |
" |
66 |
RDEPEND="${DEPEND}" |
67 |
|
68 |
+PATCHES=( |
69 |
+ "${FILESDIR}/${P}-duplicated-definitions.patch" |
70 |
+) |
71 |
+ |
72 |
src_configure() { |
73 |
mycmakeargs=( |
74 |
-DBUILD_tests=OFF |
75 |
|
76 |
|
77 |
|
78 |
1.8 kde-base/phonon-kde/phonon-kde-4.4.5.ebuild |
79 |
|
80 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.4.5.ebuild?rev=1.8&view=markup |
81 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.4.5.ebuild?rev=1.8&content-type=text/plain |
82 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.4.5.ebuild?r1=1.7&r2=1.8 |
83 |
|
84 |
Index: phonon-kde-4.4.5.ebuild |
85 |
=================================================================== |
86 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.4.5.ebuild,v |
87 |
retrieving revision 1.7 |
88 |
retrieving revision 1.8 |
89 |
diff -u -r1.7 -r1.8 |
90 |
--- phonon-kde-4.4.5.ebuild 28 Nov 2010 02:24:59 -0000 1.7 |
91 |
+++ phonon-kde-4.4.5.ebuild 28 Nov 2010 18:12:32 -0000 1.8 |
92 |
@@ -1,6 +1,6 @@ |
93 |
# Copyright 1999-2010 Gentoo Foundation |
94 |
# Distributed under the terms of the GNU General Public License v2 |
95 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.4.5.ebuild,v 1.7 2010/11/28 02:24:59 reavertm Exp $ |
96 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.4.5.ebuild,v 1.8 2010/11/28 18:12:32 reavertm Exp $ |
97 |
|
98 |
EAPI="3" |
99 |
|
100 |
@@ -21,6 +21,10 @@ |
101 |
" |
102 |
RDEPEND="${DEPEND}" |
103 |
|
104 |
+PATCHES=( |
105 |
+ "${FILESDIR}/${PN}-4.5.3-duplicated-definitions.patch" |
106 |
+) |
107 |
+ |
108 |
src_configure() { |
109 |
mycmakeargs=( |
110 |
-DBUILD_tests=OFF |