From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 16 18:53:37 2022 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) From: James Smith 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== To: guix-patches@gnu.org Subject: [PATCH] gnu: slade: Update to 3.2.1, use new package style. Date: Sun, 16 Oct 2022 15:49:21 -0700 Message-Id: <20221016224921.8205-1-jsubuntuxp@disroot.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.6 (/) X-Debbugs-Envelope-To: submit Cc: James Smith X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.4 (/) * 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") -- 2.38.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 15 05:31:16 2022 Received: (at 58574-done) by debbugs.gnu.org; 15 Nov 2022 10:31:16 +0000 Received: from localhost ([127.0.0.1]:53067 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1outDo-0003NR-GQ for submit@debbugs.gnu.org; Tue, 15 Nov 2022 05:31:16 -0500 Received: from mail-wm1-f44.google.com ([209.85.128.44]:51712) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1outDm-0003NE-Fu for 58574-done@debbugs.gnu.org; Tue, 15 Nov 2022 05:31:15 -0500 Received: by mail-wm1-f44.google.com with SMTP id 5so9359045wmo.1 for <58574-done@debbugs.gnu.org>; Tue, 15 Nov 2022 02:31:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=1Zk02PcY2r1W0zSrD72rDD4cqxDxdlcFIadaEGsPHKA=; b=HN6hRzoukR4ljkgJMsxeOCEMx8A9nmE6lARL/ibY8zLp2G9ivtgScCd1Hgto24HVaf xUa07NGpgHRTiUKPwcyhY3Qaq05UGOcJDHX/+IE9OWKWgwDXtL+eXhPpB/nAXXMDqXE6 gJceIbofk0AnARr05HAXuKGkskvPk9qmCHdCPzJT9lCG9LbG+G6GHMivzuWTY66+wG2D bFiqkut1lcBu9lOcHBSGJKC37c4FmdPLeOnJNLASt2qGBL4pg5cKoei7J7i8cfyBiaYk QUi+kwiG9O4tvRlZ2Jpbhsw9erMPs0NhTW+1HKPno+2/waIktwZNiYbqHCajmPs50Ofw lfmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=1Zk02PcY2r1W0zSrD72rDD4cqxDxdlcFIadaEGsPHKA=; b=xBlyU9ZEUPzFfcknPGHJkb1+YLZC6Jw0wK8c6zOPisZcO8caFj8z2n6Y/fD5Y72BhA S0bSyb/7mUuDMSKjwLGUzZpd6Xl/MrwEDWOHMFh3FOcJZHt+ZQAELAObluJ4RhtK7UhQ dt99hrx0TfMQOOGLnkiCoTG1e7J0SfYE+yCxaKQjWeuZjxIOqKy8OXWN3qw9lXzLapYz /6W67IRvSa4j+DVD3QXrxLtYSeNJswdEcVLZsa6/RRWYMAvBcFP2njOVIqHoJhIlikbh PVamPgoyW5nL4fexU2U0Qs5Ff2DPe4Ts/rUa5YOQLwIuOGOuEMbqqjXPmW5g4hN8pbD3 VXvQ== X-Gm-Message-State: ANoB5pm3i2lBKIiEaJqToggk0ikD9slovJ1wurS+HvesQxQ7D4BXd697 8bJTCsraJ60p/LU5JXXAPqo= X-Google-Smtp-Source: AA0mqf4WrEbxjyjbuue4LS76oHrZQGyKUnbGVU4mE7CLoAZbWqyFn+drEKAVUJGWgUd1FtxHVD3G4Q== X-Received: by 2002:a05:600c:ad7:b0:3cf:d0ba:e605 with SMTP id c23-20020a05600c0ad700b003cfd0bae605mr968741wmr.52.1668508268467; Tue, 15 Nov 2022 02:31:08 -0800 (PST) Received: from localhost ([141.226.13.150]) by smtp.gmail.com with ESMTPSA id e12-20020adffd0c000000b00236576c8eddsm12137033wrr.12.2022.11.15.02.31.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 02:31:07 -0800 (PST) Date: Tue, 15 Nov 2022 12:31:06 +0200 From: Efraim Flashner To: James Smith Subject: Re: [bug#58574] [PATCH] gnu: slade: Update to 3.2.1, use new package style. Message-ID: Mail-Followup-To: Efraim Flashner , James Smith , 58574-done@debbugs.gnu.org References: <20221016224921.8205-1-jsubuntuxp@disroot.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="AjYujcFS/91vJm7x" Content-Disposition: inline In-Reply-To: <20221016224921.8205-1-jsubuntuxp@disroot.org> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 58574-done Cc: 58574-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --AjYujcFS/91vJm7x Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Normally I'd split this into two, one to update the package and the second to switch to g-exps. Patch pushed. Thanks! --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --AjYujcFS/91vJm7x Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmNzamoACgkQQarn3Mo9 g1FvKw/9HU0YIJAYB1aKstyAmaFv1lhk0Zv7Tqc/NH8F3u6LMO0nn/pHqPz7Pp0z Nsq86PTyRim+tTbjZQrHscahU/7mS7buyTVwVdnp39Edm8BnU17pWmA/tGPED7PL JW8PyZ3XWgKDZ6Mjg51u/5atVYBHeZ3VfLBw927f8T/yiMB5FuYoV6x31k4DBHU5 BtmpGp6H0R0EIB6d6Aaan55cG928t0HOojdCsex9mPPhTWYdvM2usOW2fcN1v6Gf poNS6uNTb7PuIDGAAET2yamQkcTV3z15sLSrBZw/0gkIvNXpcwf7w/FLCHZ9qdNZ uqNQJeNfLYRBRcp/burFJyBkDWDN1F7ueCBy9tUTM9NKXXp8otqJCI+FXnfI5Ncy FK76wPLYUodBtQyrz5WNtLBMGDxLINsPhoVuBZ3GsXJsow7vW3XmOvt1yrxYIWGK 4wLKzEES+eT/0T2w1WWodoUOZvEoxXHRSyFxgdZhXE8FN5CxiRIBgTf9WaOBcLEA WnWuXJDaYb6c54hM/0GO75XzH/KsHBeSz/RbOVtffS9xlDlXWuCu40ttktQ0AyL8 4U9QsWVj4uudgx1PSAEG2Y2W7XDgvE280607VvL918uJgSCAFmmxl1y2taaroJsS KHXGCAWMU/Q4NqErMuAOYBsqFP0OoJxKHbXzxXXMl9qg3TaujKk= =BQJr -----END PGP SIGNATURE----- --AjYujcFS/91vJm7x-- From unknown Sun Jun 22 11:37:10 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 13 Dec 2022 12:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator