Hello community,
here is the log from the commit of package solarus-quest-editor for
openSUSE:Leap:15.2 checked in at 2020-04-12 15:38:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/solarus-quest-editor (Old)
and /work/SRC/openSUSE:Leap:15.2/.solarus-quest-editor.new.3248 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solarus-quest-editor"
Sun Apr 12 15:38:17 2020 rev:16 rq:792532 version:1.6.2
Changes:
--------
---
/work/SRC/openSUSE:Leap:15.2/solarus-quest-editor/solarus-quest-editor.changes
2020-01-15 16:03:27.895926876 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.solarus-quest-editor.new.3248/solarus-quest-editor.changes
2020-04-12 15:38:19.102008816 +0200
@@ -1,0 +2,45 @@
+Tue Mar 24 19:42:56 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Add patch to find moonjit:
+ * 0001-Use-pkg-config-to-get-more-search-paths.patch
+
+-------------------------------------------------------------------
+Sat Aug 17 15:49:47 UTC 2019 - Antoine Belvire <[email protected]>
+
+- Update to version 1.6.2:
+ * Fix crash when closing tileset views (#467).
+ * Fix broken enemies in the initial quest (#466).
+ * Automatically install translation files.
+ * Update French translation.
+- Remove solarus-quest-editor-v1.6.1-install-translations.patch:
+ Merged upstream.
+
+-------------------------------------------------------------------
+Mon Aug 12 08:13:44 UTC 2019 - [email protected]
+
+- Install translations:
+ * Add solarus-quest-editor-v1.6.1-install-translations.patch
+ which allows installation of translation files with CMake.
+ * Add lang subpackage.
+- Split assets into a noarch subpackage.
+- Drop obsolete build dependency on update-desktop-files.
+
+-------------------------------------------------------------------
+Sat Aug 10 16:43:35 UTC 2019 - [email protected]
+
+- Update to version 1.6.1:
+ * Allow to build a quest package (#431).
+ * Map editor: allow teletransporters to have any size multiple of
+ 8 pixels.
+ * Map editor: improve performance of deleting multiple entities.
+ * Map editor: fix performance of changing entities layer (#454).
+ * Map editor: fix wrong selections after undoing changing layers.
+ * Tileset editor: fix performance of removing multiple patterns
+ (#456).
+ * Sprite editor: fix persisting error message about missing
+ source image (#451).
+ * Dialogs editor: fix line wrapping.
+ * Initial quest: remove proprietary file added by mistake.
+ * Add Force Software Rendering option to 'Running' section.
+
+-------------------------------------------------------------------
Old:
----
solarus-quest-editor-v1.6.0.tar.bz2
New:
----
0001-Use-pkg-config-to-get-more-search-paths.patch
solarus-quest-editor-v1.6.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ solarus-quest-editor.spec ++++++
--- /var/tmp/diff_new_pack.zXYhF4/_old 2020-04-12 15:38:19.994009491 +0200
+++ /var/tmp/diff_new_pack.zXYhF4/_new 2020-04-12 15:38:19.998009494 +0200
@@ -1,7 +1,7 @@
#
# spec file for package solarus-quest-editor
#
-# Copyright (c) 2018 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
@@ -17,13 +17,15 @@
Name: solarus-quest-editor
-Version: 1.6.0
+Version: 1.6.2
Release: 0
Summary: GUI to edit quests for the Solarus engine
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/
+URL: https://www.solarus-games.org/
Source:
https://gitlab.com/solarus-games/solarus-quest-editor/-/archive/v%{version}/%{name}-v%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM
+Patch0: 0001-Use-pkg-config-to-get-more-search-paths.patch
BuildRequires: cmake >= 2.8.11
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -31,7 +33,6 @@
BuildRequires: hicolor-icon-theme
BuildRequires: physfs-devel
BuildRequires: solarus-devel >= 1.6.0
-BuildRequires: update-desktop-files
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
@@ -44,43 +45,52 @@
BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(sdl2)
BuildRequires: pkgconfig(vorbis)
+Requires: %{name}-assets = %{version}
%description
Solarus Quest Editor is a graphical user interface to create and
modify quests for the Solarus engine.
+%package assets
+Summary: Assets for the Solarus Quest Editor
+Group: Productivity/Graphics/Other
+BuildArch: noarch
+
+%description assets
+This package contains assets for the Solarus Quest Editor.
+
+%lang_package
+
%prep
%setup -q -n %{name}-v%{version}
+%patch0 -p1
%build
%cmake
-make %{?_smp_mflags}
+%cmake_build
%install
%cmake_install
%fdupes %{buildroot}%{_prefix}
-
-%if 0%{?suse_version} < 1330
-%post
-%icon_theme_cache_post
-%desktop_database_post
-
-%postun
-%icon_theme_cache_postun
-%desktop_database_postun
-%endif
+%find_lang solarus_editor --with-qt
%files
%license license.txt license_gpl.txt
%doc readme.md changelog.txt
-%{_bindir}/solarus-quest-editor
-%{_datadir}/solarus-quest-editor
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
-%dir %{_datadir}/icons/hicolor/1024x1024/
-%dir %{_datadir}/icons/hicolor/1024x1024/apps/
-%dir %{_datadir}/icons/hicolor/768x768/
-%dir %{_datadir}/icons/hicolor/768x768/apps/
+%{_bindir}/%{name}
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/icons/hicolor/20x20
+%dir %{_datadir}/icons/hicolor/20x20/apps
+%dir %{_datadir}/icons/hicolor/40x40
+%dir %{_datadir}/icons/hicolor/40x40/apps
+%{_datadir}/icons/hicolor/*/apps/%{name}*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
+%files assets
+%{_datadir}/%{name}/assets
+
+%files lang -f solarus_editor.lang
+%dir %{_datadir}/%{name}/translations
+
%changelog
++++++ 0001-Use-pkg-config-to-get-more-search-paths.patch ++++++
>From c50c1938588b6f11e081744a8658135141c41948 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <[email protected]>
Date: Tue, 24 Mar 2020 19:37:32 +0100
Subject: [PATCH] Use pkg-config to get more search paths.
Solarus can be built using moonjit. If a pkgconfig file is available,
we'll use the known include and library dirs.
---
cmake/modules/FindLuaJit.cmake | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/cmake/modules/FindLuaJit.cmake b/cmake/modules/FindLuaJit.cmake
index 206bfec..91f5f2d 100644
--- a/cmake/modules/FindLuaJit.cmake
+++ b/cmake/modules/FindLuaJit.cmake
@@ -7,9 +7,14 @@
#
# This module is similar to FindLua51.cmake except that it finds LuaJit
instead.
+FIND_PACKAGE(PkgConfig QUIET)
+
+PKG_CHECK_MODULES(PKG_LUAJIT QUIET luajit)
+
FIND_PATH(LUA_INCLUDE_DIR luajit.h
HINTS
$ENV{LUA_DIR}
+ ${PKG_LUAJIT_INCLUDE_DIRS}
PATH_SUFFIXES include/luajit-2.1 include/luajit-2.0 include/luajit-5_1-2.0
include/luajit-5_1-2.1 include
PATHS
~/Library/Frameworks
@@ -24,6 +29,7 @@ FIND_LIBRARY(LUA_LIBRARY
NAMES luajit-5.1
HINTS
$ENV{LUA_DIR}
+ ${PKG_LUAJIT_LIBRARY_DIRS}
PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
--
2.25.1
++++++ solarus-quest-editor-v1.6.0.tar.bz2 ->
solarus-quest-editor-v1.6.2.tar.bz2 ++++++
/work/SRC/openSUSE:Leap:15.2/solarus-quest-editor/solarus-quest-editor-v1.6.0.tar.bz2
/work/SRC/openSUSE:Leap:15.2/.solarus-quest-editor.new.3248/solarus-quest-editor-v1.6.2.tar.bz2
differ: char 11, line 1
