Hello community, here is the log from the commit of package solarus-quest-editor for openSUSE:Factory checked in at 2018-11-12 09:43:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solarus-quest-editor (Old) and /work/SRC/openSUSE:Factory/.solarus-quest-editor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solarus-quest-editor" Mon Nov 12 09:43:41 2018 rev:3 rq:647697 version:1.5.3 Changes: -------- --- /work/SRC/openSUSE:Factory/solarus-quest-editor/solarus-quest-editor.changes 2018-04-20 17:28:42.440198531 +0200 +++ /work/SRC/openSUSE:Factory/.solarus-quest-editor.new/solarus-quest-editor.changes 2018-11-12 09:44:54.880874282 +0100 @@ -1,0 +2,8 @@ +Thu Nov 8 20:05:52 UTC 2018 - antoine.belv...@opensuse.org + +- Add solarus-quest-editor-1.5.3-fix-compilation.patch: Fix build + on Tumbleweed (boo#1115055). +- Update source URL: Project has migrated to GitLab. +- Minor spec file cleanup. + +------------------------------------------------------------------- Old: ---- solarus-quest-editor-1.5.3.tar.gz New: ---- solarus-quest-editor-1.5.3-fix-compilation.patch solarus-quest-editor-v1.5.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solarus-quest-editor.spec ++++++ --- /var/tmp/diff_new_pack.eTWdVX/_old 2018-11-12 09:44:56.356872036 +0100 +++ /var/tmp/diff_new_pack.eTWdVX/_new 2018-11-12 09:44:56.360872030 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -23,7 +23,9 @@ License: GPL-3.0-or-later AND CC-BY-SA-3.0 Group: Productivity/Graphics/Other Url: http://www.solarus-games.org/engine/solarus-quest-editor/ -Source: https://github.com/solarus-games/solarus-quest-editor/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source: https://gitlab.com/solarus-games/solarus-quest-editor/-/archive/v%{version}/%{name}-v%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM solarus-quest-editor-1.5.3-fix-compilation.patch -- boo#1115055 +Patch0: solarus-quest-editor-1.5.3-fix-compilation.patch BuildRequires: cmake >= 2.8.11 BuildRequires: fdupes BuildRequires: gcc-c++ @@ -44,10 +46,11 @@ BuildRequires: pkgconfig(vorbis) %description -A game editor for the Solarus engine. +Solarus Quest Editor is a graphical user interface to create and +modify quests for the Solarus engine. %prep -%setup -q +%autosetup -p1 -n %{name}-v%{version} %build %cmake @@ -57,6 +60,7 @@ %cmake_install %fdupes %{buildroot}%{_prefix} +%if 0%{?suse_version} < 1330 %post %icon_theme_cache_post %desktop_database_post @@ -64,14 +68,13 @@ %postun %icon_theme_cache_postun %desktop_database_postun +%endif %files -%defattr(-,root,root,-) %license license.txt license_gpl.txt %doc README.md changelog.txt %{_bindir}/solarus-quest-editor %{_datadir}/solarus-quest-editor -%{_datadir}/solarus-quest-editor/assets %{_datadir}/icons/hicolor/*/apps/%{name}.png %dir %{_datadir}/icons/hicolor/1024x1024/ %dir %{_datadir}/icons/hicolor/1024x1024/apps/ ++++++ solarus-quest-editor-1.5.3-fix-compilation.patch ++++++ >From 8f308463030c18cd4f7c8a6052028fff3b7ca35a Mon Sep 17 00:00:00 2001 From: Christopho <christo...@solarus-games.org> Date: Tue, 5 Jun 2018 21:22:33 +0200 Subject: [PATCH] Fix compilation error --- include/widgets/map_view.h | 2 ++ src/widgets/map_view.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/include/widgets/map_view.h b/include/widgets/map_view.h index 730ec98..6a27ab7 100644 --- a/include/widgets/map_view.h +++ b/include/widgets/map_view.h @@ -21,6 +21,8 @@ #include <QGraphicsView> #include <QPointer> +class QActionGroup; + namespace SolarusEditor { class MapModel; diff --git a/src/widgets/map_view.cpp b/src/widgets/map_view.cpp index 20cc75b..860cf60 100644 --- a/src/widgets/map_view.cpp +++ b/src/widgets/map_view.cpp @@ -30,6 +30,7 @@ #include "tileset_model.h" #include "view_settings.h" #include <QAction> +#include <QActionGroup> #include <QApplication> #include <QClipboard> #include <QDebug> -- 2.18.1 diff -up solarus-quest-editor-1.5.3/src/widgets/text_editor.cpp.orig solarus-quest-editor-1.5.3/src/widgets/text_editor.cpp --- solarus-quest-editor-1.5.3/src/widgets/text_editor.cpp.orig 2018-11-08 21:59:02.591128574 +0100 +++ solarus-quest-editor-1.5.3/src/widgets/text_editor.cpp 2018-11-08 21:59:18.515129235 +0100 @@ -21,6 +21,7 @@ #include "editor_exception.h" #include "editor_settings.h" #include "quest.h" +#include <QAction> #include <QIcon> #include <QLayout> #include <QList>