1 |
commit: dd8b6b5580610d77672fc6a1e8f26cef390f9490 |
2 |
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 29 07:08:02 2011 +0000 |
4 |
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 29 08:35:24 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=dd8b6b55 |
7 |
|
8 |
x11-libs/gtk+: moved to the tree |
9 |
|
10 |
--- |
11 |
.../gtk+-2.14.3-limit-gtksignal-includes.patch | 17 -- |
12 |
x11-libs/gtk+/files/gtk+-2.21.3-multilib.patch | 21 -- |
13 |
x11-libs/gtk+/gtk+-3.0.6.ebuild | 196 -------------------- |
14 |
3 files changed, 0 insertions(+), 234 deletions(-) |
15 |
|
16 |
diff --git a/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch b/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch |
17 |
deleted file mode 100644 |
18 |
index 3fe8cff..0000000 |
19 |
--- a/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch |
20 |
+++ /dev/null |
21 |
@@ -1,17 +0,0 @@ |
22 |
-http://bugzilla.gnome.org/show_bug.cgi?id=536767 |
23 |
- |
24 |
-Makes inkscape and claws-mail buildable again. Basically all packages still using |
25 |
-GtkCList and single included headers. |
26 |
---- gtk/gtksignal.h.orig 2008-06-12 01:40:59.000000000 -0400 |
27 |
-+++ gtk/gtksignal.h 2008-06-11 18:21:47.000000000 -0400 |
28 |
-@@ -29,7 +29,9 @@ |
29 |
- #ifndef __GTK_SIGNAL_H__ |
30 |
- #define __GTK_SIGNAL_H__ |
31 |
- |
32 |
--#include <gtk/gtk.h> |
33 |
-+#include <gtk/gtkenums.h> |
34 |
-+#include <gtk/gtktypeutils.h> |
35 |
-+#include <gtk/gtkobject.h> |
36 |
- #include <gtk/gtkmarshal.h> |
37 |
- |
38 |
- G_BEGIN_DECLS |
39 |
|
40 |
diff --git a/x11-libs/gtk+/files/gtk+-2.21.3-multilib.patch b/x11-libs/gtk+/files/gtk+-2.21.3-multilib.patch |
41 |
deleted file mode 100644 |
42 |
index 3cf777d..0000000 |
43 |
--- a/x11-libs/gtk+/files/gtk+-2.21.3-multilib.patch |
44 |
+++ /dev/null |
45 |
@@ -1,21 +0,0 @@ |
46 |
-Same as the 2.8 version, except removed gdk-pixbuf parts |
47 |
- |
48 |
---- gtk+-2.21.3.orig/gtk/gtkrc.c |
49 |
-+++ gtk+-2.21.3/gtk/gtkrc.c |
50 |
-@@ -364,7 +364,15 @@ |
51 |
- if (im_module_file) |
52 |
- result = g_strdup (im_module_file); |
53 |
- else |
54 |
-- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); |
55 |
-+ { |
56 |
-+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", GTK_HOST, "gtk.immodules", NULL); |
57 |
-+ if (!g_file_test (result, G_FILE_TEST_EXISTS)) |
58 |
-+ { |
59 |
-+ g_free (result); |
60 |
-+ |
61 |
-+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); |
62 |
-+ } |
63 |
-+ } |
64 |
- } |
65 |
- |
66 |
- return result; |
67 |
|
68 |
diff --git a/x11-libs/gtk+/gtk+-3.0.6.ebuild b/x11-libs/gtk+/gtk+-3.0.6.ebuild |
69 |
deleted file mode 100644 |
70 |
index 18ef65d..0000000 |
71 |
--- a/x11-libs/gtk+/gtk+-3.0.6.ebuild |
72 |
+++ /dev/null |
73 |
@@ -1,196 +0,0 @@ |
74 |
-# Copyright 1999-2011 Gentoo Foundation |
75 |
-# Distributed under the terms of the GNU General Public License v2 |
76 |
-# $Header: $ |
77 |
- |
78 |
-EAPI="3" |
79 |
-PYTHON_DEPEND="2:2.4" |
80 |
- |
81 |
-inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx |
82 |
- |
83 |
-DESCRIPTION="Gimp ToolKit +" |
84 |
-HOMEPAGE="http://www.gtk.org/" |
85 |
- |
86 |
-LICENSE="LGPL-2" |
87 |
-SLOT="3" |
88 |
-# NOTE: *-macos support is BROKEN. See `quartz-backend` etc in configure |
89 |
-# NOTE: This gtk+ has multi-gdk-backend support, see: |
90 |
-# * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/ |
91 |
-# * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html |
92 |
-# NOTE: Lots of aqua stuff in this ebuild is probably very broken |
93 |
-IUSE="aqua cups debug doc examples +introspection jpeg jpeg2k tiff test vim-syntax xinerama" |
94 |
-if [[ ${PV} = 9999 ]]; then |
95 |
- inherit gnome2-live |
96 |
- KEYWORDS="" |
97 |
-else |
98 |
- 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" |
99 |
-fi |
100 |
- |
101 |
-# FIXME: introspection data is built against system installation of gtk+:3 |
102 |
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) |
103 |
-# Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert |
104 |
-# >=x11-libs/gtk+-2.24:2 is needed for bug 359555 |
105 |
-COMMON_DEPEND="!aqua? ( |
106 |
- x11-libs/libXrender |
107 |
- x11-libs/libX11 |
108 |
- x11-libs/libXi |
109 |
- x11-libs/libXt |
110 |
- x11-libs/libXext |
111 |
- >=x11-libs/libXrandr-1.3 |
112 |
- x11-libs/libXcursor |
113 |
- x11-libs/libXfixes |
114 |
- x11-libs/libXcomposite |
115 |
- x11-libs/libXdamage |
116 |
- >=x11-libs/cairo-1.10.0[X,svg] |
117 |
- >=x11-libs/gdk-pixbuf-2.22.0:2[X,introspection?,jpeg?,jpeg2k?,tiff?] |
118 |
- ) |
119 |
- aqua? ( |
120 |
- >=x11-libs/cairo-1.10.0[aqua,svg] |
121 |
- >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?,jpeg?,jpeg2k?,tiff?] |
122 |
- ) |
123 |
- xinerama? ( x11-libs/libXinerama ) |
124 |
- >=dev-libs/glib-2.28.0 |
125 |
- >=x11-libs/pango-1.24.0[introspection?] |
126 |
- >=dev-libs/atk-1.30[introspection?] |
127 |
- >=x11-libs/gtk+-2.24:2 |
128 |
- media-libs/fontconfig |
129 |
- x11-misc/shared-mime-info |
130 |
- cups? ( net-print/cups ) |
131 |
- introspection? ( >=dev-libs/gobject-introspection-0.10.1 )" |
132 |
-DEPEND="${COMMON_DEPEND} |
133 |
- >=dev-util/pkgconfig-0.9 |
134 |
- !aqua? ( |
135 |
- x11-proto/xextproto |
136 |
- x11-proto/xproto |
137 |
- x11-proto/inputproto |
138 |
- x11-proto/damageproto |
139 |
- ) |
140 |
- x86-interix? ( |
141 |
- sys-libs/itx-bind |
142 |
- ) |
143 |
- xinerama? ( x11-proto/xineramaproto ) |
144 |
- >=dev-util/gtk-doc-am-1.11 |
145 |
- doc? ( |
146 |
- >=dev-util/gtk-doc-1.11 |
147 |
- ~app-text/docbook-xml-dtd-4.1.2 ) |
148 |
- test? ( |
149 |
- media-fonts/font-misc-misc |
150 |
- media-fonts/font-cursor-misc )" |
151 |
-RDEPEND="${COMMON_DEPEND} |
152 |
- !<gnome-base/gail-1000" |
153 |
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )" |
154 |
- |
155 |
-strip_builddir() { |
156 |
- local rule=$1 |
157 |
- shift |
158 |
- local directory=$1 |
159 |
- shift |
160 |
- sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ |
161 |
- || die "Could not strip director ${directory} from build." |
162 |
-} |
163 |
- |
164 |
-src_prepare() { |
165 |
- # -O3 and company cause random crashes in applications. Bug #133469 |
166 |
- replace-flags -O3 -O2 |
167 |
- strip-flags |
168 |
- |
169 |
- # Non-working test in gentoo's env |
170 |
- sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \ |
171 |
- -i gtk/tests/testing.c || die "sed 1 failed" |
172 |
- sed '\%/recent-manager/add%,/recent_manager_purge/ d' \ |
173 |
- -i gtk/tests/recentmanager.c || die "sed 2 failed" |
174 |
- |
175 |
- if use x86-interix; then |
176 |
- # activate the itx-bind package... |
177 |
- append-flags "-I${EPREFIX}/usr/include/bind" |
178 |
- append-ldflags "-L${EPREFIX}/usr/lib/bind" |
179 |
- fi |
180 |
- |
181 |
- if ! use test; then |
182 |
- # don't waste time building tests |
183 |
- strip_builddir SRC_SUBDIRS tests Makefile.am |
184 |
- [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in |
185 |
- fi |
186 |
- |
187 |
- if ! use examples; then |
188 |
- # don't waste time building demos |
189 |
- strip_builddir SRC_SUBDIRS demos Makefile.am |
190 |
- [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in |
191 |
- fi |
192 |
- |
193 |
- [[ ${PV} = 9999 ]] && gnome2-live_src_prepare |
194 |
-} |
195 |
- |
196 |
-src_configure() { |
197 |
- # FIXME: PackageKit support |
198 |
- # png always on to display icons (foser) |
199 |
- local myconf="$(use_enable doc gtk-doc) |
200 |
- $(use_enable xinerama) |
201 |
- $(use_enable cups cups auto) |
202 |
- $(use_enable introspection) |
203 |
- --disable-packagekit |
204 |
- --disable-papi |
205 |
- --enable-gtk2-dependency" |
206 |
- |
207 |
- # XXX: Maybe with multi-backend we should enable x11 all the time? |
208 |
- if use aqua; then |
209 |
- myconf="${myconf} --enable-quartz-backend --disable-xinput" |
210 |
- else |
211 |
- myconf="${myconf} --enable-x11-backend --enable-xinput" |
212 |
- fi |
213 |
- |
214 |
- # Passing --disable-debug is not recommended for production use |
215 |
- use debug && myconf="${myconf} --enable-debug=yes" |
216 |
- |
217 |
- # need libdir here to avoid a double slash in a path that libtool doesn't |
218 |
- # grok so well during install (// between $EPREFIX and usr ...) |
219 |
- econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf} |
220 |
-} |
221 |
- |
222 |
-src_test() { |
223 |
- unset DBUS_SESSION_BUS_ADDRESS |
224 |
- # Exporting HOME fixes tests using XDG directories spec since all defaults |
225 |
- # are based on $HOME. It is also backward compatible with functions not |
226 |
- # yet ported to this spec. |
227 |
- XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed" |
228 |
-} |
229 |
- |
230 |
-src_install() { |
231 |
- emake DESTDIR="${D}" install || die "Installation failed" |
232 |
- |
233 |
- # see bug #133241 |
234 |
- echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc" |
235 |
- insinto /etc/gtk-3.0 |
236 |
- doins "${T}"/gtkrc || die "doins gtkrc failed" |
237 |
- |
238 |
- dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed" |
239 |
- |
240 |
- # Remove unneeded *.la files |
241 |
- find "${ED}" -name "*.la" -delete |
242 |
- |
243 |
- # add -framework Carbon to the .pc files |
244 |
- use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do |
245 |
- sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed" |
246 |
- done |
247 |
-} |
248 |
- |
249 |
-pkg_preinst() { |
250 |
- gnome2_schemas_savelist |
251 |
-} |
252 |
- |
253 |
-pkg_postinst() { |
254 |
- gnome2_schemas_update |
255 |
- |
256 |
- local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0" |
257 |
- gtk-query-immodules-3.0 > "${GTK3_MODDIR}/immodules.cache" \ |
258 |
- || ewarn "Failed to run gtk-query-immodules-3.0" |
259 |
- |
260 |
- if ! has_version "app-text/evince"; then |
261 |
- elog "Please install app-text/evince for print preview functionality." |
262 |
- elog "Alternatively, check \"gtk-print-preview-command\" documentation and" |
263 |
- elog "add it to your gtkrc." |
264 |
- fi |
265 |
-} |
266 |
- |
267 |
-pkg_postrm() { |
268 |
- gnome2_schemas_update --uninstall |
269 |
-} |