Merge pull request #35482 from mantidproject/34820_IDAaaS_native_file…

…_browser Use native file browsers on GTK-based linux environments
mantidproject · May 4, 2023 · f28a157 · f28a157
2 parents 61cf57d + 03cf1fb
commit f28a157
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/conda/recipes/conda_build_config.yaml b/conda/recipes/conda_build_config.yaml
@@ -60,9 +60,6 @@ tbb:
 hdf5:
   - 1.12.*
 
-occt:
-  - 7.5
-
 gsl:
   - 2.7
 

diff --git a/conda/recipes/mantid/meta.yaml b/conda/recipes/mantid/meta.yaml
@@ -40,7 +40,7 @@ requirements:
     - muparser
     - nexus
     - numpy {{ numpy }}
-    - occt {{ occt }}
+    - occt
     - python {{ python }}
     - poco {{ poco }}
     - setuptools {{ setuptools }}

diff --git a/conda/recipes/mantidqt/meta.yaml b/conda/recipes/mantidqt/meta.yaml
@@ -47,6 +47,7 @@ requirements:
     - {{ pin_compatible("qt-main", upper_bound="5.15.9") }}
     - qtpy
     - python
+    - qt-gtk-platformtheme # [linux]
 
 test:
   imports:

diff --git a/docs/source/release/v6.7.0/Workbench/Bugfixes/34820.rst b/docs/source/release/v6.7.0/Workbench/Bugfixes/34820.rst
@@ -0,0 +1 @@
+- Restore native file browser dialogs on Linux. This will fix problems with the file browser freezing and crashing on IDAaaS.
diff --git a/mantid-developer-linux.yml b/mantid-developer-linux.yml
@@ -24,7 +24,7 @@ dependencies:
   - nexus=4.4.*
   - ninja>=1.10.2
   - numpy<=1.23
-  - occt>=7.4.0
+  - occt
   - pip>=21.0.1
   - poco=1.12.1|>=1.12.5 # 1.12.2 introduced an unguarded #define NOMINMAX which causes a compiler warning. It's resolved on their devel branch so should be fine after 1.12.4
   - psutil>=5.8.0
@@ -37,6 +37,7 @@ dependencies:
   - qt=5.15.8 # Avoid unexpected qt upgrades
   - qtconsole=5.4.1 # 5.4.2 crashes the jupyter console
   - qtpy>=1.9.0
+  - qt-gtk-platformtheme # Use native theme on GTK-based systems, which provides a significantly better performing file browser.
   - requests>=2.25.1
   - scipy>=1.6.2
   - setuptools=47.0.0 # Pinned purposefully due to incompatibility with later versions

diff --git a/mantid-developer-win.yml b/mantid-developer-win.yml
@@ -24,7 +24,7 @@ dependencies:
   - nexus=4.4.*
   - ninja>=1.10.2
   - numpy<=1.23
-  - occt>=7.4.0
+  - occt
   - conda-wrappers
   - pip>=21.0.1
   - poco=1.12.1|>=1.12.5 # 1.12.2 introduced an unguarded #define NOMINMAX which causes a compiler warning. It's resolved on their devel branch so should be fine after 1.12.4
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,9 +60,6 @@ tbb: @@
     hdf5:
       - 1.12.*
-    occt:
-      - 7.5
     gsl:
       - 2.7
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Restore native file browser dialogs on Linux. This will fix problems with the file browser freezing and crashing on IDAaaS.