summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-02-08 04:36:23 +0000
committerMike Frysinger <vapier@gentoo.org>2007-02-08 04:36:23 +0000
commita61c32878071b21eb61b53d39b57b7b362e9208f (patch)
tree9e8e4a29cbe194309f653d39256e6f6177353442 /media-gfx
parentSign Manfiest (diff)
downloadgentoo-2-a61c32878071b21eb61b53d39b57b7b362e9208f.tar.gz
gentoo-2-a61c32878071b21eb61b53d39b57b7b362e9208f.tar.bz2
gentoo-2-a61c32878071b21eb61b53d39b57b7b362e9208f.zip
Fix building with USE=-X #159007 by Alexander Skwar.
(Portage version: 2.1.2-r8)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/fontforge/ChangeLog6
-rw-r--r--media-gfx/fontforge/files/fontforge-20061220-no-X.patch16
-rw-r--r--media-gfx/fontforge/fontforge-20061220.ebuild3
3 files changed, 23 insertions, 2 deletions
diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog
index 7f9be3c6a7c5..dc3d9ad58e4b 100644
--- a/media-gfx/fontforge/ChangeLog
+++ b/media-gfx/fontforge/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/fontforge
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.45 2007/02/07 04:57:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.46 2007/02/08 04:36:23 vapier Exp $
+
+ 08 Feb 2007; Mike Frysinger <vapier@gentoo.org>
+ +files/fontforge-20061220-no-X.patch, fontforge-20061220.ebuild:
+ Fix building with USE=-X #159007 by Alexander Skwar.
07 Feb 2007; Mike Frysinger <vapier@gentoo.org> fontforge-20061220.ebuild:
Use emake rather than make #159929 by Timothy Redaelli.
diff --git a/media-gfx/fontforge/files/fontforge-20061220-no-X.patch b/media-gfx/fontforge/files/fontforge-20061220-no-X.patch
new file mode 100644
index 000000000000..152335180d01
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-20061220-no-X.patch
@@ -0,0 +1,16 @@
+Fix from upstream
+
+http://bugs.gentoo.org/159007
+
+--- configure
++++ configure
+@@ -22716,9 +22716,6 @@
+ X_11LIB=-lX11
+ if test "$no_x" = "yes"; then
+ X_11LIB=
+- cat >>confdefs.h <<\_ACEOF
+-#define FONTFORGE_CONFIG_NO_WINDOWING_UI 1
+-_ACEOF
+
+ else
+
diff --git a/media-gfx/fontforge/fontforge-20061220.ebuild b/media-gfx/fontforge/fontforge-20061220.ebuild
index 725a23a5f144..810692504f63 100644
--- a/media-gfx/fontforge/fontforge-20061220.ebuild
+++ b/media-gfx/fontforge/fontforge-20061220.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20061220.ebuild,v 1.3 2007/02/07 04:57:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20061220.ebuild,v 1.4 2007/02/08 04:36:23 vapier Exp $
inherit flag-o-matic eutils
@@ -26,6 +26,7 @@ DEPEND="png? ( >=media-libs/libpng-1.2.4 )
src_unpack() {
unpack ${A}
cd "${S}"
+ epatch "${FILESDIR}"/${P}-no-X.patch #159007
sed -i -e 's:ungif:gif:g' configure* || die
sed -i -e 's:"libungif":"libgif":g' gdraw/gimagereadgif.c || die
}