Porting Qt 6 : second step.

LIHPC-Computational-Geometry · Dec 13, 2023 · 3aea873 · 3aea873
1 parent b28e932
commit 3aea873
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 2 deletions.
diff --git a/meshing/packages/preferences/package.py b/meshing/packages/preferences/package.py
@@ -25,6 +25,7 @@ class Preferences(CMakePackage):
     depends_on('qt')
     depends_on('pkgconfig', type=('build'))
 
+    version('6.3.0', sha256='300742a5dce7055f340b461d6740e89599b5c64e74bc37aa2f8953cc28ea7f90')
     version('6.2.2', sha256='5797fee3678c4b6d340a0cc4dd49fd2f050ed4574b9bba178d5c23aecadccc32')
     version('6.2.1', sha256='b39a6db6cb01fb264ce206c4ad2dbc49b6e2b9ce56ecc23c27b562937f70edb6')
     version('6.2.0', sha256='f7e7fe9ad7f7c5578e1bfbfd3318a04e15e6891459559f8d8971279701b0d458')

diff --git a/meshing/packages/qqualif/package.py b/meshing/packages/qqualif/package.py
@@ -38,6 +38,7 @@ class Qqualif(CMakePackage):
     variant('gmds', default=True, description='Utilisation de la structure de maillages GMDS')
     variant('vtk', default=True, description='Utilisation de la structure de maillages VTK')
 
+    version('4.3.0', sha256='4f7cfd222c207f634837ba93e319f0f57a18fcead04d1aa265ae825031c59537')
     version('4.2.1', sha256='616f7411c1e07deb7257ee6ac398082e779d691d63b52d8e4eda382625d96380')
     version('4.2.0', sha256='753182217c65ec4408fc5ea1e1d2a392ea0a662d5a977838ac5be2b09ff5af81')
     version('3.9.1', sha256='bcc2a63ff842e59483bcafe68b09da17834f18b0bc6fecbad68638f85ba8f3e1')

diff --git a/meshing/packages/qtpython/package.py b/meshing/packages/qtpython/package.py
@@ -32,6 +32,7 @@ class Qtpython(CMakePackage):
 
     variant('shared', default=True, description='Creation de bibliotheques dynamiques (defaut:shared, annuler le defaut par ~shared)')
 
+    version('6.4.0', sha256='0ec68d7699450ef924cd1ab4c333cd1045451aa698a09184af56cc2f3db89c04')
     version('6.3.3', sha256='060eb5832f39e1bd4c78e1abab7fad7dbcff2b098c9ac0764b6015bf46209d5b')
     version('6.3.2', sha256='9abf42ee139fa392179e4b969b7bcf70cde9436ac7b02f3fb07e4e0077b17624')
     version('6.3.1', sha256='9191f353d63008f84aeebf9267202ad45ce7a6a04ee05b55bb076916c99de287')

diff --git a/meshing/packages/qtutil/package.py b/meshing/packages/qtutil/package.py
@@ -20,6 +20,7 @@ class Qtutil(CMakePackage):
     depends_on('tkutil@5: +shared', type=('build', 'link'), when='+shared')
     depends_on('tkutil@5: ~shared', type=('build', 'link'), when='~shared')
     depends_on('[email protected]:', type=('build', 'link'))
+    version('6.4.0', sha256='568f09a12c92810e27457ae1c589a0a9e89d3dd605194e5e1a429a0a3e18c96b')
     version('6.3.0', sha256='183642b97f60053b3643a097124a8e4cad04447f5934f21d66715d9f17cdfa86')
     version('6.2.1', sha256='0e8f0a75dca6574d4f348c4c2db3b5689a21cea94e6345a146235053ad4bbc4c')
     version('6.2.0', sha256='74a85acee94a676060197ac49179d82a9544f2baba871d4b2c1b1633317886bb')
@@ -37,7 +38,7 @@ class Qtutil(CMakePackage):
 
     def cmake_args(self):
         args = []
-        args = [self.define_from_variant('BUILD_SHARED_LIBS', 'shared')]
-        args = [self.define_from_variant('USE_QT_TEXT_BROWSER', 'qtbrowser')]
+        args.append(self.define_from_variant('BUILD_SHARED_LIBS', 'shared'))
+        args.append(self.define_from_variant('USE_QT_TEXT_BROWSER', 'qtbrowser'))
 
         return args
diff --git a/meshing/packages/qtvtk/package.py b/meshing/packages/qtvtk/package.py
@@ -28,6 +28,7 @@ class Qtvtk(CMakePackage):
 
     variant('shared', default=True, description='Creation de bibliotheques dynamiques (defaut:shared, annuler le defaut par ~shared)')
 
+    version('8.5.0', sha256='134ecd42a13e2409f3cbc9a634ec8d1ab0ed763cdb9c6c05a4ca72586af8b0b7')
     version('8.4.1', sha256='8b5b0f74a27fd0664b4c94229d8488fb62fa34b2fd7a7367085215a2f850f786')
     version('8.4.0', sha256='851bcf977d03f514dec6e1c220f3585e80ad043c4b11ef45805a5916b1c16d64')
     version('7.14.8', sha256='2d9cb54c14afc38e849a25fe8fe534481402f64352c690454671e0e61a9fe0c4')

diff --git a/meshing/packages/qwtcharts/package.py b/meshing/packages/qwtcharts/package.py
@@ -21,6 +21,7 @@ class Qwtcharts(CMakePackage):
     depends_on('qtutil@5: ~shared', type=('build', 'link'), when='~shared')
     depends_on('[email protected]:', type=('build', 'link'))
 
+    version('5.3.0', sha256='71d7653d2887f124fe060bbaeea988f306e660a2eceeec33bf0b3baa0328be21')
     version('5.2.1', sha256='fda34002a9631f7afcdb7cc4baaca81d09cacb0cd05b10fe08af86f091eddad5')
     version('5.2.0', sha256='5566d9bdd718f6c12b83f9bc03569ba61b3b67a54ef0ba39e72221ced985f706')
     version('4.4.13', sha256='e73544b6f94e2a3f989b74827bac5afbbf9c9a8899d991528d6f101f4fbc34d4')