From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 6qEHIocnRmHHBAEAgWs5BA (envelope-from ) for ; Sat, 18 Sep 2021 19:53:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 6OXTHIcnRmHqRgAAbx9fmQ (envelope-from ) for ; Sat, 18 Sep 2021 17:53:11 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 03F12D4D4 for ; Sat, 18 Sep 2021 19:53:11 +0200 (CEST) Received: from localhost ([::1]:46090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mReWU-00075M-3E for larch@yhetil.org; Sat, 18 Sep 2021 13:53:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48516) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mReWM-00071i-Px for guix-patches@gnu.org; Sat, 18 Sep 2021 13:53:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53499) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mReWM-00058p-Hx for guix-patches@gnu.org; Sat, 18 Sep 2021 13:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mReWM-0000oD-F2 for guix-patches@gnu.org; Sat, 18 Sep 2021 13:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44039] [PATCH v3] gnu: Add slade. References: <20201016184333.1445-1-jsubuntuxp@disroot.org> In-Reply-To: <20201016184333.1445-1-jsubuntuxp@disroot.org> Resent-From: James Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Sep 2021 17:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44039 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44039@debbugs.gnu.org Cc: James Smith Received: via spool by 44039-submit@debbugs.gnu.org id=B44039.16319875733092 (code B ref 44039); Sat, 18 Sep 2021 17:53:02 +0000 Received: (at 44039) by debbugs.gnu.org; 18 Sep 2021 17:52:53 +0000 Received: from localhost ([127.0.0.1]:36812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mReW8-0000nb-QS for submit@debbugs.gnu.org; Sat, 18 Sep 2021 13:52:53 -0400 Received: from knopi.disroot.org ([178.21.23.139]:54176) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mReW6-0000nS-Cx for 44039@debbugs.gnu.org; Sat, 18 Sep 2021 13:52:48 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id B0C3469E53; Sat, 18 Sep 2021 19:52:44 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new 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 8GUTEjD_eUCS; Sat, 18 Sep 2021 19:52:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1631987563; bh=Hqvyqz5D+6Y44KeWkuyifJnpbQBoXdAhHgWgSqPhhXA=; h=From:To:Cc:Subject:Date; b=Kv7twMjMoYU978z/NWhguglHv5X2O69bIjjVr2/UpoXqASAozMCnHcprQVjbrVTz2 mu5OdchJZUTX990gd2k0jTmNvTexIw67vKw2/ZA3ND0AfcsE7hfGHhdOb+5yKtjfDa 7v8vYNEtzHfGygiXhQwZXUW7uy/V/aLgoqcAG2ThF8gKAJnV1H675LERe4KWmmb8pR bxvxHhgMfaurAPbUCbM2YnPv98GS/aWiA7L3w28h6/wMcl+w4YoJ7bZKcAPfjWXHcG Z9c5tavRRty0ws9pctfPb8omh2geinpkjA/c8+84yILYTiG/ROyYmAEfdZSDIWKnss Hxr09FL0C3TXg== Date: Sat, 18 Sep 2021 10:47:12 -0700 Message-Id: <20210918174712.27138-1-jsubuntuxp@disroot.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: James Smith X-ACL-Warn: , James Smith via Guix-patches From: James Smith via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1631987591; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=xLdP1nHW2CiDbs5Azlyi/oc8tFrZRBQLomvfMteQpb4=; b=Mjh2JnBbTnnuWH4/s2tCOoaKFiJl/GST+wNdcaxHAZvUzUbgMbatLA28xhCJgKSWhK/LHj EP4UG/f8bku0tQXkHc9SvBRNCry3f90AAwI42vfNuzkIdGEqpxdI3dWyN9FAIUvzvQvFVJ N6t9cYBofHWRxMB5T3sK/UQkHGKeOrv6kmxgmJxl/h58x+PYbd8Oe7Tr2IGoQ4Qp+aQksU 6Fq9f/cW1lTWwmdYC4TtBe8fxZRmeu7hAyjhechK0VO8eoeMwHanSrl5/sV1Eyg/9Sq18Y h5LEAgvh741Uqqn/IAiPSF7O7vx07Ni7nFIssHOoZLZUgK6StRMm/J07ldu1zw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1631987591; a=rsa-sha256; cv=none; b=JN6bgv0+68yIbOTO1fQysSprQemStsDwepjstfb1DGzHAJ1O8qXyyVRNj2c8EG2sc5Nzqi fjRk33fbxMPYJ6//UyzLDvS50LWq/W7Esllu86MOJSfs6//dks8psmRymj8SjWudi/qoP+ aM7jjR3juMv6OqMY9gzTdkqkZzDq5n72WsC1lCc9fV52KMP53fubkO+lrO/JXoYwfgylPQ G2QULq7pPP6x0bNW3IvtvXn6L96q1eiNGf4we0hpat2dtSfQWubWzGPPmavRoAAuhjNMUU 12DqanD/4qOnz1NjNMhIDq90r//OparyWatBeZltVz/hq9n069O2VzEifWJ99A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=Kv7twMjM; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.89 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=Kv7twMjM; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 03F12D4D4 X-Spam-Score: -0.89 X-Migadu-Scanner: scn0.migadu.com X-TUID: uBiS7aqidzhs * gnu/packages/game-development.scm (slade): New variable. --- I noticed there was a new release for slade, so I updated the patch and made some minor tweaks to it. James Smith gnu/packages/game-development.scm | 64 ++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 40807450ea..7e1f9f4b39 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; Copyright © 2021 Dmitry Polyakov +;;; Copyright © 2020-2021 James Smith ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,7 +40,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages game-development) - #:use-module (srfi srfi-1) + #:use-module ((srfi srfi-1) #:hide (zip)) #:use-module (ice-9 match) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -55,6 +56,7 @@ #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages boost) #:use-module (gnu packages compression) #:use-module (gnu packages check) @@ -99,6 +101,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) @@ -447,6 +450,65 @@ GUI toolkit, lighting and physics frameworks and @code{Tiled} TMX format support.") (license license:gpl3+))) +(define-public slade + (package + (name "slade") + (version "3.1.13") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sirjuddington/SLADE") + (commit version))) + (sha256 (base32 "009yc5m6y074wfalvwbrnv2zsmaf9yhbi8hzgs973di0zqnqv011")) + (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. + (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. + (inputs + `(("bash" ,bash-minimal) + ("curl" ,curl) + ("fluidsynth" ,fluidsynth) + ("freeimage" ,freeimage) + ("ftgl" ,ftgl) + ("glew" ,glew) + ("gtk+" ,gtk+) + ("sfml" ,sfml) + ("wxwidgets" ,wxwidgets-3.1))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("which" ,which) + ("zip" ,zip))) + (home-page "https://slade.mancubus.net") + (synopsis "Doom game data editor") + (description "SLADE3 is a modern editor for Doom-engine based games and +source ports. It has the ability to view, modify, and write many different game- +specific formats, and even convert between some of them, or from/to other generic +formats such as PNG.") + (license license:gpl2))) + (define-public tiled (package (name "tiled") -- 2.33.0