Skip to content

Commit 74e337b

Browse files
author
Kasper Peeters
committed
Another attempt to fix openssl issues on various platforms.
1 parent 932eeaf commit 74e337b

File tree

3 files changed

+15
-79
lines changed

3 files changed

+15
-79
lines changed

‎.github/workflows/opensuse-tumbleweed-package.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
zypper -n install --no-recommends rpmbuild git cmake python311-devel gcc-c++ \
5050
gmp-devel libuuid-devel \
5151
gtkmm3-devel sqlite3-devel \
52-
python311-matplotlib \
52+
python311-matplotlib openssl \
5353
libboost_system-devel libboost_filesystem-devel \
5454
libboost_date_time-devel libboost_program_options-devel
5555
git config --global --add safe.directory /workspace

‎cmake/packaging.cmake‎

Lines changed: 13 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -24,50 +24,16 @@ if(EXISTS "/etc/redhat-release")
2424
endif()
2525
if(LINUX_ISSUE MATCHES "Fedora")
2626
set(CPACK_GENERATOR "RPM")
27-
if(LINUX_ISSUE MATCHES "26")
28-
message("-- This is a Fedora 26 system")
29-
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, dvipng, texlive, texlive-ytableau")
30-
set(CPACK_SYSTEM_NAME "fedora26")
31-
elseif(LINUX_ISSUE MATCHES "27")
32-
message("-- This is a Fedora 27 system")
33-
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, dvipng, texlive, texlive-ytableau")
34-
set(CPACK_SYSTEM_NAME "fedora27")
35-
elseif(LINUX_ISSUE MATCHES "28")
36-
message("-- This is a Fedora 28 system")
37-
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, dvipng, texlive, texlive-ytableau")
38-
set(CPACK_SYSTEM_NAME "fedora28")
39-
elseif(LINUX_ISSUE MATCHES "29")
40-
message("-- This is a Fedora 29 system")
41-
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, dvipng, texlive, texlive-ytableau")
42-
set(CPACK_SYSTEM_NAME "fedora29")
43-
elseif(LINUX_ISSUE MATCHES "32")
44-
message("-- This is a Fedora 32 system")
45-
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, dvipng, texlive, texlive-ytableau")
46-
set(CPACK_SYSTEM_NAME "fedora32")
47-
elseif(LINUX_ISSUE MATCHES "33")
48-
message("-- This is a Fedora 33 system")
49-
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, dvipng, texlive, texlive-ytableau")
50-
set(CPACK_SYSTEM_NAME "fedora33")
51-
elseif(LINUX_ISSUE MATCHES "35")
52-
message("-- This is a Fedora 35 system")
53-
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, python3-sympy, dvipng, texlive, texlive-ytableau")
54-
set(CPACK_SYSTEM_NAME "fedora35")
55-
elseif(LINUX_ISSUE MATCHES "40")
27+
if(LINUX_ISSUE MATCHES "40")
5628
message("-- This is a Fedora 40 system")
5729
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, openssl, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, python3-sympy")
5830
set(CPACK_SYSTEM_NAME "fedora40")
5931
elseif(LINUX_ISSUE MATCHES "41")
6032
message("-- This is a Fedora 41 system")
6133
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, openssl, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, python3-sympy")
6234
set(CPACK_SYSTEM_NAME "fedora41")
63-
elseif(LINUX_ISSUE MATCHES "24")
64-
message("-- This is a Fedora 24 system")
65-
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, dvipng, texlive, texlive-ytableau")
66-
set(CPACK_SYSTEM_NAME "fedora24")
6735
else()
68-
message("-- This is a Fedora <24 system")
69-
set(CPACK_RPM_PACKAGE_REQUIRES "python-libs, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python-matplotlib, dvipng, texlive, texlive-ytableau")
70-
set(CPACK_SYSTEM_NAME "fedora")
36+
message(FATAL_ERROR "-- This is an old Fedora system <40, we do not support packaging for this anymore")
7137
endif()
7238
endif()
7339
else()
@@ -76,14 +42,14 @@ else()
7642
if(LINUX_ISSUE MATCHES "15.0")
7743
set(CPACK_SYSTEM_NAME "leap150")
7844
set(CPACK_GENERATOR "RPM")
79-
message("-- This is an openSUSE Leap 15.0 system")
45+
message("-- This is an openSUSE Leap 15.0 system (UNSUPPORTED)")
8046
set(CPACK_RPM_PACKAGE_REQUIRES "libpython3_6m1_0, libgmp10, libuuid1, libsqlite3-0, libgtkmm-3_0-1, libboost_system1_66_0, libboost_filesystem1_66_0, libboost_program_options1_66_0, libboost_regex1_66_0, libstdc++6, python3-matplotlib, python3-sympy")
8147
endif()
8248
if(LINUX_ISSUE MATCHES "Tumbleweed")
8349
set(CPACK_SYSTEM_NAME "tumbleweed")
8450
set(CPACK_GENERATOR "RPM")
8551
message("-- This is an openSUSE Tumbleweed system")
86-
set(CPACK_RPM_PACKAGE_REQUIRES "libpython3_11-1_0, libgmp10, libuuid1, libgtkmm-3_0-1, libboost_system1_85_0, libboost_filesystem1_85_0, libboost_program_options1_85_0, libboost_regex1_85_0, libstdc++6, python311-matplotlib, python311-sympy")
52+
set(CPACK_RPM_PACKAGE_REQUIRES "libpython3_11-1_0, libgmp10, libuuid1, libgtkmm-3_0-1, openssl, libboost_system1_85_0, libboost_filesystem1_85_0, libboost_program_options1_85_0, libboost_regex1_85_0, libstdc++6, python311-matplotlib, python311-sympy")
8753
endif()
8854
endif()
8955
if(EXISTS "/etc/issue")
@@ -92,7 +58,7 @@ else()
9258
if(LINUX_ISSUE MATCHES "42.1")
9359
set(CPACK_SYSTEM_NAME "leap421")
9460
set(CPACK_GENERATOR "RPM")
95-
message("-- This is an openSUSE Leap 42.1 system")
61+
message("-- This is an openSUSE Leap 42.1 system (UNSUPPORTED)")
9662
set(CPACK_RPM_PACKAGE_REQUIRES "libpython3_4m1_0, libgmp10, libuuid1, libsqlite3-0, libgtkmm-3_0-1, libboost_system1_61_0, libboost_filesystem1_61_0, libboost_program_options1_61_0, libboost_regex1_61_0, libstdc++6, python3-matplotlib, texlive-dvipng, texlive, texlive-ytableau")
9763
endif()
9864
endif()
@@ -131,26 +97,6 @@ else()
13197
set(PYTHON_SITE_PATH "/usr/lib/python3/dist-packages")
13298
set(INSTALL_LATEX_DIR "/usr/share/texmf")
13399
endif()
134-
if(LINUX_ISSUE MATCHES "14.04")
135-
set(CPACK_SYSTEM_NAME "trusty")
136-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.54.0, libboost-filesystem1.54.0, libboost-program-options1.54.0, libboost-regex1.54.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1, texlive, texlive-latex-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python-sympy")
137-
message("-- This is an Ubuntu 14.04 system")
138-
endif()
139-
if(LINUX_ISSUE MATCHES "16.04")
140-
set(CPACK_SYSTEM_NAME "xenial")
141-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.58.0, libboost-filesystem1.58.0, libboost-program-options1.58.0, libboost-regex1.58.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, texlive, texlive-latex-extra, texlive-math-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy, python3-gmpy2")
142-
message("-- This is an Ubuntu 16.04 system")
143-
endif()
144-
if(LINUX_ISSUE MATCHES "17.10")
145-
set(CPACK_SYSTEM_NAME "artful")
146-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.62.0, libboost-filesystem1.62.0, libboost-program-options1.62.0, libboost-regex1.62.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, texlive, texlive-latex-extra, texlive-math-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy, python3-gmpy2")
147-
message("-- This is an Ubuntu 17.10 system")
148-
endif()
149-
if(LINUX_ISSUE MATCHES "18.04")
150-
set(CPACK_SYSTEM_NAME "bionic")
151-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.65.1, libboost-filesystem1.65.1, libboost-program-options1.65.1, libboost-regex1.65.1, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, texlive, texlive-latex-extra, texlive-math-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy, python3-gmpy2")
152-
message("-- This is an Ubuntu 18.04 system")
153-
endif()
154100
if(LINUX_ISSUE MATCHES "20.04")
155101
set(CPACK_SYSTEM_NAME "focal")
156102
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libssl3, libboost-system1.71.0, libboost-filesystem1.71.0, libboost-program-options1.71.0, libboost-regex1.71.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, texlive, texlive-latex-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy, python3-gmpy2")
@@ -174,30 +120,20 @@ else()
174120
set(PYTHON_SITE_PATH "/usr/lib/python3/dist-packages")
175121
set(INSTALL_LATEX_DIR "/usr/share/texmf")
176122
endif()
177-
if(LINUX_ISSUE MATCHES "21")
178-
message("-- This is a Linux Mint 21 system")
179-
set(CPACK_SYSTEM_NAME "vanessa")
180-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.74.0, libboost-filesystem1.74.0, libboost-program-options1.74.0, libboost-regex1.74.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, texlive, texlive-latex-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy, python3-gmpy2")
181-
endif()
182-
if(LINUX_ISSUE MATCHES "20")
183-
message("-- This is a Linux Mint 20 system")
184-
set(CPACK_SYSTEM_NAME "ulyana")
185-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.71.0, libboost-filesystem1.71.0, libboost-program-options1.71.0, libboost-regex1.71.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, texlive, texlive-latex-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy, python3-gmpy2")
186-
endif()
187123
if(LINUX_ISSUE MATCHES "19")
188124
message("-- This is a Linux Mint 19 system")
189125
set(CPACK_SYSTEM_NAME "tessa")
190126
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.65.1, libboost-filesystem1.65.1, libboost-program-options1.65.1, libboost-regex1.65.1, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, texlive, texlive-latex-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy, python3-gmpy2")
191127
endif()
192-
if(LINUX_ISSUE MATCHES "18")
193-
message("-- This is a Linux Mint 18 system")
194-
set(CPACK_SYSTEM_NAME "sarah")
195-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.58.0, libboost-filesystem1.58.0, libboost-program-options1.58.0, libboost-regex1.58.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, texlive, texlive-latex-extra, texlive-math-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy, python3-gmpy2")
128+
if(LINUX_ISSUE MATCHES "20")
129+
message("-- This is a Linux Mint 20 system")
130+
set(CPACK_SYSTEM_NAME "ulyana")
131+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.71.0, libboost-filesystem1.71.0, libboost-program-options1.71.0, libboost-regex1.71.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, texlive, texlive-latex-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy, python3-gmpy2")
196132
endif()
197-
if(LINUX_ISSUE MATCHES "17")
198-
set(CPACK_SYSTEM_NAME "qiana")
199-
message("-- This is a Linux Mint 17 system")
200-
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.54.0, libboost-filesystem1.54.0, libboost-program-options1.54.0, libboost-regex1.54.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1, texlive, texlive-latex-extra, texlive-math-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy")
133+
if(LINUX_ISSUE MATCHES "21")
134+
message("-- This is a Linux Mint 21 system")
135+
set(CPACK_SYSTEM_NAME "vanessa")
136+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, libgmpxx4ldbl, libboost-system1.74.0, libboost-filesystem1.74.0, libboost-program-options1.74.0, libboost-regex1.74.0, libstdc++6, uuid-runtime, libgtkmm-3.0-1v5, texlive, texlive-latex-extra, texlive-science, python3-matplotlib, python3-mpmath, dvipng, python3-sympy, python3-gmpy2")
201137
endif()
202138
endif()
203139
endif()

‎frontend/gtkmm/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ find_package(Threads)
6969
find_package(SQLITE3)
7070
find_package(GLIBMM)
7171
find_package(GTKMM3)
72-
find_package(Boost 1.75.0 COMPONENTS system REQUIRED)
72+
find_package(Boost 1.71.0 COMPONENTS system REQUIRED)
7373
set(Boost_USE_STATIC_LIBS OFF)
7474
set(Boost_USE_MULTITHREADED ON)
7575
set(Boost_USE_STATIC_RUNTIME OFF)

0 commit comments

Comments
 (0)