[rpms/onnx] test-1.21.0: Fix onnxruntime patch

[rpms/onnx] test-1.21.0: Fix onnxruntime patch

[Diego Herrera]

A new commit has been pushed.

Repo   : rpms/onnx
Branch : test-1.21.0
Commit : d4747a515c09df4ac889e17a4372ebb0e1611b49
Author : Diego Herrera <dherrera@redhat.com>
Date   : 2023-09-21T12:00:45-03:00
Stats  : +24/-17 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/onnx/c/d4747a515c09df4ac889e17a4372ebb0e1611b49?branch=test-1.21.0

Log:
Fix onnxruntime patch

---
diff --git a/onnx.spec b/onnx.spec
index a86b27a..3bacb97 100644
--- a/onnx.spec
+++ b/onnx.spec
@@ -2,7 +2,7 @@
 
 Name:       onnx
 Version:    1.14.0
-Release:    7%{?dist}
+Release:    8%{?dist}
 Summary:    Open standard for machine learning interoperability
 License:    Apache-2.0
 
@@ -116,6 +116,9 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}
 %{_bindir}/check-node
 
 %changelog
+* Wed Sep 20 2023 Diego Herrera C <dherrera@redhat.com> - 1.14.0-8
+- Fix onnxruntime patch
+
 * Wed Aug 30 2023 Diego Herrera C <dherrera@redhat.com> - 1.14.0-7
 - Add fix to use with onnxruntime
 

diff --git a/onnxruntime_fix.patch b/onnxruntime_fix.patch
index d7718a2..01a7bf6 100644
--- a/onnxruntime_fix.patch
+++ b/onnxruntime_fix.patch
@@ -1,15 +1,27 @@
 diff -ruN onnx-1.14.0-orig/onnx/defs/schema.cc onnx-1.14.0/onnx/defs/schema.cc
 --- onnx-1.14.0-orig/onnx/defs/schema.cc	2023-08-04 19:00:31.645728197 -0400
-+++ onnx-1.14.0/onnx/defs/schema.cc	2023-09-06 18:27:14.667106624 -0300
-@@ -17,6 +17,7 @@
++++ onnx-1.14.0/onnx/defs/schema.cc	2023-09-21 11:42:41.643106838 -0300
+@@ -17,8 +17,19 @@
  #include "onnx/common/assertions.h"
  #include "onnx/common/stl_backports.h"
  #include "onnx/defs/parser.h"
 +#include "onnx/onnxruntime_fix.h"
  
  namespace ONNX_NAMESPACE {
++
++bool ONNXRuntimeFix::_static_registration_disabled = false;
++bool ONNXRuntimeFix::isStaticRegistrationDisabled() {
++  return _static_registration_disabled;
++}
++
++void ONNXRuntimeFix::disableStaticRegistration() {
++  _static_registration_disabled = true;
++}
++
  // -1 means ONNX schema hasn't been loaded yet
-@@ -1061,6 +1062,9 @@
+ // 0 means all versions of ONNX schema have been loaded
+ // Other positive integer means the ONNX schemas for the specified version have been loaded
+@@ -1061,6 +1072,9 @@
    class SchemasRegisterer {
     public:
      SchemasRegisterer() {
@@ -21,27 +33,19 @@ diff -ruN onnx-1.14.0-orig/onnx/defs/schema.cc onnx-1.14.0/onnx/defs/schema.cc
  #ifndef NDEBUG
 diff -ruN onnx-1.14.0-orig/onnx/onnxruntime_fix.h onnx-1.14.0/onnx/onnxruntime_fix.h
 --- onnx-1.14.0-orig/onnx/onnxruntime_fix.h	1969-12-31 21:00:00.000000000 -0300
-+++ onnx-1.14.0/onnx/onnxruntime_fix.h	2023-09-06 18:38:38.329785016 -0300
-@@ -0,0 +1,22 @@
++++ onnx-1.14.0/onnx/onnxruntime_fix.h	2023-09-21 11:36:58.418240548 -0300
+@@ -0,0 +1,14 @@
 +#pragma once
 +
 +namespace ONNX_NAMESPACE {
 +
 +class ONNXRuntimeFix {
 +public:
-+  static inline bool isStaticRegistrationDisabled() {
-+    return static_registration_disabled();
-+  }
-+
-+  static inline void disableStaticRegistration() {
-+    static_registration_disabled() = true;
-+  }
++  static bool isStaticRegistrationDisabled();
++  static void disableStaticRegistration();
 +
 +private:
-+  static inline bool& static_registration_disabled() {
-+    static auto value = false;
-+    return value;
-+  }
++  static bool _static_registration_disabled;
 +};
 +
 +} // namespace ONNX_NAMESPACE