Skip to content
This repository has been archived by the owner on Jul 4, 2023. It is now read-only.

Pyside / Shiboken 1.2.2 #28894

Closed
wants to merge 2 commits into from
Closed

Pyside / Shiboken 1.2.2 #28894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c584a1
pyside 1.2.2 (update)
joaoventura May 1, 2014
e569e1c
shiboken 1.2.2 (update)
joaoventura May 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 3 additions & 24 deletions Library/Formula/pyside.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

class Pyside < Formula
homepage 'http://www.pyside.org'
url 'https://download.qt-project.org/official_releases/pyside/pyside-qt4.8+1.2.1.tar.bz2'
mirror 'https://distfiles.macports.org/py-pyside/pyside-qt4.8+1.2.1.tar.bz2'
sha1 'eec5bed37647dd8d3d1c7a610ad913312dd55910'
url 'https://download.qt-project.org/official_releases/pyside/pyside-qt4.8+1.2.2.tar.bz2'
mirror 'https://distfiles.macports.org/py-pyside/pyside-qt4.8+1.2.2.tar.bz2'
sha1 '955e32d193d173faa64edc51111289cdcbe3b96e'

head 'git://gitorious.org/pyside/pyside.git'

Expand Down Expand Up @@ -79,24 +79,3 @@ def install
end

__END__
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can delete these two lines, as well as the the patch line up top

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto for shiboken.rb

diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt
index 7625634..6e14706 100644
--- a/PySide/QtGui/CMakeLists.txt
+++ b/PySide/QtGui/CMakeLists.txt
@@ -403,7 +403,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qwizard_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qworkspace_wrapper.cpp

${SPECIFIC_OS_FILES}
-${QPYTEXTOBJECT_MOC}
${QtGui_46_SRC}
${QtGui_47_SRC}
${QtGui_OPTIONAL_SRC}
@@ -434,7 +433,7 @@ create_pyside_module(QtGui
QtGui_deps
QtGui_typesystem_path
QtGui_SRC
- ""
+ QPYTEXTOBJECT_MOC
${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml)

install(FILES ${pyside_SOURCE_DIR}/qpytextobject.h DESTINATION include/PySide/QtGui/)
27 changes: 3 additions & 24 deletions Library/Formula/shiboken.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

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'

Expand Down Expand Up @@ -52,24 +52,3 @@ def install
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>