Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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+-2.24.9.ebuild ChangeLog gtk+-3.0.12.ebuild gtk+-2.24.6.ebuild gtk+-3.2.2-r2.ebuild gtk+-3.2.2-r1.ebuild gtk+-2.24.4.ebuild gtk+-2.24.7.ebuild
Date: Sun, 29 Jan 2012 10:51:41
Message-Id: 20120129105128.4E2AA2004B@flycatcher.gentoo.org
1 pacho 12/01/29 10:51:28
2
3 Modified: ChangeLog
4 Added: gtk+-2.24.9.ebuild
5 Removed: gtk+-3.0.12.ebuild gtk+-2.24.6.ebuild
6 gtk+-3.2.2-r2.ebuild gtk+-3.2.2-r1.ebuild
7 gtk+-2.24.4.ebuild gtk+-2.24.7.ebuild
8 Log:
9 Version bump, remove old.
10
11 (Portage version: 2.1.10.44/cvs/Linux x86_64)
12
13 Revision Changes Path
14 1.560 x11-libs/gtk+/ChangeLog
15
16 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.560&view=markup
17 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.560&content-type=text/plain
18 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?r1=1.559&r2=1.560
19
20 Index: ChangeLog
21 ===================================================================
22 RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v
23 retrieving revision 1.559
24 retrieving revision 1.560
25 diff -u -r1.559 -r1.560
26 --- ChangeLog 18 Jan 2012 21:10:14 -0000 1.559
27 +++ ChangeLog 29 Jan 2012 10:51:28 -0000 1.560
28 @@ -1,6 +1,13 @@
29 # ChangeLog for x11-libs/gtk+
30 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
31 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.559 2012/01/18 21:10:14 maekke Exp $
32 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.560 2012/01/29 10:51:28 pacho Exp $
33 +
34 +*gtk+-2.24.9 (29 Jan 2012)
35 +
36 + 29 Jan 2012; Pacho Ramos <pacho@g.o> +gtk+-2.24.9.ebuild,
37 + -gtk+-2.24.4.ebuild, -gtk+-2.24.6.ebuild, -gtk+-2.24.7.ebuild,
38 + -gtk+-3.0.12.ebuild, -gtk+-3.2.2-r1.ebuild, -gtk+-3.2.2-r2.ebuild:
39 + Version bump, remove old.
40
41 18 Jan 2012; Markus Meier <maekke@g.o> gtk+-2.24.8-r1.ebuild:
42 arm stable, bug #393007
43
44
45
46 1.1 x11-libs/gtk+/gtk+-2.24.9.ebuild
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-2.24.9.ebuild?rev=1.1&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-2.24.9.ebuild?rev=1.1&content-type=text/plain
50
51 Index: gtk+-2.24.9.ebuild
52 ===================================================================
53 # Copyright 1999-2012 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 # $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.9.ebuild,v 1.1 2012/01/29 10:51:28 pacho Exp $
56
57 EAPI="4"
58 PYTHON_DEPEND="2:2.4"
59
60 inherit eutils flag-o-matic gnome.org libtool python virtualx autotools
61
62 DESCRIPTION="Gimp ToolKit +"
63 HOMEPAGE="http://www.gtk.org/"
64 SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
65
66 LICENSE="LGPL-2"
67 SLOT="2"
68 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
69 IUSE="aqua cups debug doc examples +introspection test vim-syntax xinerama"
70
71 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
72 COMMON_DEPEND="!aqua? (
73 x11-libs/libXrender
74 x11-libs/libX11
75 x11-libs/libXi
76 x11-libs/libXt
77 x11-libs/libXext
78 >=x11-libs/libXrandr-1.3
79 x11-libs/libXcursor
80 x11-libs/libXfixes
81 x11-libs/libXcomposite
82 x11-libs/libXdamage
83 >=x11-libs/cairo-1.6[X,svg]
84 x11-libs/gdk-pixbuf:2[X,introspection?]
85 )
86 aqua? (
87 >=x11-libs/cairo-1.6[aqua,svg]
88 x11-libs/gdk-pixbuf:2[introspection?]
89 )
90 xinerama? ( x11-libs/libXinerama )
91 >=dev-libs/glib-2.27.3:2
92 >=x11-libs/pango-1.20[introspection?]
93 >=dev-libs/atk-1.29.2[introspection?]
94 media-libs/fontconfig
95 x11-misc/shared-mime-info
96 cups? ( net-print/cups )
97 introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
98 !<gnome-base/gail-1000"
99 DEPEND="${COMMON_DEPEND}
100 >=dev-util/pkgconfig-0.9
101 !aqua? (
102 x11-proto/xextproto
103 x11-proto/xproto
104 x11-proto/inputproto
105 x11-proto/damageproto
106 )
107 xinerama? ( x11-proto/xineramaproto )
108 >=dev-util/gtk-doc-am-1.11
109 doc? (
110 >=dev-util/gtk-doc-1.11
111 ~app-text/docbook-xml-dtd-4.1.2 )
112 test? (
113 media-fonts/font-misc-misc
114 media-fonts/font-cursor-misc )"
115 # gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
116 # Remove blocker after >=vte-0.28.2-r201:0 is stable
117 RDEPEND="${COMMON_DEPEND}
118 !<x11-libs/vte-0.28.2-r201:0"
119 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
120
121 strip_builddir() {
122 local rule=$1
123 shift
124 local directory=$1
125 shift
126 sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
127 || die "Could not strip director ${directory} from build."
128 }
129
130 set_gtk2_confdir() {
131 # An arch specific config directory is used on multilib systems
132 GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
133 }
134
135 src_prepare() {
136 # use an arch-specific config directory so that 32bit and 64bit versions
137 # dont clash on multilib systems
138 epatch "${FILESDIR}/${PN}-2.21.3-multilib.patch"
139
140 # Don't break inclusion of gtkclist.h, upstream bug 536767
141 epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
142
143 # fix building with gir #372953, upstream bug #642085
144 epatch "${FILESDIR}"/${PN}-2.24.7-darwin-quartz-introspection.patch
145
146 # Stop trying to build unmaintained docs, bug #349754
147 strip_builddir SUBDIRS tutorial docs/Makefile.am docs/Makefile.in
148 strip_builddir SUBDIRS faq docs/Makefile.am docs/Makefile.in
149
150 # -O3 and company cause random crashes in applications. Bug #133469
151 replace-flags -O3 -O2
152 strip-flags
153
154 use ppc64 && append-flags -mminimal-toc
155
156 if ! use test; then
157 # don't waste time building tests
158 strip_builddir SRC_SUBDIRS tests Makefile.am Makefile.in
159 else
160 # Non-working test in gentoo's env
161 sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
162 -i gtk/tests/testing.c || die "sed 1 failed"
163
164 # Cannot work because glib is too clever to find real user's home
165 # gentoo bug #285687, upstream bug #639832
166 # XXX: /!\ Pay extra attention to second sed when bumping /!\
167 sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
168 || die "failed to disable recentmanager test (1)"
169 sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
170 || die "failed to disable recentmanager test (2)"
171 sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
172 || die "failed to disable recentmanager test (3)"
173
174 # Skip tests known to fail
175 # https://bugzilla.gnome.org/show_bug.cgi?id=646609
176 sed -e '/g_test_add_func.*test_text_access/s:^://:' \
177 -i "${S}/gtk/tests/testing.c" || die
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 fi
183
184 if ! use examples; then
185 # don't waste time building demos
186 strip_builddir SRC_SUBDIRS demos Makefile.am Makefile.in
187 fi
188
189 # http://bugs.gentoo.org/show_bug.cgi?id=371907
190 mkdir -p "${S}/m4" || die
191 mv "${WORKDIR}/introspection.m4" "${S}/m4macros" || die
192 AT_M4DIR=m4macros eautoreconf
193 # Use elibtoolize in place of eautoreconf when it will be dropped
194 #elibtoolize
195 }
196
197 src_configure() {
198 local myconf="$(use_enable doc gtk-doc)
199 $(use_enable xinerama)
200 $(use_enable cups cups auto)
201 $(use_enable introspection)
202 --disable-papi"
203 if use aqua; then
204 myconf="${myconf} --with-gdktarget=quartz"
205 else
206 myconf="${myconf} --with-gdktarget=x11 --with-xinput"
207 fi
208
209 # Passing --disable-debug is not recommended for production use
210 use debug && myconf="${myconf} --enable-debug=yes"
211
212 econf ${myconf}
213 }
214
215 src_test() {
216 unset DBUS_SESSION_BUS_ADDRESS
217 # Exporting HOME fixes tests using XDG directories spec since all defaults
218 # are based on $HOME. It is also backward compatible with functions not
219 # yet ported to this spec.
220 XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
221 }
222
223 src_install() {
224 emake DESTDIR="${D}" install
225
226 set_gtk2_confdir
227 dodir ${GTK2_CONFDIR}
228 keepdir ${GTK2_CONFDIR}
229
230 # see bug #133241
231 echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
232 insinto /etc/gtk-2.0
233 doins "${T}"/gtkrc
234
235 # Enable xft in environment as suggested by <utx@g.o>
236 echo "GDK_USE_XFT=1" > "${T}"/50gtk2
237 doenvd "${T}"/50gtk2
238
239 dodoc AUTHORS ChangeLog* HACKING NEWS* README*
240
241 # add -framework Carbon to the .pc files
242 use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do
243 sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/lib/pkgconfig/$i || die "sed failed"
244 done
245
246 python_convert_shebangs 2 "${ED}"usr/bin/gtk-builder-convert
247
248 find "${D}" -name '*.la' -exec rm -f {} +
249 }
250
251 pkg_postinst() {
252 set_gtk2_confdir
253
254 # gtk.immodules should be in their CHOST directories respectively.
255 gtk-query-immodules-2.0 > "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" \
256 || ewarn "Failed to run gtk-query-immodules-2.0"
257
258 if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
259 elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
260 elog "aware location. Removing deprecated file."
261 rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
262 fi
263
264 # pixbufs are now handled by x11-libs/gdk-pixbuf
265 if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
266 elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
267 elog "Removing deprecated file."
268 rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
269 fi
270
271 # two checks needed since we dropped multilib conditional
272 if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
273 elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
274 elog "Removing deprecated file."
275 rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
276 fi
277
278 if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
279 elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
280 elog "to do that you can use qfile from portage-utils:"
281 elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
282 fi
283
284 if ! has_version "app-text/evince"; then
285 elog "Please install app-text/evince for print preview functionality."
286 elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
287 elog "add it to your gtkrc."
288 fi
289 }
Report Message
Find on MARC Find on Google Groups