From 4d3d12bae1e7deac8fa6176f1d05d627c9c1e014 Mon Sep 17 00:00:00 2001
From: Tomas Pecka <peckato1@fit.cvut.cz>
Date: Tue, 12 Mar 2019 15:51:32 +0100
Subject: [PATCH] OBS: PKGBUILD and patches update
---
extra/obs/PKGBUILD | 12 +++++++++---
extra/obs/remove-werror.patch | 26 ++++++++++++-------------
extra/obs/skip-measurements-tests.patch | 13 +++++++++++++
3 files changed, 35 insertions(+), 16 deletions(-)
create mode 100644 extra/obs/skip-measurements-tests.patch
diff --git a/extra/obs/PKGBUILD b/extra/obs/PKGBUILD
index 927bfb273c..3ee7f38345 100644
--- a/extra/obs/PKGBUILD
+++ b/extra/obs/PKGBUILD
@@ -10,11 +10,17 @@ url='https://gitlab.fit.cvut.cz/algorithms-library-toolkit/'
license=('GPL')
depends=('tclap' 'libxml2' 'readline' 'qt5-base>=5.7' 'graphviz' 'jsoncpp')
makedepends=('python3' 'cmake' 'gcc' 'bash' 'make' 'tclap')
-patch=('remove-werror.patch')
provides=('algorithms-library')
conflicts=('algorithms-library')
-sha256sums=('SKIP')
-source=("algorithms-library.tar.gz")
+sha256sums=('SKIP' 'c16c8d32762a69edaf27a96f348d14cf96092273eda99f65d6215b0d2b6ad4fb' '7a8e3aa1c28371e8317a42468dfce62e4233929a2291e53fc7b2dae310810ae5')
+source=("algorithms-library.tar.gz" "remove-werror.patch" "skip-measurements-tests.patch")
+
+prepare() {
+ cd "${srcdir}/${pkgname%-git}"
+ ls
+ patch -p0 --forward --input="${srcdir}/skip-measurements-tests.patch"
+ patch -p0 --forward --input="${srcdir}/remove-werror.patch"
+}
build() {
cd "${srcdir}/${pkgname%-git}"
diff --git a/extra/obs/remove-werror.patch b/extra/obs/remove-werror.patch
index 62565f1c31..cbb95dfcb0 100644
--- a/extra/obs/remove-werror.patch
+++ b/extra/obs/remove-werror.patch
@@ -1,13 +1,13 @@
-diff --git CMake/CMakeLists_root.txt CMake/CMakeLists_root.txt
-index 70f40be32..a2f4a971a 100644
---- CMake/CMakeLists_root.txt
-+++ CMake/CMakeLists_root.txt
-@@ -78,7 +78,7 @@ endif ()
- # Flags according to Debug/Release decision
- # - CMake uses -g on Debug implicitly
- # - fPIC for libraries will be enabled explicitly
--set(ALIB_BUILD_FLAGS_COMMON -Wall -pedantic -pipe -Wextra -Werror -Wshadow -Wpointer-arith -Wcast-qual -Wdelete-non-virtual-dtor -Wredundant-decls)
-+set(ALIB_BUILD_FLAGS_COMMON -Wall -pedantic -pipe -Wextra -Wshadow -Wpointer-arith -Wcast-qual -Wdelete-non-virtual-dtor -Wredundant-decls)
- set(ALIB_BUILD_FLAGS_DEBUG ${{ALIB_BUILD_FLAGS_COMMON}} -Og)
- set(ALIB_BUILD_FLAGS_RELEASE ${{ALIB_BUILD_FLAGS_COMMON}} -O3)
-
+diff --git CMake/Modules/CompilerFlags.cmake CMake/Modules/CompilerFlags.cmake
+index 942fa958b..c06f3992e 100644
+--- CMake/Modules/CompilerFlags.cmake
++++ CMake/Modules/CompilerFlags.cmake
+@@ -15,7 +15,7 @@ if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "(Clang|GNU)")
+ endif ()
+
+ # set build flags
+-add_compile_options(-Wall -pedantic -pipe -Wextra -Werror -Wshadow -Wpointer-arith -Wcast-qual -Wdelete-non-virtual-dtor -Wredundant-decls)
++add_compile_options(-Wall -pedantic -pipe -Wextra -Wshadow -Wpointer-arith -Wcast-qual -Wdelete-non-virtual-dtor -Wredundant-decls)
+
+ add_definitions(-DQT_NO_FOREACH)
+
diff --git a/extra/obs/skip-measurements-tests.patch b/extra/obs/skip-measurements-tests.patch
new file mode 100644
index 0000000000..df1b9ff781
--- /dev/null
+++ b/extra/obs/skip-measurements-tests.patch
@@ -0,0 +1,13 @@
+diff --git alib2measure/test-src/measurements/MeasurementsTest.cpp alib2measure/test-src/measurements/MeasurementsTest.cpp
+index 1571890f1..9370ffd03 100644
+--- alib2measure/test-src/measurements/MeasurementsTest.cpp
++++ alib2measure/test-src/measurements/MeasurementsTest.cpp
+@@ -5,7 +5,7 @@
+ #include <iostream>
+ #include <alib/measure>
+
+-TEST_CASE ( "Measurements", "[unit][measure][measurements]" ) {
++TEST_CASE ( "Measurements", "[unit][measure][measurements][.]" ) {
+ measurements::reset ( );
+
+ SECTION ( "Construct Measurements" ) {
--
GitLab