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