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 2024-04-10 17:49:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pink-pony (Old)
and /work/SRC/openSUSE:Factory/.pink-pony.new.29460 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pink-pony"
Wed Apr 10 17:49:22 2024 rev:8 rq:1166502 version:1.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/pink-pony/pink-pony.changes 2024-03-13
22:18:22.611826563 +0100
+++ /work/SRC/openSUSE:Factory/.pink-pony.new.29460/pink-pony.changes
2024-04-10 17:49:59.207582429 +0200
@@ -1,0 +2,10 @@
+Wed Mar 27 09:48:33 UTC 2024 - Max Lin <m...@suse.com>
+
+- Build with GCC13 on Leap 15
+- Apply pink-pony-1.4.1-protobuf.diff on Leap 15 starts from 15.4
+ since protobuf 25 has been added to SLE15-SP4
+- Refresh pink-pony-1.4.1-protobuf.diff and
+ 0001-Fix-compile-issues-caused-by-Imath-being-moved-out-o.patch,
+ and change the reordering
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pink-pony.spec ++++++
--- /var/tmp/diff_new_pack.15S7eA/_old 2024-04-10 17:50:00.211619378 +0200
+++ /var/tmp/diff_new_pack.15S7eA/_new 2024-04-10 17:50:00.215619526 +0200
@@ -27,8 +27,8 @@
Patch0: datadir.patch
Patch1: script.patch
Patch2: pink-pony-1.4.1.diff
-Patch3: 0001-Fix-compile-issues-caused-by-Imath-being-moved-out-o.patch
-Patch4: pink-pony-1.4.1-protobuf.diff
+Patch3: pink-pony-1.4.1-protobuf.diff
+Patch4: 0001-Fix-compile-issues-caused-by-Imath-being-moved-out-o.patch
BuildRequires: DevIL-devel
BuildRequires: SDL-devel
BuildRequires: SDL_mixer-devel
@@ -40,6 +40,11 @@
BuildRequires: scons
BuildRequires: pkgconfig(libglfw)
BuildRequires: pkgconfig(protobuf)
+%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150200
+BuildRequires: gcc13-c++
+%else
+BuildRequires: gcc-c++
+%endif
Requires: pink-pony-data = %{version}
%package data
@@ -69,8 +74,10 @@
%patch -P 1 -p1
%patch -P 2 -p1
# apply patch3 and patch4 only on openSUSE Tumbleweed
-%if 0%{?suse_version} >= 1550
+%if 0%{?suse_version} >= 1550 || (0%{?suse_version} == 1500 &&
0%{?sle_version} > 150300)
%patch -P 3 -p1
+%endif
+%if 0%{?suse_version} >= 1550
%patch -P 4 -p1
%endif
++++++ 0001-Fix-compile-issues-caused-by-Imath-being-moved-out-o.patch ++++++
--- /var/tmp/diff_new_pack.15S7eA/_old 2024-04-10 17:50:00.231620115 +0200
+++ /var/tmp/diff_new_pack.15S7eA/_new 2024-04-10 17:50:00.235620262 +0200
@@ -8,12 +8,10 @@
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']
+@@ -12,7 +12,7 @@ else:
+ env['LIBS'] = ['GLU', 'GL', 'IL']
env['CPPPATH'] = ['#', '#/src', '#/external/tinyXML', '#/external/flextGL/',
'/usr/include/OpenEXR']
-env.ParseConfig("pkg-config IlmBase --cflags --libs")
@@ -21,8 +19,6 @@
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 @@
@@ -35,7 +31,4 @@
bool Line::intersects(const Line& seg)
{
---
-2.33.0
-
++++++ pink-pony-1.4.1-protobuf.diff ++++++
--- /var/tmp/diff_new_pack.15S7eA/_old 2024-04-10 17:50:00.247620703 +0200
+++ /var/tmp/diff_new_pack.15S7eA/_new 2024-04-10 17:50:00.251620851 +0200
@@ -1,7 +1,5 @@
-Index: pink-pony-1.4.1/SConstruct
-===================================================================
---- pink-pony-1.4.1.orig/SConstruct
-+++ pink-pony-1.4.1/SConstruct
+--- a/SConstruct
++++ b/SConstruct
@@ -9,7 +9,7 @@ if 'CCFLAGS' in os.environ:
env['CCFLAGS'] = os.environ['CCFLAGS']
else:
@@ -10,7 +8,7 @@
+env['LIBS'] = ['GLU', 'GL', 'IL']
env['CPPPATH'] = ['#', '#/src', '#/external/tinyXML', '#/external/flextGL/',
'/usr/include/OpenEXR']
- env.ParseConfig("pkg-config Imath --cflags --libs")
+ env.ParseConfig("pkg-config IlmBase --cflags --libs")
@@ -17,6 +17,7 @@ env.ParseConfig("pkg-config libglfw --cf
env.ParseConfig("pkg-config ftgl --cflags --libs")
env.ParseConfig("pkg-config sigc++-2.0 --cflags --libs")
