Accepting request 1288092 from science

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

ade-0.1.2d.tar.gz

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

ade-0.1.2e.tar.gz

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

ade-use-cxx14-standard.patch

@@ -1,17 +0,0 @@
----
- CMakeLists.txt |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: ade-0.1.2d/CMakeLists.txt
-===================================================================
---- ade-0.1.2d.orig/CMakeLists.txt
-+++ ade-0.1.2d/CMakeLists.txt
-@@ -18,7 +18,7 @@ option(FORCE_ADE_ASSERTS       "Always e
- option(BUILD_ADE_DOCUMENTATION "Build doxygen documentation"      OFF)
- option(BUILD_WITH_STATIC_CRT   "Build with static multi-threaded C Runtime (MS Windows/Visual Studio only)" OFF)
- 
--set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD 14)
- 
- # TODO: this is horrible hack, we must follow cmake
- # build/install policy

ade.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jun 19 16:42:55 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 0.1.2e:
+  * build and portability fixes, in particular C++17 support
+    and fixes to work with googletest >= 1.17.0 (boo#1244989)
+- drop ade-use-cxx14-standard.patch in favor of cmake parameter
+
 -------------------------------------------------------------------
 Thu Apr 25 08:16:19 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
 

ade.spec

@@ -2,6 +2,7 @@
 # spec file for package ade
 #
 # Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,23 +18,19 @@
 
 
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
-
 %bcond_without tests
 %bcond_with docs
 %bcond_with tutorials
-
 Name:           ade
-Version:        0.1.2d
+Version:        0.1.2e
 Release:        0
 Summary:        Graph construction, manipulation, and processing framework
 License:        Apache-2.0
 Group:          Development/Libraries/C and C++
 URL:            https://opencv.org/
 Source0:        https://github.com/opencv/ade/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM ade-use-cxx14-standard.patch gh#opencv/ade#44 badshah400@gmail.com -- Enforce CMAKE_CXX_STANDARD=14 to allow building tests with gtest >= 1.14.0
-Patch0:         ade-use-cxx14-standard.patch
 BuildRequires:  c++_compiler
-BuildRequires:  cmake > 3.2
+BuildRequires:  cmake
 %if %{with tests}
 BuildRequires:  gtest
 %endif
@@ -59,11 +56,12 @@ for organizing data flow processing and execution.
 sed -i -e 's@ DESTINATION lib@ DESTINATION ${CMAKE_INSTALL_LIBDIR}@' sources/ade/CMakeLists.txt
 
 %build
-# c++14 is required, at a minimum, for gtest to build tests
+# c++17 is required, at a minimum, for gtest to build tests
 %cmake \
   %{?with_tutorials:-DBUILD_ADE_TUTORIAL=ON} \
   %{?with_docs:-DBUILD_ADE_DOCUMENTATION=ON} \
   %{?with_tests:-DGTEST_ROOT:PATH=%{_prefix} \
+  -DCMAKE_CXX_STANDARD=17 \
   -DENABLE_ADE_TESTING=ON} \
   %{nil}