Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package pink-pony for openSUSE:Factory
checked in at 2021-10-12 21:49:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pink-pony (Old)
and /work/SRC/openSUSE:Factory/.pink-pony.new.2443 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pink-pony"
Tue Oct 12 21:49:41 2021 rev:5 rq:924823 version:1.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/pink-pony/pink-pony.changes 2015-03-28
18:38:32.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pink-pony.new.2443/pink-pony.changes
2021-10-12 21:51:03.516018192 +0200
@@ -1,0 +2,6 @@
+Mon Oct 11 13:57:34 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Add upstream patch:
+ * 0001-Fix-compile-issues-caused-by-Imath-being-moved-out-o.patch
+
+-------------------------------------------------------------------
New:
----
0001-Fix-compile-issues-caused-by-Imath-being-moved-out-o.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pink-pony.spec ++++++
--- /var/tmp/diff_new_pack.MGFFRJ/_old 2021-10-12 21:51:04.092019017 +0200
+++ /var/tmp/diff_new_pack.MGFFRJ/_new 2021-10-12 21:51:04.096019022 +0200
@@ -27,7 +27,10 @@
Patch0: datadir.patch
Patch1: script.patch
Patch2: pink-pony-1.4.1.diff
-
+# PATCH-FIX-UPSTREAM -- libraries changed in openexr 3.1
+%if 0%{?suse_version} > 1500
+Patch3: 0001-Fix-compile-issues-caused-by-Imath-being-moved-out-o.patch
+%endif
BuildRequires: DevIL-devel
BuildRequires: SDL-devel
BuildRequires: SDL_mixer-devel
@@ -63,10 +66,7 @@
This package contains architecture-independent game data
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%autosetup -p1
%build
export CCFLAGS="%optflags"
++++++ 0001-Fix-compile-issues-caused-by-Imath-being-moved-out-o.patch ++++++
>From 8427d76a998b8278bd6fd0a3e12fb49af7897be1 Mon Sep 17 00:00:00 2001
From: Thomas Weber <webe...@gmx.at>
Date: Sat, 2 Oct 2021 13:49:12 +0200
Subject: [PATCH] Fix compile issues caused by Imath being moved out of IlmBase
---
SConstruct | 2 +-
src/Line.cc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/SConstruct b/SConstruct
index 026efbf..7df6e03 100644
--- a/SConstruct
+++ b/SConstruct
@@ -9,7 +9,7 @@ env['CCFLAGS'] = ['-Wall', '-Wextra', '-Wno-reorder',
'-Wno-unused-parameter'] +
env['LIBS'] = ['GLU', 'GL', 'protobuf', 'IL']
env['CPPPATH'] = ['#', '#/src', '#/external/tinyXML', '#/external/flextGL/',
'/usr/include/OpenEXR']
-env.ParseConfig("pkg-config IlmBase --cflags --libs")
+env.ParseConfig("pkg-config Imath --cflags --libs")
env.ParseConfig("pkg-config libglfw --cflags --libs")
env.ParseConfig("pkg-config ftgl --cflags --libs")
env.ParseConfig("pkg-config sigc++-2.0 --cflags --libs")
diff --git a/src/Line.cc b/src/Line.cc
index 10a8193..6a07f02 100644
--- a/src/Line.cc
+++ b/src/Line.cc
@@ -1,7 +1,7 @@
#include "Line.hh"
-#include <ImathLimits.h>
+#include <limits>
-#define EPSILON limits<double>::epsilon()
+#define EPSILON std::limits<double>::epsilon()
bool Line::intersects(const Line& seg)
{
--
2.33.0
