Hello community, here is the log from the commit of package solarus for openSUSE:Leap:15.2 checked in at 2020-03-31 07:23:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/solarus (Old) and /work/SRC/openSUSE:Leap:15.2/.solarus.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solarus" Tue Mar 31 07:23:39 2020 rev:12 rq:789556 version:1.6.2 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/solarus/solarus.changes 2020-01-15 16:03:26.535926156 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.solarus.new.3160/solarus.changes 2020-03-31 07:23:47.114434890 +0200 @@ -1,0 +2,70 @@ +Tue Mar 24 18:38:22 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Add patch to find moonjit: + * 0001-Use-pkg-config-to-get-more-search-paths.patch + +------------------------------------------------------------------- +Sun Sep 1 10:01:01 UTC 2019 - antoine.belv...@opensuse.org + +- Fix translation loading: + * Update solarus-1.6.2-install-gui-translations.patch with + final version pushed to upstream. + +------------------------------------------------------------------- +Wed Aug 21 07:46:41 UTC 2019 - Jan Engelhardt <jeng...@inai.de> + +- Package description updates. + +------------------------------------------------------------------- +Fri Aug 16 16:48:12 UTC 2019 - antoine.belv...@opensuse.org + +- Update to version 1.6.2: + * Fix scrolling teletransporters with a square size (#1412). + * Fix hero displayed above stairs walls. +- Install translations for solarus-gui: + * Add solarus-1.6.2-install-gui-translations.patch. + * Create solarus-gui-lang subpackage. +- Add _service file to create a tarball without the big + 'libraries' folder which is relevant only for Windows/Mac builds. +- Disable check section on Leap <= 15.1 to fix build. +- Disable test "lua/bugs/1269_coroutines" as it is unstable. +- Remove obsolete build dependency on update-desktop-files. + +------------------------------------------------------------------- +Sat Aug 10 16:04:10 UTC 2019 - antoine.belv...@opensuse.org + +- Update to 1.6.1: + * Engine changes: + + Add `-force-software-rendering` switch to solarus-run. + + Add argument to set mouse cursor visibility on start (#1263). + + Add simple performance counters to the engine (#1280). + + Add argument to set fullscreen mode on start (#1281). + + Add joypad buttons combo for quitting the engine (#1283). + + Add git revision information to build and main loop startup + (#1292). + + Add argument to set the joypad axis deadzone (#1293). + + Add debug warning if a surface is larger than 2048 x 2048 + (#1294). + + Add support of carried object sprites with multiple + directions (#1392). + + Improve CMake build (#1270, #1276, #1277, #1288, #1320). + + Fix several crashes (#1354, #1371, #1353, #1366, #1374, + #1361). + + Other bugfixes. See installed changelog.txt for more details. + * Lua API changes: + + This release adds new features but does not introduce any + incompatibility. + + Add methods game:get/set_transition_style() (#1368). + + Add methods state:get/set_can_use_teletransporter/switch/ + stream() (#1363). + + Make surface, text_surface and timer userdata types indexable + (#1394). +- Remove solarus-1.6.0-fix-desktop-exec.patch: Fixed upstream. +- Update spec file: + * Split GUI and GUI library from main package. + * Update URL, Source and Description fields. + * Remove obsolete desktop_database_post(un) macros. + * Use cmake_build macro. + * Add check section. + +------------------------------------------------------------------- Old: ---- solarus-1.6.0-fix-desktop-exec.patch solarus-1.6.0-src.tar.gz New: ---- 0001-Use-pkg-config-to-get-more-search-paths.patch _service solarus-1.6.2-install-gui-translations.patch solarus-1.6.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solarus.spec ++++++ --- /var/tmp/diff_new_pack.sVQTIb/_old 2020-03-31 07:23:47.522435066 +0200 +++ /var/tmp/diff_new_pack.sVQTIb/_new 2020-03-31 07:23:47.526435068 +0200 @@ -1,7 +1,7 @@ # # spec file for package solarus # -# 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,20 +17,21 @@ Name: solarus -Version: 1.6.0 +Version: 1.6.2 Release: 0 -Summary: Zelda-like game engine +Summary: Game engine for action RPGs License: GPL-3.0-or-later Group: Amusements/Games/RPG -Url: http://www.solarus-engine.org/ -Source: http://www.solarus-games.org/downloads/solarus/%{name}-%{version}-src.tar.gz -# PATCH-FIX-UPSTREAM solarus-1.6.0-fix-desktop-exec.patch -- wrong Exec field in desktop file -Patch0: solarus-1.6.0-fix-desktop-exec.patch +URL: https://www.solarus-games.org/ +Source0: %{name}-%{version}.tar.bz2 +# PATCH-FEATURE-UPSTREAM -- https://gitlab.com/solarus-games/solarus/merge_requests/1311 +Patch0: solarus-1.6.2-install-gui-translations.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-Use-pkg-config-to-get-more-search-paths.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: physfs-devel -BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Help) @@ -43,66 +44,108 @@ BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(vorbis) +Suggests: %{name}-gui %description -Solarus is a Zelda-like game engine written in C++. +Solarus is a 2D game engine written in C++, and it executes games +made in Lua. It is designed with 16-bit classic action RPGs in +mind. + +This package contains the 'solarus-run' executable required to run +games based on the Solarus engine. + +%package gui +Summary: Graphical user interface to launch Solarus games +Group: Amusements/Games/RPG +# Package "gui" was split from main package on 1.6.1 +# Make sure upgrade of main package from version < 1.6.1 +# installs "gui" as well with a specific Provides +Provides: %{name}:%{_bindir}/solarus-launcher + +%description gui +This package provides a graphical user interface to launch games +based on the Solarus engine. %package -n libsolarus1 -Summary: Zelda-like game engine +Summary: Solarus game engine shared library Group: System/Libraries %description -n libsolarus1 -Solarus is a Zelda-like game engine written in C++. +This package provides the main shared library of the Solarus game +engine. + +%package -n libsolarus-gui1 +Summary: Solarus game engine shared library (GUI parts) +Group: System/Libraries + +%description -n libsolarus-gui1 +This package provides the GUI shared library of the Solarus game +engine. %package devel Summary: Development files for solarus Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +Requires: %{name}-gui = %{version} %description devel -Development files for solarus, including header-files. +Development files for Solarus, including header files. + +%lang_package -n solarus-gui %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build %cmake -make %{?_smp_mflags} +%cmake_build %install %cmake_install +%find_lang %{name} --with-qt -%if 0%{?suse_version} < 1330 -%post -%icon_theme_cache_post -%desktop_database_post - -%postun -%icon_theme_cache_postun -%desktop_database_postun +%if 0%{?suse_version} > 1510 +%check +# Tweak path to find libsolarus.so and libsolarus-testing.so +export LD_LIBRARY_PATH="$PWD/build:$PWD/build/tests" +# Tests 1200 and 1210 require a graphical display, 1269 is unstable +%ctest --exclude-regex "lua/bugs/(1200_.*|1210_.*|1269_.*)" %endif %post -n libsolarus1 -p /sbin/ldconfig %postun -n libsolarus1 -p /sbin/ldconfig +%post -n libsolarus-gui1 -p /sbin/ldconfig +%postun -n libsolarus-gui1 -p /sbin/ldconfig %files %doc changelog.txt readme.md -%license license.txt -%{_bindir}/solarus-launcher +%license license.txt license_gpl.txt %{_bindir}/solarus-run +%{_mandir}/man6/solarus-run.6%{?ext_man} + +%files gui +%license license.txt license_gpl.txt %dir %{_datadir}/appdata/ %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_libdir}/libsolarus-gui.so -%{_mandir}/man6/solarus* +%{_bindir}/solarus-launcher +# man page should be renamed to solarus-launcher +%{_mandir}/man6/solarus.6%{?ext_man} + +%files gui-lang -f %{name}.lang +%dir %{_datadir}/%{name}-gui +%dir %{_datadir}/%{name}-gui/translations %files -n libsolarus1 %{_libdir}/libsolarus.so.* +%files -n libsolarus-gui1 +%{_libdir}/libsolarus-gui.so.* + %files devel %{_includedir}/solarus %{_libdir}/libsolarus.so +%{_libdir}/libsolarus-gui.so %changelog ++++++ 0001-Use-pkg-config-to-get-more-search-paths.patch ++++++ >From c50c1938588b6f11e081744a8658135141c41948 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christo...@krop.fr> 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 4edb6e3..25712d0 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 luajit-2.0 luajit-2.1 HINTS $ENV{LUA_DIR} + ${PKG_LUAJIT_LIBRARY_DIRS} PATH_SUFFIXES lib64 lib PATHS ~/Library/Frameworks -- 2.25.1 ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="changesgenerate">disable</param> <param name="revision">v1.6.2</param> <param name="scm">git</param> <param name="url">https://gitlab.com/solarus-games/solarus.git</param> <param name="versionformat">@PARENT_TAG@</param> <!-- tag is vX.Y.Z, we want X.Y.Z --> <param name="versionrewrite-pattern">v(.*)</param> <param name="versionrewrite-replacement">\1</param> <!-- exclude windows/mac libraries folder from tarball --> <param name="exclude">libraries</param> </service> <service mode="disabled" name="recompress"> <param name="compression">bz2</param> <param name="file">*.tar</param> </service> <service mode="disabled" name="set_version"/> </services> ++++++ solarus-1.6.2-install-gui-translations.patch ++++++ >From 640b293046ed7eec41d5034a5c45c9c707d89347 Mon Sep 17 00:00:00 2001 From: Antoine Belvire <antoine.belv...@opensuse.org> Date: Sat, 24 Aug 2019 14:14:07 +0200 Subject: [PATCH] Install translations for GUI This adds a CMake install target for GUI qm files and allows the application to load them from installation path. --- cmake/AddInstallTargets.cmake | 1 + gui/CMakeLists.txt | 1 + gui/cmake/AddDefines.cmake | 3 +++ gui/cmake/AddInstallTargets.cmake | 4 ++++ gui/src/main.cpp | 6 +++++- 5 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 gui/cmake/AddDefines.cmake diff --git a/cmake/AddInstallTargets.cmake b/cmake/AddInstallTargets.cmake index 953497449..73710c4ae 100644 --- a/cmake/AddInstallTargets.cmake +++ b/cmake/AddInstallTargets.cmake @@ -15,6 +15,7 @@ else() endif() set(SOLARUS_MANUAL_INSTALL_DESTINATION "share/man" CACHE PATH "Manual install destination") set(SOLARUS_HEADERS_INSTALL_DESTINATION "include" CACHE PATH "Headers install destination") +set(SOLARUSGUI_INSTALL_DATADIR "share/solarus-gui" CACHE PATH "GUI data install destination") # Files to install with make install. # Install the shared library and the solarus-run executable. diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 7e3d80f3f..505ea1dfd 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -5,6 +5,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) # Tell CMake to run moc automatically when needed set(CMAKE_AUTOMOC ON) +include(cmake/AddDefines.cmake) include(cmake/AddDependencies.cmake) include(cmake/AddIncludeDirectories.cmake) include(cmake/AddSolarusGuiLibrary.cmake) diff --git a/gui/cmake/AddDefines.cmake b/gui/cmake/AddDefines.cmake new file mode 100644 index 000000000..0d1aaa725 --- /dev/null +++ b/gui/cmake/AddDefines.cmake @@ -0,0 +1,3 @@ +# Add defines for the install path and the build path to help guess the assets +# location at runtime +add_definitions(-DSOLARUSGUI_TRANSLATION_PATH="${CMAKE_INSTALL_PREFIX}/${SOLARUSGUI_INSTALL_DATADIR}/translations") diff --git a/gui/cmake/AddInstallTargets.cmake b/gui/cmake/AddInstallTargets.cmake index d99f75a43..a229e6e36 100644 --- a/gui/cmake/AddInstallTargets.cmake +++ b/gui/cmake/AddInstallTargets.cmake @@ -12,6 +12,10 @@ install(FILES ${solarus-gui_FORMS_HEADERS} DESTINATION "${SOLARUS_HEADERS_INSTALL_DESTINATION}/solarus/gui" ) +install(FILES + ${solarus-gui_TRANSLATIONS_QM} + DESTINATION "${SOLARUSGUI_INSTALL_DATADIR}/translations" +) # FreeDesktop compatible icons if(UNIX AND NOT APPLE) diff --git a/gui/src/main.cpp b/gui/src/main.cpp index 984c478f4..c8b602c74 100644 --- a/gui/src/main.cpp +++ b/gui/src/main.cpp @@ -73,7 +73,11 @@ int run_gui(int argc, char* argv[]) { application.installTranslator(&qt_translator); QTranslator translator; - translator.load("solarus_" + QLocale::system().name()); + QString filename = "solarus_" + QLocale::system().name(); + bool translation_loaded = translator.load(filename); + if (!translation_loaded) { + translator.load(filename, SOLARUSGUI_TRANSLATION_PATH); + } application.installTranslator(&translator); MainWindow window(nullptr); -- 2.22.0 ++++++ solarus-1.6.0-src.tar.gz -> solarus-1.6.2.tar.bz2 ++++++ ++++ 41437 lines of diff (skipped)
