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

feat: update qcoro to 0.10.0-1 #5

Merged
merged 2 commits into from
Dec 29, 2023
Merged

feat: update qcoro to 0.10.0-1 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1ed39a
feat: update qcoro to 0.10.0-1
UTsweetyfish Dec 27, 2023
b3392ea
Update symbols files
UTsweetyfish Dec 29, 2023
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: 2 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Initial run of clang-format
0c01ca40fd8bd337ecae3ea21be1e5a97ba40e4b
12 changes: 12 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
build/
build-*/
.*.swp
.ccls-cache
compile_commands.json
/.vs
/.vscode
/CMakeSettings.json

# Python (from mkdocs)
__pycache__
venv
17 changes: 15 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.18.4)
set(qcoro_VERSION 0.9.0)
set(qcoro_VERSION 0.10.0)
set(qcoro_SOVERSION 0)
project(qcoro LANGUAGES CXX VERSION ${qcoro_VERSION})

Expand Down Expand Up @@ -105,7 +105,10 @@ if (MSVC)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /W4 /WX")
# Disable warning C5054: "operator '&': deprecated between enumerations of different types" caused by QtWidgets/qsizepolicy.h
# Disable warning C4127: "conditional expression is constant" caused by QtCore/qiterable.h
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd5054 /wd4127")
if ("${QT_VERSION_MAJOR}" STREQUAL "6" AND "${Qt6_VERSION}" VERSION_GREATER_EQUAL "6.4.0" AND "${Qt6_VERSION}" VERSION_LESS "6.5.3")
# Disable warning C4702: "unreachable code" caused by QtTest/qtestcase.h - fixed in Qt 6.5.3
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd5054 /wd4127 /wd4702")
endif()

if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
# Explicitly enable exceptions support for clang-cl (it's only enabled by CMake when targeting the Windows-MSVC platform,
Expand All @@ -120,6 +123,7 @@ endif()
if (QCORO_ENABLE_ASAN)
if (MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /INCREMENTAL:NO")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL:NO")
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
else()
Expand Down Expand Up @@ -162,6 +166,15 @@ add_code_coverage_all_targets(EXCLUDE "${CMAKE_BINARY_DIR}" tests/utils/*)
# Definitions
#-----------------------------------------------------------#

# debug suffixes for qmake compatibility
if(WIN32)
set(CMAKE_DEBUG_POSTFIX "d")
elseif(APPLE)
set(CMAKE_DEBUG_POSTFIX "_debug")
else()
set(CMAKE_DEBUG_POSTFIX "")
endif()

set(QCORO_TARGET_PREFIX "QCoro${QT_VERSION_MAJOR}")
set(QCORO_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/qcoro${QT_VERSION_MAJOR}")

Expand Down
10 changes: 9 additions & 1 deletion cmake/AddQCoroLibrary.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,18 @@ function(add_qcoro_library)
EXPORT ${target_name}Targets
)
install(
FILES ${source_HEADERS} ${LIB_HEADERS}
FILES ${source_HEADERS}
DESTINATION ${QCORO_INSTALL_INCLUDEDIR}/qcoro/
COMPONENT Devel
)
foreach(lib_header ${LIB_HEADERS})
get_filename_component(header_prefix_dir ${lib_header} DIRECTORY)
install(
FILES ${lib_header}
DESTINATION ${QCORO_INSTALL_INCLUDEDIR}/qcoro/${header_prefix_dir}
COMPONENT Devel
)
endforeach()
install(
FILES ${camelcase_HEADERS}
DESTINATION ${QCORO_INSTALL_INCLUDEDIR}/QCoro/
Expand Down
14 changes: 11 additions & 3 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
qcoro (0.9.0-2) unstable; urgency=medium
qcoro (0.10.0-1deepin1) unstable; urgency=medium

* Remove libqt6opengl6-dev dependency.
* Update symbols files.

-- Tianyu Chen <[email protected]> Fri, 29 Dec 2023 12:21:47 +0800

qcoro (0.10.0-1) unstable; urgency=medium

* Team upload.
* New upstream release.
* Update symbols files.

-- Wang Zichong <wangzichong@deepin.org> Tue, 31 Oct 2023 16:16:00 +0800
-- Pino Toscano <pino@debian.org> Wed, 06 Dec 2023 22:35:12 +0100

qcoro (0.9.0-1) unstable; urgency=medium

Expand Down
3 changes: 2 additions & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ Build-Depends: cmake (>= 3.18.4~),
dbus-x11 <!nocheck>,
debhelper-compat (= 13),
libqt5websockets5-dev (>= 5.15.0~),
qt6-websockets-dev,
libqt6opengl6-dev,
libqt6websockets6-dev (>= 6.2.0~),
pkg-kde-tools,
qml-module-qtquick-controls <!nocheck>,
qml6-module-qtqml-workerscript <!nocheck>,
Expand Down
22 changes: 8 additions & 14 deletions debian/libqcoro5core0.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SymbolsHelper-Confirmed: 0.9.0 amd64 i386
# SymbolsHelper-Confirmed: 0.10.0 amd64 arm64
libQCoro5Core.so.0 libqcoro5core0 #MINVER#
* Build-Depends-Package: qcoro-qt5-dev
_ZGVZN9QtPrivate15ConnectionTypesINS_4ListIJiN8QProcess10ExitStatusEEEELb1EE5typesEvE1t@Base 0.5.0
Expand All @@ -20,14 +20,10 @@ libQCoro5Core.so.0 libqcoro5core0 #MINVER#
_ZN5QCoro13ThreadContextD2Ev@Base 0.8.0
(optional=templinst)_ZN5QCoro4TaskI10QByteArrayED1Ev@Base 0.5.0
(optional=templinst)_ZN5QCoro4TaskI10QByteArrayED2Ev@Base 0.5.0
(optional=templinst)_ZN5QCoro4TaskIN6QTimer14QPrivateSignalEED1Ev@Base 0.5.0
(optional=templinst)_ZN5QCoro4TaskIN6QTimer14QPrivateSignalEED2Ev@Base 0.5.0
(optional=templinst)_ZN5QCoro4TaskISt8optionalIN6QTimer14QPrivateSignalEEED1Ev@Base 0.5.0
(optional=templinst)_ZN5QCoro4TaskISt8optionalIN6QTimer14QPrivateSignalEEED2Ev@Base 0.5.0
(optional=templinst)_ZN5QCoro4TaskISt8optionalIN7QThread14QPrivateSignalEEED1Ev@Base 0.5.0
(optional=templinst)_ZN5QCoro4TaskISt8optionalIN7QThread14QPrivateSignalEEED2Ev@Base 0.5.0
(optional=templinst)_ZN5QCoro4TaskISt8optionalIN8QProcess14QPrivateSignalEEED1Ev@Base 0.5.0
(optional=templinst)_ZN5QCoro4TaskISt8optionalIN8QProcess14QPrivateSignalEEED2Ev@Base 0.5.0
(optional=templinst)_ZN5QCoro4TaskISt5tupleIJEEED1Ev@Base 0.10.0
(optional=templinst)_ZN5QCoro4TaskISt5tupleIJEEED2Ev@Base 0.10.0
(optional=templinst)_ZN5QCoro4TaskISt8optionalISt5tupleIJEEEED1Ev@Base 0.10.0
(optional=templinst)_ZN5QCoro4TaskISt8optionalISt5tupleIJEEEED2Ev@Base 0.10.0
(optional=templinst)_ZN5QCoro4TaskISt8optionalISt5tupleIJiN8QProcess10ExitStatusEEEEED1Ev@Base 0.5.0
(optional=templinst)_ZN5QCoro4TaskISt8optionalISt5tupleIJiN8QProcess10ExitStatusEEEEED2Ev@Base 0.5.0
(optional=templinst)_ZN5QCoro4TaskISt8optionalIbEED1Ev@Base 0.5.0
Expand All @@ -49,10 +45,8 @@ libQCoro5Core.so.0 libqcoro5core0 #MINVER#
_ZN5QCoro6detail11QCoroThreadC1EP7QThread@Base 0.5.0
_ZN5QCoro6detail11QCoroThreadC2EP7QThread@Base 0.5.0
(optional=templinst)_ZN5QCoro6detail11TaskPromiseI10QByteArrayE19unhandled_exceptionEv@Base 0.5.0
(optional=templinst)_ZN5QCoro6detail11TaskPromiseIN6QTimer14QPrivateSignalEE19unhandled_exceptionEv@Base 0.5.0
(optional=templinst)_ZN5QCoro6detail11TaskPromiseISt8optionalIN6QTimer14QPrivateSignalEEE19unhandled_exceptionEv@Base 0.5.0
(optional=templinst)_ZN5QCoro6detail11TaskPromiseISt8optionalIN7QThread14QPrivateSignalEEE19unhandled_exceptionEv@Base 0.5.0
(optional=templinst)_ZN5QCoro6detail11TaskPromiseISt8optionalIN8QProcess14QPrivateSignalEEE19unhandled_exceptionEv@Base 0.5.0
(optional=templinst)_ZN5QCoro6detail11TaskPromiseISt5tupleIJEEE19unhandled_exceptionEv@Base 0.10.0
(optional=templinst)_ZN5QCoro6detail11TaskPromiseISt8optionalISt5tupleIJEEEE19unhandled_exceptionEv@Base 0.10.0
(optional=templinst)_ZN5QCoro6detail11TaskPromiseISt8optionalISt5tupleIJiN8QProcess10ExitStatusEEEEE19unhandled_exceptionEv@Base 0.5.0
(optional=templinst)_ZN5QCoro6detail11TaskPromiseISt8optionalIbEE19unhandled_exceptionEv@Base 0.5.0
(optional=templinst)_ZN5QCoro6detail11TaskPromiseISt8optionalIxEE19unhandled_exceptionEv@Base 0.5.0
Expand Down Expand Up @@ -166,7 +160,7 @@ libQCoro5Core.so.0 libqcoro5core0 #MINVER#
_ZNSt19bad_optional_accessD1Ev@Base 0.5.0
_ZNSt19bad_optional_accessD2Ev@Base 0.5.0
(optional=templinst)_ZNSt8__detail9__variant16_Variant_storageILb0EJSt9monostate10QByteArrayNSt15__exception_ptr13exception_ptrEEE8_M_resetEv@Base 0.5.0
(optional=templinst)_ZNSt8__detail9__variant16_Variant_storageILb0EJSt9monostateSt8optionalIN7QThread14QPrivateSignalEENSt15__exception_ptr13exception_ptrEEE8_M_resetEv@Base 0.5.0
(optional=templinst)_ZNSt8__detail9__variant16_Variant_storageILb0EJSt9monostateSt8optionalISt5tupleIJEEENSt15__exception_ptr13exception_ptrEEE8_M_resetEv@Base 0.10.0
(optional=templinst)_ZNSt8__detail9__variant16_Variant_storageILb0EJSt9monostateSt8optionalIbENSt15__exception_ptr13exception_ptrEEE8_M_resetEv@Base 0.5.0
(optional=templinst)_ZNSt8__detail9__variant16_Variant_storageILb0EJSt9monostateSt8optionalIxENSt15__exception_ptr13exception_ptrEEE8_M_resetEv@Base 0.5.0
(optional=templinst)_ZNSt8__detail9__variant16_Variant_storageILb0EJSt9monostatebNSt15__exception_ptr13exception_ptrEEE8_M_resetEv@Base 0.5.0
Expand Down
Loading