From d9afd417532d8e684414afc3727117ec85f43948 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 22 Mar 2024 10:28:35 +0200 Subject: [PATCH] Fix building. --- .cirrus.yml | 8 ++------ appveyor.yml | 10 ++++++++-- conanfile.py | 6 ++++-- src/app/tape/tape.pri | 9 ++++++--- src/libs/vmisc/crashhandler/crashhandler.cpp | 4 ++-- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 57c36c95a..73f87abb8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -71,7 +71,7 @@ linux_qt6_sonar_task_template: &LINUX_QT6_TASK_SONAR_TEMPLATE - cd ${CIRRUS_WORKING_DIR}/build/coverage-dir # --preserve-paths helps us avoid name clash for `.gcov` files corresponding to source files # with the same name but in different directories. - - find .. -name '*.o' | xargs gcov --preserve-paths + - find .. -name '*.o' -exec gcov --preserve-paths {} \; - cd $CIRRUS_WORKING_DIR - sonar-scanner -Dsonar.scm.revision=${CIRRUS_CHANGE_IN_REPO} -Dsonar.links.ci=https://cirrus-ci.com/task/${CIRRUS_TASK_ID} -Dsonar.branch.name=${CIRRUS_BRANCH} -Dsonar.cfamily.gcov.reportsPath="${CIRRUS_WORKING_DIR}/build/coverage-dir" - ccache -s @@ -149,7 +149,7 @@ appimage_task_template: &APPIMAGE_TASK_TEMPLATE - conan profile new valentina - conan profile update settings.build_type=Release valentina - conan profile update settings.os=Linux valentina - - conan profile update settings.arch=x86_64 + - conan profile update settings.arch=x86_64 valentina - conan profile update settings.compiler=gcc valentina - conan profile update settings.compiler.cppstd=17 valentina - conan profile update settings.compiler.libcxx=libstdc++11 valentina @@ -361,10 +361,6 @@ macos_task_template: &MACOS_TASK_TEMPLATE - echo $PATH - export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH" - echo $PATH - - chmod -R 755 /opt/homebrew/opt/qt6/* - - chmod -R 755 /opt/homebrew/opt/openssl@1.1/* - - chmod -R 755 /opt/homebrew/opt/poppler/* - - chmod -R 755 /opt/homebrew/opt/xerces-c/* - python3 --version - pip3 install --user --upgrade pip dropbox py7zr 'urllib3<2.0' conan==1.63.0 requests - ccache --set-config sloppiness=pch_defines,time_macros max_size="$CCACHE_SIZE" diff --git a/appveyor.yml b/appveyor.yml index cdd216256..b6a4dd98f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -683,7 +683,10 @@ for: - conan profile update settings.build_type=Release valentina - conan profile update settings.os=Macos valentina - conan profile update settings.os.Macos.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina - - conan profile update settings.compiler=clang valentina + - conan profile update settings.os.os_build=Macos valentina + - conan profile update settings.os.arch=x86_64 valentina + - conan profile update settings.os.arch_build=x86_64 valentina + - conan profile update settings.compiler=apple-clang valentina - conan profile update settings.compiler.cppstd=17 valentina - conan profile update settings.compiler.libcxx=libstdc++11 valentina - conan profile update settings.compiler.version=15 valentina @@ -878,7 +881,10 @@ for: - conan profile update settings.build_type=Release valentina - conan profile update settings.os=Macos valentina - conan profile update settings.os.Macos.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina - - conan profile update settings.compiler=clang valentina + - conan profile update settings.os_build=Macos valentina + - conan profile update settings.os.arch=x86_64 valentina + - conan profile update settings.os.arch_build=x86_64 valentina + - conan profile update settings.compiler=apple-clang valentina - conan profile update settings.compiler.cppstd=17 valentina - conan profile update settings.compiler.libcxx=libstdc++11 valentina - conan profile update settings.compiler.version=14 valentina diff --git a/conanfile.py b/conanfile.py index e138217fb..42a42e39f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -24,7 +24,9 @@ class Recipe(ConanFile): def requirements(self): if not self.options.with_xerces: - del self.requires["xerces-c"] + if "xerces-c" in self.requires: + del self.requires["xerces-c"] if not self.options.with_crash_reporting: - del self.requires["sentry-crashpad/0.6.5"] + if "sentry-crashpad/0.6.5" in self.requires: + del self.requires["sentry-crashpad/0.6.5"] diff --git a/src/app/tape/tape.pri b/src/app/tape/tape.pri index c6cd77e90..f44ca6efd 100644 --- a/src/app/tape/tape.pri +++ b/src/app/tape/tape.pri @@ -20,7 +20,8 @@ SOURCES += \ $$PWD/dialogs/dialogsetupmultisize.cpp \ $$PWD/vtapeshortcutmanager.cpp \ $$PWD/tkmmainwindow.cpp \ - $$PWD/dialogs/dialogknownmeasurementscsvcolumns.cpp + $$PWD/dialogs/dialogknownmeasurementscsvcolumns.cpp \ + $$PWD/dialogs/dialognoknownmeasurements.cpp *msvc*:SOURCES += $$PWD/stable.cpp @@ -44,7 +45,8 @@ HEADERS += \ $$PWD/dialogs/dialogsetupmultisize.h \ $$PWD/vtapeshortcutmanager.h \ $$PWD/tkmmainwindow.h \ - $$PWD/dialogs/dialogknownmeasurementscsvcolumns.h + $$PWD/dialogs/dialogknownmeasurementscsvcolumns.h \ + $$PWD/dialogs/dialognoknownmeasurements.h FORMS += \ $$PWD/dialogs/dialogdimensioncustomnames.ui \ @@ -60,5 +62,6 @@ FORMS += \ $$PWD/dialogs/configpages/tapepreferencespathpage.ui \ $$PWD/dialogs/dialogsetupmultisize.ui \ $$PWD/tkmmainwindow.ui \ - $$PWD/dialogs/dialogknownmeasurementscsvcolumns.ui + $$PWD/dialogs/dialogknownmeasurementscsvcolumns.ui \ + $$PWD/dialogs/dialognoknownmeasurements.ui diff --git a/src/libs/vmisc/crashhandler/crashhandler.cpp b/src/libs/vmisc/crashhandler/crashhandler.cpp index 2b7387a9e..c7f549f4c 100644 --- a/src/libs/vmisc/crashhandler/crashhandler.cpp +++ b/src/libs/vmisc/crashhandler/crashhandler.cpp @@ -246,6 +246,6 @@ auto InitializeCrashpad(const QString &appName) -> bool // Start crash handler auto *client = new CrashpadClient(); - return client->StartHandler(handler, reportsDir, metricsDir, url.toStdString(), annotations.toStdMap(), arguments, - true, true, attachments); + return client->StartHandler(handler, reportsDir, metricsDir, url.toStdString(), "", annotations.toStdMap(), + arguments, true, true, attachments); }