1 |
pacho 11/07/28 18:04:54 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: gtk+-3.0.12.ebuild |
5 |
Removed: gtk+-2.22.1-r1.ebuild gtk+-3.0.10.ebuild |
6 |
Log: |
7 |
Version bump, also use eapi4 and install settings.ini instead of gtkrc as it's the way to configure default settings for gtk3. Remove old. |
8 |
|
9 |
(Portage version: 2.1.10.7/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.525 x11-libs/gtk+/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.525&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.525&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?r1=1.524&r2=1.525 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v |
21 |
retrieving revision 1.524 |
22 |
retrieving revision 1.525 |
23 |
diff -u -r1.524 -r1.525 |
24 |
--- ChangeLog 11 Jul 2011 15:43:06 -0000 1.524 |
25 |
+++ ChangeLog 28 Jul 2011 18:04:54 -0000 1.525 |
26 |
@@ -1,6 +1,14 @@ |
27 |
# ChangeLog for x11-libs/gtk+ |
28 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.524 2011/07/11 15:43:06 mattst88 Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.525 2011/07/28 18:04:54 pacho Exp $ |
31 |
+ |
32 |
+*gtk+-3.0.12 (28 Jul 2011) |
33 |
+ |
34 |
+ 28 Jul 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 |
+ -gtk+-3.0.10.ebuild, +gtk+-3.0.12.ebuild, +files/settings.ini: |
37 |
+ Version bump, also use eapi4 and install settings.ini instead of gtkrc as |
38 |
+ it's the way to configure default settings for gtk3. Remove old. |
39 |
|
40 |
11 Jul 2011; Matt Turner <mattst88@g.o> gtk+-3.0.11.ebuild: |
41 |
Added ~mips, bug 364693 |
42 |
|
43 |
|
44 |
|
45 |
1.1 x11-libs/gtk+/gtk+-3.0.12.ebuild |
46 |
|
47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.0.12.ebuild?rev=1.1&view=markup |
48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.0.12.ebuild?rev=1.1&content-type=text/plain |
49 |
|
50 |
Index: gtk+-3.0.12.ebuild |
51 |
=================================================================== |
52 |
# Copyright 1999-2011 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.0.12.ebuild,v 1.1 2011/07/28 18:04:54 pacho 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 cups debug doc examples +introspection test vim-syntax xinerama" |
71 |
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" |
72 |
|
73 |
# FIXME: introspection data is built against system installation of gtk+:3 |
74 |
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) |
75 |
# Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert |
76 |
# >=x11-libs/gtk+-2.24:2 is needed for bug 359555 |
77 |
COMMON_DEPEND="!aqua? ( |
78 |
x11-libs/libXrender |
79 |
x11-libs/libX11 |
80 |
x11-libs/libXi |
81 |
x11-libs/libXt |
82 |
x11-libs/libXext |
83 |
>=x11-libs/libXrandr-1.3 |
84 |
x11-libs/libXcursor |
85 |
x11-libs/libXfixes |
86 |
x11-libs/libXcomposite |
87 |
x11-libs/libXdamage |
88 |
>=x11-libs/cairo-1.10.0[X,glib,svg] |
89 |
>=x11-libs/gdk-pixbuf-2.22.0:2[X,introspection?] |
90 |
) |
91 |
aqua? ( |
92 |
>=x11-libs/cairo-1.10.0[aqua,glib,svg] |
93 |
>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] |
94 |
) |
95 |
xinerama? ( x11-libs/libXinerama ) |
96 |
>=dev-libs/glib-2.28.0 |
97 |
>=x11-libs/pango-1.24.0[introspection?] |
98 |
>=dev-libs/atk-1.30[introspection?] |
99 |
>=x11-libs/gtk+-2.24:2 |
100 |
media-libs/fontconfig |
101 |
x11-misc/shared-mime-info |
102 |
cups? ( net-print/cups ) |
103 |
introspection? ( >=dev-libs/gobject-introspection-0.10.1 )" |
104 |
DEPEND="${COMMON_DEPEND} |
105 |
>=dev-util/pkgconfig-0.9 |
106 |
!aqua? ( |
107 |
x11-proto/xextproto |
108 |
x11-proto/xproto |
109 |
x11-proto/inputproto |
110 |
x11-proto/damageproto |
111 |
) |
112 |
x86-interix? ( |
113 |
sys-libs/itx-bind |
114 |
) |
115 |
xinerama? ( x11-proto/xineramaproto ) |
116 |
>=dev-util/gtk-doc-am-1.11 |
117 |
doc? ( |
118 |
>=dev-util/gtk-doc-1.11 |
119 |
~app-text/docbook-xml-dtd-4.1.2 ) |
120 |
test? ( |
121 |
media-fonts/font-misc-misc |
122 |
media-fonts/font-cursor-misc )" |
123 |
RDEPEND="${COMMON_DEPEND} |
124 |
!<gnome-base/gail-1000" |
125 |
PDEPEND="vim-syntax? ( app-vim/gtk-syntax )" |
126 |
|
127 |
strip_builddir() { |
128 |
local rule=$1 |
129 |
shift |
130 |
local directory=$1 |
131 |
shift |
132 |
sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ |
133 |
|| die "Could not strip director ${directory} from build." |
134 |
} |
135 |
|
136 |
src_prepare() { |
137 |
# -O3 and company cause random crashes in applications. Bug #133469 |
138 |
replace-flags -O3 -O2 |
139 |
strip-flags |
140 |
|
141 |
# Non-working test in gentoo's env |
142 |
sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \ |
143 |
-i gtk/tests/testing.c || die "sed 1 failed" |
144 |
sed '\%/recent-manager/add%,/recent_manager_purge/ d' \ |
145 |
-i gtk/tests/recentmanager.c || die "sed 2 failed" |
146 |
|
147 |
if use x86-interix; then |
148 |
# activate the itx-bind package... |
149 |
append-flags "-I${EPREFIX}/usr/include/bind" |
150 |
append-ldflags "-L${EPREFIX}/usr/lib/bind" |
151 |
fi |
152 |
|
153 |
if ! use test; then |
154 |
# don't waste time building tests |
155 |
strip_builddir SRC_SUBDIRS tests Makefile.am |
156 |
strip_builddir SRC_SUBDIRS tests Makefile.in |
157 |
fi |
158 |
|
159 |
if ! use examples; then |
160 |
# don't waste time building demos |
161 |
strip_builddir SRC_SUBDIRS demos Makefile.am |
162 |
strip_builddir SRC_SUBDIRS demos Makefile.in |
163 |
fi |
164 |
|
165 |
# http://mail.gnome.org/archives/commits-list/2011-March/msg04372.html |
166 |
epatch "${FILESDIR}"/${PN}-3.0.8-darwin-quartz.patch |
167 |
# fix building with gir #372953 |
168 |
epatch "${FILESDIR}"/${PN}-3.0.11-darwin-quartz-introspection.patch |
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 "${ED}" -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 |
} |