1 |
leio 07/10/20 05:44:36 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: gtk+-2.12.1.ebuild |
5 |
Removed: gtk+-2.12.0-r1.ebuild gtk+-2.12.0.ebuild |
6 |
Log: |
7 |
Version bump. Include patch to fix firefox print preview crash for bug #195644 |
8 |
(Portage version: 2.1.3.15) |
9 |
|
10 |
Revision Changes Path |
11 |
1.340 x11-libs/gtk+/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.340&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.340&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/gtk+/ChangeLog?r1=1.339&r2=1.340 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v |
20 |
retrieving revision 1.339 |
21 |
retrieving revision 1.340 |
22 |
diff -u -r1.339 -r1.340 |
23 |
--- ChangeLog 25 Sep 2007 23:00:34 -0000 1.339 |
24 |
+++ ChangeLog 20 Oct 2007 05:44:35 -0000 1.340 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for x11-libs/gtk+ |
27 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.339 2007/09/25 23:00:34 leio Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.340 2007/10/20 05:44:35 leio Exp $ |
30 |
+ |
31 |
+*gtk+-2.12.1 (20 Oct 2007) |
32 |
+ |
33 |
+ 20 Oct 2007; Mart Raudsepp <leio@g.o> |
34 |
+ +files/gtk+-2.12.1-firefox-print-preview.patch, -gtk+-2.12.0.ebuild, |
35 |
+ -gtk+-2.12.0-r1.ebuild, +gtk+-2.12.1.ebuild: |
36 |
+ Version bump. Include patch to fix firefox print preview crash for bug #195644 |
37 |
|
38 |
*gtk+-2.12.0-r2 (25 Sep 2007) |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.1 x11-libs/gtk+/gtk+-2.12.1.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/gtk+/gtk+-2.12.1.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/gtk+/gtk+-2.12.1.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: gtk+-2.12.1.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2007 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.12.1.ebuild,v 1.1 2007/10/20 05:44:35 leio Exp $ |
53 |
|
54 |
inherit gnome.org flag-o-matic eutils autotools virtualx |
55 |
|
56 |
DESCRIPTION="Gimp ToolKit +" |
57 |
HOMEPAGE="http://www.gtk.org/" |
58 |
|
59 |
LICENSE="LGPL-2" |
60 |
SLOT="2" |
61 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
62 |
IUSE="cups debug doc jpeg tiff xinerama" |
63 |
|
64 |
RDEPEND="x11-libs/libXrender |
65 |
x11-libs/libX11 |
66 |
x11-libs/libXi |
67 |
x11-libs/libXt |
68 |
x11-libs/libXext |
69 |
x11-libs/libXrandr |
70 |
x11-libs/libXcursor |
71 |
x11-libs/libXfixes |
72 |
x11-libs/libXcomposite |
73 |
x11-libs/libXdamage |
74 |
xinerama? ( x11-libs/libXinerama ) |
75 |
>=dev-libs/glib-2.13.5 |
76 |
>=x11-libs/pango-1.17.3 |
77 |
>=dev-libs/atk-1.10.1 |
78 |
>=x11-libs/cairo-1.2.0 |
79 |
media-libs/fontconfig |
80 |
x11-misc/shared-mime-info |
81 |
>=media-libs/libpng-1.2.1 |
82 |
cups? ( net-print/cups ) |
83 |
jpeg? ( >=media-libs/jpeg-6b-r2 ) |
84 |
tiff? ( >=media-libs/tiff-3.5.7 )" |
85 |
DEPEND="${RDEPEND} |
86 |
sys-devel/autoconf |
87 |
>=dev-util/pkgconfig-0.9 |
88 |
=sys-devel/automake-1.7* |
89 |
x11-proto/xextproto |
90 |
x11-proto/xproto |
91 |
x11-proto/inputproto |
92 |
x11-proto/damageproto |
93 |
xinerama? ( x11-proto/xineramaproto ) |
94 |
doc? ( |
95 |
>=dev-util/gtk-doc-1.6 |
96 |
~app-text/docbook-xml-dtd-4.1.2 |
97 |
)" |
98 |
|
99 |
pkg_setup() { |
100 |
if ! built_with_use x11-libs/cairo X; then |
101 |
eerror "Please re-emerge x11-libs/cairo with the X USE flag set" |
102 |
die "cairo needs the X flag set" |
103 |
fi |
104 |
} |
105 |
|
106 |
set_gtk2_confdir() { |
107 |
# An arch specific config directory is used on multilib systems |
108 |
has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" |
109 |
GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0} |
110 |
} |
111 |
|
112 |
src_unpack() { |
113 |
unpack ${A} |
114 |
cd "${S}" |
115 |
|
116 |
# use an arch-specific config directory so that 32bit and 64bit versions |
117 |
# dont clash on multilib systems |
118 |
has_multilib_profile && epatch "${FILESDIR}/${PN}-2.8.0-multilib.patch" |
119 |
|
120 |
# Workaround adobe flash infinite loop. Patch from http://bugzilla.gnome.org/show_bug.cgi?id=463773#c11 |
121 |
epatch "${FILESDIR}/${PN}-2.12.0-flash-workaround.patch" |
122 |
|
123 |
# OpenOffice.org might hang at startup (on non-gnome env) without this workaround, bug #193513 |
124 |
epatch "${FILESDIR}/${PN}-2.12.0-openoffice-freeze-workaround.patch" |
125 |
|
126 |
# Firefox print review crash fix, bug #195644 |
127 |
epatch "${FILESDIR}/${P}-firefox-print-preview.patch" |
128 |
|
129 |
# -O3 and company cause random crashes in applications. Bug #133469 |
130 |
replace-flags -O3 -O2 |
131 |
strip-flags |
132 |
|
133 |
use ppc64 && append-flags -mminimal-toc |
134 |
|
135 |
# remember, eautoreconf applies elibtoolize. |
136 |
# if you remove this, you should manually run elibtoolize |
137 |
export WANT_AUTOMAKE=1.7 |
138 |
cp aclocal.m4 old_macros.m4 |
139 |
AT_M4DIR="." eautoreconf |
140 |
|
141 |
epunt_cxx |
142 |
} |
143 |
|
144 |
src_compile() { |
145 |
# png always on to display icons (foser) |
146 |
local myconf="$(use_enable doc gtk-doc) \ |
147 |
$(use_with jpeg libjpeg) \ |
148 |
$(use_with tiff libtiff) \ |
149 |
$(use_enable xinerama) \ |
150 |
--with-libpng \ |
151 |
--with-gdktarget=x11 \ |
152 |
--with-xinput" |
153 |
|
154 |
# Passing --disable-debug is not recommended for production use |
155 |
use debug && myconf="${myconf} --enable-debug=yes" |
156 |
|
157 |
econf ${myconf} || die "configure failed" |
158 |
|
159 |
emake || die "compile failed" |
160 |
} |
161 |
|
162 |
src_test() { |
163 |
Xmake check || die |
164 |
} |
165 |
|
166 |
src_install() { |
167 |
einstall || die "Installation failed" |
168 |
|
169 |
set_gtk2_confdir |
170 |
dodir ${GTK2_CONFDIR} |
171 |
keepdir ${GTK2_CONFDIR} |
172 |
|
173 |
# see bug #133241 |
174 |
echo 'gtk-fallback-icon-theme = "gnome"' > "${D}/${GTK2_CONFDIR}/gtkrc" |
175 |
|
176 |
# Enable xft in environment as suggested by <utx@g.o> |
177 |
dodir /etc/env.d |
178 |
echo "GDK_USE_XFT=1" > "${D}/etc/env.d/50gtk2" |
179 |
|
180 |
dodoc AUTHORS ChangeLog* HACKING NEWS* README* |
181 |
|
182 |
# This has to be removed, because it's multilib specific; generated in |
183 |
# postinst |
184 |
rm "${D}/etc/gtk-2.0/gtk.immodules" |
185 |
} |
186 |
|
187 |
pkg_postinst() { |
188 |
set_gtk2_confdir |
189 |
|
190 |
if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then |
191 |
gtk-query-immodules-2.0 > ${ROOT}${GTK2_CONFDIR}/gtk.immodules |
192 |
gdk-pixbuf-query-loaders > ${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders |
193 |
else |
194 |
ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;" |
195 |
ewarn "to complete the installation of GTK+, please create the" |
196 |
ewarn "directory and then manually run:" |
197 |
ewarn " cd ${ROOT}${GTK2_CONFDIR}" |
198 |
ewarn " gtk-query-immodules-2.0 > gtk.immodules" |
199 |
ewarn " gdk-pixbuf-query-loaders > gdk-pixbuf.loaders" |
200 |
fi |
201 |
|
202 |
if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then |
203 |
elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]* |
204 |
elog "to do that you can use qfile from portage-utils:" |
205 |
elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)" |
206 |
fi |
207 |
} |
208 |
|
209 |
|
210 |
|
211 |
-- |
212 |
gentoo-commits@g.o mailing list |