1 |
commit: a0aa70526b418597514e9c690d405f5bc92d02e8 |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 1 14:00:48 2015 +0000 |
4 |
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 1 14:01:35 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0aa7052 |
7 |
|
8 |
gnome-extra/cinnamon-control-center: fix build failure with timezone-data-2015f |
9 |
|
10 |
North Korea caused build failure. |
11 |
|
12 |
Gentoo-Bug: 559052 |
13 |
Reported-by: Lara Maia |
14 |
Upstream-Bug-url: https://github.com/linuxmint/cinnamon-control-center/pull/124 |
15 |
Package-Manager: portage-2.2.20.1 |
16 |
|
17 |
gnome-extra/cinnamon-control-center/Manifest | 1 + |
18 |
.../cinnamon-control-center-2.4.2-r3.ebuild | 110 +++++++++++++++++++++ |
19 |
.../cinnamon-control-center-2.6.0-r1.ebuild | 107 ++++++++++++++++++++ |
20 |
3 files changed, 218 insertions(+) |
21 |
|
22 |
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest |
23 |
index b2b4dc0..587f3aa 100644 |
24 |
--- a/gnome-extra/cinnamon-control-center/Manifest |
25 |
+++ b/gnome-extra/cinnamon-control-center/Manifest |
26 |
@@ -1,2 +1,3 @@ |
27 |
DIST cinnamon-control-center-2.4.2.tar.gz 4305006 SHA256 7d25193a3cc13c12f22864f3c9a907acfaa616392cb2b7ab4e0624f0d200f188 SHA512 c3b4e5af84b7e6e01deaae51ed29e184158860c5effa2550b9d285902c2c35b690cb867ae747b437ed2ac2d0e75b0e6b36c97f9af3c5bf3f4621bdf304d5c253 WHIRLPOOL 41a32cb1c97f0fd3c57d67891c66082b66db6dc5a43737d50fdc6a17819c64d9b58ac2b679baa7f9bdd906643c02c161b4a72fd208b48561cdd43807a58f5621 |
28 |
+DIST cinnamon-control-center-2.6.0-pyongyang.tar.xz 32912 SHA256 d26e31c1377abc1c3e47e1c8e78572e0169d21bdfddb920ab839bec4e1bbe8a7 SHA512 3c6d6a970382a8e0429cc78873e4d230d5848f2a6ae4feee4d28db28cb21124f59cd7b4632f3a427f91dd7e497ee32dd3f7ba5139a3c1566264904939007d28e WHIRLPOOL a1a4102ddb13e00414b58352c3eabbd02dc425f2b3a59027a579d9ac78bdd0fd7dcacc8c204ceaeb858944202af72bbfcecabb48aa1e7ddf4ff6ec4e682fb97d |
29 |
DIST cinnamon-control-center-2.6.0.tar.gz 4169903 SHA256 bbc39ac8ddcbc06b6aada1ef271f95f5f0d0fe439bec38b9cd847af420305c49 SHA512 ed383484b751a9d98de7f136c21c5eb6ce7cfe1418945bd0725aa9e9f08397eb78854b38db258434ed8895dbadd2ce29b5a423a9025dea17fb4876f8847ff125 WHIRLPOOL 7e6d3373e97116d5b531f4fcff85984050fd5d7ad343137b76e30089b3c6f4ff5409f68867289f3967a257a67cd04059f2aa02c48a4e0e4c29b43755d6f4cd84 |
30 |
|
31 |
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r3.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r3.ebuild |
32 |
new file mode 100644 |
33 |
index 0000000..2467a03 |
34 |
--- /dev/null |
35 |
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r3.ebuild |
36 |
@@ -0,0 +1,110 @@ |
37 |
+# Copyright 1999-2015 Gentoo Foundation |
38 |
+# Distributed under the terms of the GNU General Public License v2 |
39 |
+# $Id$ |
40 |
+ |
41 |
+EAPI="5" |
42 |
+GCONF_DEBUG="yes" |
43 |
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen |
44 |
+ |
45 |
+inherit autotools eutils gnome2 |
46 |
+ |
47 |
+DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop" |
48 |
+HOMEPAGE="http://cinnamon.linuxmint.com/" |
49 |
+SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz |
50 |
+ https://dev.gentoo.org/~tetromino/distfiles/${PN}/${PN}-2.6.0-pyongyang.tar.xz" |
51 |
+ |
52 |
+LICENSE="GPL-2+" |
53 |
+SLOT="0" |
54 |
+IUSE="+colord +cups input_devices_wacom" |
55 |
+KEYWORDS="~amd64 ~x86" |
56 |
+ |
57 |
+# False positives caused by nested configure scripts |
58 |
+QA_CONFIGURE_OPTIONS=".*" |
59 |
+ |
60 |
+# FIXME: modemmanager is not optional |
61 |
+# networkmanager is not optional |
62 |
+ |
63 |
+COMMON_DEPEND=" |
64 |
+ >=dev-libs/glib-2.31:2 |
65 |
+ dev-libs/libxml2:2 |
66 |
+ >=gnome-base/libgnomekbd-2.91.91:0= |
67 |
+ >=gnome-extra/cinnamon-desktop-1.0:0= |
68 |
+ >=gnome-extra/cinnamon-menus-1.0:0= |
69 |
+ >=gnome-extra/cinnamon-settings-daemon-1.0:0= |
70 |
+ >=gnome-extra/nm-applet-0.9.8 |
71 |
+ media-libs/fontconfig |
72 |
+ >=media-libs/libcanberra-0.13[gtk3] |
73 |
+ >=media-sound/pulseaudio-1.1[glib] |
74 |
+ >=net-misc/modemmanager-0.7 |
75 |
+ >=net-misc/networkmanager-0.9.8[modemmanager] |
76 |
+ >=sys-auth/polkit-0.103 |
77 |
+ || ( >=sys-power/upower-0.9.1:= sys-power/upower-pm-utils ) |
78 |
+ >=x11-libs/gdk-pixbuf-2.23.0:2 |
79 |
+ >=x11-libs/gtk+-3.4.1:3 |
80 |
+ >=x11-libs/libnotify-0.7.3:0= |
81 |
+ x11-libs/libX11 |
82 |
+ x11-libs/libxklavier |
83 |
+ colord? ( >=x11-misc/colord-0.1.8:0= ) |
84 |
+ cups? ( >=net-print/cups-1.4[dbus] ) |
85 |
+ input_devices_wacom? ( |
86 |
+ >=dev-libs/libwacom-0.7 |
87 |
+ >=x11-libs/gtk+-3.8:3 |
88 |
+ >=x11-libs/libXi-1.2 ) |
89 |
+" |
90 |
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x |
91 |
+# libgnomekbd needed only for gkbd-keyboard-display tool |
92 |
+RDEPEND="${COMMON_DEPEND} |
93 |
+ || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 ) |
94 |
+ x11-themes/gnome-icon-theme |
95 |
+ x11-themes/gnome-icon-theme-symbolic |
96 |
+ colord? ( >=gnome-extra/gnome-color-manager-3 ) |
97 |
+ cups? ( |
98 |
+ app-admin/system-config-printer |
99 |
+ net-print/cups-pk-helper ) |
100 |
+ input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] ) |
101 |
+" |
102 |
+ |
103 |
+DEPEND="${COMMON_DEPEND} |
104 |
+ app-text/iso-codes |
105 |
+ x11-proto/xproto |
106 |
+ x11-proto/xf86miscproto |
107 |
+ x11-proto/kbproto |
108 |
+ |
109 |
+ dev-libs/libxslt |
110 |
+ >=dev-util/intltool-0.40.1 |
111 |
+ >=sys-devel/gettext-0.17 |
112 |
+ virtual/pkgconfig |
113 |
+ |
114 |
+ gnome-base/gnome-common |
115 |
+" |
116 |
+# Needed for autoreconf |
117 |
+# gnome-base/gnome-common |
118 |
+ |
119 |
+src_prepare() { |
120 |
+ # make some panels optional |
121 |
+ epatch "${FILESDIR}"/${PN}-2.2.5-optional.patch |
122 |
+ |
123 |
+ # Fix NM version checking, bug #536850 |
124 |
+ epatch "${FILESDIR}"/${PN}-2.4.2-networkmanager-version.patch |
125 |
+ |
126 |
+ # North Korea causes build failure |
127 |
+ cp "${WORKDIR}"/${PN}-2.6.0-pyongyang/*.png panels/datetime/data/ || die |
128 |
+ epatch "${WORKDIR}"/${PN}-2.6.0-pyongyang/*.patch |
129 |
+ |
130 |
+ epatch_user |
131 |
+ |
132 |
+ eautoreconf |
133 |
+ gnome2_src_prepare |
134 |
+} |
135 |
+ |
136 |
+src_configure() { |
137 |
+ # --enable-systemd doesn't do anything in $PN-2.2.5 |
138 |
+ gnome2_src_configure \ |
139 |
+ --disable-update-mimedb \ |
140 |
+ --disable-static \ |
141 |
+ --enable-documentation \ |
142 |
+ --without-libsocialweb \ |
143 |
+ $(use_enable colord color) \ |
144 |
+ $(use_enable cups) \ |
145 |
+ $(use_enable input_devices_wacom wacom) |
146 |
+} |
147 |
|
148 |
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0-r1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0-r1.ebuild |
149 |
new file mode 100644 |
150 |
index 0000000..617cb74 |
151 |
--- /dev/null |
152 |
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0-r1.ebuild |
153 |
@@ -0,0 +1,107 @@ |
154 |
+# Copyright 1999-2015 Gentoo Foundation |
155 |
+# Distributed under the terms of the GNU General Public License v2 |
156 |
+# $Id$ |
157 |
+ |
158 |
+EAPI="5" |
159 |
+GCONF_DEBUG="yes" |
160 |
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen |
161 |
+ |
162 |
+inherit autotools eutils gnome2 |
163 |
+ |
164 |
+DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop" |
165 |
+HOMEPAGE="http://cinnamon.linuxmint.com/" |
166 |
+SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz |
167 |
+ https://dev.gentoo.org/~tetromino/distfiles/${PN}/${PN}-2.6.0-pyongyang.tar.xz" |
168 |
+ |
169 |
+LICENSE="GPL-2+" |
170 |
+SLOT="0" |
171 |
+IUSE="+colord +cups input_devices_wacom" |
172 |
+KEYWORDS="~amd64 ~x86" |
173 |
+ |
174 |
+# False positives caused by nested configure scripts |
175 |
+QA_CONFIGURE_OPTIONS=".*" |
176 |
+ |
177 |
+# FIXME: modemmanager is not optional |
178 |
+# networkmanager is not optional |
179 |
+ |
180 |
+COMMON_DEPEND=" |
181 |
+ >=dev-libs/glib-2.31:2 |
182 |
+ dev-libs/libxml2:2 |
183 |
+ >=gnome-base/libgnomekbd-2.91.91:0= |
184 |
+ >=gnome-extra/cinnamon-desktop-1.0:0= |
185 |
+ >=gnome-extra/cinnamon-menus-1.0:0= |
186 |
+ >=gnome-extra/cinnamon-settings-daemon-1.0:0= |
187 |
+ >=gnome-extra/nm-applet-0.9.8 |
188 |
+ media-libs/fontconfig |
189 |
+ >=media-libs/libcanberra-0.13[gtk3] |
190 |
+ >=media-sound/pulseaudio-1.1[glib] |
191 |
+ >=net-misc/modemmanager-0.7 |
192 |
+ >=net-misc/networkmanager-0.9.8[modemmanager] |
193 |
+ >=sys-auth/polkit-0.103 |
194 |
+ >=x11-libs/gdk-pixbuf-2.23.0:2 |
195 |
+ >=x11-libs/gtk+-3.4.1:3 |
196 |
+ >=x11-libs/libnotify-0.7.3:0= |
197 |
+ x11-libs/libX11 |
198 |
+ x11-libs/libxklavier |
199 |
+ colord? ( >=x11-misc/colord-0.1.14:0= ) |
200 |
+ cups? ( >=net-print/cups-1.4[dbus] ) |
201 |
+ input_devices_wacom? ( |
202 |
+ >=dev-libs/libwacom-0.7 |
203 |
+ >=x11-libs/gtk+-3.8:3 |
204 |
+ >=x11-libs/libXi-1.2 ) |
205 |
+" |
206 |
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x |
207 |
+# libgnomekbd needed only for gkbd-keyboard-display tool |
208 |
+RDEPEND="${COMMON_DEPEND} |
209 |
+ || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 ) |
210 |
+ x11-themes/gnome-icon-theme |
211 |
+ x11-themes/gnome-icon-theme-symbolic |
212 |
+ colord? ( >=gnome-extra/gnome-color-manager-3 ) |
213 |
+ cups? ( |
214 |
+ app-admin/system-config-printer |
215 |
+ net-print/cups-pk-helper ) |
216 |
+ input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] ) |
217 |
+" |
218 |
+ |
219 |
+DEPEND="${COMMON_DEPEND} |
220 |
+ app-text/iso-codes |
221 |
+ x11-proto/xproto |
222 |
+ x11-proto/xf86miscproto |
223 |
+ x11-proto/kbproto |
224 |
+ |
225 |
+ dev-libs/libxslt |
226 |
+ >=dev-util/intltool-0.40.1 |
227 |
+ >=sys-devel/gettext-0.17 |
228 |
+ virtual/pkgconfig |
229 |
+ |
230 |
+ gnome-base/gnome-common |
231 |
+ |
232 |
+ app-arch/xz-utils |
233 |
+" |
234 |
+# Needed for autoreconf |
235 |
+# gnome-base/gnome-common |
236 |
+ |
237 |
+src_prepare() { |
238 |
+ # make some panels optional |
239 |
+ epatch "${FILESDIR}"/${PN}-2.6.0-optional.patch |
240 |
+ |
241 |
+ # North Korea causes build failure |
242 |
+ cp "${WORKDIR}"/${PN}-2.6.0-pyongyang/*.png panels/datetime/data/ || die |
243 |
+ epatch "${WORKDIR}"/${PN}-2.6.0-pyongyang/*.patch |
244 |
+ |
245 |
+ epatch_user |
246 |
+ |
247 |
+ eautoreconf |
248 |
+ gnome2_src_prepare |
249 |
+} |
250 |
+ |
251 |
+src_configure() { |
252 |
+ # --enable-systemd doesn't do anything in $PN-2.2.5 |
253 |
+ gnome2_src_configure \ |
254 |
+ --disable-static \ |
255 |
+ --enable-documentation \ |
256 |
+ --without-libsocialweb \ |
257 |
+ $(use_enable colord color) \ |
258 |
+ $(use_enable cups) \ |
259 |
+ $(use_enable input_devices_wacom wacom) |
260 |
+} |