1 |
pacho 11/01/01 17:58:24 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: gtk+-2.22.1-r1.ebuild |
5 |
Log: |
6 |
Revision bump to create symlinks to old icons until apps are ported (bug #339319), set new print operation settings before emitting custom-widget-apply signal (upstream bug #637069 that will end up evince remembering printer settings), stop trying to build unmaintained docs (bug #349754). |
7 |
|
8 |
(Portage version: 2.1.9.27/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.482 x11-libs/gtk+/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.482&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.482&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?r1=1.481&r2=1.482 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v |
20 |
retrieving revision 1.481 |
21 |
retrieving revision 1.482 |
22 |
diff -u -r1.481 -r1.482 |
23 |
--- ChangeLog 17 Dec 2010 07:59:35 -0000 1.481 |
24 |
+++ ChangeLog 1 Jan 2011 17:58:24 -0000 1.482 |
25 |
@@ -1,6 +1,16 @@ |
26 |
# ChangeLog for x11-libs/gtk+ |
27 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.481 2010/12/17 07:59:35 grobian Exp $ |
29 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
30 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.482 2011/01/01 17:58:24 pacho Exp $ |
31 |
+ |
32 |
+*gtk+-2.22.1-r1 (01 Jan 2011) |
33 |
+ |
34 |
+ 01 Jan 2011; Pacho Ramos <pacho@g.o> +gtk+-2.22.1-r1.ebuild, |
35 |
+ +files/gtk+-2.22.1-old-icons.patch, +files/gtk+-2.22.1-print-settings.patch: |
36 |
+ Revision bump to create symlinks to old icons until apps are ported (bug |
37 |
+ #339319), set new print operation settings before emitting |
38 |
+ custom-widget-apply signal (upstream bug #637069 that will end up evince |
39 |
+ remembering printer settings), stop trying to build unmaintained docs (bug |
40 |
+ #349754). |
41 |
|
42 |
17 Dec 2010; Fabian Groffen <grobian@g.o> gtk+-2.22.1.ebuild: |
43 |
Drop --libdir argument to econf, it seems no longer necessary |
44 |
|
45 |
|
46 |
|
47 |
1.1 x11-libs/gtk+/gtk+-2.22.1-r1.ebuild |
48 |
|
49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-2.22.1-r1.ebuild?rev=1.1&view=markup |
50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-2.22.1-r1.ebuild?rev=1.1&content-type=text/plain |
51 |
|
52 |
Index: gtk+-2.22.1-r1.ebuild |
53 |
=================================================================== |
54 |
# Copyright 1999-2011 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.22.1-r1.ebuild,v 1.1 2011/01/01 17:58:24 pacho Exp $ |
57 |
|
58 |
EAPI="3" |
59 |
PYTHON_DEPEND="2:2.4" |
60 |
|
61 |
inherit eutils flag-o-matic gnome.org libtool python virtualx autotools |
62 |
|
63 |
DESCRIPTION="Gimp ToolKit +" |
64 |
HOMEPAGE="http://www.gtk.org/" |
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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
69 |
IUSE="aqua cups debug doc examples +introspection jpeg jpeg2k tiff test vim-syntax xinerama" |
70 |
|
71 |
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) |
72 |
RDEPEND="!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[X,introspection?,jpeg?,jpeg2k?,tiff?] |
85 |
) |
86 |
aqua? ( |
87 |
>=x11-libs/cairo-1.6[aqua,svg] |
88 |
x11-libs/gdk-pixbuf[introspection?,jpeg?,jpeg2k?,tiff?] |
89 |
) |
90 |
xinerama? ( x11-libs/libXinerama ) |
91 |
>=dev-libs/glib-2.25.10 |
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="${RDEPEND} |
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 |
x86-interix? ( |
108 |
sys-libs/itx-bind |
109 |
) |
110 |
xinerama? ( x11-proto/xineramaproto ) |
111 |
>=dev-util/gtk-doc-am-1.11 |
112 |
doc? ( |
113 |
>=dev-util/gtk-doc-1.11 |
114 |
~app-text/docbook-xml-dtd-4.1.2 ) |
115 |
test? ( |
116 |
media-fonts/font-misc-misc |
117 |
media-fonts/font-cursor-misc )" |
118 |
PDEPEND="vim-syntax? ( app-vim/gtk-syntax )" |
119 |
|
120 |
set_gtk2_confdir() { |
121 |
# An arch specific config directory is used on multilib systems |
122 |
has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" |
123 |
GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0} |
124 |
} |
125 |
|
126 |
src_prepare() { |
127 |
# use an arch-specific config directory so that 32bit and 64bit versions |
128 |
# dont clash on multilib systems |
129 |
has_multilib_profile && epatch "${FILESDIR}/${PN}-2.21.3-multilib.patch" |
130 |
|
131 |
# Don't break inclusion of gtkclist.h, upstream bug 536767 |
132 |
epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch" |
133 |
|
134 |
# Set new print operation settings before emitting custom-widget-apply signal, upstream bug #637069 |
135 |
epatch "${FILESDIR}/${PN}-2.22.1-print-settings.patch" |
136 |
|
137 |
# Create symlinks to old icons until apps are ported, bug #339319 |
138 |
epatch "${FILESDIR}/${PN}-2.22.1-old-icons.patch" |
139 |
|
140 |
# Stop trying to build unmaintained docs, bug #349754 |
141 |
sed -i -e '/docs\/faq\/Makefile/d' configure.in || die |
142 |
sed -i -e '/docs\/tutorial\/Makefile/d' configure.in || die |
143 |
sed -i -e 's/tutorial faq //' docs/Makefile.am || die |
144 |
|
145 |
# -O3 and company cause random crashes in applications. Bug #133469 |
146 |
replace-flags -O3 -O2 |
147 |
strip-flags |
148 |
|
149 |
use ppc64 && append-flags -mminimal-toc |
150 |
|
151 |
# Non-working test in gentoo's env |
152 |
sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \ |
153 |
-i gtk/tests/testing.c || die "sed 1 failed" |
154 |
|
155 |
if use x86-interix; then |
156 |
# activate the itx-bind package... |
157 |
append-flags "-I${EPREFIX}/usr/include/bind" |
158 |
append-ldflags "-L${EPREFIX}/usr/lib/bind" |
159 |
fi |
160 |
|
161 |
if ! use test; then |
162 |
# don't waste time building tests |
163 |
sed 's/^\(SRC_SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ |
164 |
|| die "sed 2 failed" |
165 |
fi |
166 |
|
167 |
if ! use examples; then |
168 |
# don't waste time building demos |
169 |
sed 's/^\(SRC_SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ |
170 |
|| die "sed 3 failed" |
171 |
fi |
172 |
|
173 |
elibtoolize |
174 |
eautoreconf |
175 |
} |
176 |
|
177 |
src_configure() { |
178 |
local myconf="$(use_enable doc gtk-doc) |
179 |
$(use_enable xinerama) |
180 |
$(use_enable cups cups auto) |
181 |
$(use_enable introspection) |
182 |
--disable-papi" |
183 |
if use aqua; then |
184 |
myconf="${myconf} --with-gdktarget=quartz" |
185 |
else |
186 |
myconf="${myconf} --with-gdktarget=x11 --with-xinput" |
187 |
fi |
188 |
|
189 |
# Passing --disable-debug is not recommended for production use |
190 |
use debug && myconf="${myconf} --enable-debug=yes" |
191 |
|
192 |
econf ${myconf} |
193 |
} |
194 |
|
195 |
src_test() { |
196 |
unset DBUS_SESSION_BUS_ADDRESS |
197 |
# Exporting HOME fixes tests using XDG directories spec since all defaults |
198 |
# are based on $HOME. It is also backward compatible with functions not |
199 |
# yet ported to this spec. |
200 |
HOME="${T}" Xemake check || die "tests failed" |
201 |
} |
202 |
|
203 |
src_install() { |
204 |
emake DESTDIR="${ED}" install || die "Installation failed" |
205 |
|
206 |
set_gtk2_confdir |
207 |
dodir ${GTK2_CONFDIR} |
208 |
keepdir ${GTK2_CONFDIR} |
209 |
|
210 |
# see bug #133241 |
211 |
echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc" |
212 |
insinto ${GTK2_CONFDIR} |
213 |
doins "${T}"/gtkrc |
214 |
|
215 |
# Enable xft in environment as suggested by <utx@g.o> |
216 |
echo "GDK_USE_XFT=1" > "${T}"/50gtk2 |
217 |
doenvd "${T}"/50gtk2 |
218 |
|
219 |
dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed" |
220 |
|
221 |
# This has to be removed, because it's multilib specific; generated in |
222 |
# postinst |
223 |
rm "${ED}etc/gtk-2.0/gtk.immodules" |
224 |
|
225 |
# add -framework Carbon to the .pc files |
226 |
use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do |
227 |
sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/lib/pkgconfig/$i || die "sed failed" |
228 |
done |
229 |
|
230 |
python_convert_shebangs 2 "${ED}"usr/bin/gtk-builder-convert |
231 |
} |
232 |
|
233 |
pkg_postinst() { |
234 |
set_gtk2_confdir |
235 |
|
236 |
if [ -d "${EROOT%/}${GTK2_CONFDIR}" ]; then |
237 |
gtk-query-immodules-2.0 > "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" |
238 |
else |
239 |
ewarn "The destination path ${EROOT%/}${GTK2_CONFDIR} doesn't exist;" |
240 |
ewarn "to complete the installation of GTK+, please create the" |
241 |
ewarn "directory and then manually run:" |
242 |
ewarn " cd ${EROOT%/}${GTK2_CONFDIR}" |
243 |
ewarn " gtk-query-immodules-2.0 > gtk.immodules" |
244 |
fi |
245 |
|
246 |
if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then |
247 |
elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* |
248 |
elog "to do that you can use qfile from portage-utils:" |
249 |
elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)" |
250 |
fi |
251 |
|
252 |
if ! has_version "app-text/evince"; then |
253 |
elog "Please install app-text/evince for print preview functionality." |
254 |
elog "Alternatively, check \"gtk-print-preview-command\" documentation and" |
255 |
elog "add it to your gtkrc." |
256 |
fi |
257 |
} |