Attachment #112838 for bug #154330

View | Details | Raw Unified | Return to bug 154330
Collapse All | Expand All

Lines 6-12 Link Here

(-)/tmp/py-lzma/Makefile (-1 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= lzma	8	PORTNAME= lzma
9	PORTVERSION= 0.4.2	9	PORTVERSION= 0.4.3
10	CATEGORIES= archivers python	10	CATEGORIES= archivers python
11	MASTER_SITES= CHEESESHOP	11	MASTER_SITES= CHEESESHOP
12	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	12	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 15-20 Link Here
15	MAINTAINER= sbrabez@gmail.com	15	MAINTAINER= sbrabez@gmail.com
16	COMMENT= Python binding for the LZMA compression library	16	COMMENT= Python binding for the LZMA compression library
17		17
		18	LICENSE= LGPL21
		19	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
		20
		21	ONLY_FOR_ARCHS= i386
		22
18	USE_PYTHON= yes	23	USE_PYTHON= yes
19	USE_PYDISTUTILS= easy_install	24	USE_PYDISTUTILS= easy_install
20	PYDISTUTILS_PKGNAME= py${PORTNAME}	25	PYDISTUTILS_PKGNAME= py${PORTNAME}

Lines 1-2 Link Here

(-)/tmp/py-lzma/distinfo (-2 / +2 lines)
1	SHA256 (pylzma-0.4.2.tar.gz) = 7d61ccae245f82714451805476b5673a8704e753431d14309987cd69f37425c7	1	SHA256 (pylzma-0.4.3.tar.gz) = ddfc7fc7bfe1d4b84c88c981ce0c508a96766fdcdf53c415b63b3ca8f60a4239
2	SIZE (pylzma-0.4.2.tar.gz) = 93257	2	SIZE (pylzma-0.4.3.tar.gz) = 104857




--- ./setup.py.orig	2010-10-23 22:50:04.000000000 +0200
+++ ./setup.py	2011-01-27 02:30:39.000000000 +0100
@@ -27,13 +27,10 @@
 from distutils import log
 from distutils.command.build_ext import build_ext as _build_ext
 
-try:
-    from setuptools import setup, Extension
-except ImportError:
-    from ez_setup import use_setuptools
-    use_setuptools()
+from ez_setup import use_setuptools
+use_setuptools()
 
-    from setuptools import setup, Extension
+from setuptools import setup, Extension
 
 class UnsupportedPlatformWarning(Warning):
     pass

Line 0 Link Here

(-)/tmp/py-lzma/files/patch-src__7zip__C__CpuArch.c (+26 lines)
	1	--- ./src/7zip/C/CpuArch.c.orig 2010-07-21 22:13:50.000000000 +0200
	2	+++ ./src/7zip/C/CpuArch.c 2011-01-27 02:31:44.000000000 +0100
	3	@@ -72,14 +72,15 @@
	4
	5	#else
	6
	7	- __asm__ __volatile__ (
	8	- "cpuid"
	9	- : "=a" (*a) ,
	10	- "=b" (*b) ,
	11	- "=c" (*c) ,
	12	- "=d" (*d)
	13	- : "0" (function)) ;
	14	-
	15	+ /* fix GCC build error with -fPIC by storing ebx value before calling cpuid */
	16	+ __asm__ __volatile__(
	17	+ "pushl %%ebx \n\t"
	18	+ "cpuid \n\t"
	19	+ "movl %%ebx, %1 \n\t"
	20	+ "popl %%ebx \n\t"
	21	+ : "=a"(a), "=r"(b), "=c"(c), "=d"(d)
	22	+ : "a"(function)
	23	+ : "cc");
	24	#endif
	25
	26	#else

Lines 1-5 Link Here

(-)/tmp/py-lzma/files/patch-src__compat__LzmaCompatDecode.h (-1 / +1 lines)
1	--- ./src/compat/LzmaCompatDecode.h.orig 2010-04-24 00:26:40.000000000 +0200	1	--- ./src/compat/LzmaCompatDecode.h.orig 2010-04-24 00:26:40.000000000 +0200
2	+++ ./src/compat/LzmaCompatDecode.h 2010-11-11 00:20:51.000000000 +0100	2	+++ ./src/compat/LzmaCompatDecode.h 2011-01-27 02:30:39.000000000 +0100
3	@@ -39,14 +39,6 @@	3	@@ -39,14 +39,6 @@
4	# define LZMACALL	4	# define LZMACALL
5	#endif	5	#endif

Lines 5-10 Link Here

(-)/tmp/py-lzma/pkg-plist (+1 lines)
5	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt	5	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt
6	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe	6	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
7	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt	7	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
		8	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
8	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py7zlib.py	9	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py7zlib.py
9	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py7zlib.pyc	10	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py7zlib.pyc
10	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py7zlib.pyo	11	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py7zlib.pyo

Return to bug 154330

Line 0 Link Here

(-)/tmp/py-lzma/files/patch-setup.py (+19 lines)
	1	--- ./setup.py.orig 2010-10-23 22:50:04.000000000 +0200
	2	+++ ./setup.py 2011-01-27 02:30:39.000000000 +0100
	3	@@ -27,13 +27,10 @@
	4	from distutils import log
	5	from distutils.command.build_ext import build_ext as _build_ext
	6
	7	-try:
	8	- from setuptools import setup, Extension
	9	-except ImportError:
	10	- from ez_setup import use_setuptools
	11	- use_setuptools()
	12	+from ez_setup import use_setuptools
	13	+use_setuptools()
	14
	15	- from setuptools import setup, Extension
	16	+from setuptools import setup, Extension
	17
	18	class UnsupportedPlatformWarning(Warning):
	19	pass