Accepting request 729952 from science

Fix build with LTO, update

OBS-URL: https://build.opensuse.org/request/show/729952
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ade?expand=0&rev=2

Silence_redundant-move_warning.patch

@@ -1,23 +0,0 @@
-From 08238a4e62e88ad976352c983f8212439a8f901e Mon Sep 17 00:00:00 2001
-From: Pavel Grunt <pavel.grunt@innovatrics.com>
-Date: Thu, 13 Jun 2019 10:40:14 +0200
-Subject: [PATCH] Silence redundant-move warning
-
-Happens with gcc-9.1
----
- sources/ade/source/execution_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sources/ade/source/execution_engine.cpp b/sources/ade/source/execution_engine.cpp
-index fbc4b1d..3bc10a1 100644
---- a/sources/ade/source/execution_engine.cpp
-+++ b/sources/ade/source/execution_engine.cpp
-@@ -138,7 +138,7 @@ std::unique_ptr<Executable> ExecutionEngine::createExecutable(const Graph& graph
-         }
-     }
- 
--    return std::move(ret);
-+    return ret;
- }
- 
- void ExecutionEngine::addExecutableDependency(const std::string& lazyPassName)

ade-0.1.1d.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a6d84dae252f8244d4eebb5241715e3339edd86dbbc80a2fc5953c94e6d3eb00
-size 115694

ade-0.1.1f.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c316680efbb5dd3ac4e10bb8cea345cf26a6a25ebc22418f8f0b8ca931a550e9
+size 116074

ade.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Sep 10 18:55:12 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Update to version 0.1.1f
+- Drop upstream Silence_redundant-move_warning.patch
+- Use -ffat-lto-objects to provide a proper static library.
+- Run tests by default
+
+-------------------------------------------------------------------
+Mon Aug 26 09:24:28 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Remove pointless empty scriptlets
+
 -------------------------------------------------------------------
 Tue Jul  2 21:27:53 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 

ade.spec

@@ -12,25 +12,26 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-%bcond_with tests
+
+%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
+
+%bcond_without tests
 %bcond_with docs
-%bcond_without tutorials
+%bcond_with tutorials
 
 Name:           ade
-Version:        0.1.1d
+Version:        0.1.1f
 Release:        0
 Summary:        Graph construction, manipulation, and processing framework
 License:        Apache-2.0
 Group:          Development/Libraries/C and C++
 Url:            http://opencv.org/
 Source0:        https://github.com/opencv/ade/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM https://github.com/opencv/ade/pull/15.patch
-Patch0:         Silence_redundant-move_warning.patch
-BuildRequires:  cmake > 3.2
 BuildRequires:  c++_compiler
+BuildRequires:  cmake > 3.2
 %if %{with tests}
 BuildRequires:  gtest
 %endif
@@ -52,22 +53,28 @@ for organizing data flow processing and execution.
 
 %prep
 %setup -q
-%patch0 -p1
 # fixup library install directory (i.e. use CMake default)
 sed -i -e 's@ DESTINATION lib@ DESTINATION ${CMAKE_INSTALL_LIBDIR}@' sources/ade/CMakeLists.txt
 
 %build
 %cmake \
-  %{?with tutorials:-DBUILD_ADE_TUTORIAL=ON} \
+  %{?with_tutorials:-DBUILD_ADE_TUTORIAL=ON} \
-  %{?with docs:-DBUILD_ADE_DOCUMENTATION=ON} \
+  %{?with_docs:-DBUILD_ADE_DOCUMENTATION=ON} \
+  %{?with_tests:-DGTEST_ROOT:PATH=%{_prefix} -DENABLE_ADE_TESTING=ON} \
+
 
 %cmake_build
 
 %install
 %cmake_install
+%if %{with tests}
+rm %{buildroot}%{_bindir}/ade-tests
+%endif
 
-%post
+%check
-%postun
+%if %{with tests}
+%ctest
+%endif
 
 %files devel
 %license LICENSE