Skip to content

Commit

Permalink
PySide: Update to 1.0.9
Browse files Browse the repository at this point in the history
Also updates dependencies:

  - apiextractor
  - generatorrunner
  - shiboken
  • Loading branch information
Sharpie committed Dec 2, 2011
1 parent 5900c2a commit d2e2d9e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 36 deletions.
4 changes: 2 additions & 2 deletions Library/Formula/apiextractor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

class Apiextractor < Formula
homepage 'http://www.pyside.org/docs/apiextractor'
url 'http://pyside.org/files/apiextractor-0.10.8.tar.bz2'
md5 'ddf42bdd6becae602feacf8a1b190425'
url 'http://pyside.org/files/apiextractor-0.10.9.tar.bz2'
md5 '89a3dd539e98fccd0b3f8da881f60395'

depends_on 'cmake' => :build
depends_on 'qt'
Expand Down
4 changes: 2 additions & 2 deletions Library/Formula/generatorrunner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

class Generatorrunner < Formula
homepage 'http://www.pyside.org/docs/generatorrunner'
url 'http://pyside.org/files/generatorrunner-0.6.14.tar.bz2'
md5 '6413d4417939c7347d0e13a1e6bc608c'
url 'http://pyside.org/files/generatorrunner-0.6.15.tar.bz2'
md5 '88425f176ffc3810307edabc381415c6'

depends_on 'cmake' => :build

Expand Down
32 changes: 2 additions & 30 deletions Library/Formula/pyside.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ def site_package_dir

class Pyside < Formula
homepage 'http://www.pyside.org'
url 'http://www.pyside.org/files/pyside-qt4.7+1.0.8.tar.bz2'
md5 '131cc4d5c56b3b20bc99362f68f3f29d'
url 'http://www.pyside.org/files/pyside-qt4.7+1.0.9.tar.bz2'
md5 '63d1104cf245d9eea307434c94e15443'

depends_on 'cmake' => :build

Expand All @@ -20,12 +20,6 @@ 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
Expand All @@ -48,25 +42,3 @@ def caveats
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)
4 changes: 2 additions & 2 deletions Library/Formula/shiboken.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

class Shiboken < Formula
homepage 'http://www.pyside.org/docs/shiboken'
url 'http://pyside.org/files/shiboken-1.0.9.tar.bz2'
md5 'c33a25a64a06320e495e8b8775b8918c'
url 'http://pyside.org/files/shiboken-1.0.10.tar.bz2'
md5 'b98e7c35edef95a77594a6d1801c5875'

depends_on 'cmake' => :build

Expand Down

0 comments on commit d2e2d9e

Please sign in to comment.