1 |
pacho 11/09/26 12:21:02 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: gtk+-3.0.12-r1.ebuild |
5 |
Log: |
6 |
Use const instead G_CONST_RETURN, bug #379897 by Alexandre Rostovtsev. |
7 |
|
8 |
(Portage version: 2.1.10.19/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.532 x11-libs/gtk+/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.532&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.532&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?r1=1.531&r2=1.532 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v |
20 |
retrieving revision 1.531 |
21 |
retrieving revision 1.532 |
22 |
diff -u -r1.531 -r1.532 |
23 |
--- ChangeLog 9 Sep 2011 20:16:59 -0000 1.531 |
24 |
+++ ChangeLog 26 Sep 2011 12:21:02 -0000 1.532 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for x11-libs/gtk+ |
27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.531 2011/09/09 20:16:59 pacho Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.532 2011/09/26 12:21:02 pacho Exp $ |
30 |
+ |
31 |
+*gtk+-3.0.12-r1 (26 Sep 2011) |
32 |
+ |
33 |
+ 26 Sep 2011; Pacho Ramos <pacho@g.o> +gtk+-3.0.12-r1.ebuild, |
34 |
+ +files/gtk+-3.0.12-use-const.patch: |
35 |
+ Use const instead G_CONST_RETURN, bug #379897 by Alexandre Rostovtsev. |
36 |
|
37 |
*gtk+-2.24.6 (09 Sep 2011) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.1 x11-libs/gtk+/gtk+-3.0.12-r1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.0.12-r1.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.0.12-r1.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: gtk+-3.0.12-r1.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2011 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.0.12-r1.ebuild,v 1.1 2011/09/26 12:21:02 pacho Exp $ |
52 |
|
53 |
EAPI="4" |
54 |
|
55 |
inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx |
56 |
|
57 |
DESCRIPTION="Gimp ToolKit +" |
58 |
HOMEPAGE="http://www.gtk.org/" |
59 |
SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${PN}-3.0.12-use-const2.patch.xz" |
60 |
|
61 |
LICENSE="LGPL-2" |
62 |
SLOT="3" |
63 |
# NOTE: This gtk+ has multi-gdk-backend support, see: |
64 |
# * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/ |
65 |
# * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html |
66 |
# I tried this and got it all compiling, but the end result is unusable as it |
67 |
# horribly mixes up the backends -- grobian |
68 |
IUSE="aqua cups debug doc examples +introspection test vim-syntax xinerama" |
69 |
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" |
70 |
|
71 |
# FIXME: introspection data is built against system installation of gtk+:3 |
72 |
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) |
73 |
# Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert |
74 |
# >=x11-libs/gtk+-2.24:2 is needed for bug 359555 |
75 |
COMMON_DEPEND="!aqua? ( |
76 |
x11-libs/libXrender |
77 |
x11-libs/libX11 |
78 |
x11-libs/libXi |
79 |
x11-libs/libXt |
80 |
x11-libs/libXext |
81 |
>=x11-libs/libXrandr-1.3 |
82 |
x11-libs/libXcursor |
83 |
x11-libs/libXfixes |
84 |
x11-libs/libXcomposite |
85 |
x11-libs/libXdamage |
86 |
>=x11-libs/cairo-1.10.0[X,glib,svg] |
87 |
>=x11-libs/gdk-pixbuf-2.22.0:2[X,introspection?] |
88 |
) |
89 |
aqua? ( |
90 |
>=x11-libs/cairo-1.10.0[aqua,glib,svg] |
91 |
>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] |
92 |
) |
93 |
xinerama? ( x11-libs/libXinerama ) |
94 |
>=dev-libs/glib-2.28.0 |
95 |
>=x11-libs/pango-1.24.0[introspection?] |
96 |
>=dev-libs/atk-1.30[introspection?] |
97 |
>=x11-libs/gtk+-2.24:2 |
98 |
media-libs/fontconfig |
99 |
x11-misc/shared-mime-info |
100 |
cups? ( net-print/cups ) |
101 |
introspection? ( >=dev-libs/gobject-introspection-0.10.1 )" |
102 |
DEPEND="${COMMON_DEPEND} |
103 |
>=dev-util/pkgconfig-0.9 |
104 |
!aqua? ( |
105 |
x11-proto/xextproto |
106 |
x11-proto/xproto |
107 |
x11-proto/inputproto |
108 |
x11-proto/damageproto |
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 |
RDEPEND="${COMMON_DEPEND} |
119 |
!<gnome-base/gail-1000" |
120 |
PDEPEND="vim-syntax? ( app-vim/gtk-syntax )" |
121 |
|
122 |
strip_builddir() { |
123 |
local rule=$1 |
124 |
shift |
125 |
local directory=$1 |
126 |
shift |
127 |
sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ |
128 |
|| die "Could not strip director ${directory} from build." |
129 |
} |
130 |
|
131 |
src_prepare() { |
132 |
# -O3 and company cause random crashes in applications. Bug #133469 |
133 |
replace-flags -O3 -O2 |
134 |
strip-flags |
135 |
|
136 |
# Use const instead G_CONST_RETURN, upstream bug #658854 |
137 |
epatch "${FILESDIR}/${PN}-3.0.12-use-const.patch" |
138 |
epatch "${WORKDIR}/${PN}-3.0.12-use-const2.patch" |
139 |
|
140 |
# Non-working test in gentoo's env |
141 |
sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \ |
142 |
-i gtk/tests/testing.c || die "sed 1 failed" |
143 |
sed '\%/recent-manager/add%,/recent_manager_purge/ d' \ |
144 |
-i gtk/tests/recentmanager.c || die "sed 2 failed" |
145 |
|
146 |
if ! use test; then |
147 |
# don't waste time building tests |
148 |
strip_builddir SRC_SUBDIRS tests Makefile.am |
149 |
strip_builddir SRC_SUBDIRS tests Makefile.in |
150 |
fi |
151 |
|
152 |
if ! use examples; then |
153 |
# don't waste time building demos |
154 |
strip_builddir SRC_SUBDIRS demos Makefile.am |
155 |
strip_builddir SRC_SUBDIRS demos Makefile.in |
156 |
fi |
157 |
|
158 |
# http://mail.gnome.org/archives/commits-list/2011-March/msg04372.html |
159 |
epatch "${FILESDIR}"/${PN}-3.0.8-darwin-quartz.patch |
160 |
|
161 |
# fix building with gir #372953 |
162 |
epatch "${FILESDIR}"/${PN}-3.0.11-darwin-quartz-introspection.patch |
163 |
|
164 |
# Solaris is strict, and needs c99 |
165 |
# http://mail.gnome.org/archives/gtk-devel-list/2011-April/msg00127.html |
166 |
if [[ ${CHOST} == *-solaris* ]] ; then |
167 |
sed -i -e '/_XOPEN_SOURCE 500/d' gtk/gtksearchenginesimple.c || die |
168 |
fi |
169 |
} |
170 |
|
171 |
src_configure() { |
172 |
# FIXME: PackageKit support |
173 |
# png always on to display icons (foser) |
174 |
local myconf="$(use_enable doc gtk-doc) |
175 |
$(use_enable xinerama) |
176 |
$(use_enable cups cups auto) |
177 |
$(use_enable introspection) |
178 |
--disable-packagekit |
179 |
--disable-papi |
180 |
--enable-gtk2-dependency" |
181 |
|
182 |
# XXX: Maybe with multi-backend we should enable x11 all the time? |
183 |
if use aqua; then |
184 |
myconf="${myconf} --enable-quartz-backend --disable-xinput" |
185 |
else |
186 |
myconf="${myconf} --enable-x11-backend --enable-xinput" |
187 |
fi |
188 |
|
189 |
# Passing --disable-debug is not recommended for production use |
190 |
use debug && myconf="${myconf} --enable-debug=yes" |
191 |
|
192 |
# need libdir here to avoid a double slash in a path that libtool doesn't |
193 |
# grok so well during install (// between $EPREFIX and usr ...) |
194 |
econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf} |
195 |
} |
196 |
|
197 |
src_test() { |
198 |
unset DBUS_SESSION_BUS_ADDRESS |
199 |
# Exporting HOME fixes tests using XDG directories spec since all defaults |
200 |
# are based on $HOME. It is also backward compatible with functions not |
201 |
# yet ported to this spec. |
202 |
XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed" |
203 |
} |
204 |
|
205 |
src_install() { |
206 |
emake DESTDIR="${D}" install |
207 |
|
208 |
insinto /etc/gtk-3.0 |
209 |
doins "${FILESDIR}"/settings.ini |
210 |
|
211 |
dodoc AUTHORS ChangeLog* HACKING NEWS* README* |
212 |
|
213 |
# Remove unneeded *.la files |
214 |
find "${D}" -name "*.la" -delete |
215 |
|
216 |
# add -framework Carbon to the .pc files |
217 |
use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do |
218 |
sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed" |
219 |
done |
220 |
} |
221 |
|
222 |
pkg_preinst() { |
223 |
gnome2_schemas_savelist |
224 |
} |
225 |
|
226 |
pkg_postinst() { |
227 |
gnome2_schemas_update |
228 |
|
229 |
local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0" |
230 |
gtk-query-immodules-3.0 > "${GTK3_MODDIR}/immodules.cache" \ |
231 |
|| ewarn "Failed to run gtk-query-immodules-3.0" |
232 |
|
233 |
if ! has_version "app-text/evince"; then |
234 |
elog "Please install app-text/evince for print preview functionality." |
235 |
elog "Alternatively, check \"gtk-print-preview-command\" documentation and" |
236 |
elog "add it to your settings.ini file." |
237 |
fi |
238 |
} |
239 |
|
240 |
pkg_postrm() { |
241 |
gnome2_schemas_update --uninstall |
242 |
} |