idella4 14/04/01 15:43:50 Added: sip-4.15.5-darwin.patch Log: Add re-base of darwin patch (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Revision Changes Path 1.1 dev-python/sip/files/sip-4.15.5-darwin.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/sip/files/sip-4.15.5-darwin.patch?rev=1.1&view=markup 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 Index: sip-4.15.5-darwin.patch =================================================================== diff -ur sip-4.15.5.orig/siputils.py sip-4.15.5/siputils.py --- siputils.py 2014-02-21 18:31:35.000000000 +0800 +++ siputils.py 2014-04-01 23:21:41.895036589 +0800 @@ -945,8 +945,6 @@ """ if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"): plib = clib + ".lib" - elif sys.platform == "darwin" and framework: - plib = "-framework " + clib else: plib = "-l" + clib @@ -961,8 +959,6 @@ """ if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"): prl_name = os.path.join(self.config.qt_lib_dir, clib + ".prl") - elif sys.platform == "darwin" and framework: - prl_name = os.path.join(self.config.qt_lib_dir, clib + ".framework", clib + ".prl") else: prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib + ".prl") @@ -1633,7 +1629,7 @@ if sys.platform == "win32": ext = "pyd" elif sys.platform == "darwin": - ext = "so" + ext = "bundle" elif sys.platform == "cygwin": ext = "dll" else:
