[109055] users/mojca/ports/science/geant4

mojca at macports.org mojca at macports.org
Wed Aug 7 08:12:37 PDT 2013


Revision: 109055
          https://trac.macports.org/changeset/109055
Author:   mojca at macports.org
Date:     2013-08-07 08:12:37 -0700 (Wed, 07 Aug 2013)
Log Message:
-----------
mojca/geant4: upstream patch for a bug in qt

Modified Paths:
--------------
    users/mojca/ports/science/geant4/Portfile

Added Paths:
-----------
    users/mojca/ports/science/geant4/files/patch-source-interfaces-basic-src-G4Qt.cc.4100.diff
    users/mojca/ports/science/geant4/files/patch-source-interfaces-basic-src-G4Qt.cc.496.diff

Modified: users/mojca/ports/science/geant4/Portfile
===================================================================
--- users/mojca/ports/science/geant4/Portfile	2013-08-07 14:03:45 UTC (rev 109054)
+++ users/mojca/ports/science/geant4/Portfile	2013-08-07 15:12:37 UTC (rev 109055)
@@ -175,13 +175,15 @@
         # - patch-cmake-Modules-Geant4BuildProjectConfig.cmake:
         #       allows placing *.cmake files to a different location than LIBDIR
         if {${geant.version} == "10.0"} {
-            patchfiles      patch-source-interfaces-common-src-G4Qt.cc.diff \
+            patchfiles      patch-source-interfaces-basic-src-G4Qt.cc.4100.diff \
+                            patch-source-interfaces-common-src-G4Qt.cc.diff \
                             patch-examples-advanced-xray_fluorescence.diff \
                             patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff \
                             patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4100.diff
         }
         if {${geant.version} == "9.6"} {
-            patchfiles      patch-source-interfaces-common-src-G4Qt.cc.diff \
+            patchfiles      patch-source-interfaces-basic-src-G4Qt.cc.496.diff \
+                            patch-source-interfaces-common-src-G4Qt.cc.diff \
                             patch-examples-advanced-xray_fluorescence.diff \
                             patch-cmake-Modules-Geant4InterfaceOptions.cmake.496.diff \
                             patch-cmake-Modules-Geant4BuildProjectConfig.cmake.496.diff

Added: users/mojca/ports/science/geant4/files/patch-source-interfaces-basic-src-G4Qt.cc.4100.diff
===================================================================
--- users/mojca/ports/science/geant4/files/patch-source-interfaces-basic-src-G4Qt.cc.4100.diff	                        (rev 0)
+++ users/mojca/ports/science/geant4/files/patch-source-interfaces-basic-src-G4Qt.cc.4100.diff	2013-08-07 15:12:37 UTC (rev 109055)
@@ -0,0 +1,20 @@
+--- source/interfaces/basic/src/G4UIQt.cc.orig
++++ source/interfaces/basic/src/G4UIQt.cc
+@@ -1607,14 +1607,15 @@ void G4UIQt::AddIcon(const char* aLabel, const char* aIconFile, const char* aCom
+   QToolBar *currentToolbar = NULL;
+   if (userToolBar) {
+     if (fToolbarUser == NULL) {
+-      fToolbarUser = new QToolBar(fMainWindow);
++      fToolbarUser = new QToolBar(/*fMainWindow*/);
+       fToolbarUser->setIconSize (QSize(20,20));
+       fMainWindow->addToolBar(Qt::TopToolBarArea, fToolbarUser);
++      fMainWindow->show();
+     }
+     currentToolbar = fToolbarUser;
+   } else {
+     if (fToolbarApp == NULL) {
+-      fToolbarApp = new QToolBar(fMainWindow);
++      fToolbarApp = new QToolBar(/*fMainWindow*/);
+       fToolbarApp->setIconSize (QSize(20,20));
+       fMainWindow->addToolBar(Qt::TopToolBarArea, fToolbarApp);
+     }

Added: users/mojca/ports/science/geant4/files/patch-source-interfaces-basic-src-G4Qt.cc.496.diff
===================================================================
--- users/mojca/ports/science/geant4/files/patch-source-interfaces-basic-src-G4Qt.cc.496.diff	                        (rev 0)
+++ users/mojca/ports/science/geant4/files/patch-source-interfaces-basic-src-G4Qt.cc.496.diff	2013-08-07 15:12:37 UTC (rev 109055)
@@ -0,0 +1,20 @@
+--- source/interfaces/basic/src/G4UIQt.cc.orig
++++ source/interfaces/basic/src/G4UIQt.cc
+@@ -1585,14 +1585,15 @@ void G4UIQt::AddIcon(const char* aLabel, const char* aIconFile, const char* aCom
+   QToolBar *currentToolbar = NULL;
+   if (userToolBar) {
+     if (fToolbarUser == NULL) {
+-      fToolbarUser = new QToolBar(fMainWindow);
++      fToolbarUser = new QToolBar(/*fMainWindow*/);
+       fToolbarUser->setIconSize (QSize(20,20));
+       fMainWindow->addToolBar(Qt::TopToolBarArea, fToolbarUser);
++      fMainWindow->show();
+     }
+     currentToolbar = fToolbarUser;
+   } else {
+     if (fToolbarApp == NULL) {
+-      fToolbarApp = new QToolBar(fMainWindow);
++      fToolbarApp = new QToolBar(/*fMainWindow*/);
+       fToolbarApp->setIconSize (QSize(20,20));
+       fMainWindow->addToolBar(Qt::TopToolBarArea, fToolbarApp);
+     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130807/a79ad5ae/attachment.html>


More information about the macports-changes mailing list