Martchus
/
PKGBUILDs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update c++utilities and syncthingtray

This commit is contained in:
Martchus 2017-07-15 19:17:28 +02:00
parent 0808d53617
commit 9bd152f7ce
8 changed files with 19 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
c++utilities/default/0001-Make-check-target-depend-on-.clang-format-file.patch
View File

@ -1,84 +0,0 @@
From 5e67a9b69116329f0195f3004900275869cf6a5d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 1 Jun 2017 18:24:14 +0200
Subject: [PATCH] Make check target depend on .clang-format file
---
cmake/modules/BasicConfig.cmake | 32 ++++++++++++++++++--------------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/cmake/modules/BasicConfig.cmake b/cmake/modules/BasicConfig.cmake
index d2d16b3..64169ba 100644
--- a/cmake/modules/BasicConfig.cmake
+++ b/cmake/modules/BasicConfig.cmake
@@ -172,15 +172,6 @@ if(NOT META_NO_TIDY)
endif()
endif()
-# add autotools-style check target
-if(NOT TARGET check)
- set(CMAKE_CTEST_COMMAND ${CMAKE_CTEST_COMMAND} -V)
- add_custom_target(check
- COMMAND ${CMAKE_CTEST_COMMAND}
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- )
-endif()
-
# enable testing
enable_testing()
get_directory_property(HAS_PARENT PARENT_DIRECTORY)
@@ -201,28 +192,31 @@ if(NOT META_NO_TIDY AND EXISTS "${CLANG_FORMAT_RULES}")
if(FORMATABLE_FILES)
list(REMOVE_ITEM FORMATABLE_FILES "")
+ add_custom_command(
+ OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/.clang-format"
+ COMMAND "${CMAKE_COMMAND}" -E create_symlink "${CLANG_FORMAT_RULES}" "${CMAKE_CURRENT_SOURCE_DIR}/.clang-format"
+ COMMENT "Linking coding style from ${CLANG_FORMAT_RULES}"
+ )
add_custom_target("${TARGET_PREFIX}${META_PROJECT_NAME}${TARGET_SUFFIX}_tidy"
COMMAND "${CLANG_FORMAT_BIN}" -style=file -i ${FORMATABLE_FILES}
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
COMMENT "Tidying ${META_PROJECT_NAME} sources using clang-format"
+ DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/.clang-format"
)
if(NOT TARGET tidy)
add_custom_target(tidy)
endif()
add_dependencies(tidy "${TARGET_PREFIX}${META_PROJECT_NAME}${TARGET_SUFFIX}_tidy")
- add_custom_target("${TARGET_PREFIX}${META_PROJECT_NAME}${TARGET_SUFFIX}_link_codingstyle"
- COMMAND "${CMAKE_COMMAND}" -E create_symlink "${CLANG_FORMAT_RULES}" "${CMAKE_CURRENT_SOURCE_DIR}/.clang-format"
- COMMENT "Linking coding style from ${CLANG_FORMAT_RULES}"
- )
- add_dependencies("${TARGET_PREFIX}${META_PROJECT_NAME}${TARGET_SUFFIX}_tidy" "${TARGET_PREFIX}${META_PROJECT_NAME}${TARGET_SUFFIX}_link_codingstyle")
# also add a test to verify whether sources are tidy
add_test(NAME "${TARGET_PREFIX}${META_PROJECT_NAME}${TARGET_SUFFIX}_tidy_test"
COMMAND "${CLANG_FORMAT_BIN}" -output-replacements-xml -style=file ${FORMATABLE_FILES}
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
)
+ list(APPEND CHECK_TARGET_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/.clang-format")
set_tests_properties("${TARGET_PREFIX}${META_PROJECT_NAME}${TARGET_SUFFIX}_tidy_test" PROPERTIES
FAIL_REGULAR_EXPRESSION "<replacement.*>.*</replacement>"
+ REQUIRED_FILES "${CMAKE_CURRENT_SOURCE_DIR}/.clang-format"
)
endif()
else()
@@ -232,4 +226,14 @@ else()
message(WARNING "No rules to invoke clang-format for ${META_PROJECT_NAME} present")
endif()
+# add autotools-style check target
+if(NOT TARGET check)
+ set(CMAKE_CTEST_COMMAND ${CMAKE_CTEST_COMMAND} -V)
+ add_custom_target(check
+ COMMAND ${CMAKE_CTEST_COMMAND}
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ DEPENDS "${CHECK_TARGET_DEPENDS}"
+ )
+endif()
+
set(BASIC_PROJECT_CONFIG_DONE YES)
--
2.13.0

9
c++utilities/default/PKGBUILD
View File

@ -5,7 +5,7 @@
_reponame=cpp-utilities
pkgname=c++utilities
pkgver=4.8.0
pkgver=4.9.0
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities'
@ -15,14 +15,11 @@ optdepends=("$pkgname-doc: API documentation")
makedepends=('cmake')
checkdepends=('cppunit')
url="https://github.com/Martchus/${_reponame}"
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz"
'0001-Make-check-target-depend-on-.clang-format-file.patch')
sha256sums=('a569f51e367f372dfbfe1903944e848e54de7eeee400c20ed527d7a2c3bea8ef'
'2c965ecaad6557cbe4367f09801f4cdc78602de4c8c3eed38838943a9423bb66')
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
sha256sums=('b04bcb29c3dcb2ab63b76b9bc2d1f27022826dc9db387745b06c278b27b1faec')
prepare() {
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
patch -p1 -i "$srcdir/0001-Make-check-target-depend-on-.clang-format-file.patch"
}
build() {

4
c++utilities/doc/PKGBUILD
View File

@ -6,7 +6,7 @@
_name=c++utilities
_reponame=cpp-utilities
pkgname=$_name-doc
pkgver=4.8.0
pkgver=4.9.0
pkgrel=1
arch=('any')
pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities (API documentation)'
@ -14,7 +14,7 @@ license=('GPL')
makedepends=('cmake' 'doxygen' 'dia' 'graphviz')
url="https://github.com/Martchus/${_reponame}"
source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
sha256sums=('a569f51e367f372dfbfe1903944e848e54de7eeee400c20ed527d7a2c3bea8ef')
sha256sums=('b04bcb29c3dcb2ab63b76b9bc2d1f27022826dc9db387745b06c278b27b1faec')
build() {
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"

4
c++utilities/mingw-w64/PKGBUILD
View File

@ -6,7 +6,7 @@
_reponame=cpp-utilities
pkgname=mingw-w64-c++utilities
_name=${pkgname#mingw-w64-}
pkgver=4.8.0
pkgver=4.9.0
pkgrel=1
arch=('any')
pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities (mingw-w64)'
@ -16,7 +16,7 @@ optdepends=("$pkgname-doc: API documentation")
makedepends=('mingw-w64-gcc' 'mingw-w64-cmake')
url="https://github.com/Martchus/${_reponame}"
source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
sha256sums=('a569f51e367f372dfbfe1903944e848e54de7eeee400c20ed527d7a2c3bea8ef')
sha256sums=('b04bcb29c3dcb2ab63b76b9bc2d1f27022826dc9db387745b06c278b27b1faec')
options=(!buildflags staticlibs !strip !emptydirs)
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
[[ $NO_STATIC_LIBS ]] || _configurations='-DENABLE_STATIC_LIBS:BOOL=ON'

7
syncthingtray/default/PKGBUILD
View File

@ -3,6 +3,9 @@
# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
# you also find the URL of a binary repository.
# if tests fail due to timeout, you can try to increase the timeout
# by setting SYNCTHING_TEST_TIMEOUT_FACTOR
# set the web view provider: either webkit, webengine, auto or none
_webview_provider=webkit
@ -12,7 +15,7 @@ _enable_kio_plugin=1
_reponame=syncthingtray
pkgname=syncthingtray
pkgver=0.6.0
pkgver=0.6.2
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc='Tray application for Syncthing'
@ -27,7 +30,7 @@ checkdepends=('cppunit' 'syncthing')
[[ $_enable_kio_plugin ]] && makedepends+=('kio')
url="https://github.com/Martchus/${_reponame}"
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
sha256sums=('97940ce14b9480583da1d0a71c5797458a2d29f203d54ecd1ccd2b30065dbdf4')
sha256sums=('70a08663ec70f69fc45c9fa8fe205b55d650124d522b357d52529f6d2e179e60')
build() {
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"

3
syncthingtray/git/PKGBUILD
View File

@ -3,6 +3,9 @@
# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
# you also find the URL of a binary repository.
# if tests fail due to timeout, you can try to increase the timeout
# by setting SYNCTHING_TEST_TIMEOUT_FACTOR
# set the web view provider: either webkit, webengine, auto or none
_webview_provider=webkit

4
syncthingtray/mingw-w64-webview/PKGBUILD
View File

@ -10,7 +10,7 @@ _reponame=syncthingtray
pkgname=mingw-w64-syncthingtray-webview
provides=('mingw-w64-syncthingtray')
conflicts=('mingw-w64-syncthingtray')
pkgver=0.6.0
pkgver=0.6.2
pkgrel=1
arch=('any')
pkgdesc='Tray application for Syncthing (mingw-w64)'
@ -22,7 +22,7 @@ depends=('mingw-w64-crt' 'mingw-w64-qt5-svg' 'mingw-w64-qtutilities' 'mingw-w64-
makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg')
url="https://github.com/Martchus/${_reponame}"
source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
sha256sums=('97940ce14b9480583da1d0a71c5797458a2d29f203d54ecd1ccd2b30065dbdf4')
sha256sums=('70a08663ec70f69fc45c9fa8fe205b55d650124d522b357d52529f6d2e179e60')
options=(!buildflags staticlibs !strip !emptydirs)
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

4
syncthingtray/mingw-w64/PKGBUILD
View File

@ -9,7 +9,7 @@ _webview_provider=none
_reponame=syncthingtray
pkgname=mingw-w64-syncthingtray
_name=${pkgname#mingw-w64-}
pkgver=0.6.0
pkgver=0.6.2
pkgrel=1
arch=('any')
pkgdesc='Tray application for Syncthing (mingw-w64)'
@ -21,7 +21,7 @@ depends=('mingw-w64-crt' 'mingw-w64-qt5-svg' 'mingw-w64-qtutilities' 'mingw-w64-
makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg')
url="https://github.com/Martchus/${_reponame}"
source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
sha256sums=('97940ce14b9480583da1d0a71c5797458a2d29f203d54ecd1ccd2b30065dbdf4')
sha256sums=('70a08663ec70f69fc45c9fa8fe205b55d650124d522b357d52529f6d2e179e60')
options=(!buildflags staticlibs !strip !emptydirs)
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
[[ $NO_STATIC_LIBS ]] ||