1 |
commit: 7a029594c850603a417d3575fd43132377f541f3 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 18 21:05:54 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 18 21:05:54 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=7a029594 |
7 |
|
8 |
x11-libs/gtk+: Remove very outdated live ebuild |
9 |
|
10 |
It's gtk4 into SLOT=3, tries to build with autotools (isn't a thing |
11 |
for gtk4 git), and hasn't been synced with other changes for over |
12 |
3 years, it seems. On top of that, later blind fixes broke the |
13 |
dependency string. |
14 |
|
15 |
Closes: https://bugs.gentoo.org/674514 |
16 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
17 |
|
18 |
.../gtk+-3.16.2-remove_update-icon-cache.patch | 24 -- |
19 |
x11-libs/gtk+/files/gtk+-non-bash-support.patch | 56 ----- |
20 |
x11-libs/gtk+/files/settings.ini | 4 - |
21 |
x11-libs/gtk+/gtk+-9999.ebuild | 265 --------------------- |
22 |
x11-libs/gtk+/metadata.xml | 23 -- |
23 |
5 files changed, 372 deletions(-) |
24 |
|
25 |
diff --git a/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch |
26 |
deleted file mode 100644 |
27 |
index b121dd57..00000000 |
28 |
--- a/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch |
29 |
+++ /dev/null |
30 |
@@ -1,24 +0,0 @@ |
31 |
-From d83443d10381a53637226b937094454951de44c1 Mon Sep 17 00:00:00 2001 |
32 |
-From: Ole Reifschneider <tranquility@g.o> |
33 |
-Date: Thu, 16 Apr 2015 23:51:51 +0200 |
34 |
-Subject: [PATCH] Remove update-icon-cache from bin_PROGRAMS |
35 |
- |
36 |
---- |
37 |
- gtk/Makefile.am | 1 - |
38 |
- 1 file changed, 1 deletion(-) |
39 |
- |
40 |
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am |
41 |
-index 83dfe31..a5afc03 100644 |
42 |
---- a/gtk/Makefile.am |
43 |
-+++ b/gtk/Makefile.am |
44 |
-@@ -1380,7 +1380,6 @@ endif |
45 |
- # |
46 |
- bin_PROGRAMS = \ |
47 |
- gtk-query-immodules-3.0 \ |
48 |
-- gtk-update-icon-cache \ |
49 |
- gtk-encode-symbolic-svg \ |
50 |
- gtk-launch |
51 |
- |
52 |
--- |
53 |
-2.0.5 |
54 |
- |
55 |
|
56 |
diff --git a/x11-libs/gtk+/files/gtk+-non-bash-support.patch b/x11-libs/gtk+/files/gtk+-non-bash-support.patch |
57 |
deleted file mode 100644 |
58 |
index a1aac42c..00000000 |
59 |
--- a/x11-libs/gtk+/files/gtk+-non-bash-support.patch |
60 |
+++ /dev/null |
61 |
@@ -1,56 +0,0 @@ |
62 |
-From 43a4a28cdc60ac7347bb89f84cf049cb3401621d Mon Sep 17 00:00:00 2001 |
63 |
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@g.o> |
64 |
-Date: Sun, 26 Oct 2014 01:59:33 +0400 |
65 |
-Subject: [PATCH] gtk/Makefile.am: Remove bashisms |
66 |
-MIME-Version: 1.0 |
67 |
-Content-Type: text/plain; charset=UTF-8 |
68 |
-Content-Transfer-Encoding: 8bit |
69 |
- |
70 |
-- improve portability of ECHO |
71 |
-- remove use of shopt |
72 |
- |
73 |
-https://bugzilla.gnome.org/show_bug.cgi?id=738835 |
74 |
- |
75 |
-From: Alexander Tsoy <alexander@××××.me> |
76 |
-Signed-off-by: Rémi Cardona <remi@g.o> |
77 |
---- |
78 |
- gtk/Makefile.am | 13 +++++-------- |
79 |
- 1 file changed, 5 insertions(+), 8 deletions(-) |
80 |
- |
81 |
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am |
82 |
-index 96c651a..b1478ce 100644 |
83 |
---- a/gtk/Makefile.am |
84 |
-+++ b/gtk/Makefile.am |
85 |
-@@ -19,11 +19,7 @@ GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings % |
86 |
- endif |
87 |
- |
88 |
- SUBDIRS = inspector native . |
89 |
--if OS_DARWIN |
90 |
-- ECHO="echo" |
91 |
--else |
92 |
-- ECHO=echo -e |
93 |
--endif |
94 |
-+ECHO=printf '%b\n' |
95 |
- |
96 |
- if HAVE_CLOUDPRINT |
97 |
- if HAVE_PAPI_CUPS |
98 |
-@@ -1405,12 +1401,13 @@ gtk.gresource.xml: Makefile.am |
99 |
- n=`basename $$f`; \ |
100 |
- $(ECHO) " <file compressed=\"true\">ui/$$n</file>" >> $@; \ |
101 |
- done; \ |
102 |
-- shopt -s nullglob; \ |
103 |
- for s in 16x16 22x22 24x24 32x32 48x48; do \ |
104 |
- for c in actions status; do \ |
105 |
- for f in $(srcdir)/resources/icons/$$s/$$c/*.png; do \ |
106 |
-- n=`basename $$f`; \ |
107 |
-- $(ECHO) " <file>icons/$$s/$$c/$$n</file>" >> $@; \ |
108 |
-+ if [ -e "$$f" ] ; then \ |
109 |
-+ n=`basename $$f`; \ |
110 |
-+ $(ECHO) " <file>icons/$$s/$$c/$$n</file>" >> $@; \ |
111 |
-+ fi; \ |
112 |
- done; \ |
113 |
- done; \ |
114 |
- done; \ |
115 |
--- |
116 |
-2.3.0 |
117 |
- |
118 |
|
119 |
diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/settings.ini |
120 |
deleted file mode 100644 |
121 |
index a65c0a81..00000000 |
122 |
--- a/x11-libs/gtk+/files/settings.ini |
123 |
+++ /dev/null |
124 |
@@ -1,4 +0,0 @@ |
125 |
-[Settings] |
126 |
-gtk-theme-name = Adwaita |
127 |
-gtk-icon-theme-name = gnome |
128 |
-gtk-cursor-theme-name = Adwaita |
129 |
|
130 |
diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild |
131 |
deleted file mode 100644 |
132 |
index b6b62d7d..00000000 |
133 |
--- a/x11-libs/gtk+/gtk+-9999.ebuild |
134 |
+++ /dev/null |
135 |
@@ -1,265 +0,0 @@ |
136 |
-# Copyright 1999-2016 Gentoo Foundation |
137 |
-# Distributed under the terms of the GNU General Public License v2 |
138 |
-# $Id$ |
139 |
- |
140 |
-EAPI="5" |
141 |
-GCONF_DEBUG="yes" |
142 |
-GNOME2_LA_PUNT="yes" |
143 |
- |
144 |
-inherit eutils flag-o-matic gnome2 multilib virtualx multilib-minimal |
145 |
-if [[ ${PV} = 9999 ]]; then |
146 |
- inherit gnome2-live |
147 |
-fi |
148 |
- |
149 |
-DESCRIPTION="Gimp ToolKit +" |
150 |
-HOMEPAGE="http://www.gtk.org/" |
151 |
- |
152 |
-LICENSE="LGPL-2+" |
153 |
-SLOT="3" |
154 |
-IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama" |
155 |
-REQUIRED_USE=" |
156 |
- || ( aqua wayland X ) |
157 |
- xinerama? ( X ) |
158 |
-" |
159 |
- |
160 |
-if [[ ${PV} = 9999 ]]; then |
161 |
- IUSE="${IUSE} doc" |
162 |
- KEYWORDS="" |
163 |
-else |
164 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
165 |
-fi |
166 |
- |
167 |
-# FIXME: introspection data is built against system installation of gtk+:3 |
168 |
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) |
169 |
-COMMON_DEPEND=" |
170 |
- >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] |
171 |
- >=dev-libs/glib-2.45.8:2[${MULTILIB_USEDEP}] |
172 |
- media-libs/fontconfig[${MULTILIB_USEDEP}] |
173 |
- >=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}] |
174 |
- >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] |
175 |
- >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}] |
176 |
- >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}] |
177 |
- x11-misc/shared-mime-info |
178 |
- |
179 |
- cloudprint? ( |
180 |
- >=net-libs/rest-0.7[${MULTILIB_USEDEP}] |
181 |
- >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) |
182 |
- colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) |
183 |
- cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) |
184 |
- introspection? ( >=dev-libs/gobject-introspection-1.39:= ) |
185 |
- wayland? ( |
186 |
- >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}] |
187 |
- >=dev-libs/wayland-protocols-1.0.0[${MULTILIB_USEDEP}] |
188 |
- media-libs/mesa[wayland,${MULTILIB_USEDEP}] |
189 |
- >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] |
190 |
- ) |
191 |
- X? ( |
192 |
- >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] |
193 |
- x11-libs/libXrender[${MULTILIB_USEDEP}] |
194 |
- x11-libs/libX11[${MULTILIB_USEDEP}] |
195 |
- >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] |
196 |
- x11-libs/libXext[${MULTILIB_USEDEP}] |
197 |
- >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] |
198 |
- x11-libs/libXcursor[${MULTILIB_USEDEP}] |
199 |
- x11-libs/libXfixes[${MULTILIB_USEDEP}] |
200 |
- x11-libs/libXcomposite[${MULTILIB_USEDEP}] |
201 |
- x11-libs/libXdamage[${MULTILIB_USEDEP}] |
202 |
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
203 |
- ) |
204 |
-" |
205 |
-DEPEND="${COMMON_DEPEND} |
206 |
- app-text/docbook-xsl-stylesheets |
207 |
- app-text/docbook-xml-dtd:4.1.2 |
208 |
- dev-libs/libxslt |
209 |
- dev-libs/gobject-introspection-common |
210 |
- >=dev-util/gdbus-codegen-2.38.2 |
211 |
- >=dev-util/gtk-doc-am-1.20 |
212 |
- >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}] |
213 |
- virtual/pkgconfig[${MULTILIB_USEDEP}] |
214 |
- X? ( x11-base/xorg-proto ) |
215 |
- ) |
216 |
- test? ( |
217 |
- media-fonts/font-misc-misc |
218 |
- media-fonts/font-cursor-misc ) |
219 |
-" |
220 |
- |
221 |
-if [[ ${PV} = 9999 ]]; then |
222 |
- DEPEND="${DEPEND} |
223 |
- doc? ( >=dev-util/gtk-doc-1.20 )" |
224 |
-fi |
225 |
- |
226 |
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 |
227 |
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 |
228 |
-# >=xorg-server-1.11.4 needed for |
229 |
-# https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html |
230 |
-RDEPEND="${COMMON_DEPEND} |
231 |
- >=dev-util/gtk-update-icon-cache-3 |
232 |
- !<gnome-base/gail-1000 |
233 |
- !<x11-libs/vte-0.31.0:2.90 |
234 |
- >=x11-themes/adwaita-icon-theme-3.14 |
235 |
- X? ( !<x11-base/xorg-server-1.11.4 ) |
236 |
- abi_x86_32? ( |
237 |
- !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3 |
238 |
- !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] |
239 |
- ) |
240 |
-" |
241 |
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 |
242 |
-PDEPEND=" |
243 |
- gnome-base/librsvg[${MULTILIB_USEDEP}] |
244 |
- vim-syntax? ( app-vim/gtk-syntax ) |
245 |
-" |
246 |
- |
247 |
-MULTILIB_CHOST_TOOLS=( |
248 |
- /usr/bin/gtk-query-immodules-3.0 |
249 |
-) |
250 |
- |
251 |
-strip_builddir() { |
252 |
- local rule=$1 |
253 |
- shift |
254 |
- local directory=$1 |
255 |
- shift |
256 |
- sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ |
257 |
- || die "Could not strip director ${directory} from build." |
258 |
-} |
259 |
- |
260 |
-src_prepare() { |
261 |
- # -O3 and company cause random crashes in applications. Bug #133469 |
262 |
- replace-flags -O3 -O2 |
263 |
- strip-flags |
264 |
- |
265 |
- if ! use test ; then |
266 |
- # don't waste time building tests |
267 |
- strip_builddir SRC_SUBDIRS testsuite Makefile.am |
268 |
- [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS testsuite Makefile.in |
269 |
- strip_builddir SRC_SUBDIRS tests Makefile.am |
270 |
- [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in |
271 |
- fi |
272 |
- |
273 |
- if ! use examples; then |
274 |
- # don't waste time building demos |
275 |
- strip_builddir SRC_SUBDIRS demos Makefile.am |
276 |
- [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in |
277 |
- strip_builddir SRC_SUBDIRS examples Makefile.am |
278 |
- [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS examples Makefile.in |
279 |
- fi |
280 |
- |
281 |
- # Do no build and install gtk-update-icon-cache which is done by gtk+:2 |
282 |
- epatch "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch |
283 |
- |
284 |
- epatch_user |
285 |
- |
286 |
- eautoreconf |
287 |
- [[ ${PV} = 9999 ]] && gnome2_src_prepare |
288 |
-} |
289 |
- |
290 |
-multilib_src_configure() { |
291 |
- local myconf="" |
292 |
- |
293 |
- [[ ${PV} = 9999 ]] && myconf="${myconf} $(use_enable doc gtk-doc)" |
294 |
- |
295 |
- # Passing --disable-debug is not recommended for production use |
296 |
- # need libdir here to avoid a double slash in a path that libtool doesn't |
297 |
- # grok so well during install (// between $EPREFIX and usr ...) |
298 |
- ECONF_SOURCE=${S} \ |
299 |
- gnome2_src_configure \ |
300 |
- $(use_enable aqua quartz-backend) \ |
301 |
- $(use_enable broadway broadway-backend) \ |
302 |
- $(use_enable cloudprint) \ |
303 |
- $(use_enable colord) \ |
304 |
- $(use_enable cups cups auto) \ |
305 |
- $(multilib_native_use_enable introspection) \ |
306 |
- $(use_enable wayland wayland-backend) \ |
307 |
- $(use_enable X x11-backend) \ |
308 |
- $(use_enable X xcomposite) \ |
309 |
- $(use_enable X xdamage) \ |
310 |
- $(use_enable X xfixes) \ |
311 |
- $(use_enable X xkb) \ |
312 |
- $(use_enable X xrandr) \ |
313 |
- $(use_enable xinerama) \ |
314 |
- --disable-papi \ |
315 |
- --disable-mir-backend \ |
316 |
- --enable-man \ |
317 |
- --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ |
318 |
- --libdir="${EPREFIX}"/usr/$(get_libdir) \ |
319 |
- CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" \ |
320 |
- ${myconf} |
321 |
- |
322 |
- # work-around gtk-doc out-of-source brokedness |
323 |
- if multilib_is_native_abi; then |
324 |
- local d |
325 |
- for d in gdk gtk libgail-util; do |
326 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
327 |
- done |
328 |
- fi |
329 |
-} |
330 |
- |
331 |
-multilib_src_test() { |
332 |
- # FIXME: this should be handled at eclass level |
333 |
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die |
334 |
- |
335 |
- unset DBUS_SESSION_BUS_ADDRESS |
336 |
- unset DISPLAY #527682 |
337 |
- GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check |
338 |
-} |
339 |
- |
340 |
-multilib_src_install() { |
341 |
- gnome2_src_install |
342 |
- |
343 |
- # add -framework Carbon to the .pc files, bug #??? |
344 |
- if use aqua ; then |
345 |
- for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do |
346 |
- sed -e "s:Libs\: :Libs\: -framework Carbon :" \ |
347 |
- -i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed" |
348 |
- done |
349 |
- fi |
350 |
-} |
351 |
- |
352 |
-multilib_src_install_all() { |
353 |
- insinto /etc/gtk-3.0 |
354 |
- doins "${FILESDIR}"/settings.ini |
355 |
- |
356 |
- dodoc AUTHORS ChangeLog* HACKING NEWS* README* |
357 |
-} |
358 |
- |
359 |
-pkg_preinst() { |
360 |
- gnome2_pkg_preinst |
361 |
- |
362 |
- multilib_pkg_preinst() { |
363 |
- # Make immodules.cache belongs to gtk+ alone |
364 |
- local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" |
365 |
- |
366 |
- if [[ -e ${EROOT}${cache} ]]; then |
367 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
368 |
- else |
369 |
- touch "${ED}"/${cache} || die |
370 |
- fi |
371 |
- } |
372 |
- multilib_parallel_foreach_abi multilib_pkg_preinst |
373 |
-} |
374 |
- |
375 |
-pkg_postinst() { |
376 |
- gnome2_pkg_postinst |
377 |
- |
378 |
- multilib_pkg_postinst() { |
379 |
- gnome2_query_immodules_gtk3 \ |
380 |
- || die "Update immodules cache failed (for ${ABI})" |
381 |
- } |
382 |
- multilib_parallel_foreach_abi multilib_pkg_postinst |
383 |
- |
384 |
- if ! has_version "app-text/evince"; then |
385 |
- elog "Please install app-text/evince for print preview functionality." |
386 |
- elog "Alternatively, check \"gtk-print-preview-command\" documentation and" |
387 |
- elog "add it to your settings.ini file." |
388 |
- fi |
389 |
-} |
390 |
- |
391 |
-pkg_postrm() { |
392 |
- gnome2_pkg_postrm |
393 |
- |
394 |
- if [[ -z ${REPLACED_BY_VERSIONS} ]]; then |
395 |
- multilib_pkg_postrm() { |
396 |
- rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache |
397 |
- } |
398 |
- multilib_foreach_abi multilib_pkg_postrm |
399 |
- fi |
400 |
-} |
401 |
|
402 |
diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml |
403 |
deleted file mode 100644 |
404 |
index efa1edaa..00000000 |
405 |
--- a/x11-libs/gtk+/metadata.xml |
406 |
+++ /dev/null |
407 |
@@ -1,23 +0,0 @@ |
408 |
-<?xml version="1.0" encoding="UTF-8"?> |
409 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
410 |
-<pkgmetadata> |
411 |
- <maintainer type="project"> |
412 |
- <email>gnome@g.o</email> |
413 |
- <name>Gentoo GNOME Desktop</name> |
414 |
- </maintainer> |
415 |
- <longdescription> |
416 |
- GTK+ is a multi-platform toolkit for creating graphical user |
417 |
- interfaces. Offering a complete set of widgets, GTK+ is suitable |
418 |
- for projects ranging from small one-off projects to complete |
419 |
- application suites. |
420 |
- </longdescription> |
421 |
- <use> |
422 |
- <flag name="broadway">Enable the GDK Broadway backend.</flag> |
423 |
- <flag name="cloudprint">Enable printing via Google Cloud Print.</flag> |
424 |
- <flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management |
425 |
- in printing</flag> |
426 |
- </use> |
427 |
- <upstream> |
428 |
- <remote-id type="cpe">cpe:/a:gtk:gtk%2B</remote-id> |
429 |
- </upstream> |
430 |
-</pkgmetadata> |