chore: upgrade to v2.1.8
This commit is contained in:
parent
c2d072e60a
commit
e348231f93
@ -30,7 +30,7 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_SOURCE_DIR}/cmake/FlagsOverrides.cma
|
|||||||
|
|
||||||
# define project
|
# define project
|
||||||
project(GpgFrontendModules
|
project(GpgFrontendModules
|
||||||
VERSION 2.1.7
|
VERSION 2.1.8
|
||||||
DESCRIPTION "Modules of GpgFrontend"
|
DESCRIPTION "Modules of GpgFrontend"
|
||||||
HOMEPAGE_URL "https://gpgfrontend.bktus.com"
|
HOMEPAGE_URL "https://gpgfrontend.bktus.com"
|
||||||
LANGUAGES CXX)
|
LANGUAGES CXX)
|
||||||
@ -39,7 +39,7 @@ project(GpgFrontendModules
|
|||||||
include(GenerateExportHeader)
|
include(GenerateExportHeader)
|
||||||
|
|
||||||
# function or mode options
|
# function or mode options
|
||||||
option(GPGFRONTEND_QT5_BUILD "Swith to Qt5 building mode" OFF)
|
option(GPGFRONTEND_QT5_BUILD "Switch to Qt5 building mode" OFF)
|
||||||
|
|
||||||
# Using Standard C++-17 (Consider compatibility)
|
# Using Standard C++-17 (Consider compatibility)
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
|
@ -306,7 +306,7 @@ void GetGpgComponentInfos(void *data, int exit_code, const char *out,
|
|||||||
auto component_desc = info_split_list[1].trimmed();
|
auto component_desc = info_split_list[1].trimmed();
|
||||||
auto component_path = info_split_list[2].trimmed();
|
auto component_path = info_split_list[2].trimmed();
|
||||||
|
|
||||||
#ifdef __MINGW32__
|
#if defined(_WIN32) || defined(WIN32)
|
||||||
// replace some special substrings on windows
|
// replace some special substrings on windows
|
||||||
// platform
|
// platform
|
||||||
component_path.replace("%3a", ":");
|
component_path.replace("%3a", ":");
|
||||||
@ -382,7 +382,7 @@ void GetGpgDirectoryInfos(void *, int exit_code, const char *out,
|
|||||||
auto configuration_name = info_split_list[0].trimmed();
|
auto configuration_name = info_split_list[0].trimmed();
|
||||||
auto configuration_value = info_split_list[1].trimmed();
|
auto configuration_value = info_split_list[1].trimmed();
|
||||||
|
|
||||||
#ifdef __MINGW32__
|
#if defined(_WIN32) || defined(WIN32)
|
||||||
// replace some special substrings on windows
|
// replace some special substrings on windows
|
||||||
// platform
|
// platform
|
||||||
configuration_value.replace("%3a", ":");
|
configuration_value.replace("%3a", ":");
|
||||||
|
@ -39,7 +39,6 @@
|
|||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QUrl>
|
#include <QUrl>
|
||||||
#include <QUrlQuery>
|
#include <QUrlQuery>
|
||||||
#include <utility>
|
|
||||||
|
|
||||||
//
|
//
|
||||||
#include <GFModuleCommonUtils.hpp>
|
#include <GFModuleCommonUtils.hpp>
|
||||||
|
@ -314,8 +314,7 @@ struct packet *read_secrets_file(FILE *secrets, enum data_type input_type) {
|
|||||||
|
|
||||||
linenum = atoi(line);
|
linenum = atoi(line);
|
||||||
if (linenum != next_linenum) {
|
if (linenum != next_linenum) {
|
||||||
FLOG_ERROR("missing line number %u (saw %u)", next_linenum,
|
FLOG_ERROR("missing line number %u (saw %u)", next_linenum, linenum);
|
||||||
linenum);
|
|
||||||
free_packet(packet);
|
free_packet(packet);
|
||||||
return NULL;
|
return NULL;
|
||||||
} else
|
} else
|
||||||
|
Loading…
x
Reference in New Issue
Block a user