Fix minor mistakes
This commit is contained in:
parent
08c2ced1d6
commit
e80ed4c131
|
@ -8,7 +8,7 @@ set(META_APP_URL "https://github.com/${META_APP_AUTHOR}/${META_PROJECT_NAME}")
|
||||||
set(META_APP_DESCRIPTION "Repository browser for Arch Linux")
|
set(META_APP_DESCRIPTION "Repository browser for Arch Linux")
|
||||||
set(META_VERSION_MAJOR 0)
|
set(META_VERSION_MAJOR 0)
|
||||||
set(META_VERSION_MINOR 2)
|
set(META_VERSION_MINOR 2)
|
||||||
set(META_VERSION_PATCH 3)
|
set(META_VERSION_PATCH 4)
|
||||||
|
|
||||||
project(${META_PROJECT_NAME})
|
project(${META_PROJECT_NAME})
|
||||||
|
|
||||||
|
|
|
@ -7,12 +7,14 @@ set(SRC_FILES
|
||||||
main.cpp
|
main.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
set(META_PROJECT_TYPE application)
|
||||||
|
|
||||||
# find c++utilities
|
# find c++utilities
|
||||||
find_package(c++utilities 3.3.0 REQUIRED)
|
find_package(c++utilities 4.0.0 REQUIRED)
|
||||||
use_cpp_utilities()
|
use_cpp_utilities()
|
||||||
|
|
||||||
# find qtutilities
|
# find qtutilities
|
||||||
find_package(qtutilities 4.0.0 REQUIRED)
|
find_package(qtutilities 5.0.0 REQUIRED)
|
||||||
list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_MODULE_DIRS})
|
list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_MODULE_DIRS})
|
||||||
|
|
||||||
# need to link against the repoindex lib
|
# need to link against the repoindex lib
|
||||||
|
@ -25,6 +27,7 @@ include(QtConfig)
|
||||||
include(WindowsResources)
|
include(WindowsResources)
|
||||||
include(AppTarget)
|
include(AppTarget)
|
||||||
include(ShellCompletion)
|
include(ShellCompletion)
|
||||||
|
include(ConfigHeader)
|
||||||
|
|
||||||
# add installs for service and config files
|
# add installs for service and config files
|
||||||
install(FILES ../resources/systemd/${META_PROJECT_NAME}.service
|
install(FILES ../resources/systemd/${META_PROJECT_NAME}.service
|
||||||
|
|
|
@ -16,12 +16,14 @@ set(ICON_FILES
|
||||||
../resources/icons/hicolor/scalable/apps/${META_PROJECT_NAME}.svg
|
../resources/icons/hicolor/scalable/apps/${META_PROJECT_NAME}.svg
|
||||||
)
|
)
|
||||||
|
|
||||||
|
set(META_PROJECT_TYPE application)
|
||||||
|
|
||||||
# find c++utilities
|
# find c++utilities
|
||||||
find_package(c++utilities 3.3.0 REQUIRED)
|
find_package(c++utilities 4.0.0 REQUIRED)
|
||||||
use_cpp_utilities()
|
use_cpp_utilities()
|
||||||
|
|
||||||
# find qtutilities
|
# find qtutilities
|
||||||
find_package(qtutilities 4.0.0 REQUIRED)
|
find_package(qtutilities 5.0.0 REQUIRED)
|
||||||
use_qt_utilities()
|
use_qt_utilities()
|
||||||
|
|
||||||
# add Qt modules which can currently not be detected automatically
|
# add Qt modules which can currently not be detected automatically
|
||||||
|
@ -41,6 +43,7 @@ include(WindowsResources)
|
||||||
include(WebViewProviderConfig)
|
include(WebViewProviderConfig)
|
||||||
include(AppTarget)
|
include(AppTarget)
|
||||||
include(ShellCompletion)
|
include(ShellCompletion)
|
||||||
|
include(ConfigHeader)
|
||||||
|
|
||||||
# create desktop file using previously defined meta data
|
# create desktop file using previously defined meta data
|
||||||
add_desktop_file()
|
add_desktop_file()
|
||||||
|
|
|
@ -49,11 +49,11 @@ list(APPEND ADDITIONAL_QT_MODULES Concurrent Network WebSockets)
|
||||||
list(APPEND ADDITIONAL_KF_MODULES Archive)
|
list(APPEND ADDITIONAL_KF_MODULES Archive)
|
||||||
|
|
||||||
# find c++utilities
|
# find c++utilities
|
||||||
find_package(c++utilities 3.3.0 REQUIRED)
|
find_package(c++utilities 4.0.0 REQUIRED)
|
||||||
use_cpp_utilities()
|
use_cpp_utilities()
|
||||||
|
|
||||||
# find qtutilities
|
# find qtutilities
|
||||||
find_package(qtutilities 4.0.0 REQUIRED)
|
find_package(qtutilities 5.0.0 REQUIRED)
|
||||||
use_qt_utilities()
|
use_qt_utilities()
|
||||||
|
|
||||||
# prefix the target to avoid conflict with cli target
|
# prefix the target to avoid conflict with cli target
|
||||||
|
@ -64,3 +64,4 @@ include(BasicConfig)
|
||||||
include(QtConfig)
|
include(QtConfig)
|
||||||
include(WindowsResources)
|
include(WindowsResources)
|
||||||
include(LibraryTarget)
|
include(LibraryTarget)
|
||||||
|
include(ConfigHeader)
|
||||||
|
|
|
@ -314,7 +314,7 @@ void Manager::addDataBasesFromPacmanConfig()
|
||||||
} else if(dbName.startsWith(QLatin1String("aur"), Qt::CaseInsensitive)) {
|
} else if(dbName.startsWith(QLatin1String("aur"), Qt::CaseInsensitive)) {
|
||||||
cerr << shchar << "Error: Unable to add database from pacman config: The database name mustn't start with \"aur\" because this name is reserved for the Arch Linux User Repository." << endl;
|
cerr << shchar << "Error: Unable to add database from pacman config: The database name mustn't start with \"aur\" because this name is reserved for the Arch Linux User Repository." << endl;
|
||||||
} else if(m_syncDbMap.count(dbName)) {
|
} else if(m_syncDbMap.count(dbName)) {
|
||||||
cerr << shchar << "Error: Unable to add database from pacman config: Database names must be unique. Ignoring second occurance of database [" << scope.first << "]." << endl;
|
cerr << shchar << "Error: Unable to add database from pacman config: Database names must be unique. Ignoring second occurrence of database [" << scope.first << "]." << endl;
|
||||||
} else {
|
} else {
|
||||||
// read sig level and usage
|
// read sig level and usage
|
||||||
const auto &sigLevelStr = lastValue(scope.second, sigLevelKey);
|
const auto &sigLevelStr = lastValue(scope.second, sigLevelKey);
|
||||||
|
|
|
@ -349,7 +349,7 @@ inline bool Repository::isBusy() const
|
||||||
/*!
|
/*!
|
||||||
* \brief Returns the index of the repository.
|
* \brief Returns the index of the repository.
|
||||||
*
|
*
|
||||||
* The index is used to sort the repositories by their occurance the configuration files.
|
* The index is used to sort the repositories by their occurrence the configuration files.
|
||||||
*/
|
*/
|
||||||
inline uint32 Repository::index() const
|
inline uint32 Repository::index() const
|
||||||
{
|
{
|
||||||
|
|
|
@ -188,7 +188,7 @@ UpgradeLookup::UpgradeLookup(QObject *parent) :
|
||||||
* {pkg: ..., basic info of package providing upgrade
|
* {pkg: ..., basic info of package providing upgrade
|
||||||
* curVer: current version
|
* curVer: current version
|
||||||
* ],
|
* ],
|
||||||
* packageOnlyUpdates: [ package-only upgrades
|
* packageOnlyUpgrades: [ package-only upgrades
|
||||||
* {pkg: ..., basic info of package providing upgrade
|
* {pkg: ..., basic info of package providing upgrade
|
||||||
* curVer: current version
|
* curVer: current version
|
||||||
* ],
|
* ],
|
||||||
|
|
|
@ -0,0 +1,17 @@
|
||||||
|
// Created via CMake from template global.h.in
|
||||||
|
// WARNING! Any changes to this file will be overwritten by the next CMake run!
|
||||||
|
|
||||||
|
#ifndef REPOINDEX_GLOBAL
|
||||||
|
#define REPOINDEX_GLOBAL
|
||||||
|
|
||||||
|
#include <c++utilities/application/global.h>
|
||||||
|
|
||||||
|
#ifdef REPOINDEX_STATIC
|
||||||
|
# define REPOINDEX_EXPORT
|
||||||
|
# define REPOINDEX_IMPORT
|
||||||
|
#else
|
||||||
|
# define REPOINDEX_EXPORT LIB_EXPORT
|
||||||
|
# define REPOINDEX_IMPORT LIB_IMPORT
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif // REPOINDEX_GLOBAL
|
|
@ -33,6 +33,8 @@ configure_file(
|
||||||
"${CMAKE_BINARY_DIR}/web/index.html"
|
"${CMAKE_BINARY_DIR}/web/index.html"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
set(META_PROJECT_TYPE application)
|
||||||
|
|
||||||
# add install target for web files / minimizing
|
# add install target for web files / minimizing
|
||||||
# -> don't minimize debug builds
|
# -> don't minimize debug builds
|
||||||
if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
|
if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||||
|
|
Loading…
Reference in New Issue