diff options
| author | Charlie Sharpsteen | 2011-11-09 12:12:55 -0800 |
|---|---|---|
| committer | Charlie Sharpsteen | 2011-11-09 14:06:13 -0800 |
| commit | 65cb02daefb890489a363c482fc98e2c4ef61dc8 (patch) | |
| tree | 6273bb403b00cbd4a829799e7116f16d635f3e86 | |
| parent | cdcb773c4477ff4900011d673dc284e06db932af (diff) | |
| download | homebrew-65cb02daefb890489a363c482fc98e2c4ef61dc8.tar.bz2 | |
PySide: Update to 1.0.8
Also updates dependencies:
- apiextractor
- generatorrunner
- shiboken
| -rw-r--r-- | Library/Formula/apiextractor.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/generatorrunner.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/pyside.rb | 32 | ||||
| -rw-r--r-- | Library/Formula/shiboken.rb | 4 |
4 files changed, 36 insertions, 8 deletions
diff --git a/Library/Formula/apiextractor.rb b/Library/Formula/apiextractor.rb index b82fb010f..8ca9aa396 100644 --- a/Library/Formula/apiextractor.rb +++ b/Library/Formula/apiextractor.rb @@ -2,8 +2,8 @@ require 'formula' class Apiextractor < Formula homepage 'http://www.pyside.org/docs/apiextractor' - url 'http://pyside.org/files/apiextractor-0.10.7.tar.bz2' - md5 '539be815e7fb09064fefcdb21ad44965' + url 'http://pyside.org/files/apiextractor-0.10.8.tar.bz2' + md5 'ddf42bdd6becae602feacf8a1b190425' depends_on 'cmake' => :build depends_on 'qt' diff --git a/Library/Formula/generatorrunner.rb b/Library/Formula/generatorrunner.rb index d2ccd19f2..054a267a5 100644 --- a/Library/Formula/generatorrunner.rb +++ b/Library/Formula/generatorrunner.rb @@ -2,8 +2,8 @@ require 'formula' class Generatorrunner < Formula homepage 'http://www.pyside.org/docs/generatorrunner' - url 'http://pyside.org/files/generatorrunner-0.6.13.tar.bz2' - md5 'ca214a017404bb1f4775aebcb98e373e' + url 'http://pyside.org/files/generatorrunner-0.6.14.tar.bz2' + md5 '6413d4417939c7347d0e13a1e6bc608c' depends_on 'cmake' => :build diff --git a/Library/Formula/pyside.rb b/Library/Formula/pyside.rb index 3dea3218f..9dfac0067 100644 --- a/Library/Formula/pyside.rb +++ b/Library/Formula/pyside.rb @@ -10,8 +10,8 @@ end class Pyside < Formula homepage 'http://www.pyside.org' - url 'http://www.pyside.org/files/pyside-qt4.7+1.0.7.tar.bz2' - md5 'f2a0e8b69bf49feeaea1ff682e30a7a9' + url 'http://www.pyside.org/files/pyside-qt4.7+1.0.8.tar.bz2' + md5 '131cc4d5c56b3b20bc99362f68f3f29d' depends_on 'cmake' => :build @@ -20,6 +20,12 @@ class Pyside < Formula depends_on 'apiextractor' depends_on 'qt' + def patches + # Fix an infinite loop that was added to the CMake config file in + # PySide 1.0.8 + DATA + end + def install # The build will be unable to find Qt headers buried inside frameworks # unless the folder containing those frameworks is added to the compiler @@ -42,3 +48,25 @@ install the `pyside-tools` formula. EOS end end + +__END__ +Ensure PySideConfig.cmake gets generated with a default value for +SHIBOKEN_PYTHON_SUFFIX, otherwise an infinite loop will occur. + +Submitted upstream: + + http://bugs.pyside.org/show_bug.cgi?id=1052 + +diff --git a/libpyside/PySideConfig.cmake.in b/libpyside/PySideConfig.cmake.in +index b83c48b..ab7b389 100644 +--- a/libpyside/PySideConfig.cmake.in ++++ b/libpyside/PySideConfig.cmake.in +@@ -1,5 +1,5 @@ +-if (NOT PYTHON_BASENAME) +- message(STATUS "Using default python: @PYTHON_BASENAME@") +- SET(PYTHON_BASENAME @PYTHON_BASENAME@) ++if (NOT SHIBOKEN_PYTHON_SUFFIX) ++ message(STATUS "Using default python: @SHIBOKEN_PYTHON_SUFFIX@") ++ SET(SHIBOKEN_PYTHON_SUFFIX @SHIBOKEN_PYTHON_SUFFIX@) + endif() + include(@LIB_INSTALL_DIR@/cmake/PySide-@BINDING_API_VERSION@/PySideConfig${SHIBOKEN_PYTHON_SUFFIX}.cmake) diff --git a/Library/Formula/shiboken.rb b/Library/Formula/shiboken.rb index caaa0f480..5aed86438 100644 --- a/Library/Formula/shiboken.rb +++ b/Library/Formula/shiboken.rb @@ -2,8 +2,8 @@ require 'formula' class Shiboken < Formula homepage 'http://www.pyside.org/docs/shiboken' - url 'http://pyside.org/files/shiboken-1.0.7.tar.bz2' - md5 'b932c66a49145894c0af556030ac90ac' + url 'http://pyside.org/files/shiboken-1.0.9.tar.bz2' + md5 'c33a25a64a06320e495e8b8775b8918c' depends_on 'cmake' => :build |
