[122677] trunk/dports/science/root5

mojca at macports.org mojca at macports.org
Sat Jul 26 09:10:14 PDT 2014


Revision: 122677
          https://trac.macports.org/changeset/122677
Author:   mojca at macports.org
Date:     2014-07-26 09:10:14 -0700 (Sat, 26 Jul 2014)
Log Message:
-----------
root5: upstream patch for python-related build error (closes #44312)

Modified Paths:
--------------
    trunk/dports/science/root5/Portfile

Added Paths:
-----------
    trunk/dports/science/root5/files/patch-bindings-pyroot-src-TPyDispatcher.cxx.diff

Modified: trunk/dports/science/root5/Portfile
===================================================================
--- trunk/dports/science/root5/Portfile	2014-07-26 15:59:16 UTC (rev 122676)
+++ trunk/dports/science/root5/Portfile	2014-07-26 16:10:14 UTC (rev 122677)
@@ -48,6 +48,8 @@
 select.group        root
 select.file         ${filespath}/${name}
 
+patchfiles          patch-bindings-pyroot-src-TPyDispatcher.cxx.diff
+
 post-patch {
 #   reinplace "s|-lfreetype| \`freetype-config --libs\`|g" ${worksrcpath}/config/root-config.in
     reinplace "s|\"/usr/include\"|\"${prefix}/include /usr/include\"|g" ${worksrcpath}/configure

Added: trunk/dports/science/root5/files/patch-bindings-pyroot-src-TPyDispatcher.cxx.diff
===================================================================
--- trunk/dports/science/root5/files/patch-bindings-pyroot-src-TPyDispatcher.cxx.diff	                        (rev 0)
+++ trunk/dports/science/root5/files/patch-bindings-pyroot-src-TPyDispatcher.cxx.diff	2014-07-26 16:10:14 UTC (rev 122677)
@@ -0,0 +1,13 @@
+ps://trac.macports.org/ticket/44312
+
+--- bindings/pyroot/src/TPyDispatcher.cxx.orig
++++ bindings/pyroot/src/TPyDispatcher.cxx
+@@ -240,7 +240,7 @@ PyObject* TPyDispatcher::Dispatch( TGListTreeItem* item, TDNDData* data )
+ PyObject* TPyDispatcher::Dispatch( const char* name, const TList* attr )
+ {
+    PyObject* args = PyTuple_New( 2 );
+-   PyTuple_SET_ITEM( args, 0, PyString_FromString( name ) );
++   PyTuple_SET_ITEM( args, 0, PyROOT_PyUnicode_FromString( name ) );
+    PyTuple_SET_ITEM( args, 1, PyROOT::BindRootObject( (void*)attr, TClass::GetClass( "TList" ) ) );
+ 
+    PyObject* result = PyObject_CallObject( fCallable, args );
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140726/6d09bbfe/attachment.html>


More information about the macports-changes mailing list