From a3b10da7acec5382412093be3961418cc53c66d7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Fri, 23 Apr 2021 17:42:35 -0300
Subject: [PATCH] recipes: tde/{tdelibs,tdebase}: Build against OpenEXR 3.0.1
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Matías Fonzo <selk@dragora.org>
---
 .../4fb2a90b45964ef025ed6483f3c028934f127b01       | 26 ++++++++++++++++++++++
 recipes/tde/tdebase/recipe                         |  9 ++++++--
 recipes/tde/tdelibs/recipe                         |  5 +++--
 3 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 patches/tdebase/4fb2a90b45964ef025ed6483f3c028934f127b01

diff --git a/patches/tdebase/4fb2a90b45964ef025ed6483f3c028934f127b01 b/patches/tdebase/4fb2a90b45964ef025ed6483f3c028934f127b01
new file mode 100644
index 00000000..61744695
--- /dev/null
+++ b/patches/tdebase/4fb2a90b45964ef025ed6483f3c028934f127b01
@@ -0,0 +1,26 @@
+From 4fb2a90b45964ef025ed6483f3c028934f127b01 Mon Sep 17 00:00:00 2001
+From: Owsjannikow Sergej E <ose-nt@yandex.ru>
+Date: Fri, 23 Apr 2021 11:53:28 +0200
+Subject: Fix FTBFS with OpenEXR >= 3.0.x This resolves issue #198.
+
+Signed-off-by: Owsjannikow Sergej E. <ose-nt@yandex.ru>
+(cherry picked from commit 267adb43b8ffc1aa9a895c315c75fb3ff6205658)
+---
+ tdeioslave/thumbnail/exrcreator.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tdeioslave/thumbnail/exrcreator.cpp b/tdeioslave/thumbnail/exrcreator.cpp
+index 5708b8996..9ec2dd706 100644
+--- a/tdeioslave/thumbnail/exrcreator.cpp
++++ b/tdeioslave/thumbnail/exrcreator.cpp
+@@ -26,6 +26,7 @@
+ #include <tqfile.h>
+ 
+ #include <ImfInputFile.h>
++#include <ImfHeader.h>
+ #include <ImfPreviewImage.h>
+ 
+ #include "exrcreator.h"
+-- 
+cgit v1.2.1
+
diff --git a/recipes/tde/tdebase/recipe b/recipes/tde/tdebase/recipe
index fa5c1f03..da9be6cb 100644
--- a/recipes/tde/tdebase/recipe
+++ b/recipes/tde/tdebase/recipe
@@ -19,7 +19,7 @@ set -e
 
 program=tdebase-trinity
 version=14.0.9
-release=3
+release=4
 
 # Define a category for the output of the package name
 pkgcategory=tde
@@ -50,9 +50,14 @@ build()
 
     cd "$srcdir"
 
+    # Fix FTBFS with OpenEXR >= 3.0.x This resolves issue #198
+    # https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/198
+    patch -p1 < "${worktree}/patches/tdebase/4fb2a90b45964ef025ed6483f3c028934f127b01"
+
     # Set sane permissions
     chmod -R u+w,go-w,a+rX-s .
 
+    rm -rf BUILD
     mkdir BUILD
     cd BUILD
 
@@ -87,7 +92,7 @@ build()
      -DWITH_SAMBA=OFF                                       \
      -DWITH_LIBUSB=OFF                                      \
      -DWITH_LIBRAW1394=OFF                                  \
-     -DWITH_OPENEXR=OFF                                     \
+     -DWITH_OPENEXR=ON                                      \
      -DWITH_XCOMPOSITE=ON                                   \
      -DWITH_XCURSOR=ON                                      \
      -DWITH_XFIXES=ON                                       \
diff --git a/recipes/tde/tdelibs/recipe b/recipes/tde/tdelibs/recipe
index 7bda2b02..235d07e2 100644
--- a/recipes/tde/tdelibs/recipe
+++ b/recipes/tde/tdelibs/recipe
@@ -19,7 +19,7 @@ set -e
 
 program=tdelibs-trinity
 version=14.0.9
-release=4
+release=5
 
 # Define a category for the output of the package name
 pkgcategory=tde
@@ -56,6 +56,7 @@ build()
     # Set sane permissions
     chmod -R u+w,go-w,a+rX-s .
 
+    rm -rf BUILD
     mkdir BUILD
     cd BUILD
 
@@ -82,7 +83,7 @@ build()
      -DWITH_LIBIDN=OFF                                      \
      -DWITH_TIFF=ON                                         \
      -DWITH_JASPER=ON                                       \
-     -DWITH_OPENEXR=OFF                                     \
+     -DWITH_OPENEXR=ON                                      \
      -DWITH_AVAHI=OFF                                       \
      -DWITH_ISPELL=OFF                                      \
      -DWITH_ASPELL=ON                                       \
-- 
2.11.4.GIT