Gentoo Archives: gentoo-commits

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