From 4871477987ee6050a8f0115a9caa173667495ec33253e50656db3f0be6f1a92e Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Fri, 17 Jul 2020 07:15:31 +0000 Subject: [PATCH] Accepting request 820714 from home:Kieltux:branches:games - 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 OBS-URL: https://build.opensuse.org/request/show/820714 OBS-URL: https://build.opensuse.org/package/show/games/7kaa?expand=0&rev=24 --- 7kaa-2.15.3.tar.xz | 3 --- 7kaa-2.15.4p1.tar.xz | 3 +++ 7kaa-no-return-in-nonvoid-function.patch | 12 +++++++++ 7kaa.changes | 31 ++++++++++++++++++++++++ 7kaa.spec | 10 +++++--- 5 files changed, 52 insertions(+), 7 deletions(-) delete mode 100644 7kaa-2.15.3.tar.xz create mode 100644 7kaa-2.15.4p1.tar.xz create mode 100644 7kaa-no-return-in-nonvoid-function.patch diff --git a/7kaa-2.15.3.tar.xz b/7kaa-2.15.3.tar.xz deleted file mode 100644 index 73db1e5..0000000 --- a/7kaa-2.15.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c8270bacf162b6b1126d8be170f88d35454158c46164386d5813bcdea21922e -size 46852980 diff --git a/7kaa-2.15.4p1.tar.xz b/7kaa-2.15.4p1.tar.xz new file mode 100644 index 0000000..84c00dd --- /dev/null +++ b/7kaa-2.15.4p1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0265c077025d77b435f1c10b8ba178bdb16329e51ab735330ebaa71a104fbf8 +size 46927880 diff --git a/7kaa-no-return-in-nonvoid-function.patch b/7kaa-no-return-in-nonvoid-function.patch new file mode 100644 index 0000000..04b7031 --- /dev/null +++ b/7kaa-no-return-in-nonvoid-function.patch @@ -0,0 +1,12 @@ +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(); diff --git a/7kaa.changes b/7kaa.changes index b8af35d..0a1a41d 100644 --- a/7kaa.changes +++ b/7kaa.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Sun Jul 12 15:49:42 UTC 2020 - Carsten Ziepke + +- 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 + ------------------------------------------------------------------- Fri Mar 27 09:34:45 UTC 2020 - Christophe Giboudeaux diff --git a/7kaa.spec b/7kaa.spec index 8c94821..d87e437 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -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 @@ the GPL v2. %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