[kodi] fixup
commit e7e8f7807d9bd0ba2c0bf414793b7c64f5a72e24
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Feb 14 15:07:33 2024 +0000
fixup
kodi-20-add-more-missing-includes.patch | 11 +++++++++++
kodi-20-swig-fix.patch | 9 +++++++++
kodi.spec | 6 ++++++
3 files changed, 26 insertions(+)
---
diff --git a/kodi-20-add-more-missing-includes.patch
b/kodi-20-add-more-missing-includes.patch
new file mode 100644
index 0000000..f1b5af1
--- /dev/null
+++ b/kodi-20-add-more-missing-includes.patch
@@ -0,0 +1,11 @@
+--- a/xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp
++++ b/xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include <string>
+ #include <utility>
++#include <algorithm>
+
+ #include <arpa/inet.h>
+ #include <fmt/format.h>
+
diff --git a/kodi-20-swig-fix.patch b/kodi-20-swig-fix.patch
new file mode 100644
index 0000000..b32b991
--- /dev/null
+++ b/kodi-20-swig-fix.patch
@@ -0,0 +1,9 @@
+--- a/xbmc/interfaces/swig/AddonModuleXbmcaddon.i
++++ b/xbmc/interfaces/swig/AddonModuleXbmcaddon.i
+@@ -33,5 +33,6 @@ using namespace xbmcaddon;
+ %include "interfaces/legacy/AddonString.h"
+
+ %include "interfaces/legacy/Addon.h"
++%nodefaultctor Settings;
+ %include "interfaces/legacy/Settings.h"
+
diff --git a/kodi.spec b/kodi.spec
index bc04e24..7226c8a 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -80,6 +80,9 @@ Patch2: kodi-20-annobin-workaround.patch
Patch3:
https://github.com/xbmc/xbmc/commit/4bf9de87e700f0de56ef698a8d8d6eb7d4ff9...
# Add missing includes
Patch4:
https://github.com/xbmc/xbmc/commit/3dcea03c915f2062d4f8740d66abdf033fba9...
+Patch5: kodi-20-add-more-missing-includes.patch
+# swig buildfix
+Patch6: kodi-20-swig-fix.patch
%ifarch x86_64
%global _with_crystalhd 1
@@ -201,6 +204,7 @@ BuildRequires: pipewire-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: python3-devel
BuildRequires: python3-pillow
+BuildRequires: python3-setuptools
BuildRequires: rapidjson-devel
BuildRequires: spdlog-devel
BuildRequires: sqlite-devel
@@ -307,6 +311,8 @@ This package contains FirewallD files for Kodi.
%patch -P 3 -p1 -b.python-312
%endif
%patch -P 4 -p1 -b.missing-includes
+%patch -P 5 -p1 -b.more-missing-includes
+%patch -P 6 -p1 -b.swig-fix
# Fix up Python shebangs
%py3_shebang_fix \