Skip to content

deb+rpm: build OMEdit against qt6 with Quick3D #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sjoelund merged 1 commit into from
Sep 18, 2026
+23 −12
Merged

deb+rpm: build OMEdit against qt6 with Quick3D #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,24 @@ Build-Depends: debhelper-compat (= 13),
cmake (>= 2.8.6),
# libssl-dev (>= 0.9.8g), # Do we really depend on libssl directly? Debian stretch conflicts with it...
libreadline-dev,
qtbase5-dev,
libqt5svg5-dev,
qttools5-dev-tools,
qttools5-dev,
libqt5opengl5-dev,
qtwebengine5-dev,
libqt5xmlpatterns5-dev,
qt6-base-dev,
qt6-base-dev-tools,
qt6-tools-dev,
qt6-tools-dev-tools,
qt6-l10n-tools,
qt6-translations-l10n,
qt6-declarative-dev,
qt6-quick3d-dev,
qt6-webengine-dev,
qt6-webengine-dev-tools,
# jammy still carries the pre-6.4 binary names for these three
qt6-svg-dev | libqt6svg6-dev,
qt6-5compat-dev | libqt6core5compat6-dev,
qt6-websockets-dev | libqt6websockets6-dev,
# QtHttpServer needs Qt 6.4; OMEdit builds without the MCP server on jammy
qt6-httpserver-dev | qt6-base-dev,
flex,
bison,
liblpsolve55-dev (>= 5.5.0.10),
libhdf5-serial-dev | libhdf5-dev,
liblapack-dev,
Expand All @@ -33,7 +44,6 @@ Build-Depends: debhelper-compat (= 13),
# Should be needed but seems to mess up sbuild
# libexpat1-dev:native,
libboost-all-dev,
libopenscenegraph-dev,
pkg-config,
libffi-dev,
lsb-release,
Expand Down Expand Up @@ -183,6 +193,9 @@ Architecture: any
Depends: omc (<< 20000),
libomsimulator,
libomsensplugin,
qml6-module-qtquick,
# split out of libqt6quick3d6 in Qt 6.6
qml6-module-qtquick3d | libqt6quick3d6,
${shlibs:Depends},
${misc:Depends}
Suggests: omlibrary
Expand Down
1 change: 1 addition & 0 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ endif
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--with-qt6 \
--with-lapack="-llapack -lblas -lm" \
--without-paradiseo \
--without-omlibrary \
Expand Down
5 changes: 1 addition & 4 deletions rpm/SPECS/openmodelica.spec.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ BuildRequires: qt6-qt3d-devel
BuildRequires: qt6-qt5compat-devel
BuildRequires: qt6-qthttpserver-devel
BuildRequires: qt6-qtwebsockets-devel
BuildRequires: qt6-qtquick3d-devel
%endif


Expand Down Expand Up @@ -131,10 +132,6 @@ BuildRequires: devtoolset-11-gcc devtoolset-11-gcc-c++ devtoolset-11-gcc-gfortra
%define devtoolsconfigureflags CC=/opt/rh/devtoolset-11/root/usr/bin/gcc CXX=/opt/rh/devtoolset-11/root/usr/bin/g++ FC=/opt/rh/devtoolset-11/root/usr/bin/gfortran
%endif

%if 0%{?fedora} >= 25
BuildRequires: OpenSceneGraph-devel
%endif

%if 0%{?omqt5}
%define withqt6 ''
%define omqtversion qt5
Expand Down
Loading