diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/sip/files/sip-4.15.5-darwin.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-python/sip/files/sip-4.15.5-darwin.patch')
-rw-r--r-- | dev-python/sip/files/sip-4.15.5-darwin.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/dev-python/sip/files/sip-4.15.5-darwin.patch b/dev-python/sip/files/sip-4.15.5-darwin.patch new file mode 100644 index 000000000000..b625d15c27c5 --- /dev/null +++ b/dev-python/sip/files/sip-4.15.5-darwin.patch @@ -0,0 +1,30 @@ +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: |