| 1 |
idella4 14/04/01 15:43:50 |
| 2 |
|
| 3 |
Added: sip-4.15.5-darwin.patch |
| 4 |
Log: |
| 5 |
Add re-base of darwin patch |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-python/sip/files/sip-4.15.5-darwin.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sip/files/sip-4.15.5-darwin.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sip/files/sip-4.15.5-darwin.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: sip-4.15.5-darwin.patch |
| 16 |
=================================================================== |
| 17 |
diff -ur sip-4.15.5.orig/siputils.py sip-4.15.5/siputils.py |
| 18 |
--- siputils.py 2014-02-21 18:31:35.000000000 +0800 |
| 19 |
+++ siputils.py 2014-04-01 23:21:41.895036589 +0800 |
| 20 |
@@ -945,8 +945,6 @@ |
| 21 |
""" |
| 22 |
if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"): |
| 23 |
plib = clib + ".lib" |
| 24 |
- elif sys.platform == "darwin" and framework: |
| 25 |
- plib = "-framework " + clib |
| 26 |
else: |
| 27 |
plib = "-l" + clib |
| 28 |
|
| 29 |
@@ -961,8 +959,6 @@ |
| 30 |
""" |
| 31 |
if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"): |
| 32 |
prl_name = os.path.join(self.config.qt_lib_dir, clib + ".prl") |
| 33 |
- elif sys.platform == "darwin" and framework: |
| 34 |
- prl_name = os.path.join(self.config.qt_lib_dir, clib + ".framework", clib + ".prl") |
| 35 |
else: |
| 36 |
prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib + ".prl") |
| 37 |
|
| 38 |
@@ -1633,7 +1629,7 @@ |
| 39 |
if sys.platform == "win32": |
| 40 |
ext = "pyd" |
| 41 |
elif sys.platform == "darwin": |
| 42 |
- ext = "so" |
| 43 |
+ ext = "bundle" |
| 44 |
elif sys.platform == "cygwin": |
| 45 |
ext = "dll" |
| 46 |
else: |
Archives