From e865397f1256fe2e3d4e83dbb1f0bddf409e8aa5 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Mon, 28 Oct 2024 17:38:55 -0400 Subject: [PATCH] build: rm DESKFLOW_WEBSITE_URL define --- cmake/Definitions.cmake | 6 ------ deploy/dist/arch/PKGBUILD.in | 2 +- src/lib/gui/constants.h | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/cmake/Definitions.cmake b/cmake/Definitions.cmake index 30e447383..e53ec4a4a 100644 --- a/cmake/Definitions.cmake +++ b/cmake/Definitions.cmake @@ -54,10 +54,6 @@ endmacro() macro(configure_meta) - set(DESKFLOW_WEBSITE_URL - "https://deskflow.org" - CACHE STRING "URL of the app website") - set(DESKFLOW_VERSION_URL "https://api.deskflow.org/version" CACHE STRING "URL to get the latest version") @@ -78,7 +74,6 @@ macro(configure_meta) true CACHE BOOL "Show developer thanks message") - message(VERBOSE "Website URL: ${DESKFLOW_WEBSITE_URL}") message(VERBOSE "Version URL: ${DESKFLOW_VERSION_URL}") message(VERBOSE "Help text: ${DESKFLOW_HELP_TEXT}") message(VERBOSE "Res dir: ${DESKFLOW_DEPLOY_RES_DIR}") @@ -86,7 +81,6 @@ macro(configure_meta) message(VERBOSE "Show dev thanks: ${DESKFLOW_SHOW_DEV_THANKS}") # TODO: We need to move this to configure_file() in the future, which is much cleaner. - add_definitions(-DDESKFLOW_WEBSITE_URL="${DESKFLOW_WEBSITE_URL}") add_definitions(-DDESKFLOW_VERSION_URL="${DESKFLOW_VERSION_URL}") add_definitions(-DDESKFLOW_HELP_TEXT="${DESKFLOW_HELP_TEXT}") diff --git a/deploy/dist/arch/PKGBUILD.in b/deploy/dist/arch/PKGBUILD.in index 3343bdb01..ea92fb666 100644 --- a/deploy/dist/arch/PKGBUILD.in +++ b/deploy/dist/arch/PKGBUILD.in @@ -4,7 +4,7 @@ pkgname=deskflow pkgver=@DESKFLOW_VERSION@ pkgrel=1 pkgdesc="Mouse and keyboard sharing utility" -url='@DESKFLOW_WEBSITE_URL@' +url='https://deskflow.org' arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') license=('GPL-2.0-only') depends=( diff --git a/src/lib/gui/constants.h b/src/lib/gui/constants.h index 3c09c55cc..bafebab03 100644 --- a/src/lib/gui/constants.h +++ b/src/lib/gui/constants.h @@ -29,7 +29,7 @@ const auto kOrgDomain = QStringLiteral("deskflow.org"); const auto kLinkDownload = R"(Download now)"; const auto kUrlSourceQuery = "source=gui"; -const auto kUrlApp = DESKFLOW_WEBSITE_URL; +const auto kUrlApp = QStringLiteral("https://deskflow.org"); const auto kUrlHelp = QString("%1/help?%2").arg(kUrlApp, kUrlSourceQuery); const auto kUrlDownload = QString("%1/download?%2").arg(kUrlApp, kUrlSourceQuery);