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