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

[mojca at macports.org]

Revision: 109171
          https://trac.macports.org/changeset/109171
Author:   mojca at macports.org
Date:     2013-08-09 05:23:09 -0700 (Fri, 09 Aug 2013)
Log Message:
-----------
mojca/geant4: upstream patch - add support for multiline copy-pasting in Qt, fix loading of icons.mac

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

Removed 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-09 11:37:53 UTC (rev 109170)
+++ users/mojca/ports/science/geant4/Portfile	2013-08-09 12:23:09 UTC (rev 109171)
@@ -175,14 +175,13 @@
         # - patch-cmake-Modules-Geant4BuildProjectConfig.cmake:
         #       allows placing *.cmake files to a different location than LIBDIR
         if {${geant.version} == "10.0"} {
-            patchfiles      patch-source-interfaces-basic-src-G4Qt.cc.4100.diff \
-                            patch-source-interfaces-common-src-G4Qt.cc.diff \
+            patchfiles      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-basic-src-G4Qt.cc.496.diff \
+            patchfiles      patch-upstream-qt.496.diff \
                             patch-source-interfaces-common-src-G4Qt.cc.diff \
                             patch-examples-advanced-xray_fluorescence.diff \
                             patch-cmake-Modules-Geant4InterfaceOptions.cmake.496.diff \

Deleted: 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	2013-08-09 11:37:53 UTC (rev 109170)
+++ users/mojca/ports/science/geant4/files/patch-source-interfaces-basic-src-G4Qt.cc.4100.diff	2013-08-09 12:23:09 UTC (rev 109171)
@@ -1,20 +0,0 @@
---- 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);
-     }

Deleted: 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	2013-08-09 11:37:53 UTC (rev 109170)
+++ users/mojca/ports/science/geant4/files/patch-source-interfaces-basic-src-G4Qt.cc.496.diff	2013-08-09 12:23:09 UTC (rev 109171)
@@ -1,20 +0,0 @@
---- 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/20130809/337f04ff/attachment.html>