From f0ea7ca6e5b3b353e5ecd852096588a8c8e73adc065267ad39b740dfeaa9faf8 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 29 Sep 2015 14:11:08 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/games/7kaa?expand=0&rev=8 --- 7kaa-2.14.5.patch | 64 --------------------------------------------- 7kaa-2.14.5.tar.bz2 | 3 --- 7kaa.changes | 23 ---------------- 7kaa.spec | 1 + 4 files changed, 1 insertion(+), 90 deletions(-) delete mode 100644 7kaa-2.14.5.patch delete mode 100644 7kaa-2.14.5.tar.bz2 diff --git a/7kaa-2.14.5.patch b/7kaa-2.14.5.patch deleted file mode 100644 index 0b587bc..0000000 --- a/7kaa-2.14.5.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -ruB 7kaa-2.14.5.orig/src/client/OFIRMIF.cpp 7kaa-2.14.5/src/client/OFIRMIF.cpp ---- 7kaa-2.14.5.orig/src/client/OFIRMIF.cpp 2015-05-19 03:00:20.000000000 +0200 -+++ 7kaa-2.14.5/src/client/OFIRMIF.cpp 2015-09-25 16:23:43.405735779 +0200 -@@ -491,7 +491,7 @@ - x = INFO_X1+6+i%4*50; - y = pop_disp_y1+1+i/4*29; - -- switch( mouse.single_click(x, y, x+27, y+23, 2) ) -+ switch( mouse.any_click(x, y, x+27, y+23, LEFT_BUTTON) ? 1 : (mouse.any_click(x, y, x+27, y+23, RIGHT_BUTTON) ? 2 : 0) ) - { - case 1: // left button to select worker - selected_worker_id = i+1; -diff -ruB 7kaa-2.14.5.orig/src/client/OF_BASE.cpp 7kaa-2.14.5/src/client/OF_BASE.cpp ---- 7kaa-2.14.5.orig/src/client/OF_BASE.cpp 2015-05-19 03:00:20.000000000 +0200 -+++ 7kaa-2.14.5/src/client/OF_BASE.cpp 2015-09-25 17:05:59.616753330 +0200 -@@ -238,8 +238,8 @@ - - //------ detect the overseer button -----// - -- int rc = mouse.single_click(INFO_X1+6, INFO_Y1+58, -- INFO_X1+5+UNIT_LARGE_ICON_WIDTH, INFO_Y1+57+UNIT_LARGE_ICON_HEIGHT, 2 ); -+ int rc = mouse.any_click(INFO_X1+6, INFO_Y1+58, INFO_X1+5+UNIT_LARGE_ICON_WIDTH, INFO_Y1+57+UNIT_LARGE_ICON_HEIGHT, LEFT_BUTTON) ? 1 -+ : mouse.any_click(INFO_X1+6, INFO_Y1+58, INFO_X1+5+UNIT_LARGE_ICON_WIDTH, INFO_Y1+57+UNIT_LARGE_ICON_HEIGHT, RIGHT_BUTTON) ? 2 : 0; - - if( rc==1 ) // display this overseer's info - { -diff -ruB 7kaa-2.14.5.orig/src/client/OF_CAMP.cpp 7kaa-2.14.5/src/client/OF_CAMP.cpp ---- 7kaa-2.14.5.orig/src/client/OF_CAMP.cpp 2015-05-19 03:00:20.000000000 +0200 -+++ 7kaa-2.14.5/src/client/OF_CAMP.cpp 2015-09-25 17:07:32.962237653 +0200 -@@ -421,8 +421,8 @@ - - //------ detect the overseer button -----// - -- int rc = mouse.single_click(INFO_X1+6, INFO_Y1+58, -- INFO_X1+5+UNIT_LARGE_ICON_WIDTH, INFO_Y1+57+UNIT_LARGE_ICON_HEIGHT, 2 ); -+ int rc = mouse.any_click(INFO_X1+6, INFO_Y1+58, INFO_X1+5+UNIT_LARGE_ICON_WIDTH, INFO_Y1+57+UNIT_LARGE_ICON_HEIGHT, LEFT_BUTTON) ? 1 -+ : mouse.any_click(INFO_X1+6, INFO_Y1+58, INFO_X1+5+UNIT_LARGE_ICON_WIDTH, INFO_Y1+57+UNIT_LARGE_ICON_HEIGHT, RIGHT_BUTTON) ? 2 : 0; - - if( rc==1 ) // display this overseer's info - { -diff -ruB 7kaa-2.14.5.orig/src/client/OF_MARK.cpp 7kaa-2.14.5/src/client/OF_MARK.cpp ---- 7kaa-2.14.5.orig/src/client/OF_MARK.cpp 2015-05-19 03:00:20.000000000 +0200 -+++ 7kaa-2.14.5/src/client/OF_MARK.cpp 2015-09-25 16:22:12.651232950 +0200 -@@ -814,7 +814,7 @@ - } - else - { -- market_product_array[marketGoods->raw_id-1] = NULL; -+ market_product_array[marketGoods->product_raw_id-1] = NULL; - marketGoods->product_raw_id = 0; - } - } -diff -ruB 7kaa-2.14.5.orig/src/client/OVOLUME.cpp 7kaa-2.14.5/src/client/OVOLUME.cpp ---- 7kaa-2.14.5.orig/src/client/OVOLUME.cpp 2015-05-19 03:00:20.000000000 +0200 -+++ 7kaa-2.14.5/src/client/OVOLUME.cpp 2015-09-25 16:24:29.805481641 +0200 -@@ -70,7 +70,7 @@ - long absY = posVolume.y >= 0 ? posVolume.y : -posVolume.y; - long dist = absX >= absY ? absX :absY; - if( dist <= DEFAULT_DIST_LIMIT ) -- rel_vol = rel_vol = 100 - dist * 100 / DEFAULT_VOL_DROP; -+ rel_vol = 100 - dist * 100 / DEFAULT_VOL_DROP; - else - rel_vol = 0; - diff --git a/7kaa-2.14.5.tar.bz2 b/7kaa-2.14.5.tar.bz2 deleted file mode 100644 index cc62cb1..0000000 --- a/7kaa-2.14.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:185308f54c829cde51a5a15231def904b8737e2a1502fa5469a2724ed0fa17a5 -size 38473819 diff --git a/7kaa.changes b/7kaa.changes index 7b35034..662a6f2 100644 --- a/7kaa.changes +++ b/7kaa.changes @@ -1,26 +1,3 @@ -------------------------------------------------------------------- -Fri Sep 25 18:32:04 UTC 2015 - nemysis@openSUSE.org - -- Update to 2.14.5, announce message: - - * Switched to using SDL2. - * Gained support for full-screen stretching. - * Gained support for MacOS. - * Switched to using enet, replacing SDL_net. - * Audio code improvements. - * The multiplayer connection code has stablized. - * New game hotkeys. - * Migrate population across extended town networks. - * Added ability to migrate 10 people at a time across between towns. - * Gettext translation support. - * Several bug fixes. - -- Add patch 7kaa-2.14.5.patch, - fix build -- Remove BuildRequires for desktop-file-utils -- Add BuildRequires, changed by Upstream for enet-devel and sdl2 -- Remove BuildRequires, changed by Upstream for SDL_net and sdl -- Fix build with gcc5, add CXXFLAGS="%{optflags} -fno-strict-aliasing" - ------------------------------------------------------------------- Fri Nov 7 17:04:26 UTC 2014 - nemysis@gmx.ch diff --git a/7kaa.spec b/7kaa.spec index a3db157..150327e 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -65,6 +65,7 @@ the GPL v2. %build %configure --docdir=%{_docdir}/%{name} export CXXFLAGS="%{optflags} -fno-strict-aliasing" +make %{?_smp_mflags} %install %make_install