The package rpms/cataclysm-dda.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/cataclysm-dda.git/commit/?id=3b02cf9....
Change: +%ifarch armv7hl
Thanks.
Full change: ============
commit 58a94fe138e8b7448e034c75fa787d61fd6b1ad7 Author: Artem Polishchuk ego.cordatus@gmail.com Date: Tue Apr 20 02:10:29 2021 +0300
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/%%7Bname%7D-0.E-2... +Source0: https://github.com/CleverRaven/Cataclysm-DDA/archive/0.E-3/%%7Bname%7D-0.E-3... 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 ego.cordatus@gmail.com - 0.E.3-1 +- build(update): 0.E-3 + * Tue Jan 26 2021 Fedora Release Engineering releng@fedoraproject.org - 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
commit 82c602e34187f60106de840c9f51202f3529053c Author: Fedora Release Engineering releng@fedoraproject.org Date: Tue Jan 26 01:41:51 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/cataclysm-dda.spec b/cataclysm-dda.spec index 22eb8da..0f10a66 100644 --- a/cataclysm-dda.spec +++ b/cataclysm-dda.spec @@ -8,7 +8,7 @@
Name: cataclysm-dda Version: 0.E.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Turn-based survival game set in a post-apocalyptic world
License: CC-BY-SA @@ -199,6 +199,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%changelog +* Tue Jan 26 2021 Fedora Release Engineering releng@fedoraproject.org - 0.E.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Dec 04 2020 Jeff Law law@redhat.com - 0.E.2-8 - More C++ loop fixes for gcc-11
commit a91ceaee01fa75b72738da3106434097868de38a Author: Tom Stellard tstellar@redhat.com Date: Thu Dec 17 03:20:42 2020 +0000
Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
diff --git a/cataclysm-dda.spec b/cataclysm-dda.spec index 59c1f8e..22eb8da 100644 --- a/cataclysm-dda.spec +++ b/cataclysm-dda.spec @@ -30,6 +30,7 @@ BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(SDL2_image) BuildRequires: pkgconfig(SDL2_mixer) BuildRequires: pkgconfig(SDL2_ttf) +BuildRequires: make
Requires: %{name}-data = %{version}-%{release}
commit 736217e19ac8a564271fd65a27639f345fd08a2b Author: Jeff Law law@redhat.com Date: Fri Dec 4 15:57:58 2020 -0700
More C++ loop fixes for gcc-11
diff --git a/cataclysm-dda-gcc11.patch b/cataclysm-dda-gcc11.patch index f084036..93f160f 100644 --- a/cataclysm-dda-gcc11.patch +++ b/cataclysm-dda-gcc11.patch @@ -72,3 +72,144 @@ index d0edeb4..4a29a20 100644 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 ++++ b/src/bionics.cpp +@@ -1290,7 +1290,7 @@ void Character::heat_emission( int b, int fuel_energy ) + const int heat_spread = std::max( heat_prod / 10 - heat_level, 1 ); + g->m.emit_field( pos(), hotness, heat_spread ); + } +- for( const std::pair<body_part, size_t> &bp : bio.info().occupied_bodyparts ) { ++ for( const std::pair<const body_part, size_t> &bp : bio.info().occupied_bodyparts ) { + add_effect( effect_heating_bionic, 2_seconds, bp.first, false, heat_prod ); + } + } +diff --git a/src/item.cpp b/src/item.cpp +index 194df4d..5918105 100644 +--- a/src/item.cpp ++++ b/src/item.cpp +@@ -3185,7 +3185,7 @@ void item::final_info( std::vector<iteminfo> &info, const iteminfo_query *parts, + info.push_back( iteminfo( "DESCRIPTION", + _( "<bold>Environmental Protection:</bold> " ), + iteminfo::no_newline ) ); +- for( const std::pair< body_part, size_t > &element : bid->env_protec ) { ++ for( const std::pair<const body_part, size_t > &element : bid->env_protec ) { + info.push_back( iteminfo( "CBM", body_part_name_as_heading( element.first, 1 ), + " <num> ", iteminfo::no_newline, element.second ) ); + } +@@ -3195,7 +3195,7 @@ void item::final_info( std::vector<iteminfo> &info, const iteminfo_query *parts, + info.push_back( iteminfo( "DESCRIPTION", + _( "<bold>Bash Protection:</bold> " ), + iteminfo::no_newline ) ); +- for( const std::pair< body_part, size_t > &element : bid->bash_protec ) { ++ for( const std::pair<const body_part, size_t > &element : bid->bash_protec ) { + info.push_back( iteminfo( "CBM", body_part_name_as_heading( element.first, 1 ), + " <num> ", iteminfo::no_newline, element.second ) ); + } +@@ -3204,7 +3204,7 @@ void item::final_info( std::vector<iteminfo> &info, const iteminfo_query *parts, + info.push_back( iteminfo( "DESCRIPTION", + _( "<bold>Cut Protection:</bold> " ), + iteminfo::no_newline ) ); +- for( const std::pair< body_part, size_t > &element : bid->cut_protec ) { ++ for( const std::pair<const body_part, size_t > &element : bid->cut_protec ) { + info.push_back( iteminfo( "CBM", body_part_name_as_heading( element.first, 1 ), + " <num> ", iteminfo::no_newline, element.second ) ); + } +diff --git a/src/monster.cpp b/src/monster.cpp +index d3c4599..3d56924 100644 +--- a/src/monster.cpp ++++ b/src/monster.cpp +@@ -2055,7 +2055,7 @@ void monster::process_turn() + { + decrement_summon_timer(); + if( !is_hallucination() ) { +- for( const std::pair<emit_id, time_duration> &e : type->emit_fields ) { ++ for( const std::pair<const emit_id, time_duration> &e : type->emit_fields ) { + if( !calendar::once_every( e.second ) ) { + continue; + } +diff --git a/src/monstergenerator.cpp b/src/monstergenerator.cpp +index f11ba0e..8a371fa 100644 +--- a/src/monstergenerator.cpp ++++ b/src/monstergenerator.cpp +@@ -1177,7 +1177,7 @@ void MonsterGenerator::check_monster_definitions() const + } + } + +- for( const std::pair<emit_id, time_duration> &e : mon.emit_fields ) { ++ for( const std::pair<const emit_id, time_duration> &e : mon.emit_fields ) { + const emit_id emid = e.first; + if( !emid.is_valid() ) { + debugmsg( "monster %s has invalid emit source %s", mon.id.c_str(), emid.c_str() ); +diff --git a/src/recipe.cpp b/src/recipe.cpp +index cc7b022..a89c13d 100644 +--- a/src/recipe.cpp ++++ b/src/recipe.cpp +@@ -274,7 +274,7 @@ void recipe::load( const JsonObject &jo, const std::string &src ) + for( JsonArray cur : jneeds.get_array( "skills" ) ) { + skills_blueprint[skill_id( cur.get_string( 0 ) )] = cur.get_int( 1 ); + } +- for( const std::pair<skill_id, int> &p : skills_blueprint ) { ++ for( const std::pair<const skill_id, int> &p : skills_blueprint ) { + const auto it = required_skills.find( p.first ); + if( it == required_skills.end() ) { + required_skills.emplace( p ); +@@ -667,7 +667,7 @@ void recipe::check_blueprint_requirements() + + jsout.member( "skills" ); + jsout.start_array( /*wrap=*/!total_reqs.skills.empty() ); +- for( const std::pair<skill_id, int> &p : total_reqs.skills ) { ++ for( const std::pair<const skill_id, int> &p : total_reqs.skills ) { + jsout.start_array(); + jsout.write( p.first ); + jsout.write( p.second ); +diff --git a/tests/crafting_test.cpp b/tests/crafting_test.cpp +index 1cc0996..3ef4d8d 100644 +--- a/tests/crafting_test.cpp ++++ b/tests/crafting_test.cpp +@@ -124,7 +124,7 @@ TEST_CASE( "available_recipes", "[recipes]" ) + + GIVEN( "a recipe that can be automatically learned" ) { + WHEN( "the player has lower skill" ) { +- for( const std::pair<skill_id, int> &skl : r->required_skills ) { ++ for( const std::pair<const skill_id, int> &skl : r->required_skills ) { + dummy.set_skill_level( skl.first, skl.second - 1 ); + } + +@@ -134,7 +134,7 @@ TEST_CASE( "available_recipes", "[recipes]" ) + } + WHEN( "the player has just the skill that's required" ) { + dummy.set_skill_level( r->skill_used, r->difficulty ); +- for( const std::pair<skill_id, int> &skl : r->required_skills ) { ++ for( const std::pair<const skill_id, int> &skl : r->required_skills ) { + dummy.set_skill_level( skl.first, skl.second ); + } + +@@ -143,7 +143,7 @@ TEST_CASE( "available_recipes", "[recipes]" ) + + AND_WHEN( "his skill rusts" ) { + dummy.set_skill_level( r->skill_used, 0 ); +- for( const std::pair<skill_id, int> &skl : r->required_skills ) { ++ for( const std::pair<const skill_id, int> &skl : r->required_skills ) { + dummy.set_skill_level( skl.first, 0 ); + } + +@@ -167,7 +167,7 @@ TEST_CASE( "available_recipes", "[recipes]" ) + dummy.set_skill_level( r->skill_used, 2 ); + // Secondary skills are just set to be what the autolearn requires + // but the primary is not +- for( const std::pair<skill_id, int> &skl : r->required_skills ) { ++ for( const std::pair<const skill_id, int> &skl : r->required_skills ) { + dummy.set_skill_level( skl.first, skl.second ); + } + +@@ -287,7 +287,7 @@ static void prep_craft( const recipe_id &rid, const std::vector<item> &tools, + const recipe &r = rid.obj(); + + // Ensure adequate skill for all "required" skills +- for( const std::pair<skill_id, int> &skl : r.required_skills ) { ++ for( const std::pair<const skill_id, int> &skl : r.required_skills ) { + g->u.set_skill_level( skl.first, skl.second ); + } + // and just in case "used" skill difficulty is higher, set that too diff --git a/cataclysm-dda.spec b/cataclysm-dda.spec index cd54aef..59c1f8e 100644 --- a/cataclysm-dda.spec +++ b/cataclysm-dda.spec @@ -8,7 +8,7 @@
Name: cataclysm-dda Version: 0.E.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Turn-based survival game set in a post-apocalyptic world
License: CC-BY-SA @@ -198,6 +198,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%changelog +* Fri Dec 04 2020 Jeff Law law@redhat.com - 0.E.2-8 +- More C++ loop fixes for gcc-11 + * Mon Oct 19 2020 Jeff Law law@redhat.com - 0.E.2-7 - Fix range-loop-construct diagnostic from gcc-11
commit 9e980628d55830c5fd6b42cb2f8a90c261d873a0 Author: Jeff Law law@redhat.com Date: Mon Oct 19 21:55:43 2020 -0600
- Fix range-loop-construct diagnostic from gcc-11
diff --git a/cataclysm-dda-gcc11.patch b/cataclysm-dda-gcc11.patch index fa01209..f084036 100644 --- a/cataclysm-dda-gcc11.patch +++ b/cataclysm-dda-gcc11.patch @@ -59,3 +59,16 @@ 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/cataclysm-dda.spec b/cataclysm-dda.spec index 75f00b7..cd54aef 100644 --- a/cataclysm-dda.spec +++ b/cataclysm-dda.spec @@ -8,7 +8,7 @@
Name: cataclysm-dda Version: 0.E.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Turn-based survival game set in a post-apocalyptic world
License: CC-BY-SA @@ -198,6 +198,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%changelog +* Mon Oct 19 2020 Jeff Law law@redhat.com - 0.E.2-7 +- Fix range-loop-construct diagnostic from gcc-11 + * Tue Sep 15 2020 Jeff Law law@redhat.com - 0.E.2-6 - Fix uninitialized variable caught by gcc-11. Fix dynamic casts to avoid gcc-11 diagnostic
commit 105785cad74a4ac5d3319b445c9f78438d455b06 Author: Jeff Law law@redhat.com Date: Tue Sep 15 07:38:04 2020 -0600
Fix uninitialized variable caught by gcc-11. Fix dynamic casts to avoid gcc-11 diagnostic
diff --git a/cataclysm-dda-gcc11.patch b/cataclysm-dda-gcc11.patch new file mode 100644 index 0000000..fa01209 --- /dev/null +++ b/cataclysm-dda-gcc11.patch @@ -0,0 +1,61 @@ +diff --git a/src/activity_item_handling.cpp b/src/activity_item_handling.cpp +index 0b59272..a7dc11e 100644 +--- a/src/activity_item_handling.cpp ++++ b/src/activity_item_handling.cpp +@@ -1146,7 +1146,7 @@ static activity_reason_info find_base_construction( + + //we can't immediately build it, looking for pre-req + used.insert( idx ); +- cata::optional<do_activity_reason> reason; ++ cata::optional<do_activity_reason> reason = { }; + construction_id pre_req_idx( -1 ); + //first step: try only constructions with the same description + //second step: try all constructions +diff --git a/src/avatar.cpp b/src/avatar.cpp +index 6c17505..4d33e34 100644 +--- a/src/avatar.cpp ++++ b/src/avatar.cpp +@@ -416,7 +416,7 @@ bool avatar::read( item &it, const bool continuous ) + // special guidebook effect: print a misc. hint when read + if( reader != this ) { + add_msg( m_info, fail_messages[0] ); +- dynamic_cast<const npc *>( reader )->say( get_hint() ); ++ dynamic_cast<const npc &>( *reader ).say( get_hint() ); + } else { + add_msg( m_info, get_hint() ); + } +diff --git a/src/avatar_action.cpp b/src/avatar_action.cpp +index 1a7149c..728e51d 100644 +--- a/src/avatar_action.cpp ++++ b/src/avatar_action.cpp +@@ -595,7 +595,7 @@ void avatar_action::autoattack( avatar &you, map &m ) + if( !c->is_npc() ) { + return false; + } +- return !dynamic_cast<const npc *>( c )->is_enemy(); ++ return !dynamic_cast<const npc &>( *c ).is_enemy(); + } ), critters.end() ); + if( critters.empty() ) { + add_msg( m_info, _( "No hostile creature in reach. Waiting a turn." ) ); +diff --git a/src/item.cpp b/src/item.cpp +index 635b56c..194df4d 100644 +--- a/src/item.cpp ++++ b/src/item.cpp +@@ -7799,13 +7799,13 @@ units::volume item::get_total_capacity() const + // future then this probably warrants a new method on use_function to + // access this information generically. + if( is_bandolier() ) { +- result += dynamic_cast<const bandolier_actor *> +- ( type->get_use( "bandolier" )->get_actor_ptr() )->max_stored_volume(); ++ result += dynamic_cast<const bandolier_actor &> ++ ( *type->get_use( "bandolier" )->get_actor_ptr() ).max_stored_volume(); + } + + if( is_holster() ) { +- result += dynamic_cast<const holster_actor *> +- ( type->get_use( "holster" )->get_actor_ptr() )->max_stored_volume(); ++ result += dynamic_cast<const holster_actor &> ++ ( *type->get_use( "holster" )->get_actor_ptr() ).max_stored_volume(); + } + + return result; diff --git a/cataclysm-dda.spec b/cataclysm-dda.spec index f3c7a21..75f00b7 100644 --- a/cataclysm-dda.spec +++ b/cataclysm-dda.spec @@ -8,12 +8,13 @@
Name: cataclysm-dda Version: 0.E.2 -Release: 5%{?dist} +Release: 6%{?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/%%7Bname%7D-0.E-2... +Patch0: cataclysm-dda-gcc11.patch
# Due virtual memory exhausted and build fail ExcludeArch: i686 @@ -197,6 +198,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%changelog +* Tue Sep 15 2020 Jeff Law law@redhat.com - 0.E.2-6 +- Fix uninitialized variable caught by gcc-11. Fix dynamic casts + to avoid gcc-11 diagnostic + * Sat Aug 01 2020 Artem Polishchuk ego.cordatus@gmail.com - 0.E.2-5 - Fix Fedora build flags invocation
commit 01014740cbcb987eb6668d435bc3863c34bff8ab Author: Artem Polishchuk ego.cordatus@gmail.com Date: Sat Aug 1 04:47:42 2020 +0300
Fix Fedora build flags invocation
diff --git a/cataclysm-dda.spec b/cataclysm-dda.spec index c705205..f3c7a21 100644 --- a/cataclysm-dda.spec +++ b/cataclysm-dda.spec @@ -8,7 +8,7 @@
Name: cataclysm-dda Version: 0.E.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Turn-based survival game set in a post-apocalyptic world
License: CC-BY-SA @@ -95,9 +95,10 @@ Data files for %{name}-tiles. # This package is triggering a compiler error on armv7hl when # LTO is enabled. Disable on armv7hl for now %define _lto_cflags %{nil} -%set_build_flags %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 \ @@ -196,6 +197,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%changelog +* Sat Aug 01 2020 Artem Polishchuk ego.cordatus@gmail.com - 0.E.2-5 +- Fix Fedora build flags invocation + * Sat Aug 01 2020 Fedora Release Engineering releng@fedoraproject.org - 0.E.2-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 1480db8b113ac2325ef09447e529481dbf579398 Author: Fedora Release Engineering releng@fedoraproject.org Date: Sat Aug 1 00:19:16 2020 +0000
- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/cataclysm-dda.spec b/cataclysm-dda.spec index c099b75..c705205 100644 --- a/cataclysm-dda.spec +++ b/cataclysm-dda.spec @@ -8,7 +8,7 @@
Name: cataclysm-dda Version: 0.E.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Turn-based survival game set in a post-apocalyptic world
License: CC-BY-SA @@ -196,6 +196,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%changelog +* Sat Aug 01 2020 Fedora Release Engineering releng@fedoraproject.org - 0.E.2-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Jeff Law law@redhat.com - 0.E.2-3 - Disable LTO on armv7hl
commit 3b02cf9d2fb334f53d150cb66557934059d70b44 Author: Jeff Law law@redhat.com Date: Tue Jul 28 17:07:51 2020 -0600
Disable LTO on armv7hl
diff --git a/cataclysm-dda.spec b/cataclysm-dda.spec index d69b73c..c099b75 100644 --- a/cataclysm-dda.spec +++ b/cataclysm-dda.spec @@ -8,7 +8,7 @@
Name: cataclysm-dda Version: 0.E.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Turn-based survival game set in a post-apocalyptic world
License: CC-BY-SA @@ -91,7 +91,12 @@ Data files for %{name}-tiles.
%build +%ifarch armv7hl +# This package is triggering a compiler error on armv7hl when +# LTO is enabled. Disable on armv7hl for now +%define _lto_cflags %{nil} %set_build_flags +%endif
# Note: Don't use LTO for builds in COPR due to limited resources. COPR build # will fail because of LTO. @@ -191,6 +196,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%changelog +* Tue Jul 28 2020 Jeff Law law@redhat.com - 0.E.2-3 +- Disable LTO on armv7hl + * Mon Jul 27 2020 Fedora Release Engineering releng@fedoraproject.org - 0.E.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 7a6f9d4cc1f738104092466fc7c76a72e36592fa Author: Fedora Release Engineering releng@fedoraproject.org Date: Mon Jul 27 13:41:51 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/cataclysm-dda.spec b/cataclysm-dda.spec index cd5da8b..d69b73c 100644 --- a/cataclysm-dda.spec +++ b/cataclysm-dda.spec @@ -8,7 +8,7 @@
Name: cataclysm-dda Version: 0.E.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based survival game set in a post-apocalyptic world
License: CC-BY-SA @@ -191,6 +191,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%changelog +* Mon Jul 27 2020 Fedora Release Engineering releng@fedoraproject.org - 0.E.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed May 20 2020 Artem Polishchuk ego.cordatus@gmail.com - 0.E.2-1 - Update to 0.E-2 - Disable LTO
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org