[136949] trunk/dports/devel/dylibbundler

ryandesign at macports.org ryandesign at macports.org
Sat May 30 21:17:42 PDT 2015


Revision: 136949
          https://trac.macports.org/changeset/136949
Author:   ryandesign at macports.org
Date:     2015-05-30 21:17:42 -0700 (Sat, 30 May 2015)
Log Message:
-----------
dylibbundler: fix off-by-one error in computing the filename from the "otool" output which resulted in an extra space at the end of every filename; also use rfind instead of find to properly handle files whose names contain the search string " ("

Modified Paths:
--------------
    trunk/dports/devel/dylibbundler/Portfile

Added Paths:
-----------
    trunk/dports/devel/dylibbundler/files/patch-src-DylibBundler.cpp.diff

Modified: trunk/dports/devel/dylibbundler/Portfile
===================================================================
--- trunk/dports/devel/dylibbundler/Portfile	2015-05-31 03:22:29 UTC (rev 136948)
+++ trunk/dports/devel/dylibbundler/Portfile	2015-05-31 04:17:42 UTC (rev 136949)
@@ -5,7 +5,7 @@
 
 name                dylibbundler
 version             0.4.4
-revision            1
+revision            2
 categories          devel
 platforms           darwin
 maintainers         strasweb.fr:rudloff openmaintainer
@@ -38,6 +38,7 @@
 }
 
 patchfiles          patch-makefile.diff \
+                    patch-src-DylibBundler.cpp.diff \
                     patch-src-main.cpp.diff
 
 post-patch {

Added: trunk/dports/devel/dylibbundler/files/patch-src-DylibBundler.cpp.diff
===================================================================
--- trunk/dports/devel/dylibbundler/files/patch-src-DylibBundler.cpp.diff	                        (rev 0)
+++ trunk/dports/devel/dylibbundler/files/patch-src-DylibBundler.cpp.diff	2015-05-31 04:17:42 UTC (rev 136949)
@@ -0,0 +1,20 @@
+--- src/DylibBundler.cpp.orig	2013-09-08 04:44:52.000000000 -0500
++++ src/DylibBundler.cpp	2015-05-30 23:09:27.000000000 -0500
+@@ -86,7 +86,7 @@
+         if( lines[n].find(".framework") != std::string::npos ) continue; //Ignore frameworks, we can not handle them
+         
+         addDependency( // trim useless info, keep only library name
+-                       lines[n].substr(1, lines[n].find(" (") )
++                       lines[n].substr(1, lines[n].rfind(" (") - 1)
+                        );
+     }
+ }
+@@ -112,7 +112,7 @@
+                 if( lines[n].find(".framework") != std::string::npos ) continue; //Ignore frameworks, we can not handle them
+                 
+                 addDependency( // trim useless info, keep only library name
+-                               lines[n].substr(1, lines[n].find(" (") )
++                               lines[n].substr(1, lines[n].rfind(" (") - 1)
+                                );
+             }//next
+         }//next
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150530/00ac4c34/attachment.html>


More information about the macports-changes mailing list