diff options
| author |   Aron Griffis <agriffis@gentoo.org> | 2006-02-17 00:14:27 +0000 |
|---|---|---|
| committer | Aron Griffis <agriffis@gentoo.org> | 2006-02-17 00:14:27 +0000 |
| commit | 9e880f8ae8150e13c65b5a013a28a0f8a9e10362 (patch) | |
| tree | 42936564ca4ab637477135893139f8a8856789e1 /app-office/dia | |
| parent | Bump pycrypto dep once more so we can rely on the generic fix (diff) | |
| download | gentoo-2-9e880f8ae8150e13c65b5a013a28a0f8a9e10362.tar.gz gentoo-2-9e880f8ae8150e13c65b5a013a28a0f8a9e10362.tar.bz2 gentoo-2-9e880f8ae8150e13c65b5a013a28a0f8a9e10362.zip | |
Fix gnome compilation #118591. Mark 0.94-r4 stable on ia64
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'app-office/dia')
| -rw-r--r-- | app-office/dia/ChangeLog | 8 | ||||
| -rw-r--r-- | app-office/dia/dia-0.94-r4.ebuild | 9 | ||||
| -rw-r--r-- | app-office/dia/files/dia-0.94-pkgconfig.patch | 10 |
3 files changed, 22 insertions, 5 deletions
diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog index 71163f4fce40..a022199bc818 100644 --- a/app-office/dia/ChangeLog +++ b/app-office/dia/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/dia -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.74 2005/11/02 14:07:25 obz Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.75 2006/02/17 00:14:27 agriffis Exp $ + + 17 Feb 2006; Aron Griffis <agriffis@gentoo.org> + +files/dia-0.94-pkgconfig.patch, dia-0.94-r4.ebuild: + Fix gnome compilation #118591. Mark 0.94-r4 stable on ia64 *dia-0.94-r4 (02 Nov 2005) diff --git a/app-office/dia/dia-0.94-r4.ebuild b/app-office/dia/dia-0.94-r4.ebuild index 5731ce2e6816..c5cd09b93283 100644 --- a/app-office/dia/dia-0.94-r4.ebuild +++ b/app-office/dia/dia-0.94-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.94-r4.ebuild,v 1.1 2005/11/02 14:07:25 obz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.94-r4.ebuild,v 1.2 2006/02/17 00:14:27 agriffis Exp $ inherit eutils gnome2 libtool @@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/projects/dia/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="gnome png python static zlib" RDEPEND=">=x11-libs/gtk+-2 @@ -40,6 +40,9 @@ src_unpack() { unpack ${A} cd ${S} + # Patch to fix configure.in issues with gnome support, bug 118591 + epatch ${FILESDIR}/dia-0.94-pkgconfig.patch + # Disable python -c 'import gtk' during compile to prevent using # X being involved (#31589) epatch ${FILESDIR}/${PV}-disable_python_gtk_import.patch diff --git a/app-office/dia/files/dia-0.94-pkgconfig.patch b/app-office/dia/files/dia-0.94-pkgconfig.patch new file mode 100644 index 000000000000..9859f6d89e64 --- /dev/null +++ b/app-office/dia/files/dia-0.94-pkgconfig.patch @@ -0,0 +1,10 @@ +--- configure.in 2006/01/15 00:17:25 1.1 ++++ configure.in 2006/01/15 00:17:38 +@@ -53,7 +53,6 @@ AC_SUBST(APP_LIBS) + dnl Checks for libraries + + AM_PATH_GLIB_2_0(2.0.0) +-AM_PATH_GTK_2_0(2.0.0) + + GTK_MODULES="gtk+-2.0 libxml-2.0 gdk-pixbuf-2.0" + PKG_CHECK_MODULES(PANGOVERSION, pango >= 1.1.5, , |