diff options
| author |   Alastair Tse <liquidx@gentoo.org> | 2003-07-15 22:22:33 +0000 |
|---|---|---|
| committer | Alastair Tse <liquidx@gentoo.org> | 2003-07-15 22:22:33 +0000 |
| commit | 3f140908c9c256cfca5117f37be783ef2a049f90 (patch) | |
| tree | 984c6cda0e33b520baa143cd95162ad279c8e1e8 /dev-python | |
| parent | Fixed issue with zapping_setup_fb. Closes #24142 (diff) | |
| download | gentoo-2-3f140908c9c256cfca5117f37be783ef2a049f90.tar.gz gentoo-2-3f140908c9c256cfca5117f37be783ef2a049f90.tar.bz2 gentoo-2-3f140908c9c256cfca5117f37be783ef2a049f90.zip | |
bugfix for setup.py
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/Imaging/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/Imaging/Imaging-1.1.4.ebuild | 19 | ||||
| -rw-r--r-- | dev-python/Imaging/Manifest | 7 | ||||
| -rw-r--r-- | dev-python/Imaging/files/Imaging-1.1.4-setup.py.patch | 11 |
4 files changed, 30 insertions, 13 deletions
diff --git a/dev-python/Imaging/ChangeLog b/dev-python/Imaging/ChangeLog index bab79c4577ba..534e5f529135 100644 --- a/dev-python/Imaging/ChangeLog +++ b/dev-python/Imaging/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/Imaging # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/Imaging/ChangeLog,v 1.11 2003/06/02 12:59:22 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/Imaging/ChangeLog,v 1.12 2003/07/15 22:22:23 liquidx Exp $ + + 15 Jul 2003; Alastair Tse <liquidx@gentoo.org> Imaging-1.1.4.ebuild, + files/Imaging-1.1.4-setup.py.patch: + add patch to fix installations with tkinter (#24351) *Imaging-1.1.4 (02 Jun 2003) diff --git a/dev-python/Imaging/Imaging-1.1.4.ebuild b/dev-python/Imaging/Imaging-1.1.4.ebuild index e89d0fb170c2..81249932b8d1 100644 --- a/dev-python/Imaging/Imaging-1.1.4.ebuild +++ b/dev-python/Imaging/Imaging-1.1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/Imaging/Imaging-1.1.4.ebuild,v 1.4 2003/07/12 12:49:25 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/Imaging/Imaging-1.1.4.ebuild,v 1.5 2003/07/15 22:22:23 liquidx Exp $ inherit distutils @@ -18,23 +18,24 @@ DEPEND="virtual/python >=media-libs/jpeg-6a >=sys-libs/zlib-0.95 tcltk? ( dev-lang/tk )" - + +src_unpack() { + unpack ${A} + cd ${S} + patch -p0 setup.py < ${FILESDIR}/${P}-setup.py.patch +} + src_compile() { export OPT=${CFLAGS} #Build the core imaging library (libImaging.a) cd ${S}/libImaging econf - cp Makefile Makefile.orig - #Not configured by configure - sed \ - -e "s:\(JPEGINCLUDE=[[:blank:]]*/usr/\)local/\(include\).*:\1\2:" \ - Makefile.orig > Makefile + sed -e "s:\(JPEGINCLUDE=[[:blank:]]*/usr/\)local/\(include\).*:\1\2:" \ + -i Makefile emake || die cd ${S}; distutils_src_compile - #cd ${S} - #CFLAGS="$(CFLAGS) -DUSE_COMPOSITELESS_PHOTO_PUT_BLOCK" distutils_src_compile } src_install () diff --git a/dev-python/Imaging/Manifest b/dev-python/Imaging/Manifest index 2e78734811b1..b934b33da14f 100644 --- a/dev-python/Imaging/Manifest +++ b/dev-python/Imaging/Manifest @@ -1,12 +1,13 @@ -MD5 2acba0c7372c9cde1a4b222c5c82e853 ChangeLog 1831 +MD5 77c895fd45c945422c1bad13c907c85e ChangeLog 1996 MD5 71da466a4884263c71275d7d6f6058f2 Imaging-1.1.2-r2.ebuild 2636 MD5 cec3e35a062a232a06f0d5c2ab19dd63 Imaging-1.1.3.ebuild 2643 MD5 d9f2ada42b966ce32b4a0bbcbc31c8d7 Imaging-1.1.3-r1.ebuild 1179 -MD5 ff83390e1d60df40b9c1272bd2abfd05 Imaging-1.1.3-r2.ebuild 1235 -MD5 23c131e86ec5cef60f2000b0c33ad85f Imaging-1.1.4.ebuild 1285 +MD5 77591c73720b185782ca36358c6589d9 Imaging-1.1.3-r2.ebuild 1231 +MD5 66c36fc037419d56de2372865016219d Imaging-1.1.4.ebuild 1241 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159 MD5 7e1eafa229aad0303d6d04c88c1f89e6 files/digest-Imaging-1.1.2-r2 65 MD5 a7c02afc37ec55a40b4369ace30d8fdb files/digest-Imaging-1.1.3 65 MD5 a7c02afc37ec55a40b4369ace30d8fdb files/digest-Imaging-1.1.3-r1 65 MD5 a7c02afc37ec55a40b4369ace30d8fdb files/digest-Imaging-1.1.3-r2 65 MD5 171777970922938dc6a815dd2b6a85de files/digest-Imaging-1.1.4 65 +MD5 d0b3528fb0e74be99cf9ac5e9372e317 files/Imaging-1.1.4-setup.py.patch 374 diff --git a/dev-python/Imaging/files/Imaging-1.1.4-setup.py.patch b/dev-python/Imaging/files/Imaging-1.1.4-setup.py.patch new file mode 100644 index 000000000000..d115d2b68ecc --- /dev/null +++ b/dev-python/Imaging/files/Imaging-1.1.4-setup.py.patch @@ -0,0 +1,11 @@ +--- setup.py.old 2003-07-15 22:44:54.000000000 +0100 ++++ setup.py 2003-07-15 22:46:29.000000000 +0100 +@@ -229,6 +229,8 @@ + INCLUDE_DIRS = ["libImaging"] + LIBRARY_DIRS = [] + LIBRARIES = [] ++ EXTRA_COMPILE_ARGS = None ++ EXTRA_LINK_ARGS = None + have_freetype = 1 # Assume we have it, unless proven otherwise + + # use source distribution, if available |