<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121729] trunk/dports/python/py-pyside</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121729">121729</a></dd>
<dt>Author</dt> <dd>mmoll@macports.org</dd>
<dt>Date</dt> <dd>2014-07-05 19:58:25 -0700 (Sat, 05 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-pyside: install pkgconfig and cmake files. closes #44251</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpypysidePortfile">trunk/dports/python/py-pyside/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportspythonpypysidefilespatchcmakepkgconfigdiff">trunk/dports/python/py-pyside/files/patch-cmakepkgconfig.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportspythonpypysidefilesFindShibokencmakepatch">trunk/dports/python/py-pyside/files/FindShiboken.cmake.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpypysidePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-pyside/Portfile (121728 => 121729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pyside/Portfile 2014-07-06 00:00:53 UTC (rev 121728)
+++ trunk/dports/python/py-pyside/Portfile 2014-07-06 02:58:25 UTC (rev 121729)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx"> set realname pyside
</span><span class="cx"> name py-${realname}
</span><span class="cx"> version 1.2.2
</span><ins>+revision 1
</ins><span class="cx"> set qt.ver 4.8
</span><span class="cx"> python.versions 26 27 32 33 34
</span><span class="cx"> python.default_version 27
</span><span class="lines">@@ -31,23 +32,14 @@
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><span class="cx"> if {${name} ne ${subport}} {
</span><del>- patchfiles FindShiboken.cmake.patch
- post-patch {
- if {${python.version} < 30} {
- reinplace "s|@PYTHONSUFFIX@|-python${python.branch}|g" ${worksrcpath}/cmake/Macros/FindShiboken.cmake
- } else {
- reinplace "s|@PYTHONSUFFIX@|.cpython-${python.version}m|g" ${worksrcpath}/cmake/Macros/FindShiboken.cmake
- }
- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/cmake/Macros/FindShiboken.cmake
- reinplace "s|@PYTHONBRANCH@|${python.branch}|g" ${worksrcpath}/cmake/Macros/FindShiboken.cmake
- reinplace "s|@PYTHONINCLUDE@|${python.include}|g" ${worksrcpath}/cmake/Macros/FindShiboken.cmake
- reinplace "s|@PYTHONBIN@|${python.bin}|g" ${worksrcpath}/cmake/Macros/FindShiboken.cmake
-
- }
</del><ins>+ patchfiles patch-cmakepkgconfig.diff
</ins><span class="cx"> depends_lib-append port:qt4-mac port:py${python.version}-shiboken
</span><span class="cx"> use_configure yes
</span><ins>+ configure.env-append CMAKE_PREFIX_PATH=${python.prefix}
</ins><span class="cx"> configure.args-append -DBUILD_TESTS:BOOL=FALSE \
</span><del>- -DSITE_PACKAGE=${python.pkgd}
</del><ins>+ -DSITE_PACKAGE=${python.pkgd} \
+ -DPYTHONBRANCH=${python.branch} \
+ -DPYTHONPREFIX=${python.prefix}
</ins><span class="cx"> build.cmd make
</span><span class="cx"> build.target all
</span><span class="cx"> destroot.cmd make
</span><span class="lines">@@ -55,11 +47,8 @@
</span><span class="cx"> post-destroot {
</span><span class="cx"> move ${destroot}${prefix}/include/PySide ${destroot}${prefix}/include/PySide-${python.branch}
</span><span class="cx"> move ${destroot}${prefix}/share/PySide ${destroot}${prefix}/share/PySide-${python.branch}
</span><del>- file delete ${destroot}${prefix}/lib/cmake/PySide-${version}/PySideConfig-python${python.branch}.cmake
- file delete ${destroot}${prefix}/lib/cmake/PySide-${version}/PySideConfig.cmake
- file delete ${destroot}${prefix}/lib/cmake/PySide-${version}/PySideConfigVersion.cmake
- file delete ${destroot}${prefix}/lib/pkgconfig/pyside.pc
-
</del><ins>+ move ${destroot}${prefix}/lib/cmake ${destroot}${python.prefix}/lib/cmake
+ move ${destroot}${prefix}/lib/pkgconfig ${destroot}${python.prefix}/lib/pkgconfig
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportspythonpypysidefilesFindShibokencmakepatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/python/py-pyside/files/FindShiboken.cmake.patch (121728 => 121729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pyside/files/FindShiboken.cmake.patch 2014-07-06 00:00:53 UTC (rev 121728)
+++ trunk/dports/python/py-pyside/files/FindShiboken.cmake.patch 2014-07-06 02:58:25 UTC (rev 121729)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>-diff -r FindShiboken.cmake FindShiboken.cmake
---- cmake/Macros/FindShiboken.cmake Thu Jan 01 00:00:00 1970 +0000
-+++ cmake/Macros/FindShiboken.cmake Sat Sep 28 20:27:46 2013 -0500
-@@ -0,0 +1,7 @@
-+set(SHIBOKEN_PYTHON_SUFFIX "@PYTHONSUFFIX@")
-+set(SHIBOKEN_INCLUDE_DIR "@PREFIX@/include/shiboken-@PYTHONBRANCH@")
-+set(SHIBOKEN_LIBRARY "@PREFIX@/lib/libshiboken${SHIBOKEN_PYTHON_SUFFIX}.dylib")
-+set(SHIBOKEN_PYTHON_INCLUDE_DIR "@PYTHONINCLUDE@")
-+set(SHIBOKEN_PYTHON_INTERPRETER "@PYTHONBIN@")
-+set(SHIBOKEN_PYTHON_LIBRARIES "-undefined dynamic_lookup")
-+set(SHIBOKEN_BINARY "@PREFIX@/bin/shiboken-@PYTHONBRANCH@")
</del></span></pre></div>
<a id="trunkdportspythonpypysidefilespatchcmakepkgconfigdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-pyside/files/patch-cmakepkgconfig.diff (0 => 121729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pyside/files/patch-cmakepkgconfig.diff (rev 0)
+++ trunk/dports/python/py-pyside/files/patch-cmakepkgconfig.diff 2014-07-06 02:58:25 UTC (rev 121729)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+diff -rubw libpyside/PySideConfig-spec.cmake.in libpyside/PySideConfig-spec.cmake.in
+--- libpyside/PySideConfig-spec.cmake.in 2014-04-22 10:45:29.000000000 -0500
++++ libpyside/PySideConfig-spec.cmake.in 2014-07-05 21:38:17.000000000 -0500
+@@ -3,7 +3,7 @@
+ # PYSIDE_PYTHONPATH - Path to where the PySide Python module files could be found
+ # PYSIDE_TYPESYSTEMS - Type system files that should be used by other bindings extending PySide
+
+-SET(PYSIDE_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/PySide@pyside_SUFFIX@")
++SET(PYSIDE_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/PySide-@PYTHONBRANCH@")
+ # Platform specific library names
+ if(MSVC)
+ SET(PYSIDE_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@pyside@pyside_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@SHIBOKEN_PYTHON_SUFFIX@.lib")
+@@ -15,4 +15,4 @@
+ SET(PYSIDE_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@pyside@pyside_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@SHIBOKEN_PYTHON_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
+ endif()
+ SET(PYSIDE_PYTHONPATH "@SITE_PACKAGE@")
+-SET(PYSIDE_TYPESYSTEMS "@CMAKE_INSTALL_PREFIX@/share/PySide@pyside_SUFFIX@/typesystems")
++SET(PYSIDE_TYPESYSTEMS "@CMAKE_INSTALL_PREFIX@/share/PySide-@PYTHONBRANCH@/typesystems")
+diff -rubw libpyside/PySideConfig.cmake.in libpyside/PySideConfig.cmake.in
+--- libpyside/PySideConfig.cmake.in 2014-04-22 10:45:29.000000000 -0500
++++ libpyside/PySideConfig.cmake.in 2014-07-05 21:38:11.000000000 -0500
+@@ -2,4 +2,4 @@
+ message(STATUS "Using default python: @SHIBOKEN_PYTHON_SUFFIX@")
+ SET(PYTHON_BASENAME @SHIBOKEN_PYTHON_SUFFIX@)
+ endif()
+-include(@LIB_INSTALL_DIR@/cmake/PySide-@BINDING_API_VERSION@/PySideConfig${PYTHON_BASENAME}.cmake)
++include(@PYTHONPREFIX@/lib/cmake/PySide-@BINDING_API_VERSION@/PySideConfig${PYTHON_BASENAME}.cmake)
+diff -rubw libpyside/pyside.pc.in libpyside/pyside.pc.in
+--- libpyside/pyside.pc.in 2014-04-22 10:45:29.000000000 -0500
++++ libpyside/pyside.pc.in 2014-07-05 21:38:07.000000000 -0500
+@@ -1,8 +1,8 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+ libdir=@LIB_INSTALL_DIR@
+-includedir=@CMAKE_INSTALL_PREFIX@/include/PySide@pyside_SUFFIX@
+-typesystemdir=@CMAKE_INSTALL_PREFIX@/share/PySide@pyside_SUFFIX@/typesystems
++includedir=@CMAKE_INSTALL_PREFIX@/include/PySide-@PYTHONBRANCH@
++typesystemdir=@CMAKE_INSTALL_PREFIX@/share/PySide-@PYTHONBRANCH@/typesystems
+ pythonpath=@SITE_PACKAGE@
+
+ Name: PySide@pyside_SUFFIX@
</ins></span></pre>
</div>
</div>
</body>
</html>