From db3acea7739da92d26f0642e0cd502a46dc8a289 Mon Sep 17 00:00:00 2001
From: Francesco Colista <fcolista@alpinelinux.org>
Date: Wed, 10 Jun 2020 08:10:31 +0000
Subject: testing/scap-workbench: upgrade to 1.2.1

---
 testing/scap-workbench/APKBUILD                      | 12 +++++++-----
 testing/scap-workbench/remove-werror-cxx-flags.patch | 13 +++++++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 testing/scap-workbench/remove-werror-cxx-flags.patch

diff --git a/testing/scap-workbench/APKBUILD b/testing/scap-workbench/APKBUILD
index f96a8404a19..1328b8eb783 100644
--- a/testing/scap-workbench/APKBUILD
+++ b/testing/scap-workbench/APKBUILD
@@ -1,16 +1,17 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=scap-workbench
-pkgver=1.2.0
-pkgrel=2
+pkgver=1.2.1
+pkgrel=0
 pkgdesc="SCAP Scanner And Tailoring Graphical User Interface"
 url="https://www.open-scap.org/tools/scap-workbench/"
 arch="all !mips !mips64"
 license="GPL-3.0"
 depends="openssh-askpass util-linux openssh-client polkit"
-makedepends="qt5-qtbase-dev qt5-qtxmlpatterns-dev openscap-dev cmake asciidoctor"
+makedepends="qt5-qtbase-dev qt5-qtxmlpatterns-dev openscap-dev cmake asciidoc libxslt"
 subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/OpenSCAP/$pkgname/archive/$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/OpenSCAP/$pkgname/archive/$pkgver.tar.gz
+remove-werror-cxx-flags.patch"
 builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
@@ -36,4 +37,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c766b3a93721a2abc52cd47f44f9ed4b1ad02c733ef89dfb3f368f0f3e016c39b188f6ba29e06f1d3ca3b1b6cdc17e057a80198b105e94c60e484acafd7e1373  scap-workbench-1.2.0.tar.gz"
+sha512sums="37dad3d3310a9ba200756480eee2c93913617a77e9983c18dafdc3320fc62774d23b327200fa21f63cec160ef8d6527ac43c11e7d0cdce49b3a364590311fbad  scap-workbench-1.2.1.tar.gz
+7434322c26be306f2c73ccf864846f8d8f8857a4def784b7c67c9613010f0ffdefad3a360d86b1945d3e77d1a197e657d1b3a71c9f73d3bee98d1bccb7021c9e  remove-werror-cxx-flags.patch"
diff --git a/testing/scap-workbench/remove-werror-cxx-flags.patch b/testing/scap-workbench/remove-werror-cxx-flags.patch
new file mode 100644
index 00000000000..9256be6b8fb
--- /dev/null
+++ b/testing/scap-workbench/remove-werror-cxx-flags.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0e98b7f..de3d01f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -162,7 +162,7 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND ${CMAKE_CXX_COMPILER_VERSION} VE
+ endif()
+ 
+ if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra ")
+ endif()
+ 
+ include_directories(${SCAP_WORKBENCH_INCLUDE_DIRS})
-- 
cgit v1.2.3