From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id owEAHN0Lil8TfAAA0tVLHw (envelope-from ) for ; Fri, 16 Oct 2020 21:08:45 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id wBt7F90Lil/weAAAB5/wlQ (envelope-from ) for ; Fri, 16 Oct 2020 21:08:45 +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 F1CF694060F for ; Fri, 16 Oct 2020 21:08:44 +0000 (UTC) Received: from localhost ([::1]:48856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTWxv-0001G4-U5 for larch@yhetil.org; Fri, 16 Oct 2020 17:08:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTWxG-0000dj-SD for guix-patches@gnu.org; Fri, 16 Oct 2020 17:08:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49484) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kTWxG-0004nq-Hw for guix-patches@gnu.org; Fri, 16 Oct 2020 17:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kTWxG-00074n-Cu for guix-patches@gnu.org; Fri, 16 Oct 2020 17:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44039] [PATCH] gnu: Add slade. Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Oct 2020 21:08: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: James Smith Cc: 44039@debbugs.gnu.org X-Debbugs-Original-Cc: guix-patches@gnu.org, 44039@debbugs.gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160288247327173 (code B ref -1); Fri, 16 Oct 2020 21:08:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Oct 2020 21:07:53 +0000 Received: from localhost ([127.0.0.1]:32795 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kTWx7-00074D-BO for submit@debbugs.gnu.org; Fri, 16 Oct 2020 17:07:53 -0400 Received: from lists.gnu.org ([209.51.188.17]:36056) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kTWx6-000745-9k for submit@debbugs.gnu.org; Fri, 16 Oct 2020 17:07:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTWx6-0000an-5I for guix-patches@gnu.org; Fri, 16 Oct 2020 17:07:52 -0400 Received: from tobias.gr ([2a02:c205:2020:6054::1]:38048) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTWx0-0004kS-8t for guix-patches@gnu.org; Fri, 16 Oct 2020 17:07:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobias.gr; s=2018; bh=n3eFK1c+CjQVKclUJAjAVqNqoASB6w9/lEY0q7qGceQ=; h=date:in-reply-to: references:subject:cc:to:from; b=VaVs+ikkVxvGbhfZFgkdBcnCHxj5A+Q7/xREL AvRNttJhpeRNEL84sllaC27shl17PijScNn5Yf2FmDCdQmZm5dSwrt+EjKtjFNXo1dM7Da p3hd8fBucwXg7AinfFzV4AdsBnPWz3/L3hB5aekos1iSNU4Ig/+FjF4GDEJeJiiTV9GZ8/ mdCDm+FgLwEOYBmqJAG+a8GM8XChIHjwG1sewYN97Px+R+1IoE+umwh5rgQFVhfjqO+47T wiD6CaS/6VRjdsNGnZRvXtmjl6baLtyODFQrqNJWH+Xsu23RiAx9ev8SoHTiev8tQNneNu 8kvhhlbZB4MB+mB3BszKblx4w== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id c8ef7036 (TLSv1.2:ECDHE-ECDSA-AES256-GCM-SHA384:256:NO); Fri, 16 Oct 2020 21:07:56 +0000 (UTC) BIMI-Selector: v=BIMI1; s=default; References: <20201016184333.1445-1-jsubuntuxp@disroot.org> In-reply-to: <20201016184333.1445-1-jsubuntuxp@disroot.org> Date: Fri, 16 Oct 2020 23:07:46 +0200 Message-ID: <87zh4lanh9.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a02:c205:2020:6054::1; envelope-from=me@tobias.gr; helo=tobias.gr X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.4 (--) 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: Tobias Geerinckx-Rice , Tobias Geerinckx-Rice via Guix-patches From: Tobias Geerinckx-Rice via Guix-patches via X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=tobias.gr header.s=2018 header.b=VaVs+ikk; 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-Spam-Score: -3.11 X-TUID: 1gbAJpxvQC89 --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable James, Thanks for the patch! James Smith =E5=86=99=E9=81=93=EF=BC=9A > +(define-public slade Let's keep modules vaguely alphabetical. Could you move this=20 above =E2=80=98tiled=E2=80=99? > + (add-after 'install 'patch-gdk-backend Nitpick: it's not patching anything. > + ;; Set GDK_BACKEND to x11 to prevent crash on=20 > Wayland. > + ;; See=20 > https://github.com/sirjuddington/SLADE/issues/1097 for details. > + (lambda* _ No need for lambda* over lambda when you're not using any of its=20 extended features.... > + (string-append (assoc-ref %outputs "out")=20 > "/bin/slade") ...however, you *could* use its keyword arguments to get rid of=20 this ugly %outputs pseudo-global. See below. > + `("GDK_BACKEND" "" =3D (,"x11"))) This works but the "" and , are redundant. All in all, the phase can be rewritten as: (add-after 'install 'wrap-with-x11-gdk-backend ;; Set GDK_BACKEND to x11 to prevent crash on Wayland.=20 See ;; https://github.com/sirjuddington/SLADE/issues/1097=20 for details. (lambda* (#:key outputs #:allow-other-keys) (wrap-program (string-append (assoc-ref outputs "out")=20 "/bin/slade") '("GDK_BACKEND" =3D ("x11"))) #t))) > + #:tests? #f)) Are there no tests at all? If so, note in a comment: #:tests? #f)) ; no test suite Same if there are tests but they're broken or pointless (linting=20 etc.). There's one more problem: set(ZIP_COMMAND "${ZIPTOOL_ZIP_EXECUTABLE}" -X -UN=3DUTF8 -9 -r \ "${CMAKE_BINARY_DIR}/slade.pk3" .) Even zip -X won't create an identical archive on every run. There=20 doesn't seem to be an option to do so. The result: --- /gnu/store/aaa-slade-3.1.12a/share/slade3/slade.pk3 +++ /gnu/store/bbb-slade-3.1.12a/share/slade3/slade.pk3 Zip file size: 3624588 bytes, number of entries: 768 -drwxr-xr-x 3.0 unx 0 b- stor 20-Oct-16 19:17 html/ -drwxr-xr-x 3.0 unx 0 b- stor 20-Oct-16 19:17 config/ -drwxr-xr-x 3.0 unx 0 b- stor 20-Oct-16 19:17 config/colours/ +drwxr-xr-x 3.0 unx 0 b- stor 20-Oct-16 19:31 html/ +drwxr-xr-x 3.0 unx 0 b- stor 20-Oct-16 19:31 config/ +drwxr-xr-x 3.0 unx 0 b- stor 20-Oct-16 19:31 config/colours/ This is not ideal: Guix aims for reproducible builds. The following made multiple builds on one machine identical, but=20 was not consistent between file systems, probably due to readdir=20 order: + (add-before 'build 'reset-slade.pk3-timestamps + ;; This appears sufficient to make slade.pk3 reproducible. + (lambda _ + (invoke "find" "../source/dist/res" "-exec" "touch" + "--no-dereference" "-t" "197001010000.00" "{}"=20 "+"))) I suppose I could try using find to sort the files before invoking=20 zip, or something. Thoughts? Kind regards, T G-R --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIMEARYKACsWIQT12iAyS4c9C3o4dnINsP+IT1VteQUCX4oLog0cbWVAdG9iaWFz LmdyAAoJEA2w/4hPVW15rtQA/j60C81XRN19jxaTSDhaRVPAYtb+AGfLS60C8ppR UZ13AP9gENWeHc6UhsPw0jtjxa+1lzdC7z3birrh9iXRDzW8AA== =dJU1 -----END PGP SIGNATURE----- --=-=-=--