summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-04-10 20:36:28 +0000
committerMike Frysinger <vapier@gentoo.org>2005-04-10 20:36:28 +0000
commitf44bd6c7c50ae2266f6d47dad6c7f50bd2853925 (patch)
treebe70aa3f9311cb9c045a8dd20c560279c0298a2c /media-libs
parentPackage-Manager: portage-2.0.51.19 (diff)
downloadhistorical-f44bd6c7c50ae2266f6d47dad6c7f50bd2853925.tar.gz
historical-f44bd6c7c50ae2266f6d47dad6c7f50bd2853925.tar.bz2
historical-f44bd6c7c50ae2266f6d47dad6c7f50bd2853925.zip
fix typo in configure script #88546
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/imlib2/Manifest4
-rw-r--r--media-libs/imlib2/files/imlib2-1.2.0.004-x-lib.patch15
-rw-r--r--media-libs/imlib2/files/imlib2-1.2.0.20050220-no-x.patch18
-rw-r--r--media-libs/imlib2/imlib2-1.2.0.004.ebuild8
4 files changed, 24 insertions, 21 deletions
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index f26d71983610..e08e022aa88c 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,7 +1,7 @@
MD5 7b0fe0945db61f48995a0f0b84b643bd ChangeLog 4104
MD5 0b095f88ab0ecae4abaacc19e515c5eb imlib2-1.1.2.ebuild 1003
MD5 0c36280f1141c2ab86d0bd09ceec038a metadata.xml 2284
-MD5 94a120cc6556533fa2d8b365190b8330 imlib2-1.2.0.004.ebuild 956
+MD5 900b37b6bbca556979d17c26c6d6a6cc imlib2-1.2.0.004.ebuild 1050
MD5 b49040f60c8adc69c3b8745db04d79a7 imlib2-9999.ebuild 935
MD5 f65905e9f93f158e099b1f6524284f43 imlib2-1.2.0-r2.ebuild 1088
MD5 f7ecd36a44e0026d2e19b5a22073e9db files/digest-imlib2-1.2.0.004 68
@@ -9,4 +9,4 @@ MD5 78f8f17705b3e58fd3f15a898dfa2e25 files/digest-imlib2-1.1.2 64
MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-imlib2-9999 0
MD5 00966d224a91444676648c49ecc1eaf4 files/digest-imlib2-1.2.0-r2 64
MD5 e493696ea98688132769496642a1044c files/imlib2-1.2.0-loaders.patch 2613
-MD5 0263e17f00e6e19d606fe6c941114468 files/imlib2-1.2.0.20050220-no-x.patch 471
+MD5 6ef031ec7b5059f614e58bf7a5cd9afa files/imlib2-1.2.0.004-x-lib.patch 328
diff --git a/media-libs/imlib2/files/imlib2-1.2.0.004-x-lib.patch b/media-libs/imlib2/files/imlib2-1.2.0.004-x-lib.patch
new file mode 100644
index 000000000000..f060ab576c1a
--- /dev/null
+++ b/media-libs/imlib2/files/imlib2-1.2.0.004-x-lib.patch
@@ -0,0 +1,15 @@
+Fix a typo.
+
+http://bugs.gentoo.org/show_bug.cgi?id=88546
+
+--- configure
++++ configure
+@@ -20231,7 +20231,7 @@
+ # See if we find them without any special options.
+ # Don't add to $LIBS permanently.
+ ac_save_LIBS=$LIBS
+- LIBS="-lX $LIBS"
++ LIBS="-lX11 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
diff --git a/media-libs/imlib2/files/imlib2-1.2.0.20050220-no-x.patch b/media-libs/imlib2/files/imlib2-1.2.0.20050220-no-x.patch
deleted file mode 100644
index 6e14892bcdea..000000000000
--- a/media-libs/imlib2/files/imlib2-1.2.0.20050220-no-x.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: src/lib/image.h
-===================================================================
-RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/image.h,v
-retrieving revision 1.2
-diff -u -r1.2 image.h
---- src/lib/image.h 16 Jan 2005 18:23:47 -0000 1.2
-+++ src/lib/image.h 22 Feb 2005 23:52:42 -0000
-@@ -3,7 +3,9 @@
-
- #include "common.h"
- #ifdef BUILD_X11
--#include <X11/Xlib.h>
-+# include <X11/Xlib.h>
-+#else
-+# define X_DISPLAY_MISSING
- #endif
-
- #include <dlfcn.h>
diff --git a/media-libs/imlib2/imlib2-1.2.0.004.ebuild b/media-libs/imlib2/imlib2-1.2.0.004.ebuild
index f3f669097598..81df137dfc80 100644
--- a/media-libs/imlib2/imlib2-1.2.0.004.ebuild
+++ b/media-libs/imlib2/imlib2-1.2.0.004.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.2.0.004.ebuild,v 1.1 2005/04/10 03:11:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.2.0.004.ebuild,v 1.2 2005/04/10 20:36:28 vapier Exp $
EKEY_STATE=snap
EHACKAUTOGEN=yes
@@ -19,6 +19,12 @@ DEPEND="=media-libs/freetype-2*
tiff? ( >=media-libs/tiff-3.5.5 )
X? ( virtual/x11 )"
+src_unpack() {
+ enlightenment_src_unpack
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-x-lib.patch
+}
+
src_compile() {
local mymmx=""
if [ "${ARCH}" == "amd64" ] ; then