Hello community,

here is the log from the commit of package hedgewars for openSUSE:Factory 
checked in at 2020-06-05 20:20:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hedgewars (Old)
 and      /work/SRC/openSUSE:Factory/.hedgewars.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "hedgewars"

Fri Jun  5 20:20:19 2020 rev:9 rq:811610 version:1.0.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/hedgewars/hedgewars.changes      2020-01-02 
14:41:38.360918859 +0100
+++ /work/SRC/openSUSE:Factory/.hedgewars.new.3606/hedgewars.changes    
2020-06-05 20:26:34.992950132 +0200
@@ -1,0 +2,6 @@
+Thu Jun  4 17:37:16 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Add upstream patch:
+  * 0001-Fix-build-with-Qt-5.15.patch
+
+-------------------------------------------------------------------

New:
----
  0001-Fix-build-with-Qt-5.15.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ hedgewars.spec ++++++
--- /var/tmp/diff_new_pack.OGVWjT/_old  2020-06-05 20:26:36.896950493 +0200
+++ /var/tmp/diff_new_pack.OGVWjT/_new  2020-06-05 20:26:36.896950493 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package hedgewars
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -32,10 +32,12 @@
 Summary:        Turn-based artillery game, featuring fighting hedgehogs
 License:        GPL-2.0-only
 Group:          Amusements/Games/Strategy/Turn Based
-Url:            http://www.hedgewars.org/
+URL:            http://www.hedgewars.org/
 Source:         
http://hedgewars.org/download/releases/hedgewars-src-%{version}.tar.bz2
 Source99:       %{name}-rpmlintrc
 Patch0:         hedgewars-disable_fpc_workaround.patch
+# PATCH-FIX-UPSTREAM
+Patch1:         0001-Fix-build-with-Qt-5.15.patch
 BuildRequires:  SDL2-devel
 BuildRequires:  SDL2_image-devel
 BuildRequires:  SDL2_mixer-devel
@@ -121,8 +123,8 @@
 
 %prep
 %setup -q -n %{name}-src-%{version}
-
 %patch0 -p0
+%patch1 -p1
 
 %build
 # CMAKE_POLICY_DEFAULT_CMP0083=NEW - apply POSITION_INDEPENDENT_CODE also to 
"-pie", since CMake 3.14

++++++ 0001-Fix-build-with-Qt-5.15.patch ++++++
>From d0a3d313bbc1b939f77647d85f3179ac1e81959d Mon Sep 17 00:00:00 2001
From: Felix Yan <[email protected]>
Date: Thu, 4 Jun 2020 14:44:18 +0800
Subject: [PATCH] Fix build with Qt 5.15+
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

```
/build/hedgewars/src/hedgewars-src-1.0.0/QTfrontend/ui/page/pagegamestats.cpp: 
In member function ‘void PageGameStats::renderStats()’:
/build/hedgewars/src/hedgewars-src-1.0.0/QTfrontend/ui/page/pagegamestats.cpp:222:26:
 error: aggregate ‘QPainterPath path’ has incomplete type and cannot be defined
  222 |             QPainterPath path;
      |                          ^~~~
```
---
 QTfrontend/ui/page/pagegamestats.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/QTfrontend/ui/page/pagegamestats.cpp 
b/QTfrontend/ui/page/pagegamestats.cpp
index ed2751f..6f675c8 100644
--- a/QTfrontend/ui/page/pagegamestats.cpp
+++ b/QTfrontend/ui/page/pagegamestats.cpp
@@ -21,6 +21,7 @@
 #include <QHBoxLayout>
 #include <QGraphicsScene>
 #include <QGroupBox>
+#include <QPainterPath>
 #include <QSizePolicy>
 
 #include "pagegamestats.h"
-- 
2.26.2


Reply via email to