Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/gtk+/
Date: Sat, 12 Dec 2015 14:29:21
Message-Id: 1449930485.280638cc400d3c299dc207350a48c1c3a7a3ffb9.pacho@gentoo
1 commit: 280638cc400d3c299dc207350a48c1c3a7a3ffb9
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 12 12:23:12 2015 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 12 14:28:05 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=280638cc
7
8 x11-libs/gtk+: Version bump
9
10 Package-Manager: portage-2.2.24
11
12 x11-libs/gtk+/Manifest | 1 +
13 x11-libs/gtk+/gtk+-2.24.29.ebuild | 297 ++++++++++++++++++++++++++++++++++++++
14 2 files changed, 298 insertions(+)
15
16 diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
17 index 078cc5b..9374158 100644
18 --- a/x11-libs/gtk+/Manifest
19 +++ b/x11-libs/gtk+/Manifest
20 @@ -1,6 +1,7 @@
21 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684 SHA512 aaef9275ff6330a9fe1cbe1e40def181329d79cd33eb2b2ff5ae9cba5fa57e706716233ac7515f621d913f81343eb8244c6669e6411f7d50ca69187bf8d4fd86 WHIRLPOOL 2aacaa61e3291ff3c96a724e02a1fd250fa1574a69c730fa8635c28926c4134b780e9695e3aec3a6fd27b6e25848fcaee4075e17cd47bed2851bdcf311f19020
22 DIST gtk+-1.2.10.tar.gz 2868322 SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34 SHA512 6a05062520954287b0e24a95169d18c216145ee79d1fa7f54222db32c8e39e011e3dc49886d3bc4de1cc1ebd71f5744e41891cde8d5c2759f637e71c390a235f WHIRLPOOL 906a78c2e2664b1cbd70fb9e64ce6ca1155b2a59c169eab986f5b4b90e937f380a5d35e2e28eb56913b0fbdfb53abeca5ef6823f92a3ab3906cd4e9f7c595b15
23 DIST gtk+-2.24.28.tar.xz 13354884 SHA256 b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656 SHA512 86d563645ca70c1e14afd4b38d925f496e596cbf6181f2e95310f58c2f4152aaecc559e3c513e6d405fcf48d8d413d59a9d72782216529c1280bd8e1947d7760 WHIRLPOOL b4943bb7792f962e0fc50a118f0dbce58a79678e1a98632717a2f3bda4ddd99b62ce9aed3b14f1c0912a4b53eb975991527843985f625c5a9e052db4889acfb0
24 +DIST gtk+-2.24.29.tar.xz 13143648 SHA256 0741c59600d3d810a223866453dc2bbb18ce4723828681ba24aa6519c37631b8 SHA512 3cdc868b74831c35b9181edfe29fc7743118b5db6b4e742cc684cf5b7d8e87686f53c4460ee14dee635c25cfd1fd7aefb5cc472d022f0f77d83b6d3a881eff26 WHIRLPOOL 9a7bf26647ac9f10dea2d1f7a50fe36ba9d88c74784b6863e0e6572ab165a716774c84c1e067c61920e9a8bb08068bc765099d65d975b3778fee2abd8f80af37
25 DIST gtk+-3.14.13.tar.xz 15784112 SHA256 b1efcb1ef299f9b205e6f4512428315fd03484e5790f65bd3ac164e84ade90b0 SHA512 e4fcca57fe58821832ee0b542d86033a1028c19e2248929e25a8c16ef05603a93815556591bcc025995bfab1238ad4060fcdf4920ec2df22ab3175b404f3a207 WHIRLPOOL 36a77983701da6041f0762013638303d323a42487a6f6508e92dfa0571f8f13b8598a8187e9665e6eeb62e41b7c2533a1fe9d2b68f097e85599d373969d52da0
26 DIST gtk+-3.16.6.tar.xz 18273872 SHA256 4d12726d0856a968b41802ae5c5971d7e9bac532717e309d3f81b9989da5ffbe SHA512 0b3417c57ef755c8eb498b6800cd9e1dc1df01d508425c968944aaa0d7ff50f25a00370f9a6ccf23a87cc9f7fb251447e63055149264b997ee5a681e98dc54ec WHIRLPOOL f944cce4396d2519d357ef75f1e9d420b64d77004110f0e7d2eb643ae5b3f8182db5be28e35269a57ecfe9cbc3280dc65008c30ce1c977d64d0fbb317e6f6bce
27 DIST gtk+-3.16.7.tar.xz 18294656 SHA256 19689d14de54d182fad538153dbff6d41f53841f940aa871585fdea0306c7fba SHA512 8f74b3a4093ecf776466d3988806fdae081d10d5e74c66770b52f624076afe92d58efb68ace47fd0dbc5a170a577fc9a8d1b4768794aa4249433c95198db00c8 WHIRLPOOL f8b4d9fa6b7b3ed9702f76d28d729b745217e072898239517d320f0635e87691ca874a136607566cf53d73aead53833c5ecf484fc7aea74f3c26a1f14cc5a9b4
28
29 diff --git a/x11-libs/gtk+/gtk+-2.24.29.ebuild b/x11-libs/gtk+/gtk+-2.24.29.ebuild
30 new file mode 100644
31 index 0000000..1d8284d
32 --- /dev/null
33 +++ b/x11-libs/gtk+/gtk+-2.24.29.ebuild
34 @@ -0,0 +1,297 @@
35 +# Copyright 1999-2015 Gentoo Foundation
36 +# Distributed under the terms of the GNU General Public License v2
37 +# $Id$
38 +
39 +EAPI="5"
40 +GCONF_DEBUG="yes"
41 +GNOME2_LA_PUNT="yes"
42 +
43 +inherit autotools eutils flag-o-matic gnome2 multilib virtualx readme.gentoo multilib-minimal
44 +
45 +DESCRIPTION="Gimp ToolKit +"
46 +HOMEPAGE="http://www.gtk.org/"
47 +
48 +LICENSE="LGPL-2+"
49 +SLOT="2"
50 +IUSE="aqua cups examples +introspection test vim-syntax xinerama"
51 +REQUIRED_USE="
52 + xinerama? ( !aqua )
53 +"
54 +
55 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
56 +
57 +# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
58 +COMMON_DEPEND="
59 + >=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}]
60 + >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
61 + >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
62 + >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}]
63 + >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
64 + >=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}]
65 + x11-misc/shared-mime-info
66 +
67 + cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
68 + introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
69 + !aqua? (
70 + >=x11-libs/cairo-1.12.14-r4:=[X]
71 + >=x11-libs/gdk-pixbuf-2.30.7:2[X]
72 + >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
73 + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
74 + >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
75 + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
76 + >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
77 + >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
78 + >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
79 + >=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
80 + >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
81 + xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
82 + )
83 +"
84 +DEPEND="${COMMON_DEPEND}
85 + dev-libs/gobject-introspection-common
86 + >=dev-util/gtk-doc-am-1.20
87 + sys-devel/gettext
88 + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
89 + !aqua? (
90 + >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
91 + >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
92 + >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
93 + >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
94 + xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
95 + )
96 + test? (
97 + x11-themes/hicolor-icon-theme
98 + media-fonts/font-misc-misc
99 + media-fonts/font-cursor-misc )
100 +"
101 +
102 +# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
103 +# Add blocker against old gtk-builder-convert to be sure we maintain both
104 +# in sync.
105 +RDEPEND="${COMMON_DEPEND}
106 + >=dev-util/gtk-update-icon-cache-2
107 + !<gnome-base/gail-1000
108 + !<dev-util/gtk-builder-convert-${PV}
109 + !<x11-libs/vte-0.28.2-r201:0
110 +"
111 +# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
112 +PDEPEND="
113 + gnome-base/librsvg[${MULTILIB_USEDEP}]
114 + vim-syntax? ( app-vim/gtk-syntax )
115 +"
116 +
117 +DISABLE_AUTOFORMATTING="yes"
118 +DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default,
119 +edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following:
120 +[Filechooser Settings]
121 +StartupMode=cwd"
122 +
123 +MULTILIB_CHOST_TOOLS=(
124 + /usr/bin/gtk-query-immodules-2.0
125 +)
126 +
127 +strip_builddir() {
128 + local rule=$1
129 + shift
130 + local directory=$1
131 + shift
132 + sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
133 + || die "Could not strip director ${directory} from build."
134 +}
135 +
136 +set_gtk2_confdir() {
137 + # An arch specific config directory is used on multilib systems
138 + GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
139 +}
140 +
141 +src_prepare() {
142 + # Fix tests running when building out of sources, bug #510596, upstream bug #730319
143 + epatch "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch
144 +
145 + # Rely on split gtk-update-icon-cache package, bug #528810
146 + epatch "${FILESDIR}"/${PN}-2.24.27-update-icon-cache.patch
147 +
148 + # marshalers code was pre-generated with glib-2.31, upstream bug #662109
149 + rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \
150 + perf/marshalers.c || die
151 +
152 + # Stop trying to build unmaintained docs, bug #349754, upstream bug #623150
153 + strip_builddir SUBDIRS tutorial docs/Makefile.{am,in}
154 + strip_builddir SUBDIRS faq docs/Makefile.{am,in}
155 +
156 + # -O3 and company cause random crashes in applications, bug #133469
157 + replace-flags -O3 -O2
158 + strip-flags
159 +
160 + if ! use test ; then
161 + # don't waste time building tests
162 + strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
163 + strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in}
164 + else
165 + # Non-working test in gentoo's env
166 + sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
167 + -i gtk/tests/testing.c || die "sed 1 failed"
168 +
169 + # Cannot work because glib is too clever to find real user's home
170 + # gentoo bug #285687, upstream bug #639832
171 + # XXX: /!\ Pay extra attention to second sed when bumping /!\
172 + sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
173 + || die "failed to disable recentmanager test (1)"
174 + sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
175 + || die "failed to disable recentmanager test (2)"
176 + sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
177 + || die "failed to disable recentmanager test (3)"
178 +
179 + # https://bugzilla.gnome.org/show_bug.cgi?id=617473
180 + sed -i -e 's:pltcheck.sh:$(NULL):g' \
181 + gtk/Makefile.am || die
182 +
183 + # UI tests require immodules already installed; bug #413185
184 + if ! has_version 'x11-libs/gtk+:2'; then
185 + ewarn "Disabling UI tests because this is the first install of"
186 + ewarn "gtk+:2 on this machine. Please re-run the tests after $P"
187 + ewarn "has been installed."
188 + sed '/g_test_add_func.*ui-tests/ d' \
189 + -i gtk/tests/testing.c || die "sed 2 failed"
190 + fi
191 + fi
192 +
193 + if ! use examples; then
194 + # don't waste time building demos
195 + strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
196 + fi
197 +
198 + epatch_user
199 +
200 + eautoreconf
201 + gnome2_src_prepare
202 +}
203 +
204 +multilib_src_configure() {
205 + [[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc
206 +
207 + ECONF_SOURCE=${S} \
208 + gnome2_src_configure \
209 + $(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
210 + $(usex aqua "" --with-xinput) \
211 + $(use_enable cups cups auto) \
212 + $(multilib_native_use_enable introspection) \
213 + $(use_enable xinerama) \
214 + --disable-papi \
215 + CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
216 +
217 + # work-around gtk-doc out-of-source brokedness
218 + if multilib_is_native_abi; then
219 + local d
220 + for d in gdk gtk libgail-util; do
221 + ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
222 + done
223 + fi
224 +}
225 +
226 +multilib_src_test() {
227 + Xemake check
228 +}
229 +
230 +multilib_src_install() {
231 + gnome2_src_install
232 +}
233 +
234 +multilib_src_install_all() {
235 + # see bug #133241
236 + # Also set more default variables in sync with gtk3 and other distributions
237 + echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
238 + echo 'gtk-theme-name = "Adwaita"' >> "${T}/gtkrc"
239 + echo 'gtk-icon-theme-name = "gnome"' >> "${T}/gtkrc"
240 + echo 'gtk-cursor-theme-name = "Adwaita"' >> "${T}/gtkrc"
241 +
242 + insinto /usr/share/gtk-2.0
243 + doins "${T}"/gtkrc
244 +
245 + dodoc AUTHORS ChangeLog* HACKING NEWS* README*
246 +
247 + # dev-util/gtk-builder-convert split off into a separate package, #402905
248 + rm "${ED}"usr/bin/gtk-builder-convert || die
249 +
250 + readme.gentoo_create_doc
251 +}
252 +
253 +pkg_preinst() {
254 + gnome2_pkg_preinst
255 +
256 + multilib_pkg_preinst() {
257 + # Make immodules.cache belongs to gtk+ alone
258 + local cache="usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
259 +
260 + if [[ -e ${EROOT}${cache} ]]; then
261 + cp "${EROOT}"${cache} "${ED}"/${cache} || die
262 + else
263 + touch "${ED}"/${cache} || die
264 + fi
265 + }
266 + multilib_parallel_foreach_abi multilib_pkg_preinst
267 +}
268 +
269 +pkg_postinst() {
270 + gnome2_pkg_postinst
271 +
272 + multilib_pkg_postinst() {
273 + gnome2_query_immodules_gtk2 \
274 + || die "Update immodules cache failed (for ${ABI})"
275 + }
276 + multilib_parallel_foreach_abi multilib_pkg_postinst
277 +
278 + set_gtk2_confdir
279 +
280 + if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
281 + elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
282 + elog "aware location. Removing deprecated file."
283 + rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
284 + fi
285 +
286 + if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then
287 + elog "File /etc/gtk-2.0/gtk.immodules has been moved to"
288 + elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
289 + elog "Removing deprecated file."
290 + rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules
291 + fi
292 +
293 + # pixbufs are now handled by x11-libs/gdk-pixbuf
294 + if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
295 + elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
296 + elog "Removing deprecated file."
297 + rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
298 + fi
299 +
300 + # two checks needed since we dropped multilib conditional
301 + if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
302 + elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
303 + elog "Removing deprecated file."
304 + rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
305 + fi
306 +
307 + if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
308 + elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
309 + elog "to do that you can use qfile from portage-utils:"
310 + elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
311 + fi
312 +
313 + if ! has_version "app-text/evince"; then
314 + elog "Please install app-text/evince for print preview functionality."
315 + elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
316 + elog "add it to your gtkrc."
317 + fi
318 +
319 + readme.gentoo_print_elog
320 +}
321 +
322 +pkg_postrm() {
323 + gnome2_pkg_postrm
324 +
325 + if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
326 + multilib_pkg_postrm() {
327 + rm -f "${EROOT}"usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache
328 + }
329 + multilib_foreach_abi multilib_pkg_postrm
330 + fi
331 +}