[96395] trunk/dports/python
adfernandes at macports.org
adfernandes at macports.org
Wed Aug 8 09:01:24 PDT 2012
Revision: 96395
https://trac.macports.org/changeset/96395
Author: adfernandes at macports.org
Date: 2012-08-08 09:01:22 -0700 (Wed, 08 Aug 2012)
Log Message:
-----------
py-shiboken and py-pyside: update to match latest qt4.8 version
Modified Paths:
--------------
trunk/dports/python/py-pyside/Portfile
trunk/dports/python/py-shiboken/Portfile
Added Paths:
-----------
trunk/dports/python/py-shiboken/files/
trunk/dports/python/py-shiboken/files/default_visibility.patch
trunk/dports/python/py-shiboken/files/filename_collision.patch
Modified: trunk/dports/python/py-pyside/Portfile
===================================================================
--- trunk/dports/python/py-pyside/Portfile 2012-08-08 15:23:50 UTC (rev 96394)
+++ trunk/dports/python/py-pyside/Portfile 2012-08-08 16:01:22 UTC (rev 96395)
@@ -6,7 +6,8 @@
set realname pyside
name py-${realname}
-version 1.1.0
+version 1.1.1
+set qt.ver 4.8
revision 1
python.versions 25 26 27
python.default_version 27
@@ -24,10 +25,10 @@
license LGPL
master_sites http://www.pyside.org/files/
-checksums md5 233f0c6d2b3daf58cf88877d7f74557b \
- rmd160 f274d82c855ea4e7ba2b011155374969a69eafcb \
- sha1 e0f0440cf2a3d20b305397faf8bfed74bdcab873
-distname ${realname}-qt4.7+${version}
+checksums md5 0176d3746074afe47373d7302e1b4501 \
+ rmd160 ecdba4d1ae0a62810694d4dfad9a770e33fcdb0d \
+ sha1 37b4a2f666a84e39aa4b55f8909964c73ce47123
+distname ${realname}-qt${qt.ver}+${version}
use_bzip2 yes
if {$subport != $name} {
@@ -46,10 +47,10 @@
destroot.destdir DESTDIR=${destroot}
}
-if {${name} == ${subport}} {
+if {${name} == ${subport}} {
livecheck.type regex
livecheck.url ${master_sites}
- livecheck.regex ${realname}-qt4.7\\+(\[0-9.\]+)\\.tar\\.bz2
+ livecheck.regex ${realname}-qt${qt.ver}\\+(\[0-9.\]+)\\.tar\\.bz2
} else {
livecheck.type none
-}
\ No newline at end of file
+}
Modified: trunk/dports/python/py-shiboken/Portfile
===================================================================
--- trunk/dports/python/py-shiboken/Portfile 2012-08-08 15:23:50 UTC (rev 96394)
+++ trunk/dports/python/py-shiboken/Portfile 2012-08-08 16:01:22 UTC (rev 96395)
@@ -6,7 +6,7 @@
set realname shiboken
name py-${realname}
-version 1.1.0
+version 1.1.1
revision 1
python.versions 25 26 27
python.default_version 27
@@ -22,12 +22,20 @@
platforms darwin
master_sites http://www.pyside.org/files/
-checksums md5 9c9d696c8c426fb5abf28a6bd3759558 \
- rmd160 c99179381511e16cf1fd68fc8581e9c612d1d5b9 \
- sha1 c16300f72ea717e17e54bccd90d9494058c3f9a1
+checksums md5 fa451b6c4f3e06cce283a84550a96fd2 \
+ rmd160 4a0997c9474f433a6b0998d68eb84e98613bd010 \
+ sha1 d24efc1e7499e9d7db4dfc85a975291e3cb3f311
distname ${realname}-${version}
use_bzip2 yes
+pre-patch {
+ # MacOS cannot have a file and directory with the same name, as occurs here
+ system "mv -v '${worksrcpath}/generator/shiboken' '${worksrcpath}/generator/shiboken.d'"
+}
+
+patchfiles default_visibility.patch \
+ filename_collision.patch
+
if {$subport != $name} {
depends_lib-append port:qt4-mac port:apiextractor port:generatorrunner port:python${python.version}
use_configure yes
@@ -41,7 +49,7 @@
destroot.destdir DESTDIR=${destroot}
}
-if {${name} == ${subport}} {
+if {${name} == ${subport}} {
livecheck.type regex
livecheck.url ${master_sites}
livecheck.regex ${realname}-(\[0-9.\]+)\\.tar\\.bz2
Added: trunk/dports/python/py-shiboken/files/default_visibility.patch
===================================================================
--- trunk/dports/python/py-shiboken/files/default_visibility.patch (rev 0)
+++ trunk/dports/python/py-shiboken/files/default_visibility.patch 2012-08-08 16:01:22 UTC (rev 96395)
@@ -0,0 +1,11 @@
+--- CMakeLists.txt 2012-08-08 11:29:50.000000000 -0400
++++ CMakeLists.txt 2012-08-08 11:30:08.000000000 -0400
+@@ -38,7 +38,7 @@
+ set(CMAKE_CXX_FLAGS "/Zc:wchar_t- /GR /EHsc /DWIN32 /D_WINDOWS /D_SCL_SECURE_NO_WARNINGS")
+ else()
+ if(CMAKE_HOST_UNIX AND NOT CYGWIN)
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fvisibility=hidden -Wno-strict-aliasing")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fvisibility=default -Wno-strict-aliasing")
+ endif()
+ set(CMAKE_CXX_FLAGS_DEBUG "-g")
+ option(ENABLE_GCC_OPTIMIZATION "Enable specific GCC flags to optimization library size and performance. Only available on Release Mode" 0)
Added: trunk/dports/python/py-shiboken/files/filename_collision.patch
===================================================================
--- trunk/dports/python/py-shiboken/files/filename_collision.patch (rev 0)
+++ trunk/dports/python/py-shiboken/files/filename_collision.patch 2012-08-08 16:01:22 UTC (rev 96395)
@@ -0,0 +1,28 @@
+--- generator/CMakeLists.txt 2012-08-08 11:38:27.000000000 -0400
++++ generator/CMakeLists.txt 2012-08-08 11:39:15.000000000 -0400
+@@ -2,11 +2,11 @@
+
+ set(shiboken_SRC
+ generator.cpp
+-shiboken/cppgenerator.cpp
+-shiboken/headergenerator.cpp
+-shiboken/overloaddata.cpp
+-shiboken/shibokengenerator.cpp
+-shiboken/shibokennormalize.cpp
++shiboken.d/cppgenerator.cpp
++shiboken.d/headergenerator.cpp
++shiboken.d/overloaddata.cpp
++shiboken.d/shibokengenerator.cpp
++shiboken.d/shibokennormalize.cpp
+ main.cpp
+ )
+
+@@ -15,7 +15,7 @@
+ add_definitions(-DDOCSTRINGS_ENABLED)
+ endif()
+
+-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/shiboken
++include_directories(${CMAKE_CURRENT_SOURCE_DIR}/shiboken.d
+ ${CMAKE_CURRENT_SOURCE_DIR}/qtdoc
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120808/cb8d41bb/attachment-0001.html>
More information about the macports-changes
mailing list