Mercurial > hg > bitcoin

changeset 3471:828575fdc7c4 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix mac .dmg packager for latest macports qt4
author Gavin Andresen <gavinandresen@gmail.com>
date Wed, 05 Sep 2012 17:54:37 -0400
parents 233fa9b8fcbe
children 1c7eab83cebf
files contrib/macdeploy/macdeployqtplus
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/macdeploy/macdeployqtplus
+++ b/contrib/macdeploy/macdeployqtplus
@@ -169,6 +169,9 @@
         elif os.path.exists(os.path.join(parentDir, "share", "qt4", "translations")):
             # MacPorts layout, e.g. "/opt/local/share/qt4"
             self.qtPath = os.path.join(parentDir, "share", "qt4")
+        elif os.path.exists(os.path.join(os.path.dirname(parentDir), "share", "qt4", "translations")):
+            # Newer Macports layout
+            self.qtPath = os.path.join(os.path.dirname(parentDir), "share", "qt4")
         
         if self.qtPath is not None:
             pluginPath = os.path.join(self.qtPath, "plugins")
@@ -725,7 +728,7 @@
         disk.close()
         if bg_path is not None:
             subprocess.call(["SetFile", "-a", "V", bg_path])
-        disk.update(registering_applications=False)
+#        disk.update(registering_applications=False)
         sleep(2)
         disk.eject()