From 58a94fe138e8b7448e034c75fa787d61fd6b1ad7 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Apr 19 2021 23:10:29 +0000 Subject: build(update): 0.E-3 --- diff --git a/.gitignore b/.gitignore index 681cb6a..536c311 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /cataclysm-dda-0.D.10491.20200405git0f1e6aa.tar.gz /cataclysm-dda-0.E.tar.gz /cataclysm-dda-0.E-2.tar.gz +/cataclysm-dda-0.E-3.tar.gz diff --git a/cataclysm-dda-gcc11.patch b/cataclysm-dda-gcc11.patch index 93f160f..1ad8453 100644 --- a/cataclysm-dda-gcc11.patch +++ b/cataclysm-dda-gcc11.patch @@ -59,19 +59,6 @@ index 635b56c..194df4d 100644 } return result; -diff --git a/src/advanced_inv.cpp b/src/advanced_inv.cpp -index d0edeb4..4a29a20 100644 ---- a/src/advanced_inv.cpp -+++ b/src/advanced_inv.cpp -@@ -852,7 +852,7 @@ bool advanced_inventory::move_all_items( bool nested_call ) - - // Check some preconditions to quickly leave the function. - size_t liquid_items = 0; -- for( const advanced_inv_listitem elem : spane.items ) { -+ for( const advanced_inv_listitem &elem : spane.items ) { - for( const item *elemit : elem.items ) { - if( elemit->made_of_from_type( LIQUID ) && !elemit->is_frozen_liquid() ) { - liquid_items++; diff --git a/src/bionics.cpp b/src/bionics.cpp index ea39bbd..0b2a356 100644 --- a/src/bionics.cpp diff --git a/cataclysm-dda.spec b/cataclysm-dda.spec index 0f10a66..80c1fd5 100644 --- a/cataclysm-dda.spec +++ b/cataclysm-dda.spec @@ -7,13 +7,13 @@ %endif Name: cataclysm-dda -Version: 0.E.2 -Release: 9%{?dist} +Version: 0.E.3 +Release: 1%{?dist} Summary: Turn-based survival game set in a post-apocalyptic world License: CC-BY-SA URL: http://cataclysmdda.org -Source0: https://github.com/CleverRaven/Cataclysm-DDA/archive/0.E-2/%{name}-0.E-2.tar.gz +Source0: https://github.com/CleverRaven/Cataclysm-DDA/archive/0.E-3/%{name}-0.E-3.tar.gz Patch0: cataclysm-dda-gcc11.patch # Due virtual memory exhausted and build fail @@ -25,12 +25,13 @@ BuildRequires: gcc-c++ >= 7 BuildRequires: git-core BuildRequires: intltool BuildRequires: libappstream-glib +BuildRequires: make + BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(SDL2_image) BuildRequires: pkgconfig(SDL2_mixer) BuildRequires: pkgconfig(SDL2_ttf) -BuildRequires: make Requires: %{name}-data = %{version}-%{release} @@ -76,7 +77,7 @@ BuildArch: noarch Requires: %{name}-tiles = %{version}-%{release} Requires: hicolor-icon-theme -#Recommends: unifont-fonts +# Recommends: unifont-fonts # Bundled, hardcoded fonts. Tiles version doesn't work if delete. Provides: bundled(fixedsys) @@ -89,58 +90,57 @@ Data files for %{name}-tiles. %prep -%autosetup -n Cataclysm-DDA-0.E-2 -p1 +%autosetup -n Cataclysm-DDA-0.E-3 -p1 %build %ifarch armv7hl -# This package is triggering a compiler error on armv7hl when -# LTO is enabled. Disable on armv7hl for now +# This package is triggering a compiler error on armv7hl when LTO is enabled. +# Disable on armv7hl for now. +# Note: Don't use LTO for builds in COPR due to limited resources. COPR build +# will fail because of LTO. %define _lto_cflags %{nil} %endif %set_build_flags - -# Note: Don't use LTO for builds in COPR due to limited resources. COPR build -# will fail because of LTO. -%make_build \ - PREFIX=%{_prefix} \ - USE_HOME_DIR=1 \ +%make_build \ + PREFIX=%{_prefix} \ + USE_HOME_DIR=1 \ %if %{with release_build} - RELEASE=1 \ - #LTO=1 \ + RELEASE=1 \ + %{nil} %endif # Version with gfx and sound -%make_build \ - PREFIX=%{_prefix} \ - SOUND=1 \ - TILES=1 \ - USE_HOME_DIR=1 \ +%make_build \ + PREFIX=%{_prefix} \ + SOUND=1 \ + TILES=1 \ + USE_HOME_DIR=1 \ %if %{with release_build} - RELEASE=1 \ - #LTO=1 \ + RELEASE=1 \ + %{nil} %endif %install -%make_install \ - PREFIX=%{_prefix} \ - USE_HOME_DIR=1 \ +%make_install \ + PREFIX=%{_prefix} \ + USE_HOME_DIR=1 \ %if %{with release_build} - RELEASE=1 \ - #LTO=1 \ + RELEASE=1 \ + %{nil} %endif # Version with gfx and sound -%make_install \ - PREFIX=%{_prefix} \ - SOUND=1 \ - TILES=1 \ - USE_HOME_DIR=1 \ +%make_install \ + PREFIX=%{_prefix} \ + SOUND=1 \ + TILES=1 \ + USE_HOME_DIR=1 \ %if %{with release_build} - RELEASE=1 \ - #LTO=1 \ + RELEASE=1 \ + %{nil} %endif # Install desktop file, icon and appdata manifest @@ -148,9 +148,9 @@ install -m 0644 -Dp data/xdg/%{name}.desktop %{buildroot}%{_datadir}/appl install -m 0644 -Dp data/xdg/%{name}.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg install -m 0644 -Dp data/xdg/%{name}.appdata.xml %{buildroot}%{_metainfodir}/%{name}.appdata.xml -# FIXME: Remove bundled fonts -# * This for next builds and requires some testing -#rm -r %{buildroot}%{_datadir}/%{name}/font +### FIXME: Remove bundled fonts +### * This for next builds and requires some testing +# rm -r %{buildroot}%{_datadir}/%{name}/font rm -r %{buildroot}%{_datadir}/%{name}/font/terminus.fon \ %{buildroot}%{_datadir}/%{name}/LICENSE-OFL-Terminus-Font.txt @@ -199,6 +199,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %changelog +* Sun Apr 18 2021 Artem Polishchuk - 0.E.3-1 +- build(update): 0.E-3 + * Tue Jan 26 2021 Fedora Release Engineering - 0.E.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index efa7f6d..dcfe7fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cataclysm-dda-0.E-2.tar.gz) = a8560ef087cb189a750beba7d5bc6d98fd9431923eafde40f772e19d5811a8e7041364faa4fd3db7d24d37af0777b48a74706764116276df447fbf9b05a96c2b +SHA512 (cataclysm-dda-0.E-3.tar.gz) = 6d8c330c01a1f9ca4708f424da67ad08117b71db5ba24ad86718d22140bf911ddd49d54460fbb8d58d20478a75df3b79479841dd8b160a8557dd8e34ac63a7c5