Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/gtk+: gtk+-3.10.6.ebuild ChangeLog
Date: Tue, 24 Dec 2013 15:19:36
Message-Id: 20131224151932.8C4DD2004C@flycatcher.gentoo.org
1 pacho 13/12/24 15:19:32
2
3 Modified: ChangeLog
4 Added: gtk+-3.10.6.ebuild
5 Log:
6 Version bump for Gnome 3.10
7
8 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
9
10 Revision Changes Path
11 1.692 x11-libs/gtk+/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.692&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.692&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?r1=1.691&r2=1.692
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v
20 retrieving revision 1.691
21 retrieving revision 1.692
22 diff -u -r1.691 -r1.692
23 --- ChangeLog 22 Dec 2013 15:41:37 -0000 1.691
24 +++ ChangeLog 24 Dec 2013 15:19:32 -0000 1.692
25 @@ -1,6 +1,11 @@
26 # ChangeLog for x11-libs/gtk+
27 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.691 2013/12/22 15:41:37 jer Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.692 2013/12/24 15:19:32 pacho Exp $
30 +
31 +*gtk+-3.10.6 (24 Dec 2013)
32 +
33 + 24 Dec 2013; Pacho Ramos <pacho@g.o> +gtk+-3.10.6.ebuild:
34 + Version bump for Gnome 3.10
35
36 22 Dec 2013; Jeroen Roovers <jer@g.o> gtk+-2.24.22.ebuild,
37 gtk+-3.8.7.ebuild:
38
39
40
41 1.1 x11-libs/gtk+/gtk+-3.10.6.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.10.6.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.10.6.ebuild?rev=1.1&content-type=text/plain
45
46 Index: gtk+-3.10.6.ebuild
47 ===================================================================
48 # Copyright 1999-2013 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.10.6.ebuild,v 1.1 2013/12/24 15:19:32 pacho Exp $
51
52 EAPI="5"
53
54 inherit eutils flag-o-matic gnome.org gnome2-utils multilib virtualx
55
56 DESCRIPTION="Gimp ToolKit +"
57 HOMEPAGE="http://www.gtk.org/"
58
59 LICENSE="LGPL-2+"
60 SLOT="3"
61 # NOTE: This gtk+ has multi-gdk-backend support, see:
62 # * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
63 # * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
64 # I tried this and got it all compiling, but the end result is unusable as it
65 # horribly mixes up the backends -- grobian
66 IUSE="aqua colord cups debug examples +introspection packagekit test vim-syntax wayland X xinerama"
67 REQUIRED_USE="
68 || ( aqua wayland X )
69 xinerama? ( X )"
70
71 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"
72
73 # FIXME: introspection data is built against system installation of gtk+:3
74 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
75 # Use gtk+:2 for gtk-update-icon-cache
76 COMMON_DEPEND="
77 >=dev-libs/atk-2.7.5[introspection?]
78 >=dev-libs/glib-2.37.5:2
79 media-libs/fontconfig
80 >=x11-libs/cairo-1.12[aqua?,glib,svg,X?]
81 >=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
82 >=x11-libs/gtk+-2.24:2
83 >=x11-libs/pango-1.32.4[introspection?]
84 x11-misc/shared-mime-info
85
86 colord? ( >=x11-misc/colord-0.1.9 )
87 cups? ( >=net-print/cups-1.2 )
88 introspection? ( >=dev-libs/gobject-introspection-1.32 )
89 wayland? (
90 >=dev-libs/wayland-1.2
91 media-libs/mesa[wayland]
92 >=x11-libs/libxkbcommon-0.2
93 )
94 X? (
95 >=app-accessibility/at-spi2-atk-2.5.3
96 x11-libs/libXrender
97 x11-libs/libX11
98 >=x11-libs/libXi-1.3
99 x11-libs/libXext
100 >=x11-libs/libXrandr-1.3
101 x11-libs/libXcursor
102 x11-libs/libXfixes
103 x11-libs/libXcomposite
104 x11-libs/libXdamage
105 xinerama? ( x11-libs/libXinerama )
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-util/gdbus-codegen
113 >=dev-util/gtk-doc-am-1.11
114 virtual/pkgconfig
115 X? (
116 x11-proto/xextproto
117 x11-proto/xproto
118 x11-proto/inputproto
119 x11-proto/damageproto
120 xinerama? ( x11-proto/xineramaproto )
121 )
122 test? (
123 media-fonts/font-misc-misc
124 media-fonts/font-cursor-misc )
125 "
126 # gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
127 # gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
128 # >=xorg-server-1.11.4 needed for
129 # http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
130 RDEPEND="${COMMON_DEPEND}
131 !<gnome-base/gail-1000
132 !<x11-libs/vte-0.31.0:2.90
133 packagekit? ( app-admin/packagekit-base )
134 X? ( !<x11-base/xorg-server-1.11.4 )
135 "
136 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
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 gnome2_environment_reset
149
150 # Build fails with USE="wayland introspection"
151 # Fixed upstream with commit 8dd899dae (and will be in 3.10.7 tarball)
152 rm "${S}"/gdk/wayland/gtk-shell-client-protocol.h || die
153 rm "${S}"/gdk/wayland/gtk-shell-protocol.c || die
154
155 # -O3 and company cause random crashes in applications. Bug #133469
156 replace-flags -O3 -O2
157 strip-flags
158
159 if ! use test ; then
160 # don't waste time building tests
161 strip_builddir SRC_SUBDIRS testsuite Makefile.am
162 strip_builddir SRC_SUBDIRS testsuite Makefile.in
163 strip_builddir SRC_SUBDIRS tests Makefile.am
164 strip_builddir SRC_SUBDIRS tests Makefile.in
165 fi
166
167 if ! use examples; then
168 # don't waste time building demos
169 strip_builddir SRC_SUBDIRS demos Makefile.am
170 strip_builddir SRC_SUBDIRS demos Makefile.in
171 fi
172 }
173
174 src_configure() {
175 # Passing --disable-debug is not recommended for production use
176 # need libdir here to avoid a double slash in a path that libtool doesn't
177 # grok so well during install (// between $EPREFIX and usr ...)
178 econf \
179 $(use_enable aqua quartz-backend) \
180 $(use_enable colord) \
181 $(use_enable cups cups auto) \
182 $(usex debug --enable-debug=yes "") \
183 $(use_enable introspection) \
184 $(use_enable packagekit) \
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-gtk-doc \
194 --disable-papi \
195 --enable-man \
196 --enable-gtk2-dependency \
197 --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
198 --libdir="${EPREFIX}/usr/$(get_libdir)"
199 }
200
201 src_test() {
202 # Tests require a new gnome-themes-standard, but adding it to DEPEND
203 # would result in circular dependencies.
204 # https://bugzilla.gnome.org/show_bug.cgi?id=669562
205 if ! has_version '>=x11-themes/gnome-themes-standard-3.6[gtk]'; then
206 ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk]"
207 ewarn "is not installed. Please re-run tests after installing the"
208 ewarn "required version of gnome-themes-standard."
209 return 0
210 fi
211
212 # FIXME: this should be handled at eclass level
213 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
214
215 unset DBUS_SESSION_BUS_ADDRESS
216 GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
217 }
218
219 src_install() {
220 emake DESTDIR="${D}" install
221
222 insinto /etc/gtk-3.0
223 doins "${FILESDIR}"/settings.ini
224
225 dodoc AUTHORS ChangeLog* HACKING NEWS* README*
226
227 prune_libtool_files --modules
228
229 # add -framework Carbon to the .pc files
230 if use aqua ; then
231 for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
232 sed -e "s:Libs\: :Libs\: -framework Carbon :" \
233 -i "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
234 done
235 fi
236 }
237
238 pkg_preinst() {
239 gnome2_schemas_savelist
240
241 # Make sure loaders.cache belongs to gdk-pixbuf alone
242 local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
243
244 if [[ -e ${EROOT}${cache} ]]; then
245 cp "${EROOT}"${cache} "${ED}"/${cache} || die
246 else
247 touch "${ED}"/${cache} || die
248 fi
249 }
250
251 pkg_postinst() {
252 gnome2_schemas_update
253 gnome2_query_immodules_gtk3
254
255 if ! has_version "app-text/evince"; then
256 elog "Please install app-text/evince for print preview functionality."
257 elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
258 elog "add it to your settings.ini file."
259 fi
260 }
261
262 pkg_postrm() {
263 gnome2_schemas_update
264
265 if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
266 rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
267 fi
268 }