From patchwork Sun Oct 16 22:49:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Smith X-Patchwork-Id: 43453 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 3F20627BBEA; Mon, 17 Oct 2022 01:32:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 64FC727BBE9 for ; Mon, 17 Oct 2022 01:32:36 +0100 (BST) Received: from localhost ([::1]:45212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okE3X-00086J-Je for patchwork@mira.cbaines.net; Sun, 16 Oct 2022 20:32:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okCWA-0001Ph-VB for guix-patches@gnu.org; Sun, 16 Oct 2022 18:54:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47321) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1okCWA-00057M-ML for guix-patches@gnu.org; Sun, 16 Oct 2022 18:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1okCWA-0000pP-4z for guix-patches@gnu.org; Sun, 16 Oct 2022 18:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58574] [PATCH] gnu: slade: Update to 3.2.1, use new package style. Resent-From: James Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Oct 2022 22:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58574 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58574@debbugs.gnu.org Cc: James Smith X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16659608183146 (code B ref -1); Sun, 16 Oct 2022 22:54:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Oct 2022 22:53:38 +0000 Received: from localhost ([127.0.0.1]:46399 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1okCVl-0000og-Ct for submit@debbugs.gnu.org; Sun, 16 Oct 2022 18:53:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:45082) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1okCVi-0000oU-UZ for submit@debbugs.gnu.org; Sun, 16 Oct 2022 18:53:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okCVg-0001HT-Uu for guix-patches@gnu.org; Sun, 16 Oct 2022 18:53:34 -0400 Received: from knopi.disroot.org ([178.21.23.139]:37910) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okCVe-000554-G4 for guix-patches@gnu.org; Sun, 16 Oct 2022 18:53:32 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 64EAD4DB8E; Mon, 17 Oct 2022 00:53:26 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wN4pNVTzbjDf; Mon, 17 Oct 2022 00:53:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1665960800; bh=Mnn3Jupk5yn2pZaRmnP6TcqG6bqpW4pCujUZJZKSZew=; h=From:To:Cc:Subject:Date; b=JKPMxWdeVo94u9w/0lIUDOpPQCppn6VA8u8KsF81YtmkAM3WpK09uOmGGJwtjTQ70 XHqWTbaZS8HOzPM4QV1vtwGG0iIge8mAHIasytHAS2d8MYgDSWgP69o55b7goTdm7H ZGqzKImJQNCmSUivVtZ6clfod08iKbhv6UnSuVfQ14Pzp/1G28eIzRK7qEEgCUvGUl Z2cy/dO5Oi2HkO7QF01/1RT4SXiT+gGcG33ohADGXDnKqq6/cRbso3La53JjgW3HAp TEhZalYqwhghRiLY2lBbmhalPnGXLdK9hckj/jLqJFWRXdzBCnE8maq6nFlbzJ5lAK ayNQSPCESQYLA== Date: Sun, 16 Oct 2022 15:49:21 -0700 Message-Id: <20221016224921.8205-1-jsubuntuxp@disroot.org> Mime-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=jsubuntuxp@disroot.org; helo=knopi.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sun, 16 Oct 2022 20:32:18 -0400 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" Reply-to: James Smith X-ACL-Warn: , James Smith via Guix-patches X-Patchwork-Original-From: James Smith via Guix-patches via From: James Smith X-getmail-retrieved-from-mailbox: Patches * gnu/packages/game-development.scm (slade): Update to 3.2.1. [arguments]: Use G-expressions. [phases]: Removed reset-slade.pk3-timestamp phase. [inputs]: Remove input labels. Add lua and mpg123. Replaced wxwidgets-3.1 with wxwidgets. --- gnu/packages/game-development.scm | 67 ++++++++++++++----------------- 1 file changed, 30 insertions(+), 37 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index d40a97eef2..83355d9886 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -22,7 +22,7 @@ ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; Copyright © 2021 Dmitry Polyakov -;;; Copyright © 2020-2021 James Smith +;;; Copyright © 2020-2022 James Smith ;;; Copyright © 2021 Ekaitz Zarraga ;;; Copyright © 2021 Andy Tai ;;; Copyright © 2022 Felix Gruber @@ -516,52 +516,45 @@ (define-public python-xsge (define-public slade (package (name "slade") - (version "3.1.13") + (version "3.2.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/sirjuddington/SLADE") (commit version))) - (sha256 (base32 "009yc5m6y074wfalvwbrnv2zsmaf9yhbi8hzgs973di0zqnqv011")) + (sha256 (base32 "11ab38nv190lpvkdba5r2gckdrk4h15pri0zzslz7zy8qzg5fm18")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - '(#:configure-flags - (list "-DWX_GTK3=ON" "-DNO_WEBVIEW=ON" - (string-append "-DWITH_WXPATH=" - (assoc-ref %build-inputs "wxwidgets") "/bin") - (string-append "-DwxWidgets_LIBRARIES=" - (assoc-ref %build-inputs "wxwidgets") "/lib")) - #:phases - (modify-phases %standard-phases - (add-before 'build 'reset-slade.pk3-timestamps - ;; This is neccessary to make slade reproducible due to - ;; . TODO: Remove on next core update - ;; cycle. - (lambda _ - (invoke "find" "../source/dist/res" "-exec" "touch" - "--no-dereference" "-t" "197001010000.00" "{}" - "+"))) - (add-after 'install 'wrap-with-x11-gdk-backend - ;; Set GDK_BACKEND to x11 to prevent crash on Wayland. - ;; See https://github.com/sirjuddington/SLADE/issues/1097 for details. - (lambda* (#:key outputs #:allow-other-keys) - (wrap-program - (string-append (assoc-ref outputs "out") - "/bin/slade") - '("GDK_BACKEND" = ("x11")))))) - #:tests? #f)) ;; No test suite. + (list #:configure-flags + #~(list "-DWX_GTK3=ON" "-DNO_WEBVIEW=ON" + (string-append "-DWITH_WXPATH=" + #$(this-package-input "wxwidgets") "/bin") + (string-append "-DwxWidgets_LIBRARIES=" + #$(this-package-input "wxwidgets") "/lib")) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'wrap-with-x11-gdk-backend + ;; Set GDK_BACKEND to x11 to prevent crash on Wayland. + ;; See https://github.com/sirjuddington/SLADE/issues/1097 for + ;; details. + (lambda _ + (wrap-program (string-append #$output "/bin/slade") + '("GDK_BACKEND" = ("x11")))))) + #:tests? #f)) ;; No test suite. (inputs - `(("bash" ,bash-minimal) - ("curl" ,curl) - ("fluidsynth" ,fluidsynth) - ("freeimage" ,freeimage) - ("ftgl" ,ftgl) - ("glew" ,glew) - ("gtk+" ,gtk+) - ("sfml" ,sfml) - ("wxwidgets" ,wxwidgets-3.1))) + (list bash-minimal + curl + fluidsynth + freeimage + ftgl + glew + gtk+ + lua + mpg123 + sfml + wxwidgets)) (native-inputs (list pkg-config which zip)) (home-page "https://slade.mancubus.net")