1 |
commit: 096f896e12c1648af44ef5376930db8166a779fc |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 7 21:59:57 2017 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 7 21:59:57 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=096f896e |
7 |
|
8 |
Revert "x11-libs/gtk+: remove old" |
9 |
|
10 |
This temporarily reverts commit 4086e98f8384562502ad73bfce2802556eb62e0e. |
11 |
media-video/parole is being a naughty boy, so restore gtk+-3.20 until that is fixed |
12 |
instead. |
13 |
|
14 |
x11-libs/gtk+/Manifest | 1 + |
15 |
.../gtk+-3.16.2-remove_update-icon-cache.patch | 24 +++ |
16 |
x11-libs/gtk+/gtk+-3.20.9.ebuild | 233 +++++++++++++++++++++ |
17 |
3 files changed, 258 insertions(+) |
18 |
|
19 |
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest |
20 |
index 6aa3aa59220..7a5756a1dd7 100644 |
21 |
--- a/x11-libs/gtk+/Manifest |
22 |
+++ b/x11-libs/gtk+/Manifest |
23 |
@@ -1,3 +1,4 @@ |
24 |
DIST gtk+-2.24.31.tar.xz 12805344 SHA256 68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658 SHA512 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1 WHIRLPOOL 6f59d444b28910b0f4cd7d0d0bf04f8e442acd945205679c19e5adf7ca3f8e7406d4095e9ff9ca597882eb937a7551e19af63b6597e7b57c0babe5b061f9110e |
25 |
+DIST gtk+-3.20.9.tar.xz 17174872 SHA256 83a609ba2f3424b5509e73967c49c67833af466d6f91081b24ee5c64fce6ac17 SHA512 5848403959f76633511009231c80a814cfe24a7ba07c9429704f432191e51b54d3e6621ce5b578f79999f21993920af3a45c8d03dad6ba03af5f9a342b32626e WHIRLPOOL 7964b82dabf72b5d45a34565874ba02e0dda09b0f358f640ca0c602c3c7aa4618432829d047794f5f202424c34c837bbdc31ccb3c5457768e252f048afd30107 |
26 |
DIST gtk+-3.22.15.tar.xz 18662944 SHA256 c8a012c2a99132629ab043f764a2b7cb6388483a015cd15c7a4288bec3590fdb SHA512 c99c4a52bc447a21be20546bdc7808081abde076af9603424c1de20af031ac3f9bd121709d4c18705db8ba2f66ace0aae9b32741347788a8d81afa358d67e758 WHIRLPOOL f0eae97db9ef7e1a3ecedc0d98fb35c4a671774f473c1b6f5a17424e2f6ca3d25e98efd74312bb481addfacbc44b6d2d6a549658d202ed6a7215743678de1d00 |
27 |
DIST gtk+-3.22.16.tar.xz 18655144 SHA256 3e0c3ad01f3c8c5c9b1cc1ae00852bd55164c8e5a9c1f90ba5e07f14f175fe2c SHA512 a981ba3c420db649645787916d603a22f1da9d839aba39f3786bab47f9a247867d94d342ce4c3aa47de4876072ed9cf3615304a73de7e613063cef08b8c0d612 WHIRLPOOL 364cec780093ba60832a85769b4b6994adce43efbb408bc291fc059a6c804c50da169af4f0bbe152ed3072d02b02417bf0d700f52b50d9e41bea9bdf67784f71 |
28 |
|
29 |
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 |
30 |
new file mode 100644 |
31 |
index 00000000000..b121dd57281 |
32 |
--- /dev/null |
33 |
+++ b/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch |
34 |
@@ -0,0 +1,24 @@ |
35 |
+From d83443d10381a53637226b937094454951de44c1 Mon Sep 17 00:00:00 2001 |
36 |
+From: Ole Reifschneider <tranquility@g.o> |
37 |
+Date: Thu, 16 Apr 2015 23:51:51 +0200 |
38 |
+Subject: [PATCH] Remove update-icon-cache from bin_PROGRAMS |
39 |
+ |
40 |
+--- |
41 |
+ gtk/Makefile.am | 1 - |
42 |
+ 1 file changed, 1 deletion(-) |
43 |
+ |
44 |
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am |
45 |
+index 83dfe31..a5afc03 100644 |
46 |
+--- a/gtk/Makefile.am |
47 |
++++ b/gtk/Makefile.am |
48 |
+@@ -1380,7 +1380,6 @@ endif |
49 |
+ # |
50 |
+ bin_PROGRAMS = \ |
51 |
+ gtk-query-immodules-3.0 \ |
52 |
+- gtk-update-icon-cache \ |
53 |
+ gtk-encode-symbolic-svg \ |
54 |
+ gtk-launch |
55 |
+ |
56 |
+-- |
57 |
+2.0.5 |
58 |
+ |
59 |
|
60 |
diff --git a/x11-libs/gtk+/gtk+-3.20.9.ebuild b/x11-libs/gtk+/gtk+-3.20.9.ebuild |
61 |
new file mode 100644 |
62 |
index 00000000000..4c60225b850 |
63 |
--- /dev/null |
64 |
+++ b/x11-libs/gtk+/gtk+-3.20.9.ebuild |
65 |
@@ -0,0 +1,233 @@ |
66 |
+# Copyright 1999-2017 Gentoo Foundation |
67 |
+# Distributed under the terms of the GNU General Public License v2 |
68 |
+ |
69 |
+EAPI=6 |
70 |
+GNOME2_LA_PUNT="yes" |
71 |
+ |
72 |
+inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal |
73 |
+ |
74 |
+DESCRIPTION="Gimp ToolKit +" |
75 |
+HOMEPAGE="http://www.gtk.org/" |
76 |
+ |
77 |
+LICENSE="LGPL-2+" |
78 |
+SLOT="3" |
79 |
+IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama" |
80 |
+REQUIRED_USE=" |
81 |
+ || ( aqua wayland X ) |
82 |
+ xinerama? ( X ) |
83 |
+" |
84 |
+ |
85 |
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
86 |
+ |
87 |
+# Upstream wants us to do their job: |
88 |
+# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 |
89 |
+RESTRICT="test" |
90 |
+ |
91 |
+# FIXME: introspection data is built against system installation of gtk+:3, |
92 |
+# bug #???? |
93 |
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) |
94 |
+COMMON_DEPEND=" |
95 |
+ >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] |
96 |
+ >=dev-libs/glib-2.45.8:2[${MULTILIB_USEDEP}] |
97 |
+ media-libs/fontconfig[${MULTILIB_USEDEP}] |
98 |
+ >=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}] |
99 |
+ >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] |
100 |
+ >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}] |
101 |
+ >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}] |
102 |
+ x11-misc/shared-mime-info |
103 |
+ |
104 |
+ cloudprint? ( |
105 |
+ >=net-libs/rest-0.7[${MULTILIB_USEDEP}] |
106 |
+ >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) |
107 |
+ colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) |
108 |
+ cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) |
109 |
+ introspection? ( >=dev-libs/gobject-introspection-1.39:= ) |
110 |
+ wayland? ( |
111 |
+ >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}] |
112 |
+ >=dev-libs/wayland-protocols-1.0 |
113 |
+ media-libs/mesa[wayland,${MULTILIB_USEDEP}] |
114 |
+ >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] |
115 |
+ ) |
116 |
+ X? ( |
117 |
+ >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] |
118 |
+ x11-libs/libXrender[${MULTILIB_USEDEP}] |
119 |
+ x11-libs/libX11[${MULTILIB_USEDEP}] |
120 |
+ >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] |
121 |
+ x11-libs/libXext[${MULTILIB_USEDEP}] |
122 |
+ >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] |
123 |
+ x11-libs/libXcursor[${MULTILIB_USEDEP}] |
124 |
+ x11-libs/libXfixes[${MULTILIB_USEDEP}] |
125 |
+ x11-libs/libXcomposite[${MULTILIB_USEDEP}] |
126 |
+ x11-libs/libXdamage[${MULTILIB_USEDEP}] |
127 |
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
128 |
+ ) |
129 |
+" |
130 |
+DEPEND="${COMMON_DEPEND} |
131 |
+ app-text/docbook-xsl-stylesheets |
132 |
+ app-text/docbook-xml-dtd:4.1.2 |
133 |
+ dev-libs/libxslt |
134 |
+ dev-libs/gobject-introspection-common |
135 |
+ >=dev-util/gdbus-codegen-2.38.2 |
136 |
+ >=dev-util/gtk-doc-am-1.20 |
137 |
+ >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}] |
138 |
+ virtual/pkgconfig[${MULTILIB_USEDEP}] |
139 |
+ X? ( |
140 |
+ x11-proto/xextproto[${MULTILIB_USEDEP}] |
141 |
+ x11-proto/xproto[${MULTILIB_USEDEP}] |
142 |
+ x11-proto/inputproto[${MULTILIB_USEDEP}] |
143 |
+ x11-proto/damageproto[${MULTILIB_USEDEP}] |
144 |
+ xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] ) |
145 |
+ ) |
146 |
+ test? ( |
147 |
+ media-fonts/font-misc-misc |
148 |
+ media-fonts/font-cursor-misc ) |
149 |
+" |
150 |
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 |
151 |
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 |
152 |
+# >=xorg-server-1.11.4 needed for |
153 |
+# https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html |
154 |
+RDEPEND="${COMMON_DEPEND} |
155 |
+ >=dev-util/gtk-update-icon-cache-3 |
156 |
+ !<gnome-base/gail-1000 |
157 |
+ !<x11-libs/vte-0.31.0:2.90 |
158 |
+ >=x11-themes/adwaita-icon-theme-3.14 |
159 |
+ X? ( !<x11-base/xorg-server-1.11.4 ) |
160 |
+" |
161 |
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 |
162 |
+PDEPEND=" |
163 |
+ gnome-base/librsvg[${MULTILIB_USEDEP}] |
164 |
+ vim-syntax? ( app-vim/gtk-syntax ) |
165 |
+" |
166 |
+ |
167 |
+MULTILIB_CHOST_TOOLS=( |
168 |
+ /usr/bin/gtk-query-immodules-3.0$(get_exeext) |
169 |
+) |
170 |
+ |
171 |
+strip_builddir() { |
172 |
+ local rule=$1 |
173 |
+ shift |
174 |
+ local directory=$1 |
175 |
+ shift |
176 |
+ sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ |
177 |
+ || die "Could not strip director ${directory} from build." |
178 |
+} |
179 |
+ |
180 |
+src_prepare() { |
181 |
+ # -O3 and company cause random crashes in applications. Bug #133469 |
182 |
+ replace-flags -O3 -O2 |
183 |
+ strip-flags |
184 |
+ |
185 |
+ if ! use test ; then |
186 |
+ # don't waste time building tests |
187 |
+ strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} |
188 |
+ |
189 |
+ # the tests dir needs to be build now because since commit |
190 |
+ # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there |
191 |
+ # strip_builddir SRC_SUBDIRS tests Makefile.{am,in} |
192 |
+ fi |
193 |
+ |
194 |
+ if ! use examples; then |
195 |
+ # don't waste time building demos |
196 |
+ strip_builddir SRC_SUBDIRS demos Makefile.{am,in} |
197 |
+ strip_builddir SRC_SUBDIRS examples Makefile.{am,in} |
198 |
+ fi |
199 |
+ |
200 |
+ # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache |
201 |
+ eapply "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch |
202 |
+ |
203 |
+ gnome2_src_prepare |
204 |
+ eautoreconf |
205 |
+} |
206 |
+ |
207 |
+multilib_src_configure() { |
208 |
+ # need libdir here to avoid a double slash in a path that libtool doesn't |
209 |
+ # grok so well during install (// between $EPREFIX and usr ...) |
210 |
+ ECONF_SOURCE=${S} \ |
211 |
+ gnome2_src_configure \ |
212 |
+ $(use_enable aqua quartz-backend) \ |
213 |
+ $(use_enable broadway broadway-backend) \ |
214 |
+ $(use_enable cloudprint) \ |
215 |
+ $(use_enable colord) \ |
216 |
+ $(use_enable cups cups auto) \ |
217 |
+ $(multilib_native_use_enable introspection) \ |
218 |
+ $(use_enable wayland wayland-backend) \ |
219 |
+ $(use_enable X x11-backend) \ |
220 |
+ $(use_enable X xcomposite) \ |
221 |
+ $(use_enable X xdamage) \ |
222 |
+ $(use_enable X xfixes) \ |
223 |
+ $(use_enable X xkb) \ |
224 |
+ $(use_enable X xrandr) \ |
225 |
+ $(use_enable xinerama) \ |
226 |
+ --disable-papi \ |
227 |
+ --disable-mir-backend \ |
228 |
+ --enable-man \ |
229 |
+ --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ |
230 |
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \ |
231 |
+ CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" |
232 |
+ |
233 |
+ # work-around gtk-doc out-of-source brokedness |
234 |
+ if multilib_is_native_abi; then |
235 |
+ local d |
236 |
+ for d in gdk gtk libgail-util; do |
237 |
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
238 |
+ done |
239 |
+ fi |
240 |
+} |
241 |
+ |
242 |
+multilib_src_test() { |
243 |
+ "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die |
244 |
+ GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check |
245 |
+} |
246 |
+ |
247 |
+multilib_src_install() { |
248 |
+ gnome2_src_install |
249 |
+} |
250 |
+ |
251 |
+multilib_src_install_all() { |
252 |
+ insinto /etc/gtk-3.0 |
253 |
+ doins "${FILESDIR}"/settings.ini |
254 |
+ einstalldocs |
255 |
+} |
256 |
+ |
257 |
+pkg_preinst() { |
258 |
+ gnome2_pkg_preinst |
259 |
+ |
260 |
+ multilib_pkg_preinst() { |
261 |
+ # Make immodules.cache belongs to gtk+ alone |
262 |
+ local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" |
263 |
+ |
264 |
+ if [[ -e ${EROOT}${cache} ]]; then |
265 |
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die |
266 |
+ else |
267 |
+ touch "${ED}"/${cache} || die |
268 |
+ fi |
269 |
+ } |
270 |
+ multilib_parallel_foreach_abi multilib_pkg_preinst |
271 |
+} |
272 |
+ |
273 |
+pkg_postinst() { |
274 |
+ gnome2_pkg_postinst |
275 |
+ |
276 |
+ multilib_pkg_postinst() { |
277 |
+ gnome2_query_immodules_gtk3 \ |
278 |
+ || die "Update immodules cache failed (for ${ABI})" |
279 |
+ } |
280 |
+ multilib_parallel_foreach_abi multilib_pkg_postinst |
281 |
+ |
282 |
+ if ! has_version "app-text/evince"; then |
283 |
+ elog "Please install app-text/evince for print preview functionality." |
284 |
+ elog "Alternatively, check \"gtk-print-preview-command\" documentation and" |
285 |
+ elog "add it to your settings.ini file." |
286 |
+ fi |
287 |
+} |
288 |
+ |
289 |
+pkg_postrm() { |
290 |
+ gnome2_pkg_postrm |
291 |
+ |
292 |
+ if [[ -z ${REPLACED_BY_VERSION} ]]; then |
293 |
+ multilib_pkg_postrm() { |
294 |
+ rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache |
295 |
+ } |
296 |
+ multilib_foreach_abi multilib_pkg_postrm |
297 |
+ fi |
298 |
+} |