Ticket #42999: geant4.9.6.p03.diff

File geant4.9.6.p03.diff, 3.2 KB (added by mojca (Mojca Miklavec), 11 years ago)
  • Portfile

     
    3434# if we start distributing betas, epoch will have to be added for the transition from version 4.x.y.b01 to 4.x.y
    3535set geant.versions_info {
    3636     9.5  1  0  2  4.9.5.p02    33413f6233b75c003254af5888f4af32d17f515d  adb04fce9472228bb10d78cbc7f40493bfb37454beee22e7c80d630646cd3777
    37      9.6  1  0  2  4.9.6.p02    9ae32c3f8769e303b41df164693f77a74ca6db97  cf5df83b7e2c99e6729449b32d3ecb0727b4692317426b66fc7fd41951c7351f
     37     9.6  0  0  3  4.9.6.p03    581acefab40a25f5c7123cfa3a93c2a9d3ef2c73  3a7e969039e8992716b3bc33b44cbdbff9c8d5850385f1a02fdd756a4fa6305c
    3838    10.0  0  0  1  4.10.00.p01  f1f70d381cef712781a1d0f13ffa4cb8fb4fa6a9  09c431ff3ef81034282c46501cea01046d4a20438c2ea2a7339576e1ecf26ba0
    3939}
    4040
  • files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.496.diff

     
    11--- cmake/Modules/Geant4InterfaceOptions.cmake.orig
    22+++ cmake/Modules/Geant4InterfaceOptions.cmake
    3 @@ -141,20 +141,11 @@ if(UNIX)
     3@@ -174,22 +174,11 @@ if(UNIX)
    44     set(CMAKE_FIND_FRAMEWORK NEVER)
    55 
    66     set(X11_INC_SEARCH_PATH
     
    1111-        /usr/openwin/include
    1212-        /usr/openwin/share/include
    1313-        /opt/graphics/OpenGL/include
    14 -        )
     14-        /opt/X11/include
    1515+        @PREFIX@/include
    16 +    )
     16         )
    1717 
    1818     set(X11_LIB_SEARCH_PATH
    1919-        /usr/pkg/xorg/lib
     
    2020-        /usr/X11R6/lib
    2121-        /usr/X11R7/lib
    2222-        /usr/openwin/lib
     23-        /opt/X11/lib
    2324+        @PREFIX@/lib
    2425         )
    2526 
    2627     find_path(X11_Xmu_INCLUDE_PATH X11/Xmu/Xmu.h ${X11_INC_SEARCH_PATH})
    27 @@ -197,17 +188,17 @@ if(UNIX)
     28@@ -232,17 +221,17 @@ if(UNIX)
    2829       set(CMAKE_FIND_FRAMEWORK NEVER)
    2930 
    3031       find_path(OPENGL_X11_INCLUDE_DIR GL/gl.h
    31 -        PATHS /usr/X11R6/include
     32-        PATHS /usr/X11R6/include /opt/X11/include
    3233+        PATHS @PREFIX@/include
    3334         NO_DEFAULT_PATH
    3435         )
    3536 
    3637       find_library(OPENGL_X11_gl_LIBRARY GL
    37 -        PATHS /usr/X11R6/lib
     38-        PATHS /usr/X11R6/lib /opt/X11/lib
    3839+        PATHS @PREFIX@/lib
    3940         NO_DEFAULT_PATH
    4041         )
    4142 
    4243       find_library(OPENGL_X11_glu_LIBRARY GLU
    43 -        PATHS /usr/X11R6/lib
     44-        PATHS /usr/X11R6/lib /opt/X11/lib
    4445+        PATHS @PREFIX@/lib
    4546         NO_DEFAULT_PATH
    4647         )
  • files/patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff

     
    22 * http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1487
    33--- source/interfaces/common/src/G4Qt.cc.orig
    44+++ source/interfaces/common/src/G4Qt.cc
    5 @@ -153,6 +153,20 @@ G4Qt::G4Qt (
     5@@ -148,6 +148,20 @@ G4Qt::G4Qt (
    66   }
    77 #endif
    88   //  AddDispatcher     ((G4DispatchFunction)XtDispatchEvent);