diff --git a/shogun-5.0.0_fix_invalid_use_of_pre-declared_class.patch b/shogun-5.0.0_fix_invalid_use_of_pre-declared_class.patch new file mode 100644 index 0000000..15fda11 --- /dev/null +++ b/shogun-5.0.0_fix_invalid_use_of_pre-declared_class.patch @@ -0,0 +1,44 @@ +From bb94f47fc398cba0d1ab8bcd7f6e6d5a996ceca8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Sat, 21 Jan 2017 10:33:47 +0100 +Subject: [PATCH] fix invalid use of pre-declared class + +--- + src/shogun/kernel/Kernel.h | 4 ---- + src/shogun/kernel/normalizer/KernelNormalizer.h | 3 ++- + 2 files changed, 2 insertions(+), 5 deletions(-) + +diff --git a/src/shogun/kernel/Kernel.h b/src/shogun/kernel/Kernel.h +index 88e66fb..48121ae 100644 +--- a/src/shogun/kernel/Kernel.h ++++ b/src/shogun/kernel/Kernel.h +@@ -30,10 +30,6 @@ + + namespace shogun + { +- class CFile; +- class CFeatures; +- class CKernelNormalizer; +- + #ifdef USE_SHORTREAL_KERNELCACHE + /** kernel cache element */ + typedef float32_t KERNELCACHE_ELEM; +diff --git a/src/shogun/kernel/normalizer/KernelNormalizer.h b/src/shogun/kernel/normalizer/KernelNormalizer.h +index c2029f2..a6af1cf 100644 +--- a/src/shogun/kernel/normalizer/KernelNormalizer.h ++++ b/src/shogun/kernel/normalizer/KernelNormalizer.h +@@ -13,7 +13,6 @@ + + #include + +-#include + #include + + namespace shogun +@@ -117,4 +116,6 @@ class CKernelNormalizer : public CSGObject + ENormalizerType m_type; + }; + } ++ ++#include + #endif diff --git a/shogun.spec b/shogun.spec index 947b1ed..47e6805 100644 --- a/shogun.spec +++ b/shogun.spec @@ -303,6 +303,7 @@ Source2: https://github.com/shogun-toolbox/docs/archive/%{doc_commit}.tar.gz#/% Source99: https://github.com/google/googletest/archive/release-1.8.0.tar.gz#/gtest-1.8.0.tar.gz Patch0: %{?giturl}/commit/ab6b067017a18712d6b35d1834b4905ee2fdf147.patch#/shogun-5.0.0_use_Eigen330.patch +Patch1: %{?giturl}/pull/3599.patch#/shogun-5.0.0_fix_invalid_use_of_pre-declared_class.patch BuildRequires: arpack-devel BuildRequires: arprec-devel @@ -788,6 +789,7 @@ This package contains the Ruby-plugin for %{name}. pushd py2 # Apply patches. %patch0 -p1 -b .eigen330 +%patch1 -p1 -b .invalid_predecl # Remove cluttering stuff and create some needed dirs. %{__rm} -rf %{_cmake_build_subdir} build data doc/tutorial third_party @@ -1217,6 +1219,7 @@ popd - Spec-file clean-up - Cli and doc-cn packages are faded - Generate regular debuginfo for bindings again +- Add Patch1 to fix build * Mon Dec 19 2016 Miro HronĨok - 4.1.0-9 - Rebuild for Python 3.6