1 |
Dnia 2015-06-27, o godz. 22:02:21 |
2 |
"Johannes Huber (johu)" <johu@g.o> napisał(a): |
3 |
|
4 |
> johu 15/06/27 22:02:21 |
5 |
> |
6 |
> Modified: ChangeLog kde5-functions.eclass kde5.eclass |
7 |
> Log: |
8 |
> Sync kde5*eclass with kde overlay. Handle more whitespace variations by Michael Palimaka <kensington@g.o>. Fixes translation handling by Michael Palimaka <kensington@g.o> and Andreas Sturmlechner <andreas.sturmlechner@×××××.com>, bug #552664. Raises deps on KDE Frameworks and KDE Plasma Manuel Rüger <mrueg@g.o>. |
9 |
> |
10 |
> Revision Changes Path |
11 |
> 1.1691 eclass/ChangeLog |
12 |
> |
13 |
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1691&view=markup |
14 |
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1691&content-type=text/plain |
15 |
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1690&r2=1.1691 |
16 |
> |
17 |
> Index: ChangeLog |
18 |
> =================================================================== |
19 |
> RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
20 |
> retrieving revision 1.1690 |
21 |
> retrieving revision 1.1691 |
22 |
> diff -u -r1.1690 -r1.1691 |
23 |
> --- ChangeLog 27 Jun 2015 17:41:20 -0000 1.1690 |
24 |
> +++ ChangeLog 27 Jun 2015 22:02:21 -0000 1.1691 |
25 |
> @@ -1,6 +1,14 @@ |
26 |
> # ChangeLog for eclass directory |
27 |
> # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
28 |
> -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1690 2015/06/27 17:41:20 mpagano Exp $ |
29 |
> +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1691 2015/06/27 22:02:21 johu Exp $ |
30 |
> + |
31 |
> + 27 Jun 2015; Johannes Huber <johu@g.o> kde5-functions.eclass, |
32 |
> + kde5.eclass: |
33 |
> + Sync kde5*eclass with kde overlay. Handle more whitespace variations by |
34 |
> + Michael Palimaka <kensington@g.o>. Fixes translation handling by |
35 |
> + Michael Palimaka <kensington@g.o> and Andreas Sturmlechner |
36 |
> + <andreas.sturmlechner@×××××.com>, bug #552664. Raises deps on KDE Frameworks |
37 |
> + and KDE Plasma Manuel Rüger <mrueg@g.o>. |
38 |
> |
39 |
> 27 Jun 2015; Mike Pagano <mpagano@g.o> kernel-2.eclass: |
40 |
> Fix conditional bug for UNIPATCH_DROP |
41 |
> |
42 |
> |
43 |
> |
44 |
> 1.9 eclass/kde5-functions.eclass |
45 |
> |
46 |
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?rev=1.9&view=markup |
47 |
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?rev=1.9&content-type=text/plain |
48 |
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?r1=1.8&r2=1.9 |
49 |
> |
50 |
> Index: kde5-functions.eclass |
51 |
> =================================================================== |
52 |
> RCS file: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v |
53 |
> retrieving revision 1.8 |
54 |
> retrieving revision 1.9 |
55 |
> diff -u -r1.8 -r1.9 |
56 |
> --- kde5-functions.eclass 8 Jun 2015 12:27:32 -0000 1.8 |
57 |
> +++ kde5-functions.eclass 27 Jun 2015 22:02:21 -0000 1.9 |
58 |
> @@ -1,6 +1,6 @@ |
59 |
> # Copyright 1999-2015 Gentoo Foundation |
60 |
> # Distributed under the terms of the GNU General Public License v2 |
61 |
> -# $Header: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v 1.8 2015/06/08 12:27:32 mrueg Exp $ |
62 |
> +# $Header: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v 1.9 2015/06/27 22:02:21 johu Exp $ |
63 |
> |
64 |
> # @ECLASS: kde5-functions.eclass |
65 |
> # @MAINTAINER: |
66 |
> @@ -26,12 +26,12 @@ |
67 |
> # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL |
68 |
> # @DESCRIPTION: |
69 |
> # Minimal Frameworks version to require for the package. |
70 |
> -: ${FRAMEWORKS_MINIMAL:=5.10.0} |
71 |
> +: ${FRAMEWORKS_MINIMAL:=5.11.0}> - RDEPEND+=" |
72 |
> |
73 |
> # @ECLASS-VARIABLE: PLASMA_MINIMAL |
74 |
> # @DESCRIPTION: |
75 |
> # Minimal Plasma version to require for the package. |
76 |
> -: ${PLASMA_MINIMAL:=5.3.0} |
77 |
> +: ${PLASMA_MINIMAL:=5.3.1} |
78 |
> |
79 |
> # @ECLASS-VARIABLE: KDE_APPS_MINIMAL |
80 |
> # @DESCRIPTION: |
81 |
> @@ -218,7 +218,7 @@ |
82 |
> local prefix=${1} |
83 |
> local dep=${2} |
84 |
> |
85 |
> - pcregrep -Mn "(?s)find_package\(\s*${prefix}.[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}" |
86 |
> + pcregrep -Mn "(?s)find_package\s*\(\s*${prefix}.[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}" |
87 |
> |
88 |
> # pcregrep returns non-zero on no matches/error |
89 |
> if [[ $? != 0 ]] ; then |
90 |
> @@ -232,7 +232,7 @@ |
91 |
> sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die |
92 |
> |
93 |
> if [[ ${length} = 1 ]] ; then |
94 |
> - sed -e "/find_package(\s*${prefix}\s*REQUIRED\s*COMPONENTS\s*)/d" -i CMakeLists.txt || die |
95 |
> + sed -e "/find_package\s*(\s*${prefix}\s*REQUIRED\s*COMPONENTS\s*)/d" -i CMakeLists.txt || die |
96 |
> fi |
97 |
> } |
98 |
> |
99 |
> |
100 |
> |
101 |
> |
102 |
> 1.11 eclass/kde5.eclass |
103 |
> |
104 |
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?rev=1.11&view=markup |
105 |
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?rev=1.11&content-type=text/plain |
106 |
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?r1=1.10&r2=1.11 |
107 |
> |
108 |
> Index: kde5.eclass |
109 |
> =================================================================== |
110 |
> RCS file: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v |
111 |
> retrieving revision 1.10 |
112 |
> retrieving revision 1.11 |
113 |
> diff -u -r1.10 -r1.11 |
114 |
> --- kde5.eclass 31 May 2015 15:51:21 -0000 1.10 |
115 |
> +++ kde5.eclass 27 Jun 2015 22:02:21 -0000 1.11 |
116 |
> @@ -1,6 +1,6 @@ |
117 |
> # Copyright 1999-2015 Gentoo Foundation |
118 |
> # Distributed under the terms of the GNU General Public License v2 |
119 |
> -# $Header: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v 1.10 2015/05/31 15:51:21 mrueg Exp $ |
120 |
> +# $Header: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v 1.11 2015/06/27 22:02:21 johu Exp $ |
121 |
> |
122 |
> # @ECLASS: kde5.eclass |
123 |
> # @MAINTAINER: |
124 |
> @@ -142,10 +142,7 @@ |
125 |
> fi |
126 |
> |
127 |
> if [[ ${KDE_BLOCK_SLOT4} = true && ${CATEGORY} = kde-apps ]]; then |
128 |
> - RDEPEND+=" |
129 |
> - !kde-apps/${PN}:4 |
130 |
> - !kde-base/${PN} |
131 |
> - " |
132 |
> + RDEPEND+=" !kde-apps/${PN}:4" |
133 |
> fi |
134 |
> ;; |
135 |
> esac |
136 |
> @@ -376,11 +373,20 @@ |
137 |
> # enable only the requested translations |
138 |
> # when required |
139 |
> if [[ ${KDE_BUILD_TYPE} = release ]] ; then |
140 |
> - for lang in $(ls po 2> /dev/null) ; do |
141 |
> - if ! has ${lang} ${LINGUAS} ; then |
142 |
> - rm -rf po/${lang} |
143 |
> - fi |
144 |
> - done |
145 |
> + if [[ -d po ]] ; then |
146 |
> + pushd po > /dev/null |
147 |
|
148 |
||die. |
149 |
|
150 |
> + for lang in $(ls) ; do |
151 |
|
152 |
How about... for lang in *? |
153 |
|
154 |
> + if ! has ${lang} ${LINGUAS} ; then |
155 |
> + if [[ ${lang} != CMakeLists.txt ]] ; then |
156 |
> + rm -rf ${lang} |
157 |
|
158 |
||die. |
159 |
|
160 |
> + fi |
161 |
> + if [[ -e CMakeLists.txt ]] ; then |
162 |
> + comment_add_subdirectory ${lang} |
163 |
> + fi |
164 |
> + fi |
165 |
> + done |
166 |
> + popd > /dev/null |
167 |
|
168 |
||die. |
169 |
|
170 |
> + fi |
171 |
> |
172 |
> if [[ ${KDE_HANDBOOK} = true ]] ; then |
173 |
> pushd doc > /dev/null |
174 |
|
175 |
Here too btw. |
176 |
|
177 |
-- |
178 |
Best regards, |
179 |
Michał Górny |
180 |
<http://dev.gentoo.org/~mgorny/> |