From patchwork Sat Jun 26 19:20:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 30735 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 B7D7E27BC81; Sat, 26 Jun 2021 20:22:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3525C27BC78 for ; Sat, 26 Jun 2021 20:22:09 +0100 (BST) Received: from localhost ([::1]:39616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxDsW-0003YJ-40 for patchwork@mira.cbaines.net; Sat, 26 Jun 2021 15:22:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxDsQ-0003Y8-97 for guix-patches@gnu.org; Sat, 26 Jun 2021 15:22:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37092) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lxDsQ-000759-1m for guix-patches@gnu.org; Sat, 26 Jun 2021 15:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lxDsP-0001iK-QR for guix-patches@gnu.org; Sat, 26 Jun 2021 15:22:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49235] [PATCH] gnu: Add oneko. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Jun 2021 19:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49235 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49235@debbugs.gnu.org Cc: Timotej Lazar X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16247352936548 (code B ref -1); Sat, 26 Jun 2021 19:22:01 +0000 Received: (at submit) by debbugs.gnu.org; 26 Jun 2021 19:21:33 +0000 Received: from localhost ([127.0.0.1]:48638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxDrr-0001hR-Lu for submit@debbugs.gnu.org; Sat, 26 Jun 2021 15:21:33 -0400 Received: from lists.gnu.org ([209.51.188.17]:55328) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxDrm-0001hD-Qd for submit@debbugs.gnu.org; Sat, 26 Jun 2021 15:21:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxDrm-0003WO-GM for guix-patches@gnu.org; Sat, 26 Jun 2021 15:21:22 -0400 Received: from araneo.si ([2001:15c0:2110:3400::2]:50020) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxDrg-0006aJ-Br for guix-patches@gnu.org; Sat, 26 Jun 2021 15:21:22 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id afc4c696 for ; Sat, 26 Jun 2021 19:21:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20180623; bh=ons9uN2fpE9KPSbzXdDW7 w9kgis=; b=WeLvPPTjjrqwXdfpj44KnUSyJa2CHKfNca0uW1UuTo6XuuTc0rUCw KlHBo716GjWN2CehoNVUaI+m0EjPtnH7tS3rmRG/2mLZoaLC60B9vsWWAK7cDXy2 G2E3nDO/+DSI05vBU2u/+Y8n6+RVxQKAgny+udKdj129zJk1+E4VPV/1rm0sWC1A ze4OSuyMJiOW0HLHPPJa52ze7LNLUWROQFaoPNtTE4QnBAUip8B3toGHgS9l8Myg RrZo0TYy4Gv8m/ibJ7UbtLu8d9v92XDunkSpLrch3xJ14p2b59t3+QJd/BbE2oJx 4aj5xpLos4gWOq9NKJqpFoeik+nxAnfaw== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 3771845c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 26 Jun 2021 19:21:09 +0000 (UTC) From: Timotej Lazar Date: Sat, 26 Jun 2021 21:20:49 +0200 Message-Id: <20210626192049.20405-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2001:15c0:2110:3400::2; envelope-from=timotej.lazar@araneo.si; helo=araneo.si 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-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 * gnu/packages/toys.scm (oneko): New variable. --- This adds the oneko version of the original xneko toy. The license statement seems to be at the end of README (not sure as I can’t read Japanese), but Debian and FSF agree it’s in the public domain. `guix lint` complains about a newer version, but the only differences are a somewhat less broken build system and an additional bitmap of the BSD daemon, which is trademarked. I opted for this version instead of basically reverting all changes from the newer one. Thanks! Timotej gnu/packages/toys.scm | 50 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm index bbd5753841..d396062fe1 100644 --- a/gnu/packages/toys.scm +++ b/gnu/packages/toys.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Jesse Gibbons -;;; Copyright © 2019, 2020 Timotej Lazar +;;; Copyright © 2019, 2020, 2021 Timotej Lazar ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2021 Leo Famulari ;;; @@ -36,6 +36,54 @@ #:use-module (guix packages) #:use-module (guix utils)) +(define-public oneko + (package + (name "oneko") + ;; Identical to version 1.2.sakura.5b but without the trademarked BSD daemon. + (version "1.1b.sakura.5") + (source + (origin + (method url-fetch) + (uri (string-append + "http://www.daidouji.com/oneko/distfiles/oneko-" version ".tar.gz")) + (sha256 + (base32 "0dh5xr579clq0871pk6m7xfmsa24jk3idgx61k7skl37i40klaa3")))) + (build-system gnu-build-system) + (native-inputs + `(("imake" ,imake))) + (inputs + `(("libx11" ,libx11) + ("libxext" ,libxext))) + (arguments + `(#:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ + (substitute* "Imakefile" + ((" = /bin/") " = ") ; don’t use absolute paths for cp, rm and strip + (("\\$\\(DESTDIR\\)/man") "$(DESTDIR)/share/man")) + (invoke "xmkmf") + (substitute* "Makefile" + ;; Fix incorrectly generated compiler flags. + (("(CDEBUGFLAGS = ).*" _ front) (string-append front "-O2\n"))) + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name))) + (mkdir-p (string-append out "/bin")) + (mkdir-p (string-append out "/share/man/man1")) + (invoke "make" (string-append "DESTDIR=" out) "install") + (for-each (lambda (file) (install-file file doc)) + (find-files "." "README.*"))) + #t))))) + (home-page "http://www.daidouji.com/oneko/") + (synopsis "Cute cat chasing your mouse pointer") + (description "Displays a cat or another animated character that chases the +mouse pointer around the screen while you work.") + (license license:public-domain))) ; see https://directory.fsf.org/wiki/Oneko + (define-public sl (package (name "sl")