Gentoo Archives: gentoo-commits

From: "Gilles Dartiguelongue (eva)" <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/gtk+: ChangeLog gtk+-3.16.4.ebuild
Date: Sun, 05 Jul 2015 10:15:36
Message-Id: 20150705101533.B76A7751@oystercatcher.gentoo.org
1 eva 15/07/05 10:15:33
2
3 Modified: ChangeLog
4 Added: gtk+-3.16.4.ebuild
5 Log:
6 Version bump.
7
8 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key C6085806)
9
10 Revision Changes Path
11 1.787 x11-libs/gtk+/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.787&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.787&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?r1=1.786&r2=1.787
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v
20 retrieving revision 1.786
21 retrieving revision 1.787
22 diff -u -r1.786 -r1.787
23 --- ChangeLog 26 Jun 2015 09:24:07 -0000 1.786
24 +++ ChangeLog 5 Jul 2015 10:15:33 -0000 1.787
25 @@ -1,6 +1,11 @@
26 # ChangeLog for x11-libs/gtk+
27 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.786 2015/06/26 09:24:07 ago Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.787 2015/07/05 10:15:33 eva Exp $
30 +
31 +*gtk+-3.16.4 (05 Jul 2015)
32 +
33 + 05 Jul 2015; Gilles Dartiguelongue <eva@g.o> +gtk+-3.16.4.ebuild:
34 + Version bump.
35
36 26 Jun 2015; Agostino Sarubbo <ago@g.o> gtk+-1.2.10-r13.ebuild,
37 gtk+-2.24.28-r1.ebuild, gtk+-3.14.13.ebuild:
38
39
40
41 1.1 x11-libs/gtk+/gtk+-3.16.4.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.16.4.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.16.4.ebuild?rev=1.1&content-type=text/plain
45
46 Index: gtk+-3.16.4.ebuild
47 ===================================================================
48 # Copyright 1999-2015 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.16.4.ebuild,v 1.1 2015/07/05 10:15:33 eva Exp $
51
52 EAPI="5"
53 GCONF_DEBUG="yes"
54 GNOME2_LA_PUNT="yes"
55
56 inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
57
58 DESCRIPTION="Gimp ToolKit +"
59 HOMEPAGE="http://www.gtk.org/"
60
61 LICENSE="LGPL-2+"
62 SLOT="3"
63 IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama"
64 REQUIRED_USE="
65 || ( aqua wayland X )
66 xinerama? ( X )
67 "
68
69 KEYWORDS="~alpha ~amd64 ~arm ~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"
70
71 # FIXME: introspection data is built against system installation of gtk+:3
72 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
73 COMMON_DEPEND="
74 >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
75 >=dev-libs/glib-2.43.4:2[${MULTILIB_USEDEP}]
76 media-libs/fontconfig[${MULTILIB_USEDEP}]
77 >=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}]
78 >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
79 >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
80 >=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}]
81 x11-misc/shared-mime-info
82
83 cloudprint? (
84 >=net-libs/rest-0.7[${MULTILIB_USEDEP}]
85 >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
86 colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
87 cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
88 introspection? ( >=dev-libs/gobject-introspection-1.39 )
89 wayland? (
90 >=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
91 media-libs/mesa[wayland,${MULTILIB_USEDEP}]
92 >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
93 )
94 X? (
95 >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
96 x11-libs/libXrender[${MULTILIB_USEDEP}]
97 x11-libs/libX11[${MULTILIB_USEDEP}]
98 >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
99 x11-libs/libXext[${MULTILIB_USEDEP}]
100 >=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
101 x11-libs/libXcursor[${MULTILIB_USEDEP}]
102 x11-libs/libXfixes[${MULTILIB_USEDEP}]
103 x11-libs/libXcomposite[${MULTILIB_USEDEP}]
104 x11-libs/libXdamage[${MULTILIB_USEDEP}]
105 xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
106 )
107 "
108 DEPEND="${COMMON_DEPEND}
109 app-text/docbook-xsl-stylesheets
110 app-text/docbook-xml-dtd:4.1.2
111 dev-libs/libxslt
112 dev-libs/gobject-introspection-common
113 >=dev-util/gdbus-codegen-2.38.2
114 >=dev-util/gtk-doc-am-1.20
115 >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
116 virtual/pkgconfig[${MULTILIB_USEDEP}]
117 X? (
118 x11-proto/xextproto[${MULTILIB_USEDEP}]
119 x11-proto/xproto[${MULTILIB_USEDEP}]
120 x11-proto/inputproto[${MULTILIB_USEDEP}]
121 x11-proto/damageproto[${MULTILIB_USEDEP}]
122 xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
123 )
124 test? (
125 media-fonts/font-misc-misc
126 media-fonts/font-cursor-misc )
127 examples? ( media-libs/libcanberra[gtk3] )
128 "
129 # gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
130 # gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
131 # >=xorg-server-1.11.4 needed for
132 # http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
133 RDEPEND="${COMMON_DEPEND}
134 >=dev-util/gtk-update-icon-cache-3
135 !<gnome-base/gail-1000
136 !<x11-libs/vte-0.31.0:2.90
137 >=x11-themes/adwaita-icon-theme-3.14
138 X? ( !<x11-base/xorg-server-1.11.4 )
139 abi_x86_32? (
140 !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
141 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
142 )
143 "
144 # librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
145 PDEPEND="
146 gnome-base/librsvg[${MULTILIB_USEDEP}]
147 vim-syntax? ( app-vim/gtk-syntax )
148 "
149
150 MULTILIB_CHOST_TOOLS=(
151 /usr/bin/gtk-query-immodules-3.0
152 )
153
154 strip_builddir() {
155 local rule=$1
156 shift
157 local directory=$1
158 shift
159 sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
160 || die "Could not strip director ${directory} from build."
161 }
162
163 src_prepare() {
164 # -O3 and company cause random crashes in applications. Bug #133469
165 replace-flags -O3 -O2
166 strip-flags
167
168 if ! use test ; then
169 # don't waste time building tests
170 strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
171
172 # the tests dir needs to be build now because since commit
173 # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
174 # strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
175 fi
176
177 if ! use examples; then
178 # don't waste time building demos
179 strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
180 strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
181 fi
182
183 # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
184 epatch "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch
185
186 epatch_user
187
188 eautoreconf
189 gnome2_src_prepare
190 }
191
192 multilib_src_configure() {
193 # need libdir here to avoid a double slash in a path that libtool doesn't
194 # grok so well during install (// between $EPREFIX and usr ...)
195 ECONF_SOURCE=${S} \
196 gnome2_src_configure \
197 $(use_enable aqua quartz-backend) \
198 $(use_enable broadway broadway-backend) \
199 $(use_enable cloudprint) \
200 $(use_enable colord) \
201 $(use_enable cups cups auto) \
202 $(multilib_native_use_enable introspection) \
203 $(use_enable wayland wayland-backend) \
204 $(use_enable X x11-backend) \
205 $(use_enable X xcomposite) \
206 $(use_enable X xdamage) \
207 $(use_enable X xfixes) \
208 $(use_enable X xkb) \
209 $(use_enable X xrandr) \
210 $(use_enable xinerama) \
211 --disable-papi \
212 --disable-mir-backend \
213 --enable-man \
214 --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
215 --libdir="${EPREFIX}"/usr/$(get_libdir) \
216 CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
217
218 # work-around gtk-doc out-of-source brokedness
219 if multilib_is_native_abi; then
220 local d
221 for d in gdk gtk libgail-util; do
222 ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
223 done
224 fi
225 }
226
227 multilib_src_test() {
228 # FIXME: this should be handled at eclass level
229 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
230
231 unset DBUS_SESSION_BUS_ADDRESS
232 unset DISPLAY #527682
233 GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
234 }
235
236 multilib_src_install() {
237 gnome2_src_install
238
239 # add -framework Carbon to the .pc files, bug #???
240 if use aqua ; then
241 for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
242 sed -e "s:Libs\: :Libs\: -framework Carbon :" \
243 -i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
244 done
245 fi
246 }
247
248 multilib_src_install_all() {
249 insinto /etc/gtk-3.0
250 doins "${FILESDIR}"/settings.ini
251
252 dodoc AUTHORS ChangeLog* HACKING NEWS* README*
253 }
254
255 pkg_preinst() {
256 gnome2_pkg_preinst
257
258 multilib_pkg_preinst() {
259 # Make immodules.cache belongs to gtk+ alone
260 local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
261
262 if [[ -e ${EROOT}${cache} ]]; then
263 cp "${EROOT}"${cache} "${ED}"/${cache} || die
264 else
265 touch "${ED}"/${cache} || die
266 fi
267 }
268 multilib_parallel_foreach_abi multilib_pkg_preinst
269 }
270
271 pkg_postinst() {
272 gnome2_pkg_postinst
273
274 multilib_pkg_postinst() {
275 gnome2_query_immodules_gtk3 \
276 || die "Update immodules cache failed (for ${ABI})"
277 }
278 multilib_parallel_foreach_abi multilib_pkg_postinst
279
280 if ! has_version "app-text/evince"; then
281 elog "Please install app-text/evince for print preview functionality."
282 elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
283 elog "add it to your settings.ini file."
284 fi
285 }
286
287 pkg_postrm() {
288 gnome2_pkg_postrm
289
290 if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
291 multilib_pkg_postrm() {
292 rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
293 }
294 multilib_foreach_abi multilib_pkg_postrm
295 fi
296 }