1 |
tetromino 12/05/02 06:54:42 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: gtk+-3.4.1-r1.ebuild |
5 |
Log: |
6 |
Fix annotation button in evince (bug #412751, thanks to Geraint Yang). Fix inefficient scrolling. |
7 |
|
8 |
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.586 x11-libs/gtk+/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.586&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.586&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?r1=1.585&r2=1.586 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v |
20 |
retrieving revision 1.585 |
21 |
retrieving revision 1.586 |
22 |
diff -u -r1.585 -r1.586 |
23 |
--- ChangeLog 29 Apr 2012 16:18:28 -0000 1.585 |
24 |
+++ ChangeLog 2 May 2012 06:54:42 -0000 1.586 |
25 |
@@ -1,6 +1,15 @@ |
26 |
# ChangeLog for x11-libs/gtk+ |
27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.585 2012/04/29 16:18:28 maekke Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.586 2012/05/02 06:54:42 tetromino Exp $ |
30 |
+ |
31 |
+*gtk+-3.4.1-r1 (02 May 2012) |
32 |
+ |
33 |
+ 02 May 2012; Alexandre Rostovtsev <tetromino@g.o> |
34 |
+ +gtk+-3.4.1-r1.ebuild, +files/gtk+-3.4.1-extraneous-events-scrolling.patch, |
35 |
+ +files/gtk+-3.4.1-toolpalette-adjustment.patch, |
36 |
+ +files/gtk+-3.4.1-toolpalette-rename.patch: |
37 |
+ Fix annotation button in evince (bug #412751, thanks to Geraint Yang). |
38 |
+ Fix inefficient scrolling. |
39 |
|
40 |
29 Apr 2012; Markus Meier <maekke@g.o> gtk+-2.24.10-r1.ebuild: |
41 |
x86 stable, bug #410611 |
42 |
|
43 |
|
44 |
|
45 |
1.1 x11-libs/gtk+/gtk+-3.4.1-r1.ebuild |
46 |
|
47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.4.1-r1.ebuild?rev=1.1&view=markup |
48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.4.1-r1.ebuild?rev=1.1&content-type=text/plain |
49 |
|
50 |
Index: gtk+-3.4.1-r1.ebuild |
51 |
=================================================================== |
52 |
# Copyright 1999-2012 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.4.1-r1.ebuild,v 1.1 2012/05/02 06:54:42 tetromino Exp $ |
55 |
|
56 |
EAPI="4" |
57 |
|
58 |
inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx |
59 |
|
60 |
DESCRIPTION="Gimp ToolKit +" |
61 |
HOMEPAGE="http://www.gtk.org/" |
62 |
|
63 |
LICENSE="LGPL-2" |
64 |
SLOT="3" |
65 |
# NOTE: This gtk+ has multi-gdk-backend support, see: |
66 |
# * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/ |
67 |
# * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html |
68 |
# I tried this and got it all compiling, but the end result is unusable as it |
69 |
# horribly mixes up the backends -- grobian |
70 |
IUSE="aqua colord cups debug doc examples +introspection packagekit test vim-syntax wayland X xinerama" |
71 |
REQUIRED_USE=" |
72 |
|| ( aqua wayland X ) |
73 |
xinerama? ( X )" |
74 |
|
75 |
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" |
76 |
|
77 |
# FIXME: introspection data is built against system installation of gtk+:3 |
78 |
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) |
79 |
# Use gtk+:2 for gtk-update-icon-cache |
80 |
COMMON_DEPEND="X? ( |
81 |
x11-libs/libXrender |
82 |
x11-libs/libX11 |
83 |
>=x11-libs/libXi-1.3 |
84 |
x11-libs/libXt |
85 |
x11-libs/libXext |
86 |
>=x11-libs/libXrandr-1.3 |
87 |
x11-libs/libXcursor |
88 |
x11-libs/libXfixes |
89 |
x11-libs/libXcomposite |
90 |
x11-libs/libXdamage |
91 |
xinerama? ( x11-libs/libXinerama ) |
92 |
) |
93 |
wayland? ( |
94 |
dev-libs/wayland |
95 |
media-libs/mesa[egl,wayland] |
96 |
x11-libs/cairo[opengl] |
97 |
x11-libs/libxkbcommon |
98 |
) |
99 |
>=dev-libs/glib-2.32 |
100 |
>=x11-libs/pango-1.30[introspection?] |
101 |
>=dev-libs/atk-2.2[introspection?] |
102 |
>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?] |
103 |
>=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?] |
104 |
>=x11-libs/gtk+-2.24:2 |
105 |
media-libs/fontconfig |
106 |
x11-misc/shared-mime-info |
107 |
colord? ( >=x11-misc/colord-0.1.9 ) |
108 |
cups? ( >=net-print/cups-1.2 ) |
109 |
introspection? ( >=dev-libs/gobject-introspection-1.32 )" |
110 |
DEPEND="${COMMON_DEPEND} |
111 |
>=dev-util/pkgconfig-0.9 |
112 |
X? ( |
113 |
x11-proto/xextproto |
114 |
x11-proto/xproto |
115 |
x11-proto/inputproto |
116 |
x11-proto/damageproto |
117 |
xinerama? ( x11-proto/xineramaproto ) |
118 |
) |
119 |
>=dev-util/gtk-doc-am-1.11 |
120 |
doc? ( |
121 |
>=dev-util/gtk-doc-1.11 |
122 |
~app-text/docbook-xml-dtd-4.1.2 ) |
123 |
test? ( |
124 |
media-fonts/font-misc-misc |
125 |
media-fonts/font-cursor-misc )" |
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 |
PDEPEND="vim-syntax? ( app-vim/gtk-syntax )" |
136 |
|
137 |
strip_builddir() { |
138 |
local rule=$1 |
139 |
shift |
140 |
local directory=$1 |
141 |
shift |
142 |
sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ |
143 |
|| die "Could not strip director ${directory} from build." |
144 |
} |
145 |
|
146 |
src_prepare() { |
147 |
# -O3 and company cause random crashes in applications. Bug #133469 |
148 |
replace-flags -O3 -O2 |
149 |
strip-flags |
150 |
|
151 |
# https://bugzilla.gnome.org/show_bug.cgi?id=65410 |
152 |
epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch" |
153 |
|
154 |
# Apparently needed for new libxkbcommon headers; bug #408131 |
155 |
epatch "${FILESDIR}/${PN}-3.3.20-wayland-xkbcommon-headers.patch" |
156 |
|
157 |
# In next release |
158 |
epatch "${FILESDIR}/${P}-extraneous-events-scrolling.patch" |
159 |
epatch "${FILESDIR}/${P}-toolpalette-rename.patch" |
160 |
epatch "${FILESDIR}/${P}-toolpalette-adjustment.patch" |
161 |
|
162 |
# Non-working test in gentoo's env |
163 |
sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \ |
164 |
-i gtk/tests/testing.c || die "sed 1 failed" |
165 |
sed '\%/recent-manager/add%,/recent_manager_purge/ d' \ |
166 |
-i gtk/tests/recentmanager.c || die "sed 2 failed" |
167 |
|
168 |
# FIXME: multiple reftests fail when run from portage (but succeed when |
169 |
# run from a manual compile in a temp directory) |
170 |
sed -e 's:\(SUBDIRS.*\)reftests:\1:' \ |
171 |
-i tests/Makefile.* || die "sed 3 failed" |
172 |
|
173 |
# Test results depend on the list of mounted filesystems! |
174 |
rm -v tests/a11y/pickers.{ui,txt} || die "rm failed" |
175 |
|
176 |
if ! use test; then |
177 |
# don't waste time building tests |
178 |
strip_builddir SRC_SUBDIRS tests Makefile.am |
179 |
[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in |
180 |
fi |
181 |
|
182 |
if ! use examples; then |
183 |
# don't waste time building demos |
184 |
strip_builddir SRC_SUBDIRS demos Makefile.am |
185 |
[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in |
186 |
fi |
187 |
|
188 |
[[ ${PV} = 9999 ]] && gnome2_src_prepare |
189 |
} |
190 |
|
191 |
src_configure() { |
192 |
local myconf="$(use_enable aqua quartz-backend) |
193 |
$(use_enable colord) |
194 |
$(use_enable cups cups auto) |
195 |
$(use_enable doc gtk-doc) |
196 |
$(use_enable introspection) |
197 |
$(use_enable packagekit) |
198 |
$(use_enable wayland wayland-backend) |
199 |
$(use_enable X x11-backend) |
200 |
$(use_enable X xcomposite) |
201 |
$(use_enable X xdamage) |
202 |
$(use_enable X xfixes) |
203 |
$(use_enable X xkb) |
204 |
$(use_enable X xrandr) |
205 |
$(use_enable xinerama) |
206 |
--disable-papi |
207 |
--enable-gtk2-dependency" |
208 |
|
209 |
# Passing --disable-debug is not recommended for production use |
210 |
use debug && myconf="${myconf} --enable-debug=yes" |
211 |
|
212 |
# need libdir here to avoid a double slash in a path that libtool doesn't |
213 |
# grok so well during install (// between $EPREFIX and usr ...) |
214 |
econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf} |
215 |
} |
216 |
|
217 |
src_test() { |
218 |
# Tests require a new gnome-themes-standard, but adding it to DEPEND |
219 |
# would result in circular dependencies. |
220 |
# https://bugzilla.gnome.org/show_bug.cgi?id=669562 |
221 |
if ! has_version '>=x11-themes/gnome-themes-standard-3.3.91'; then |
222 |
ewarn "Tests will be skipped beecause >=gnome-themes-standard-3.3.90" |
223 |
ewarn "is not installed. Please re-run tests after installing the" |
224 |
ewarn "required version of gnome-themes-standard." |
225 |
return 0 |
226 |
fi |
227 |
unset DBUS_SESSION_BUS_ADDRESS |
228 |
# Exporting HOME fixes tests using XDG directories spec since all defaults |
229 |
# are based on $HOME. It is also backward compatible with functions not |
230 |
# yet ported to this spec. |
231 |
XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed" |
232 |
} |
233 |
|
234 |
src_install() { |
235 |
emake DESTDIR="${D}" install |
236 |
|
237 |
insinto /etc/gtk-3.0 |
238 |
doins "${FILESDIR}"/settings.ini |
239 |
|
240 |
dodoc AUTHORS ChangeLog* HACKING NEWS* README* |
241 |
|
242 |
# Remove unneeded *.la files |
243 |
find "${D}" -name '*.la' -exec rm -f {} + |
244 |
|
245 |
# add -framework Carbon to the .pc files |
246 |
use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do |
247 |
sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed" |
248 |
done |
249 |
} |
250 |
|
251 |
pkg_preinst() { |
252 |
gnome2_schemas_savelist |
253 |
} |
254 |
|
255 |
pkg_postinst() { |
256 |
gnome2_schemas_update |
257 |
|
258 |
local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0" |
259 |
gtk-query-immodules-3.0 > "${GTK3_MODDIR}/immodules.cache" \ |
260 |
|| ewarn "Failed to run gtk-query-immodules-3.0" |
261 |
|
262 |
if ! has_version "app-text/evince"; then |
263 |
elog "Please install app-text/evince for print preview functionality." |
264 |
elog "Alternatively, check \"gtk-print-preview-command\" documentation and" |
265 |
elog "add it to your settings.ini file." |
266 |
fi |
267 |
} |
268 |
|
269 |
pkg_postrm() { |
270 |
gnome2_schemas_update |
271 |
} |