From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
Date: Tue, 29 Mar 2011 08:35:58 +0000 (UTC) [thread overview]
Message-ID: <dd8b6b5580610d77672fc6a1e8f26cef390f9490.nirbheek@gentoo> (raw)
commit: dd8b6b5580610d77672fc6a1e8f26cef390f9490
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 07:08:02 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 08:35:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=dd8b6b55
x11-libs/gtk+: moved to the tree
---
.../gtk+-2.14.3-limit-gtksignal-includes.patch | 17 --
x11-libs/gtk+/files/gtk+-2.21.3-multilib.patch | 21 --
x11-libs/gtk+/gtk+-3.0.6.ebuild | 196 --------------------
3 files changed, 0 insertions(+), 234 deletions(-)
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
deleted file mode 100644
index 3fe8cff..0000000
--- a/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugzilla.gnome.org/show_bug.cgi?id=536767
-
-Makes inkscape and claws-mail buildable again. Basically all packages still using
-GtkCList and single included headers.
---- gtk/gtksignal.h.orig 2008-06-12 01:40:59.000000000 -0400
-+++ gtk/gtksignal.h 2008-06-11 18:21:47.000000000 -0400
-@@ -29,7 +29,9 @@
- #ifndef __GTK_SIGNAL_H__
- #define __GTK_SIGNAL_H__
-
--#include <gtk/gtk.h>
-+#include <gtk/gtkenums.h>
-+#include <gtk/gtktypeutils.h>
-+#include <gtk/gtkobject.h>
- #include <gtk/gtkmarshal.h>
-
- G_BEGIN_DECLS
diff --git a/x11-libs/gtk+/files/gtk+-2.21.3-multilib.patch b/x11-libs/gtk+/files/gtk+-2.21.3-multilib.patch
deleted file mode 100644
index 3cf777d..0000000
--- a/x11-libs/gtk+/files/gtk+-2.21.3-multilib.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Same as the 2.8 version, except removed gdk-pixbuf parts
-
---- gtk+-2.21.3.orig/gtk/gtkrc.c
-+++ gtk+-2.21.3/gtk/gtkrc.c
-@@ -364,7 +364,15 @@
- if (im_module_file)
- result = g_strdup (im_module_file);
- else
-- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+ {
-+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", GTK_HOST, "gtk.immodules", NULL);
-+ if (!g_file_test (result, G_FILE_TEST_EXISTS))
-+ {
-+ g_free (result);
-+
-+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+ }
-+ }
- }
-
- return result;
diff --git a/x11-libs/gtk+/gtk+-3.0.6.ebuild b/x11-libs/gtk+/gtk+-3.0.6.ebuild
deleted file mode 100644
index 18ef65d..0000000
--- a/x11-libs/gtk+/gtk+-3.0.6.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.4"
-
-inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="3"
-# NOTE: *-macos support is BROKEN. See `quartz-backend` etc in configure
-# NOTE: This gtk+ has multi-gdk-backend support, see:
-# * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
-# * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
-# NOTE: Lots of aqua stuff in this ebuild is probably very broken
-IUSE="aqua cups debug doc examples +introspection jpeg jpeg2k tiff test vim-syntax xinerama"
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
- KEYWORDS=""
-else
- 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"
-fi
-
-# FIXME: introspection data is built against system installation of gtk+:3
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-# Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert
-# >=x11-libs/gtk+-2.24:2 is needed for bug 359555
-COMMON_DEPEND="!aqua? (
- x11-libs/libXrender
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXt
- x11-libs/libXext
- >=x11-libs/libXrandr-1.3
- x11-libs/libXcursor
- x11-libs/libXfixes
- x11-libs/libXcomposite
- x11-libs/libXdamage
- >=x11-libs/cairo-1.10.0[X,svg]
- >=x11-libs/gdk-pixbuf-2.22.0:2[X,introspection?,jpeg?,jpeg2k?,tiff?]
- )
- aqua? (
- >=x11-libs/cairo-1.10.0[aqua,svg]
- >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?,jpeg?,jpeg2k?,tiff?]
- )
- xinerama? ( x11-libs/libXinerama )
- >=dev-libs/glib-2.28.0
- >=x11-libs/pango-1.24.0[introspection?]
- >=dev-libs/atk-1.30[introspection?]
- >=x11-libs/gtk+-2.24:2
- media-libs/fontconfig
- x11-misc/shared-mime-info
- cups? ( net-print/cups )
- introspection? ( >=dev-libs/gobject-introspection-0.10.1 )"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/pkgconfig-0.9
- !aqua? (
- x11-proto/xextproto
- x11-proto/xproto
- x11-proto/inputproto
- x11-proto/damageproto
- )
- x86-interix? (
- sys-libs/itx-bind
- )
- xinerama? ( x11-proto/xineramaproto )
- >=dev-util/gtk-doc-am-1.11
- doc? (
- >=dev-util/gtk-doc-1.11
- ~app-text/docbook-xml-dtd-4.1.2 )
- test? (
- media-fonts/font-misc-misc
- media-fonts/font-cursor-misc )"
-RDEPEND="${COMMON_DEPEND}
- !<gnome-base/gail-1000"
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
-
-strip_builddir() {
- local rule=$1
- shift
- local directory=$1
- shift
- sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
- || die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
- # -O3 and company cause random crashes in applications. Bug #133469
- replace-flags -O3 -O2
- strip-flags
-
- # Non-working test in gentoo's env
- sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
- -i gtk/tests/testing.c || die "sed 1 failed"
- sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
- -i gtk/tests/recentmanager.c || die "sed 2 failed"
-
- if use x86-interix; then
- # activate the itx-bind package...
- append-flags "-I${EPREFIX}/usr/include/bind"
- append-ldflags "-L${EPREFIX}/usr/lib/bind"
- fi
-
- if ! use test; then
- # don't waste time building tests
- strip_builddir SRC_SUBDIRS tests Makefile.am
- [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in
- fi
-
- if ! use examples; then
- # don't waste time building demos
- strip_builddir SRC_SUBDIRS demos Makefile.am
- [[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
- fi
-
- [[ ${PV} = 9999 ]] && gnome2-live_src_prepare
-}
-
-src_configure() {
- # FIXME: PackageKit support
- # png always on to display icons (foser)
- local myconf="$(use_enable doc gtk-doc)
- $(use_enable xinerama)
- $(use_enable cups cups auto)
- $(use_enable introspection)
- --disable-packagekit
- --disable-papi
- --enable-gtk2-dependency"
-
- # XXX: Maybe with multi-backend we should enable x11 all the time?
- if use aqua; then
- myconf="${myconf} --enable-quartz-backend --disable-xinput"
- else
- myconf="${myconf} --enable-x11-backend --enable-xinput"
- fi
-
- # Passing --disable-debug is not recommended for production use
- use debug && myconf="${myconf} --enable-debug=yes"
-
- # need libdir here to avoid a double slash in a path that libtool doesn't
- # grok so well during install (// between $EPREFIX and usr ...)
- econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- # Exporting HOME fixes tests using XDG directories spec since all defaults
- # are based on $HOME. It is also backward compatible with functions not
- # yet ported to this spec.
- XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Installation failed"
-
- # see bug #133241
- echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
- insinto /etc/gtk-3.0
- doins "${T}"/gtkrc || die "doins gtkrc failed"
-
- dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
-
- # Remove unneeded *.la files
- find "${ED}" -name "*.la" -delete
-
- # add -framework Carbon to the .pc files
- use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
- sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
- done
-}
-
-pkg_preinst() {
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- gnome2_schemas_update
-
- local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0"
- gtk-query-immodules-3.0 > "${GTK3_MODDIR}/immodules.cache" \
- || ewarn "Failed to run gtk-query-immodules-3.0"
-
- if ! has_version "app-text/evince"; then
- elog "Please install app-text/evince for print preview functionality."
- elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
- elog "add it to your gtkrc."
- fi
-}
-
-pkg_postrm() {
- gnome2_schemas_update --uninstall
-}
next reply other threads:[~2011-03-29 8:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-29 8:35 Nirbheek Chauhan [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-01-18 21:07 [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/ Mart Raudsepp
2014-11-30 15:52 Remi Cardona
2014-04-20 18:17 Gilles Dartiguelongue
2012-08-10 5:31 Priit Laes
2012-08-05 13:34 Priit Laes
2012-03-15 15:55 Alexandre Restovtsev
2012-02-26 21:19 Alexandre Restovtsev
2011-10-17 19:10 Alexandre Restovtsev
2011-03-09 11:34 Nirbheek Chauhan
2011-02-25 9:39 Priit Laes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dd8b6b5580610d77672fc6a1e8f26cef390f9490.nirbheek@gentoo \
--to=nirbheek@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox