diff options
| author | João Ventura | 2014-05-01 21:06:29 +0100 |
|---|---|---|
| committer | Adam Vandenberg | 2014-05-02 07:19:08 -0700 |
| commit | 892ed54426e58b4b4ff66c239c01f0477201d429 (patch) | |
| tree | b05b46e504c8209d1dd35a8cf586bf8c7d21d246 | |
| parent | 2f6c39feb3a089bc39ad1ab225efe0a764c2271c (diff) | |
| download | homebrew-892ed54426e58b4b4ff66c239c01f0477201d429.tar.bz2 | |
shiboken 1.2.2
Closes #28894.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
| -rw-r--r-- | Library/Formula/shiboken.rb | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/Library/Formula/shiboken.rb b/Library/Formula/shiboken.rb index f80550f4c..5c6eb0ade 100644 --- a/Library/Formula/shiboken.rb +++ b/Library/Formula/shiboken.rb @@ -2,9 +2,9 @@ require 'formula' class Shiboken < Formula homepage 'http://www.pyside.org/docs/shiboken' - url 'http://download.qt-project.org/official_releases/pyside/shiboken-1.2.1.tar.bz2' - mirror 'https://distfiles.macports.org/py-shiboken/shiboken-1.2.1.tar.bz2' - sha1 'f310ac163f3407109051ccebfd192bc9620e9124' + url 'http://download.qt-project.org/official_releases/pyside/shiboken-1.2.2.tar.bz2' + mirror 'https://distfiles.macports.org/py-shiboken/shiboken-1.2.2.tar.bz2' + sha1 '55731616791500750ef373f382057a43e133fa08' head 'git://gitorious.org/pyside/shiboken.git' @@ -50,26 +50,3 @@ class Shiboken < Formula end end end - -__END__ -diff --git a/ext/sparsehash/google/sparsehash/sparseconfig.h b/ext/sparsehash/google/sparsehash/sparseconfig.h -index 44a4dda..5073639 100644 ---- a/ext/sparsehash/google/sparsehash/sparseconfig.h -+++ b/ext/sparsehash/google/sparsehash/sparseconfig.h -@@ -13,6 +13,16 @@ - #define HASH_NAMESPACE stdext - /* The system-provided hash function including the namespace. */ - #define SPARSEHASH_HASH HASH_NAMESPACE::hash_compare -+/* libc++ does not implement the tr1 namespce, instead the -+ * equivalient functionality is placed in namespace std, -+ * so use when it targeting such systems (OS X 10.7 onwards) */ -+#elif defined(_LIBCPP_VERSION) -+ /* the location of the header defining hash functions */ -+ #define HASH_FUN_H <functional> -+ /* the namespace of the hash<> function */ -+ #define HASH_NAMESPACE std -+ /* The system-provided hash function including the namespace. */ -+ #define SPARSEHASH_HASH HASH_NAMESPACE::hash - #else - /* the location of the header defining hash functions */ - #define HASH_FUN_H <tr1/functional> |