From patchwork Sat Jan 1 18:34:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 35858 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8154427BBEA; Sat, 1 Jan 2022 18:35:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F3C5D27BBE9 for ; Sat, 1 Jan 2022 18:35:32 +0000 (GMT) Received: from localhost ([::1]:36522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n3jE3-0001V5-V6 for patchwork@mira.cbaines.net; Sat, 01 Jan 2022 13:35:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n3jDa-0001Us-Os for guix-patches@gnu.org; Sat, 01 Jan 2022 13:35:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47732) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n3jDa-0004bF-FF for guix-patches@gnu.org; Sat, 01 Jan 2022 13:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n3jDa-00088o-Dw for guix-patches@gnu.org; Sat, 01 Jan 2022 13:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52933] [PATCH] gnu: widelands: Fix build against boost 1.77. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 01 Jan 2022 18:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52933 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52933@debbugs.gnu.org Cc: Felix Gruber X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164106209031268 (code B ref -1); Sat, 01 Jan 2022 18:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 Jan 2022 18:34:50 +0000 Received: from localhost ([127.0.0.1]:59278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n3jDG-000886-Tn for submit@debbugs.gnu.org; Sat, 01 Jan 2022 13:34:50 -0500 Received: from lists.gnu.org ([209.51.188.17]:38178) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n3jDF-00087y-8m for submit@debbugs.gnu.org; Sat, 01 Jan 2022 13:34:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n3jDF-0001UZ-32 for guix-patches@gnu.org; Sat, 01 Jan 2022 13:34:41 -0500 Received: from mout02.posteo.de ([185.67.36.66]:49207) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n3jDC-0004UH-Dj for guix-patches@gnu.org; Sat, 01 Jan 2022 13:34:40 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id BBB83240104 for ; Sat, 1 Jan 2022 19:34:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1641062071; bh=p0Z8Jzlqy0m5PiLxDcE59+aA7R6ypPmoqX7SkCn7TaA=; h=From:To:Cc:Subject:Date:From; b=Dqnv2lgjZvzZyLMVZX0vE7Iz8NdjrazIQN4TZDN/LrIXR2LpPDMdZebjSdPBAdR5k Aw7XomzRxaWFcqDM18k7hRAxfq190uHLz3gzQYlgonjbZQFb9YD7KciMxsPvG7tAKq 1IIbzuN4xG7kz6EhK7QCWB5++oa5R6ois3kWY6gSnLguphUKUqhRQbl+3zeTlLT840 k9wgRQ0djPRH3s6im0bV97huJ8qsZVLOmvvVF3KkajB5zHuwcPFlNEsU/TnI0pQ8fA uNawzYe7OQd8b52UR21ue3kA0ueFTY4BOqnKPKDgSsBG2DMu7ooHDZNXredhiRAnux nf4DgkR0nxKKQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JR9dz043Kz9rxF; Sat, 1 Jan 2022 19:34:30 +0100 (CET) From: Felix Gruber Date: Sat, 1 Jan 2022 18:34:14 +0000 Message-Id: <20220101183414.101071-1-felgru@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.66; envelope-from=felgru@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Widelands fails to build with boost 1.77 due to a missing include in one of Wideland's header files that was previously indirectly included by boost 1.76. * gnu/packages/games.scm (widelands)[source]: Add patch. * gnu/packages/patches/widelands-add-missing-map-include.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/games.scm | 5 ++-- .../widelands-add-missing-map-include.patch | 28 +++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/widelands-add-missing-map-include.patch diff --git a/gnu/local.mk b/gnu/local.mk index e14bd47b95..c3ecafb149 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1927,6 +1927,7 @@ dist_patch_DATA = \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \ %D%/packages/patches/wicd-urwid-1.3.patch \ %D%/packages/patches/wicd-wpa2-ttls.patch \ + %D%/packages/patches/widelands-add-missing-map-include.patch \ %D%/packages/patches/widelands-system-wide_minizip.patch \ %D%/packages/patches/wmctrl-64-fix.patch \ %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 3e6cdf4514..36b15dfa66 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -61,7 +61,7 @@ ;;; Copyright © 2021 Stefan Reichör ;;; Copyright © 2021 Greg Hogan ;;; Copyright © 2021 David Pflug -;;; Copyright © 2021 Felix Gruber +;;; Copyright © 2021, 2022 Felix Gruber ;;; Copyright © 2021 Solene Rapenne ;;; Copyright © 2021 Noisytoot ;;; Copyright © 2021 Petr Hodina @@ -5135,7 +5135,8 @@ tactics.") (patches ;; Use system Minizip. Patch is provided by Debian, and discussed ;; upstream at . - (search-patches "widelands-system-wide_minizip.patch")))) + (search-patches "widelands-system-wide_minizip.patch" + "widelands-add-missing-map-include.patch")))) (build-system cmake-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/patches/widelands-add-missing-map-include.patch b/gnu/packages/patches/widelands-add-missing-map-include.patch new file mode 100644 index 0000000000..633731bea2 --- /dev/null +++ b/gnu/packages/patches/widelands-add-missing-map-include.patch @@ -0,0 +1,28 @@ +From 316eaea209754368a57f445ea4dd016ecf8eded6 Mon Sep 17 00:00:00 2001 +From: matthiakl +Date: Sat, 14 Aug 2021 19:24:08 +0200 +Subject: [PATCH] Added missing direct incude (#5025) + +--- +This patch is from +https://github.com/widelands/widelands/pull/5025 +which has been merged after the release of Widelands 1.0. + + src/network/bufferedconnection.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/network/bufferedconnection.h b/src/network/bufferedconnection.h +index fe974b9e..7e1ecf87 100644 +--- a/src/network/bufferedconnection.h ++++ b/src/network/bufferedconnection.h +@@ -20,6 +20,7 @@ + #ifndef WL_NETWORK_BUFFEREDCONNECTION_H + #define WL_NETWORK_BUFFEREDCONNECTION_H + ++#include + #include + #include + #include +-- +2.30.2 +