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