From e78b453a67eb79a9a5df7f9d062e98b7fd427035 Mon Sep 17 00:00:00 2001 From: psykose Date: Mon, 13 Feb 2023 14:20:15 +0000 Subject: [PATCH] testing/scap-workbench: install appdata to metainfo, modernise https://gitlab.alpinelinux.org/alpine/aports/-/issues/11642 --- testing/scap-workbench/APKBUILD | 49 ++++++++++++++-------------- testing/scap-workbench/appdata.patch | 13 ++++++++ 2 files changed, 38 insertions(+), 24 deletions(-) create mode 100644 testing/scap-workbench/appdata.patch diff --git a/testing/scap-workbench/APKBUILD b/testing/scap-workbench/APKBUILD index 31830946e9c..d47f8cd8738 100644 --- a/testing/scap-workbench/APKBUILD +++ b/testing/scap-workbench/APKBUILD @@ -2,40 +2,41 @@ # Maintainer: Francesco Colista pkgname=scap-workbench pkgver=1.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="SCAP Scanner And Tailoring Graphical User Interface" url="https://www.open-scap.org/tools/scap-workbench/" arch="all !armhf" -license="GPL-3.0" +license="GPL-3.0-or-later" depends="openssh-askpass util-linux openssh-client polkit" -makedepends="qt5-qtbase-dev qt5-qtxmlpatterns-dev openscap-dev cmake asciidoc libxslt" +makedepends=" + asciidoc + cmake + libxslt + openscap-dev + qt5-qtbase-dev + qt5-qtxmlpatterns-dev + samurai + " subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/OpenSCAP/$pkgname/archive/$pkgver.tar.gz -remove-werror-cxx-flags.patch" -builddir="$srcdir/$pkgname-$pkgver" +source="$pkgname-$pkgver.tar.gz::https://github.com/OpenSCAP/scap-workbench/archive/$pkgver.tar.gz + appdata.patch + remove-werror-cxx-flags.patch + " +options="!check" # todo -prepare() { - default_prepare - cd "$builddir" - mkdir -p build -} build() { - cd "$builddir"/build - cmake \ + cmake -B build -G Ninja \ -DCMAKE_INSTALL_PREFIX=/usr \ - .. - make -} - -check() { - cd "$builddir"/build - return 0 + -DCMAKE_BUILD_TYPE=none + cmake --build build } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" cmake --install build } -sha512sums="37dad3d3310a9ba200756480eee2c93913617a77e9983c18dafdc3320fc62774d23b327200fa21f63cec160ef8d6527ac43c11e7d0cdce49b3a364590311fbad scap-workbench-1.2.1.tar.gz -7434322c26be306f2c73ccf864846f8d8f8857a4def784b7c67c9613010f0ffdefad3a360d86b1945d3e77d1a197e657d1b3a71c9f73d3bee98d1bccb7021c9e remove-werror-cxx-flags.patch" +sha512sums=" +37dad3d3310a9ba200756480eee2c93913617a77e9983c18dafdc3320fc62774d23b327200fa21f63cec160ef8d6527ac43c11e7d0cdce49b3a364590311fbad scap-workbench-1.2.1.tar.gz +b2bf0e1cca3f30f4cacf5f584a6e4958077e2907a3821ea98064d6174322d66ad163fc2708adca167db94454246f39bcf8c444074d4ed70a6739ee7af47b8597 appdata.patch +7434322c26be306f2c73ccf864846f8d8f8857a4def784b7c67c9613010f0ffdefad3a360d86b1945d3e77d1a197e657d1b3a71c9f73d3bee98d1bccb7021c9e remove-werror-cxx-flags.patch +" diff --git a/testing/scap-workbench/appdata.patch b/testing/scap-workbench/appdata.patch new file mode 100644 index 00000000000..29a793fa18c --- /dev/null +++ b/testing/scap-workbench/appdata.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0e98b7f..d4fb02c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -284,7 +284,7 @@ install(FILES "share/pixmaps/scap-workbench.png" + install(FILES "share/pixmaps/scap-workbench.svg" + DESTINATION "${CMAKE_INSTALL_DATADIR}/pixmaps") + install(FILES "scap-workbench.appdata.xml" +- DESTINATION "${CMAKE_INSTALL_DATADIR}/appdata") ++ DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo") + + if (ASCIIDOC_EXECUTABLE) + file(GLOB USER_MANUAL_SCREENSHOTS "${CMAKE_CURRENT_SOURCE_DIR}/doc/user_manual/*.png")