Skip to content
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

Jump to bottom

ci: upgrade to Fedora 41 #59595

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
+8 −3
Draft

ci: upgrade to Fedora 41 #59595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f386be
ci: upgrade to Fedora 40
t0b3 Sep 6, 2024
baf3fc9
ci: omit compiler warning on deprecated declarations
t0b3 Nov 25, 2024
a24543e
ci: upgrade to Fedora 41
t0b3 Nov 26, 2024
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
2 changes: 1 addition & 1 deletion .docker/qgis3-qt6-build-deps.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG DISTRO_VERSION=39
ARG DISTRO_VERSION=41

FROM fedora:${DISTRO_VERSION} as binary-for-oracle
MAINTAINER Matthias Kuhn <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
# LD_PRELOAD: /lib/x86_64-linux-gnu/libSegFault.so
experimental: false

- distro-version: '39'
- distro-version: '41'
qt-version: 6
run-tests: true
with-qt6: ON
Expand Down Expand Up @@ -248,7 +248,7 @@ jobs:
docker-target: binary-only

- qt-version: 6
distro-version: 39
distro-version: 41
docker-target: binary-only

- qt-version: 5
Expand Down
5 changes: 5 additions & 0 deletions src/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2196,6 +2196,11 @@ else()
endif()
endif()

# Workaround CLANG deprecation warning
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set_source_files_properties(painting/qgsmaskpaintdevice.cpp PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

strange... What are those warnings? Can we not fix them?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

feel free to step in... https://cdash.orfeo-toolbox.org/viewBuildError.php?type=1&buildid=27379
I didn't succeed with the Q_NOWARN_DEPRECATED_PUSH macro, but your experience may help 👍

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

try to surround reference to QgsMaskPaintEngine with Q_NOWARN_DEPRECATED_PUSH and Q_NOWARN_DEPRECATED_POP, starting maybe with the declaration on line 89 of qgsmaskpaintdevice.h

Maybe we also should deprecate the whole classes Engine & Device.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's what I already tried - it didn't change neither to include the whole two deprecated classes, neither even in combination with Q_NOWARN_DEPRECATED_PUSH/POPping the calls in the qgsmaskpaintdevice.cpp :-( - that's why I turned to this solution which works after all...

endif()

# Generate cpp+header file from .proto file using "protoc" tool (to support MVT encoding of vector tiles)
protobuf_generate_cpp(VECTOR_TILE_PROTO_SRCS VECTOR_TILE_PROTO_HDRS vectortile/vector_tile.proto)
set(QGIS_CORE_SRCS ${QGIS_CORE_SRCS} ${VECTOR_TILE_PROTO_SRCS})
Expand Down
Loading