Hello community, here is the log from the commit of package 7kaa for openSUSE:Factory checked in at 2020-07-17 20:50:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/7kaa (Old) and /work/SRC/openSUSE:Factory/.7kaa.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "7kaa" Fri Jul 17 20:50:40 2020 rev:8 rq:821419 version:2.15.4p1 Changes: -------- --- /work/SRC/openSUSE:Factory/7kaa/7kaa.changes 2020-03-30 23:07:13.832307329 +0200 +++ /work/SRC/openSUSE:Factory/.7kaa.new.3592/7kaa.changes 2020-07-17 20:51:29.000959922 +0200 @@ -1,0 +2,31 @@ +Sun Jul 12 15:49:42 UTC 2020 - Carsten Ziepke <kiel...@gmail.com> + +- Update to 2.15.4p1 + * This is a patch release to fix a few issues with 2.15.4. + All users should upgrade. +- Update to 2.15.4 + * Fixed a problem in multiplayer that halted the game play. + * Added option to play with the original seven kingdoms, and + enabled on original scenarios. + * Apply the leadership bonus when the general is in fort for + defending soldiers in range. + * Fixed the mobile general range calculation for the leadership + bonus to not apply to the troop anywhere on the map. + * Apply the leadership bonus when the general is on a ship for + defending soldiers in range. + * Updated translations. + * Added hotkeys for managing the build menu in the War Factory, + Harbor, and Town. + * Restored support for real full screen resolution that requires + a screen mode change. + * Improved dynamic UI button and text layout. + * Added Polish translation. + * Added trade locations to the trade report. + * Sort and filter trade locations based on the map selected + caravan. + * Allow setting stops using the trade report. + * Allow copying trade routes using the trade report. +- Add 7kaa-no-return-in-nonvoid-function.patch +- Clean with spec-cleaner + +------------------------------------------------------------------- Old: ---- 7kaa-2.15.3.tar.xz New: ---- 7kaa-2.15.4p1.tar.xz 7kaa-no-return-in-nonvoid-function.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ 7kaa.spec ++++++ --- /var/tmp/diff_new_pack.LToLUv/_old 2020-07-17 20:51:31.212962230 +0200 +++ /var/tmp/diff_new_pack.LToLUv/_new 2020-07-17 20:51:31.216962234 +0200 @@ -16,19 +16,20 @@ # -# See also http://en.opensuse.org/openSUSE:Specfile_guidelines Name: 7kaa -Version: 2.15.3 +Version: 2.15.4p1 Release: 0 Summary: Seven Kingdoms: Ancient Adversaries License: GPL-2.0-only Group: Amusements/Games/Strategy/Real Time -URL: http://7kfans.com/ +URL: https://7kfans.com/ Source0: https://github.com/the3dfxdude/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz Source1: %{name}.png Source2: %{name}.desktop # PATCH-FIX-UPSTREAM - gcc6_char_cast.patch -- https://github.com/the3dfxdude/7kaa/issues/63 Patch0: gcc6_char_cast.patch +# PATCH-FIX-UPSTREAM - 7kaa-no-return-in-nonvoid-function.patch -- gh#the3dfxdude/7kaa#192 +Patch1: 7kaa-no-return-in-nonvoid-function.patch BuildRequires: curl-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -59,11 +60,12 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build export CXXFLAGS="%{optflags} -fno-strict-aliasing" %configure --docdir=%{_docdir}/%{name} -make %{?_smp_mflags} +%make_build %install %make_install ++++++ 7kaa-no-return-in-nonvoid-function.patch ++++++ diff -Nur 7kaa-2.15.4p1/include/OFIRM.h new/include/OFIRM.h --- 7kaa-2.15.4p1/include/OFIRM.h 2020-07-11 04:47:28.000000000 +0200 +++ new/include/OFIRM.h 2020-07-13 17:12:35.540867933 +0200 @@ -322,7 +322,7 @@ void detect_info_both(); virtual void put_info(int refreshFlag) {;} - virtual int detect_info() {;} + virtual int detect_info() {return 0;} void sort_worker(); void process_animation();
