From 0caab90de4eb57ea021216a4d9c37b23decfb665 Mon Sep 17 00:00:00 2001 From: uglyside Date: Sun, 18 Aug 2024 17:02:57 +0300 Subject: [PATCH 1/3] catch2. --- programming/library/catch2/actions.py | 37 ++++++++++----------------- programming/library/catch2/pspec.xml | 15 ++++++++--- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/programming/library/catch2/actions.py b/programming/library/catch2/actions.py index 35c5af0c7a..811ea7a5c4 100644 --- a/programming/library/catch2/actions.py +++ b/programming/library/catch2/actions.py @@ -1,37 +1,26 @@ -#!/usr/bin/env python +#!/usr/bin/python # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt +# See the file https://www.gnu.org/licenses/gpl-3.0.txt -from pisi.actionsapi import autotools, cmaketools, shelltools -from pisi.actionsapi import pisitools -from pisi.actionsapi import get +from pisi.actionsapi import cmaketools, mesontools +l = ''.join([ + ' -DCMAKE_BUILD_TYPE=Release', + ' -DCMAKE_INSTALL_PREFIX=/usr', + ' -DBUILD_SHARED_LIBS=1', + ' -Bbuild -G Ninja -L ' + ]) def setup(): - parameters = ' '.join([ - '-B build', - '-DCMAKE_INSTALL_LIBDIR=lib', - '-DCATCH_USE_VALGRIND=OFF', - '-DCATCH_BUILD_EXAMPLES=OFF', - '-DCATCH_ENABLE_COVERAGE=OFF', - '-DCATCH_ENABLE_WERROR=OFF', - '-DBUILD_TESTING=ON' - ]) - cmaketools.configure(parameters) - + cmaketools.configure(l) def build(): - shelltools.cd('build') - autotools.make() - + mesontools.build() def check(): - shelltools.cd('build') - autotools.make('test') - + pass def install(): - shelltools.cd('build') - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + mesontools.install() diff --git a/programming/library/catch2/pspec.xml b/programming/library/catch2/pspec.xml index 953b4aa838..db0a6cef8b 100644 --- a/programming/library/catch2/pspec.xml +++ b/programming/library/catch2/pspec.xml @@ -1,9 +1,9 @@ - + catch2 - https://github.com/catchorg/catch2 + https://github.com/catchorg/Catch2/ Safa Arıman safaariman@pisilinux.org @@ -12,9 +12,10 @@ library C++ Automated Test Cases in Headers Catch2 is a multi-paradigm test framework for C++, which also supports Objective-C. It is primarily distributed as a single header file, although certain extensions may require additional headers. - https://github.com/catchorg/Catch2/archive/v2.13.9.tar.gz + https://github.com/catchorg/Catch2/archive/refs/tags/v3.7.0.tar.gz cmake + ninja python3-devel @@ -24,12 +25,18 @@ /usr/include /usr/lib - /usr/share/doc /usr/share + + 2024-08-18 + 3.7.0 + Version bump. + fury + uglyside@yandex.ru + 2022-11-05 2.13.9 From cfef915ddc58a1edfab4b7fe0594d32f72b9f32a Mon Sep 17 00:00:00 2001 From: uglyside Date: Sun, 18 Aug 2024 17:03:16 +0300 Subject: [PATCH 2/3] expected. --- programming/library/expected/actions.py | 29 ++++++++++++------------- programming/library/expected/pspec.xml | 16 +++++++++----- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/programming/library/expected/actions.py b/programming/library/expected/actions.py index 59a046f76c..9b54f0ba79 100644 --- a/programming/library/expected/actions.py +++ b/programming/library/expected/actions.py @@ -1,29 +1,28 @@ -#!/usr/bin/env python +#!/usr/bin/python # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt +# See the file https://www.gnu.org/licenses/gpl-3.0.txt -from pisi.actionsapi import cmaketools, shelltools -from pisi.actionsapi import pisitools +from pisi.actionsapi import cmaketools, mesontools, pisitools +l = ''.join([ + ' -DCMAKE_BUILD_TYPE=Release', + ' -DCATCH_ENABLE_WERROR=ON', + ' -DEXPECTED_BUILD_PACKAGE_DEB=OFF ' + ' -Bbuild -G Ninja -L ' + ]) def setup(): - cmaketools.configure('-B build') - + cmaketools.configure(l) def build(): - shelltools.cd('build') - cmaketools.make() - + mesontools.build() def check(): - shelltools.cd('build') - shelltools.system('./tests') - + mesontools.build("test") def install(): - shelltools.cd('build') - cmaketools.install() + mesontools.install() - pisitools.dodoc('../COPYING') + pisitools.dodoc("COPYING") diff --git a/programming/library/expected/pspec.xml b/programming/library/expected/pspec.xml index 8ace17ab7c..9d1a653a36 100644 --- a/programming/library/expected/pspec.xml +++ b/programming/library/expected/pspec.xml @@ -1,5 +1,5 @@ - + expected @@ -12,10 +12,10 @@ library Single header implementation of std::expected with functional-style extensions. std::expected is proposed as the preferred way to represent object which will either have an expected value, or an unexpected value giving information about why something failed. Unfortunately, chaining together many computations which may fail can be verbose, as error-checking code will be mixed in with the actual programming logic. This implementation provides a number of utilities to make coding with expected cleaner. - https://github.com/TartanLlama/expected/archive/v1.0.0.tar.gz + https://github.com/TartanLlama/expected/archive/refs/tags/v1.1.0.tar.gz cmake - git + ninja catch2 @@ -24,12 +24,18 @@ expected-devel /usr/include - /usr/share/doc - /usr/share/cmake + /usr/share + + 2024-08-18 + 1.1.0 + Version bump. + Safa Arıman + safa@ariman.gen.tr + 2020-03-17 1.0.0 From f0ab648159b15c778e5e37c80c8f487796f0688f Mon Sep 17 00:00:00 2001 From: uglyside Date: Sun, 18 Aug 2024 17:03:33 +0300 Subject: [PATCH 3/3] nuspell. --- office/spellcheck/nuspell/pspec.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/office/spellcheck/nuspell/pspec.xml b/office/spellcheck/nuspell/pspec.xml index 2d256b88d5..4c806e915d 100644 --- a/office/spellcheck/nuspell/pspec.xml +++ b/office/spellcheck/nuspell/pspec.xml @@ -20,7 +20,6 @@ https://github.com/nuspell/nuspell/archive/refs/tags/v5.1.6.tar.gz - git cmake catch2 pandoc-bin