From a22c1d8dc3f9be98adf085010546e446cb97a5bf Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Wed, 10 Aug 2022 22:51:50 -0700 Subject: Updated to 2022-08-06-2156 Remove obsolete gcc patch Remove revert-05 Fix bunker shop backport for BN's overmap connection change. --- PKGBUILD | 22 +++----- hotfix-01_gcc12-support.patch | 17 ------- npc-10_bunker-merchant.patch | 2 +- ...lth-and-fault-on-uninstalled-bionics-1389.patch | 58 ---------------------- 4 files changed, 9 insertions(+), 90 deletions(-) delete mode 100644 hotfix-01_gcc12-support.patch delete mode 100644 revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch diff --git a/PKGBUILD b/PKGBUILD index aa0450b..e311dc2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,8 +13,8 @@ pkgbase=cataclysm-bn pkgname=(cataclysm-bn cataclysm-bn-tiles) pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental -pkgver=202207221520 -_pkgver=2022-07-22-1520 +pkgver=202208062156 +_pkgver=2022-08-06-2156 pkgrel=1 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" @@ -31,13 +31,11 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "cataclysm-bn-tiles.desktop" "icon_128x128.png" - "hotfix-01_gcc12-support.patch" - "revert-01_removed-traits.patch" "revert-02_revert-book-revamp.patch" "revert-03_generic-nv.patch" "revert-04_telescopic-lenses.patch" - "revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch" + #"revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch" "revert-06_Obsolete-useless-hub01-basement-1457.patch" "revert-07_Remove-handload-quality-distinction-1481.patch" @@ -129,16 +127,14 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "cataclysm-dda-soundpack_jcsoundpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-soundpack_jcsoundpack.git/snapshot/cataclysm-dda-soundpack_jcsoundpack-master.tar.xz" "cataclysm-dda-musicpack_coag-musicpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-musicpack_coag-musicpack.git/snapshot/cataclysm-dda-musicpack_coag-musicpack-master.tar.xz" ) -b2sums=('7d0e636f82a927ec2f7185a94d824c427f307f1fc917cd59518f3542887b2b9f354ec94a2019ffd8e613622d91a6e26032b8a61eb0e9583f7c9a46bb551f494a' +b2sums=('670541c80a6ca19564b2b0ff7926049ab4310085c37b875924501c4ef83aa4374653228cc221aee1f11c425e8ab1092d5bfc9afba147dade7c9db9407a1f6b6d' '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' - 'acde8c7be1ffed6a11898dc783619dfc17115730d2fb477d386713ad730620dec5eb8925180d79bb4acd418b42fd4a049014d988fcd805f4587cc75801bbd409' '839c92715bfd1f63d94d6d252813a19e6093ded3e45f9efbbc4953ab85adfb886bcdfcfa41c9bb9ed422c0a32917a1ac75f98019e7de946b840e345cd3969d19' '5a33531c5742bbee44b1b3edec89cfceb6e0f161a5e0f0b131149fec010be4ab45095fdc558d0dd0023182cde66200f387f819aa392410dd317c0bc8dddb6294' 'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe' '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a' - '61900a29c35d44477125a040413cf1d5a351e7c94a2fe347215d5f5e419c6d9bf7fb25d9e1ac583c1d5b8adc3b6afa47bf1d95a1e6f7dcaa34e76f256bce7349' '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac' '1a54b9a3e742061d34409e24fb347c00735cfaf29f945e29881fd2571f3cd57eddc711750dd2fd914da761c26ae3db6810c88cbff493df353b7533244c990637' '207f765e998c5a92db2030e25779c98d57ed50ce6664d94439e4fdb4654466b764723f7b58872a186dea5f7504793efe4d93df2d8390139649a45d32eec06848' @@ -172,7 +168,7 @@ b2sums=('7d0e636f82a927ec2f7185a94d824c427f307f1fc917cd59518f3542887b2b9f354ec94 'd2c149bb48e3152100b02d138471ec107e172f282a05ee4bae321ef0828c758d0cf1f7a6e9bbb02bca14148d59d61f92abcbc5ddb9a7a0b7cba8db9cef22c391' '9fc166f1d7393bd697e58e9ac9aa54b527a28da707da8efeaaf54bfe877c03ae007325928fb04f4c3684ce59232ad3ea5dd834e12e9c877d46ad69b5ca01408b' '3bf7da4e2efabe6b050aa357ec74c120e184a0a1bc6d4342fbb03a3c0cd0bae58c9fc1cda5f69ffdcc7e48a34f51f4a18107163f99348d2504096bccfd1766a9' - '9bb382d203bfb6534b38ce54e53046f4a25a08b53620453f04b71b72b6994d55e9348306d9ea1186180dbce25811fdfce938f7b6e45286e523540fb3c22ab9bc' + '88dd4e6a53b948ddd5bdf9a567a116f70047cc6cf5fb695b72b9ab571641e9af52e386c6e0b442c9dd794de39d57b26891dc8bb83e4c92506547f395d340915b' 'adcf0b46ad57390488b3932910fba5a5be8152f91b45864bf078a2b8d92dc89e9944c320dafb7a0d4786e1fce48bedea714d671feefe565ffbbb74baca21d98e' '3373939e76f1ddb788b45424533c2e7687bbacae840fb3e6b1d49034e18315297af66dddf1b13d4f42033608123929b78819f38cca6cbc6c5ecca09bc67ab69f' '0b34beb3afa14605d73d84f1d75bf8182ff0fcb2396e82d06e170cf0dc0d30386071959bd1be3553182c37bb5661a81cf6be8c4e0a14e4df0b01889cfe7edaf1' @@ -231,13 +227,11 @@ prepare() { sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp # Fix version - sed -i 's|VERSION = unstable|VERSION = 2022-07-22-1520|' Makefile + sed -i 's|VERSION = unstable|VERSION = 2022-08-06-2156|' Makefile # # # Hotfixes - echo "Applying hotfixes" - # Fix gcc12 builds - patch -Np1 -i "$srcdir"/hotfix-01_gcc12-support.patch + #echo "Applying hotfixes" # # # Reverts @@ -249,7 +243,7 @@ prepare() { patch -NREp1 -i "$srcdir"/revert-06_Obsolete-useless-hub01-basement-1457.patch # Revert removal of filthy/faulty bionics patch. - patch -NREp1 -i "$srcdir"/revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch + #patch -NREp1 -i "$srcdir"/revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch # Revert the book changes for now. patch -NREp1 -i "$srcdir"/revert-02_revert-book-revamp.patch diff --git a/hotfix-01_gcc12-support.patch b/hotfix-01_gcc12-support.patch deleted file mode 100644 index a20eeb9..0000000 --- a/hotfix-01_gcc12-support.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/src/sdl_font.cpp -+++ b/src/sdl_font.cpp -@@ -12,12 +12,12 @@ - { - const TTF_Font_Ptr fnt( TTF_OpenFontIndex( f.c_str(), size, faceIndex ) ); - if( fnt ) { -- char *style = TTF_FontFaceStyleName( fnt.get() ); -+ const char *style = TTF_FontFaceStyleName( fnt.get() ); - if( style != nullptr ) { - int faces = TTF_FontFaces( fnt.get() ); - for( int i = faces - 1; i >= 0; i-- ) { - const TTF_Font_Ptr tf( TTF_OpenFontIndex( f.c_str(), size, i ) ); -- char *ts = nullptr; -+ const char *ts = nullptr; - if( tf ) { - if( nullptr != ( ts = TTF_FontFaceStyleName( tf.get() ) ) ) { - if( lcequal( ts, style ) && TTF_FontHeight( tf.get() ) <= size ) { diff --git a/npc-10_bunker-merchant.patch b/npc-10_bunker-merchant.patch index 20f19be..e33a9af 100644 --- a/npc-10_bunker-merchant.patch +++ b/npc-10_bunker-merchant.patch @@ -358,7 +358,7 @@ + { "point": [ 0, 0, 0 ], "overmap": "bunker_shop_g_south" }, + { "point": [ 0, 0, -1 ], "overmap": "bunker_shop_b_south" } + ], -+ "connections": [ { "point": [ 0, -1, 0 ], "terrain": "road", "existing": true, "connection": "local_road", "from": [ 0, 0, 0 ] } ], ++ "connections": [ { "point": [ 0, -1, 0 ], "existing": true, "connection": "local_road", "from": [ 0, 0, 0 ] } ], + "locations": [ "wilderness" ], + "city_distance": [ 10, -1 ], + "city_sizes": [ 1, 12 ], diff --git a/revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch b/revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch deleted file mode 100644 index 8840161..0000000 --- a/revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 95488dda031d1bee2d33c5331f75e22e3f865e45 Mon Sep 17 00:00:00 2001 -From: Chaosvolt -Date: Sat, 19 Mar 2022 09:58:44 -0500 -Subject: [PATCH] No filth and fault on uninstalled bionics (#1389) - -* No filth and fault on uninstalled bionics - -* Removed unused declarations ---- - src/bionics.cpp | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/src/bionics.cpp b/src/bionics.cpp -index 9bdbf04379..52ffef4532 100644 ---- a/src/bionics.cpp -+++ b/src/bionics.cpp -@@ -134,8 +134,6 @@ static const itype_id itype_UPS( "UPS" ); - static const itype_id itype_UPS_off( "UPS_off" ); - static const itype_id itype_water_clean( "water_clean" ); - --static const fault_id fault_bionic_salvaged( "fault_bionic_salvaged" ); -- - static const skill_id skill_computer( "computer" ); - static const skill_id skill_electronics( "electronics" ); - static const skill_id skill_firstaid( "firstaid" ); -@@ -192,7 +190,6 @@ static const trait_id trait_THRESH_MEDICAL( "THRESH_MEDICAL" ); - static const std::string flag_ALLOWS_NATURAL_ATTACKS( "ALLOWS_NATURAL_ATTACKS" ); - static const std::string flag_AURA( "AURA" ); - static const std::string flag_CABLE_SPOOL( "CABLE_SPOOL" ); --static const std::string flag_FILTHY( "FILTHY" ); - static const std::string flag_NO_PACKED( "NO_PACKED" ); - static const std::string flag_NO_STERILE( "NO_STERILE" ); - static const std::string flag_NO_UNWIELD( "NO_UNWIELD" ); -@@ -2019,10 +2016,8 @@ - if( bid->itype().is_valid() ) { - cbm = item( bid.c_str() ); - } -- cbm.set_flag( flag_FILTHY ); - cbm.set_flag( flag_NO_STERILE ); - cbm.set_flag( flag_NO_PACKED ); -- cbm.faults.emplace( fault_bionic_salvaged ); - here.add_item( pos(), cbm ); - } else { - g->events().send( getID(), bid ); -@@ -2094,10 +2089,8 @@ - patient.remove_bionic( target_cbm.id ); - const itype_id iid = itemtype.is_valid() ? itemtype : itype_burnt_out_bionic; - item cbm( iid, calendar::start_of_cataclysm ); -- cbm.set_flag( flag_FILTHY ); - cbm.set_flag( flag_NO_STERILE ); - cbm.set_flag( flag_NO_PACKED ); -- cbm.faults.emplace( fault_bionic_salvaged ); - get_map().add_item( patient.pos(), cbm ); - } else { - bionics_uninstall_failure( installer, patient, difficulty, success, adjusted_skill ); --- -2.35.1 - -- cgit v1.2.1