From unknown Fri Aug 15 15:33:37 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#49235 <49235@debbugs.gnu.org> To: bug#49235 <49235@debbugs.gnu.org> Subject: Status: [PATCH] gnu: Add oneko. Reply-To: bug#49235 <49235@debbugs.gnu.org> Date: Fri, 15 Aug 2025 22:33:37 +0000 retitle 49235 [PATCH] gnu: Add oneko. reassign 49235 guix-patches submitter 49235 Timotej Lazar severity 49235 normal tag 49235 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 26 15:21:33 2021 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: Add oneko. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Timotej Lazar 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: -2.3 (--) * 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") -- 2.32.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 27 08:46:28 2021 Received: (at 49235) by debbugs.gnu.org; 27 Jun 2021 12:46:28 +0000 Received: from localhost ([127.0.0.1]:49056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxUB2-0007LO-Ap for submit@debbugs.gnu.org; Sun, 27 Jun 2021 08:46:28 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:46778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxUAy-0007LC-B6 for 49235@debbugs.gnu.org; Sun, 27 Jun 2021 08:46:18 -0400 Received: from [10.0.0.4] (62-116-34-49.adsl.highway.telekom.at [62.116.34.49]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GCVpr5HdZz3wZ9; Sun, 27 Jun 2021 14:46:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1624797972; bh=dKe8Zlme7YB9Zc5wuo0VJ+cscbClh500Lp7tSGP9bI4=; h=Subject:From:To:Date:In-Reply-To:References; b=uNJbPjUvMy9oUDqpMnGZfe6K2niMQz53b9J7NLqGYRzaoCFumBvWOT2s85yMnbQcS ZlQ/Dcuof+jXCgWCBmf1rbqC1YWGtl6kJDfd9kPoB0zOZyrRr73G5+R04btrMG1bGA m2hb+d+8a2gQYeEzLIetMF3LJIGn5oHa90KvOaM4= Message-ID: Subject: Re: [PATCH] gnu: Add oneko. From: Leo Prikler To: Timotej Lazar , 49235@debbugs.gnu.org Date: Sun, 27 Jun 2021 14:45:45 +0200 In-Reply-To: <20210626192049.20405-1-timotej.lazar@araneo.si> References: <20210626192049.20405-1-timotej.lazar@araneo.si> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 49235 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: -1.0 (-) Am Samstag, den 26.06.2021, 21:20 +0200 schrieb Timotej Lazar: > * 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. 基本的にＰＤＳですが、バグ修正や機能拡張は（こっそりでもいいですから）私（kato@ntts.co.jp）に教えて下さいね。 バージョンアップもするつもりです。 With my limited Japanese knowledge, this roughly translates to: "It's basically PDS[1], but if it's about bug fixes or enhancements[2], please write tell me (kato@ntss.co.jp). I also plan to do version updates." [1] probably means public domain software [2] the bracket expression（こっそりでもいいですから）roughly translates to "because it's also fine if you do it silently", basically meaning it's also fine if you fix bugs/enhance the program without telling Kato. Based on the above, I think both Debian and the FSF are correct in assuming, that *the code* is 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. This, however, seems to be an odd choice to me, particularly because the "sakura" variant already adds characters that are owned by CLAMP. 『カードキャプターさくら』およびそのキャラクターは CLAMP の著作物です。 ただしそのキャラクターは同人誌等における利用が容認されています。 CLAMP 学園電子分校（http://www.clamp.f-2.co.jp/）をご参照ください。 This roughly translates to "Cardcaptor Sakura" and it's characters are owned by CLAMP. However, it is acceptable to use those characters in Doujin[1] work. Please see CLAMP 学園電子分校[2]（http://www.clamp.f-2.co.jp/） [1] Japanese media companies are generally lax when it comes to enforce their IPs against fans of their work, i.e. against doujins. A comparable scenario exists in the BBC tacitly allowing Doctor Who fanfiction. However, this does not always make them compatible with free software – ZUN, the creator of Touhou, for instance disallows commercial reuse without his approval. [2] It's a proper name, and I'm not attempting to translate it. Since the site mentioned appears to be currently down, I'll have to do a little deeper dive to see whether it's actually safe to keep the Cardcaptor Sakura characters. However, this does call into the question whether we can really pin a version that is safe from all those legally dangerous bits. I think it is probably safer to use the same version as Debian (i.e. the currently latest IIUC) and apply the same patch as Debian here. Regards, Leo > > 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 < > timotej.lazar@araneo.si> > ;;; 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") From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 27 09:40:27 2021 Received: (at 49235) by debbugs.gnu.org; 27 Jun 2021 13:40:27 +0000 Received: from localhost ([127.0.0.1]:49118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxV1P-0000Fh-0a for submit@debbugs.gnu.org; Sun, 27 Jun 2021 09:40:27 -0400 Received: from araneo.si ([90.157.193.204]:50442) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxV1N-0000FY-0Y for 49235@debbugs.gnu.org; Sun, 27 Jun 2021 09:40:26 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id a150bfc1; Sun, 27 Jun 2021 13:40:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to :subject:in-reply-to:references:date:message-id:mime-version :content-type:content-transfer-encoding; s=20180623; bh=AgjnTN3O RjH8sNhzfkL+OiCQEQY=; b=VHA4Y2NaQDdqOIXy0r8bDooiBx7/IqL+GomNfdsM KDEB7OO1w/N1wf9ajWUIsYRuDGByLmy0tHN9lDaLi9dkdV55PKeKPBuLRKgr1Mjm 4P4PC/HEaDb8MAD/oJ+8vyXyf/Q8TAky8BsFJAmnKzbQZ+lsVOuT6fwE+M16dzQw 0Vp6xo+xprFCpSHCMrFqivM+8ZdSm2TPvr8bzmP5HKli0RgNHolwMuuTmyTIScZu FX4ZI/f+nEnSvCjly5e0Ph5HtleB+C8Lz+awhJfLAM8Gx8Pfk0RkKYljlBBxu9QA yKenbZVSKeQiet4tLxObJ4WiMgfGNke4PztiFlBqkID6iQ== Received: by araneo.si (OpenSMTPD) with ESMTPSA id f0a7b856 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 27 Jun 2021 13:40:22 +0000 (UTC) From: Timotej Lazar To: Leo Prikler , 49235@debbugs.gnu.org Subject: Re: [PATCH] gnu: Add oneko. In-Reply-To: References: <20210626192049.20405-1-timotej.lazar@araneo.si> Date: Sun, 27 Jun 2021 15:40:22 +0200 Message-ID: <87bl7ro27t.fsf@araneo.si> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 49235 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: -1.0 (-) Leo Prikler [2021-06-27 14:45:45+0200]: > This roughly translates to > > "Cardcaptor Sakura" and it's characters are owned by CLAMP. > However, it is acceptable to use those characters in Doujin[1] work. > Please see CLAMP =E5=AD=A6=E5=9C=92=E9=9B=BB=E5=AD=90=E5=88=86=E6=A0=A1[2= ]=EF=BC=88http://www.clamp.f-2.co.jp/=EF=BC=89 Seems that Debian=E2=80=99s analysis, which was my primary source, is somew= hat lacking. It would probably be safest to remove all characters except the original neko, tora and dog options. I can send a new package using the latest version with these characters removed. Thanks for taking the time to investigate this! From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 27 09:55:47 2021 Received: (at 49235) by debbugs.gnu.org; 27 Jun 2021 13:55:47 +0000 Received: from localhost ([127.0.0.1]:50246 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxVGF-0000sa-Cd for submit@debbugs.gnu.org; Sun, 27 Jun 2021 09:55:47 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:14279) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxVG9-0000sO-TW for 49235@debbugs.gnu.org; Sun, 27 Jun 2021 09:55:46 -0400 Received: from [10.0.0.4] (62-116-34-49.adsl.highway.telekom.at [62.116.34.49]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GCXLy53Nvz3wXX; Sun, 27 Jun 2021 15:55:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1624802138; bh=1XMAIIf4m+RYJjFWDMq4udRDi4tg+K4iyas0YATRHqQ=; h=Subject:From:To:Date:In-Reply-To:References; b=IENiDJLM+kXjnwzIKHQYkqsNe2mxClvFM0ezbXXJQNfkr3AFkQkK22e2BWTXiOsW2 qVBcqYiy7lvnbTkaj4g7suZOneTm25OAJral44L74peINfVtNn3SbTd92RmArwBwqc 7GbAWnl83+cRHsXVE1bFIWDgy6tkEqkcVtoLxqvU= Message-ID: <2b6c8ceade7f0ced46cdc5486f26e75cc1cedb10.camel@student.tugraz.at> Subject: Re: [PATCH] gnu: Add oneko. From: Leo Prikler To: Timotej Lazar , 49235@debbugs.gnu.org Date: Sun, 27 Jun 2021 15:55:17 +0200 In-Reply-To: <87bl7ro27t.fsf@araneo.si> References: <20210626192049.20405-1-timotej.lazar@araneo.si> <87bl7ro27t.fsf@araneo.si> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 49235 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: -3.3 (---) Am Sonntag, den 27.06.2021, 15:40 +0200 schrieb Timotej Lazar: > Leo Prikler [2021-06-27 > 14:45:45+0200]: > > This roughly translates to > > > > "Cardcaptor Sakura" and it's characters are owned by CLAMP. > > However, it is acceptable to use those characters in Doujin[1] > > work. > > Please see CLAMP 学園電子分校[2]（http://www.clamp.f-2.co.jp/） > > Seems that Debian’s analysis, which was my primary source, is > somewhat > lacking. It would probably be safest to remove all characters except > the > original neko, tora and dog options. I can send a new package using > the > latest version with these characters removed. Upon further investigation, this page appears to have been dead for ~20 years. The newer CLAMP homepage does not appear to mention doujins at all and trying to search for a policy of theirs will only yield unrelated results. In other words, yeah, keeping only the original neko, tora and dog is the safest bet here. Please don't forget to also have a look at the cursors. From what I can see only the mouse and the bone should be fine as they relate to neko and tora or dog respectively. Regards, Leo From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 27 13:50:06 2021 Received: (at 49235) by debbugs.gnu.org; 27 Jun 2021 17:50:06 +0000 Received: from localhost ([127.0.0.1]:50353 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxYur-0006uH-If for submit@debbugs.gnu.org; Sun, 27 Jun 2021 13:50:06 -0400 Received: from araneo.si ([90.157.193.204]:50460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxYum-0006u5-8Q for 49235@debbugs.gnu.org; Sun, 27 Jun 2021 13:49:56 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 5317421b for <49235@debbugs.gnu.org>; Sun, 27 Jun 2021 17:49:49 +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=wVQQOHEa7oBKtroWPebmf X5MFCo=; b=XpFQuyMt5xhykbbm5kuGB2n1FNaXlYSllpEeRsMXSXYpnJANOoj+i 4GMYFnKRjS8RDPC1VXbxJXsr40UhU0EkY2T4NTEPjfx9HWWgtNB78MBr7QxZMnPR MMc8+hUDBst4Y3Qs2GTxRuwNqbSP/v+NBJmTOlHvw+HBMzuBTtvcwVT9RER5koMo c4JfOgDs17XgwcG+oWy7k6JVII40kDciqO/qYgJPEAMieaFE5vUXbS1O9wYPK1wk MkLEg3IuyZX48tyeVToZwQrFITqeIUVLnbed9QuXZoeLHum1Pq56TxJOl6fAAOM1 77xe31QofFb6p3uD/4VzjUK3gyg8+akZA== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 071d6010 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 27 Jun 2021 17:49:49 +0000 (UTC) From: Timotej Lazar To: 49235@debbugs.gnu.org Subject: [PATCH v2] gnu: Add oneko. Date: Sun, 27 Jun 2021 19:49:33 +0200 Message-Id: <20210627174933.14348-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 49235 Cc: Timotej Lazar 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: -1.0 (-) * gnu/packages/toys.scm (oneko): New variable. --- gnu/local.mk | 1 + ...oneko-remove-refs-to-nonfree-bitmaps.patch | 307 ++++++++++++++++++ gnu/packages/toys.scm | 61 +++- 3 files changed, 368 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/oneko-remove-refs-to-nonfree-bitmaps.patch diff --git a/gnu/local.mk b/gnu/local.mk index f507fe566f..2d3ca77504 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1499,6 +1499,7 @@ dist_patch_DATA = \ %D%/packages/patches/ocaml-dose3-dont-make-printconf.patch \ %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \ %D%/packages/patches/omake-fix-non-determinism.patch \ + %D%/packages/patches/oneko-remove-refs-to-nonfree-bitmaps.patch \ %D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch \ %D%/packages/patches/opencascade-oce-glibc-2.26.patch \ %D%/packages/patches/opencv-fix-build-of-grfmt_jpeg2000.cpp.patch \ diff --git a/gnu/packages/patches/oneko-remove-refs-to-nonfree-bitmaps.patch b/gnu/packages/patches/oneko-remove-refs-to-nonfree-bitmaps.patch new file mode 100644 index 0000000000..2ab4b5dda0 --- /dev/null +++ b/gnu/packages/patches/oneko-remove-refs-to-nonfree-bitmaps.patch @@ -0,0 +1,307 @@ +Removes references to bitmaps with unclear copyright status, and related +program options. Bitmaps themselves are deleted in a source snippet. +diff --git a/cursors/cursor.include b/cursors/cursor.include +index ef96d72..1dc3dc2 100644 +--- a/cursors/cursor.include ++++ b/cursors/cursor.include +@@ -2,9 +2,3 @@ + #include "mouse_cursor_mask.xbm" + #include "bone_cursor.xbm" + #include "bone_cursor_mask.xbm" +-#include "bsd_cursor.xbm" +-#include "bsd_cursor_mask.xbm" +-#include "card_cursor.xbm" +-#include "card_cursor_mask.xbm" +-#include "petal_cursor.xbm" +-#include "petal_cursor_mask.xbm" +diff --git a/oneko.c b/oneko.c +index d2b81fe..04fa59f 100644 +--- a/oneko.c ++++ b/oneko.c +@@ -33,7 +33,7 @@ XColor theBackgroundColor; /* $@?'(J ($@%P%C%/%0%i%&%s%I(J) */ + + int Synchronous = False; + /* Types of animals */ +-#define BITMAPTYPES 6 ++#define BITMAPTYPES 3 + typedef struct _AnimalDefaults { + char *name; + int speed, idle, bitmap_width, bitmap_height; +@@ -51,12 +51,6 @@ AnimalDefaultsData AnimalDefaultsDataTable[] = + mouse_cursor_width,mouse_cursor_height, mouse_cursor_x_hot,mouse_cursor_y_hot }, + { "dog" , 10, 6, 32, 32, 125000L, 0, 0, bone_cursor_bits,bone_cursor_mask_bits, + bone_cursor_width,bone_cursor_height, bone_cursor_x_hot,bone_cursor_y_hot }, +- { "bsd_daemon" , 16, 6, 32, 32, 300000L, 22, 20, bsd_cursor_bits,bsd_cursor_mask_bits, +- bsd_cursor_width,bsd_cursor_height, bsd_cursor_x_hot,bsd_cursor_y_hot }, +- { "sakura" , 13, 6, 32, 32, 125000L, 0, 0, card_cursor_bits,card_cursor_mask_bits, +- card_cursor_width,card_cursor_height, card_cursor_x_hot,card_cursor_y_hot }, +- { "tomoyo" , 10, 6, 32, 32, 125000L, 32, 32, petal_cursor_bits,petal_cursor_mask_bits, +- petal_cursor_width,petal_cursor_height, petal_cursor_x_hot,petal_cursor_y_hot }, + }; + + /* +@@ -154,70 +148,70 @@ typedef struct { + + BitmapGCData BitmapGCDataTable[] = + { +- { &Mati2GC, &Mati2Xbm, mati2_bits, mati2_tora_bits, mati2_dog_bits, mati2_bsd_bits, mati2_sakura_bits, mati2_tomoyo_bits, +- &Mati2Msk, mati2_mask_bits, mati2_mask_bits, mati2_dog_mask_bits, mati2_bsd_mask_bits, mati2_sakura_mask_bits, mati2_tomoyo_mask_bits }, +- { &Jare2GC, &Jare2Xbm, jare2_bits, jare2_tora_bits, jare2_dog_bits, jare2_bsd_bits, jare2_sakura_bits, jare2_tomoyo_bits, +- &Jare2Msk, jare2_mask_bits, jare2_mask_bits, jare2_dog_mask_bits, jare2_bsd_mask_bits, jare2_sakura_mask_bits, jare2_tomoyo_mask_bits }, +- { &Kaki1GC, &Kaki1Xbm, kaki1_bits, kaki1_tora_bits, kaki1_dog_bits, kaki1_bsd_bits, kaki1_sakura_bits, kaki1_tomoyo_bits, +- &Kaki1Msk, kaki1_mask_bits, kaki1_mask_bits, kaki1_dog_mask_bits, kaki1_bsd_mask_bits, kaki1_sakura_mask_bits, kaki1_tomoyo_mask_bits }, +- { &Kaki2GC, &Kaki2Xbm, kaki2_bits, kaki2_tora_bits, kaki2_dog_bits, kaki2_bsd_bits, kaki2_sakura_bits, kaki2_tomoyo_bits, +- &Kaki2Msk, kaki2_mask_bits, kaki2_mask_bits, kaki2_dog_mask_bits, kaki2_bsd_mask_bits, kaki2_sakura_mask_bits, kaki2_tomoyo_mask_bits }, +- { &Mati3GC, &Mati3Xbm, mati3_bits, mati3_tora_bits, mati3_dog_bits, mati3_bsd_bits, mati3_sakura_bits, mati3_tomoyo_bits, +- &Mati3Msk, mati3_mask_bits, mati3_mask_bits, mati3_dog_mask_bits, mati3_bsd_mask_bits, mati3_sakura_mask_bits, mati3_tomoyo_mask_bits }, +- { &Sleep1GC, &Sleep1Xbm, sleep1_bits, sleep1_tora_bits, sleep1_dog_bits, sleep1_bsd_bits, sleep1_sakura_bits, sleep1_tomoyo_bits, +- &Sleep1Msk, sleep1_mask_bits, sleep1_mask_bits, sleep1_dog_mask_bits, sleep1_bsd_mask_bits, sleep1_sakura_mask_bits, sleep1_tomoyo_mask_bits }, +- { &Sleep2GC, &Sleep2Xbm, sleep2_bits, sleep2_tora_bits, sleep2_dog_bits, sleep2_bsd_bits, sleep2_sakura_bits, sleep2_tomoyo_bits, +- &Sleep2Msk, sleep2_mask_bits, sleep2_mask_bits, sleep2_dog_mask_bits, sleep2_bsd_mask_bits, sleep2_sakura_mask_bits, sleep2_tomoyo_mask_bits }, +- { &AwakeGC, &AwakeXbm, awake_bits, awake_tora_bits, awake_dog_bits, awake_bsd_bits, awake_sakura_bits, awake_tomoyo_bits, +- &AwakeMsk, awake_mask_bits, awake_mask_bits, awake_dog_mask_bits, awake_bsd_mask_bits, awake_sakura_mask_bits, awake_tomoyo_mask_bits }, +- { &Up1GC, &Up1Xbm, up1_bits, up1_tora_bits, up1_dog_bits, up1_bsd_bits, up1_sakura_bits, up1_tomoyo_bits, +- &Up1Msk, up1_mask_bits, up1_mask_bits, up1_dog_mask_bits, up1_bsd_mask_bits, up1_sakura_mask_bits, up1_tomoyo_mask_bits }, +- { &Up2GC, &Up2Xbm, up2_bits, up2_tora_bits, up2_dog_bits, up2_bsd_bits, up2_sakura_bits, up2_tomoyo_bits, +- &Up2Msk, up2_mask_bits, up2_mask_bits, up2_dog_mask_bits, up2_bsd_mask_bits, up2_sakura_mask_bits, up2_tomoyo_mask_bits }, +- { &Down1GC, &Down1Xbm, down1_bits, down1_tora_bits, down1_dog_bits, down1_bsd_bits, down1_sakura_bits, down1_tomoyo_bits, +- &Down1Msk, down1_mask_bits, down1_mask_bits, down1_dog_mask_bits, down1_bsd_mask_bits, down1_sakura_mask_bits, down1_tomoyo_mask_bits }, +- { &Down2GC, &Down2Xbm, down2_bits, down2_tora_bits, down2_dog_bits, down2_bsd_bits, down2_sakura_bits, down2_tomoyo_bits, +- &Down2Msk, down2_mask_bits, down2_mask_bits, down2_dog_mask_bits, down2_bsd_mask_bits, down2_sakura_mask_bits, down2_tomoyo_mask_bits }, +- { &Left1GC, &Left1Xbm, left1_bits, left1_tora_bits, left1_dog_bits, left1_bsd_bits, left1_sakura_bits, left1_tomoyo_bits, +- &Left1Msk, left1_mask_bits, left1_mask_bits, left1_dog_mask_bits, left1_bsd_mask_bits, left1_sakura_mask_bits, left1_tomoyo_mask_bits }, +- { &Left2GC, &Left2Xbm, left2_bits, left2_tora_bits, left2_dog_bits, left2_bsd_bits, left2_sakura_bits, left2_tomoyo_bits, +- &Left2Msk, left2_mask_bits, left2_mask_bits, left2_dog_mask_bits, left2_bsd_mask_bits, left2_sakura_mask_bits, left2_tomoyo_mask_bits }, +- { &Right1GC, &Right1Xbm, right1_bits, right1_tora_bits, right1_dog_bits, right1_bsd_bits, right1_sakura_bits, right1_tomoyo_bits, +- &Right1Msk, right1_mask_bits, right1_mask_bits,right1_dog_mask_bits, right1_bsd_mask_bits, right1_sakura_mask_bits, right1_tomoyo_mask_bits }, +- { &Right2GC, &Right2Xbm, right2_bits, right2_tora_bits, right2_dog_bits, right2_bsd_bits, right2_sakura_bits, right2_tomoyo_bits, +- &Right2Msk, right2_mask_bits, right2_mask_bits, right2_dog_mask_bits, right2_bsd_mask_bits, right2_sakura_mask_bits, right2_tomoyo_mask_bits }, +- { &UpLeft1GC, &UpLeft1Xbm, upleft1_bits, upleft1_tora_bits, upleft1_dog_bits, upleft1_bsd_bits, upleft1_sakura_bits, upleft1_tomoyo_bits, +- &UpLeft1Msk, upleft1_mask_bits, upleft1_mask_bits, upleft1_dog_mask_bits, upleft1_bsd_mask_bits, upleft1_sakura_mask_bits, upleft1_tomoyo_mask_bits }, +- { &UpLeft2GC, &UpLeft2Xbm, upleft2_bits, upleft2_tora_bits, upleft2_dog_bits, upleft2_bsd_bits, upleft2_sakura_bits, upleft2_tomoyo_bits, +- &UpLeft2Msk, upleft2_mask_bits, upleft2_mask_bits,upleft2_dog_mask_bits, upleft2_bsd_mask_bits, upleft2_sakura_mask_bits, upleft2_tomoyo_mask_bits }, +- { &UpRight1GC, &UpRight1Xbm, upright1_bits, upright1_tora_bits, upright1_dog_bits, upright1_bsd_bits, upright1_sakura_bits, upright1_tomoyo_bits, +- &UpRight1Msk, upright1_mask_bits, upright1_mask_bits,upright1_dog_mask_bits, upright1_bsd_mask_bits, upright1_sakura_mask_bits, upright1_tomoyo_mask_bits }, +- { &UpRight2GC, &UpRight2Xbm, upright2_bits, upright2_tora_bits, upright2_dog_bits, upright2_bsd_bits, upright2_sakura_bits, upright2_tomoyo_bits, +- &UpRight2Msk, upright2_mask_bits, upright2_mask_bits,upright2_dog_mask_bits, upright2_bsd_mask_bits, upright2_sakura_mask_bits, upright2_tomoyo_mask_bits }, +- { &DownLeft1GC, &DownLeft1Xbm, dwleft1_bits, dwleft1_tora_bits, dwleft1_dog_bits, dwleft1_bsd_bits, dwleft1_sakura_bits, dwleft1_tomoyo_bits, +- &DownLeft1Msk, dwleft1_mask_bits, dwleft1_mask_bits, dwleft1_dog_mask_bits, dwleft1_bsd_mask_bits, dwleft1_sakura_mask_bits, dwleft1_tomoyo_mask_bits }, +- { &DownLeft2GC, &DownLeft2Xbm, dwleft2_bits, dwleft2_tora_bits, dwleft2_dog_bits, dwleft2_bsd_bits, dwleft2_sakura_bits, dwleft2_tomoyo_bits, +- &DownLeft2Msk, dwleft2_mask_bits, dwleft2_mask_bits, dwleft2_dog_mask_bits, dwleft2_bsd_mask_bits, dwleft2_sakura_mask_bits, dwleft2_tomoyo_mask_bits }, +- { &DownRight1GC, &DownRight1Xbm, dwright1_bits, dwright1_tora_bits, dwright1_dog_bits, dwright1_bsd_bits, dwright1_sakura_bits, dwright1_tomoyo_bits, +- &DownRight1Msk, dwright1_mask_bits, dwright1_mask_bits, dwright1_dog_mask_bits, dwright1_bsd_mask_bits, dwright1_sakura_mask_bits, dwright1_tomoyo_mask_bits }, +- { &DownRight2GC, &DownRight2Xbm, dwright2_bits, dwright2_tora_bits, dwright2_dog_bits, dwright2_bsd_bits, dwright2_sakura_bits, dwright2_tomoyo_bits, +- &DownRight2Msk, dwright2_mask_bits, dwright2_mask_bits, dwright2_dog_mask_bits, dwright2_bsd_mask_bits, dwright2_sakura_mask_bits, dwright2_tomoyo_mask_bits }, +- { &UpTogi1GC, &UpTogi1Xbm, utogi1_bits, utogi1_tora_bits, utogi1_dog_bits, utogi1_bsd_bits, utogi1_sakura_bits, utogi1_tomoyo_bits, +- &UpTogi1Msk, utogi1_mask_bits, utogi1_mask_bits, utogi1_dog_mask_bits, utogi1_bsd_mask_bits, utogi1_sakura_mask_bits, utogi1_tomoyo_mask_bits }, +- { &UpTogi2GC, &UpTogi2Xbm, utogi2_bits, utogi2_tora_bits, utogi2_dog_bits, utogi2_bsd_bits, utogi2_sakura_bits, utogi2_tomoyo_bits, +- &UpTogi2Msk, utogi2_mask_bits, utogi2_mask_bits, utogi2_dog_mask_bits, utogi2_bsd_mask_bits, utogi2_sakura_mask_bits, utogi2_tomoyo_mask_bits }, +- { &DownTogi1GC, &DownTogi1Xbm, dtogi1_bits, dtogi1_tora_bits, dtogi1_dog_bits, dtogi1_bsd_bits, dtogi1_sakura_bits, dtogi1_tomoyo_bits, +- &DownTogi1Msk, dtogi1_mask_bits, dtogi1_mask_bits, dtogi1_dog_mask_bits, dtogi1_bsd_mask_bits, dtogi1_sakura_mask_bits, dtogi1_tomoyo_mask_bits }, +- { &DownTogi2GC, &DownTogi2Xbm, dtogi2_bits, dtogi2_tora_bits, dtogi2_dog_bits, dtogi2_bsd_bits, dtogi2_sakura_bits, dtogi2_tomoyo_bits, +- &DownTogi2Msk, dtogi2_mask_bits, dtogi2_mask_bits, dtogi2_dog_mask_bits, dtogi2_bsd_mask_bits, dtogi2_sakura_mask_bits, dtogi2_tomoyo_mask_bits }, +- { &LeftTogi1GC, &LeftTogi1Xbm, ltogi1_bits, ltogi1_tora_bits, ltogi1_dog_bits, ltogi1_bsd_bits, ltogi1_sakura_bits, ltogi1_tomoyo_bits, +- &LeftTogi1Msk, ltogi1_mask_bits, ltogi1_mask_bits,ltogi1_dog_mask_bits, ltogi1_bsd_mask_bits, ltogi1_sakura_mask_bits, ltogi1_tomoyo_mask_bits }, +- { &LeftTogi2GC, &LeftTogi2Xbm, ltogi2_bits, ltogi2_tora_bits, ltogi2_dog_bits, ltogi2_bsd_bits, ltogi2_sakura_bits, ltogi2_tomoyo_bits, +- &LeftTogi2Msk, ltogi2_mask_bits, ltogi2_mask_bits,ltogi2_dog_mask_bits, ltogi2_bsd_mask_bits, ltogi2_sakura_mask_bits, ltogi2_tomoyo_mask_bits }, +- { &RightTogi1GC, &RightTogi1Xbm, rtogi1_bits, rtogi1_tora_bits, rtogi1_dog_bits, rtogi1_bsd_bits, rtogi1_sakura_bits, rtogi1_tomoyo_bits, +- &RightTogi1Msk, rtogi1_mask_bits, rtogi1_mask_bits,rtogi1_dog_mask_bits, rtogi1_bsd_mask_bits, rtogi1_sakura_mask_bits, rtogi1_tomoyo_mask_bits }, +- { &RightTogi2GC, &RightTogi2Xbm, rtogi2_bits, rtogi2_tora_bits, rtogi2_dog_bits, rtogi2_bsd_bits, rtogi2_sakura_bits, rtogi2_tomoyo_bits, +- &RightTogi2Msk, rtogi2_mask_bits, rtogi2_mask_bits,rtogi2_dog_mask_bits, rtogi2_bsd_mask_bits, rtogi2_sakura_mask_bits, rtogi2_tomoyo_mask_bits }, ++ { &Mati2GC, &Mati2Xbm, mati2_bits, mati2_tora_bits, mati2_dog_bits, ++ &Mati2Msk, mati2_mask_bits, mati2_mask_bits, mati2_dog_mask_bits }, ++ { &Jare2GC, &Jare2Xbm, jare2_bits, jare2_tora_bits, jare2_dog_bits, ++ &Jare2Msk, jare2_mask_bits, jare2_mask_bits, jare2_dog_mask_bits }, ++ { &Kaki1GC, &Kaki1Xbm, kaki1_bits, kaki1_tora_bits, kaki1_dog_bits, ++ &Kaki1Msk, kaki1_mask_bits, kaki1_mask_bits, kaki1_dog_mask_bits }, ++ { &Kaki2GC, &Kaki2Xbm, kaki2_bits, kaki2_tora_bits, kaki2_dog_bits, ++ &Kaki2Msk, kaki2_mask_bits, kaki2_mask_bits, kaki2_dog_mask_bits }, ++ { &Mati3GC, &Mati3Xbm, mati3_bits, mati3_tora_bits, mati3_dog_bits, ++ &Mati3Msk, mati3_mask_bits, mati3_mask_bits, mati3_dog_mask_bits }, ++ { &Sleep1GC, &Sleep1Xbm, sleep1_bits, sleep1_tora_bits, sleep1_dog_bits, ++ &Sleep1Msk, sleep1_mask_bits, sleep1_mask_bits, sleep1_dog_mask_bits }, ++ { &Sleep2GC, &Sleep2Xbm, sleep2_bits, sleep2_tora_bits, sleep2_dog_bits, ++ &Sleep2Msk, sleep2_mask_bits, sleep2_mask_bits, sleep2_dog_mask_bits }, ++ { &AwakeGC, &AwakeXbm, awake_bits, awake_tora_bits, awake_dog_bits, ++ &AwakeMsk, awake_mask_bits, awake_mask_bits, awake_dog_mask_bits }, ++ { &Up1GC, &Up1Xbm, up1_bits, up1_tora_bits, up1_dog_bits, ++ &Up1Msk, up1_mask_bits, up1_mask_bits, up1_dog_mask_bits }, ++ { &Up2GC, &Up2Xbm, up2_bits, up2_tora_bits, up2_dog_bits, ++ &Up2Msk, up2_mask_bits, up2_mask_bits, up2_dog_mask_bits }, ++ { &Down1GC, &Down1Xbm, down1_bits, down1_tora_bits, down1_dog_bits, ++ &Down1Msk, down1_mask_bits, down1_mask_bits, down1_dog_mask_bits }, ++ { &Down2GC, &Down2Xbm, down2_bits, down2_tora_bits, down2_dog_bits, ++ &Down2Msk, down2_mask_bits, down2_mask_bits, down2_dog_mask_bits }, ++ { &Left1GC, &Left1Xbm, left1_bits, left1_tora_bits, left1_dog_bits, ++ &Left1Msk, left1_mask_bits, left1_mask_bits, left1_dog_mask_bits }, ++ { &Left2GC, &Left2Xbm, left2_bits, left2_tora_bits, left2_dog_bits, ++ &Left2Msk, left2_mask_bits, left2_mask_bits, left2_dog_mask_bits }, ++ { &Right1GC, &Right1Xbm, right1_bits, right1_tora_bits, right1_dog_bits, ++ &Right1Msk, right1_mask_bits, right1_mask_bits,right1_dog_mask_bits }, ++ { &Right2GC, &Right2Xbm, right2_bits, right2_tora_bits, right2_dog_bits, ++ &Right2Msk, right2_mask_bits, right2_mask_bits, right2_dog_mask_bits }, ++ { &UpLeft1GC, &UpLeft1Xbm, upleft1_bits, upleft1_tora_bits, upleft1_dog_bits, ++ &UpLeft1Msk, upleft1_mask_bits, upleft1_mask_bits, upleft1_dog_mask_bits }, ++ { &UpLeft2GC, &UpLeft2Xbm, upleft2_bits, upleft2_tora_bits, upleft2_dog_bits, ++ &UpLeft2Msk, upleft2_mask_bits, upleft2_mask_bits,upleft2_dog_mask_bits }, ++ { &UpRight1GC, &UpRight1Xbm, upright1_bits, upright1_tora_bits, upright1_dog_bits, ++ &UpRight1Msk, upright1_mask_bits, upright1_mask_bits,upright1_dog_mask_bits }, ++ { &UpRight2GC, &UpRight2Xbm, upright2_bits, upright2_tora_bits, upright2_dog_bits, ++ &UpRight2Msk, upright2_mask_bits, upright2_mask_bits,upright2_dog_mask_bits }, ++ { &DownLeft1GC, &DownLeft1Xbm, dwleft1_bits, dwleft1_tora_bits, dwleft1_dog_bits, ++ &DownLeft1Msk, dwleft1_mask_bits, dwleft1_mask_bits, dwleft1_dog_mask_bits }, ++ { &DownLeft2GC, &DownLeft2Xbm, dwleft2_bits, dwleft2_tora_bits, dwleft2_dog_bits, ++ &DownLeft2Msk, dwleft2_mask_bits, dwleft2_mask_bits, dwleft2_dog_mask_bits }, ++ { &DownRight1GC, &DownRight1Xbm, dwright1_bits, dwright1_tora_bits, dwright1_dog_bits, ++ &DownRight1Msk, dwright1_mask_bits, dwright1_mask_bits, dwright1_dog_mask_bits }, ++ { &DownRight2GC, &DownRight2Xbm, dwright2_bits, dwright2_tora_bits, dwright2_dog_bits, ++ &DownRight2Msk, dwright2_mask_bits, dwright2_mask_bits, dwright2_dog_mask_bits }, ++ { &UpTogi1GC, &UpTogi1Xbm, utogi1_bits, utogi1_tora_bits, utogi1_dog_bits, ++ &UpTogi1Msk, utogi1_mask_bits, utogi1_mask_bits, utogi1_dog_mask_bits }, ++ { &UpTogi2GC, &UpTogi2Xbm, utogi2_bits, utogi2_tora_bits, utogi2_dog_bits, ++ &UpTogi2Msk, utogi2_mask_bits, utogi2_mask_bits, utogi2_dog_mask_bits }, ++ { &DownTogi1GC, &DownTogi1Xbm, dtogi1_bits, dtogi1_tora_bits, dtogi1_dog_bits, ++ &DownTogi1Msk, dtogi1_mask_bits, dtogi1_mask_bits, dtogi1_dog_mask_bits }, ++ { &DownTogi2GC, &DownTogi2Xbm, dtogi2_bits, dtogi2_tora_bits, dtogi2_dog_bits, ++ &DownTogi2Msk, dtogi2_mask_bits, dtogi2_mask_bits, dtogi2_dog_mask_bits }, ++ { &LeftTogi1GC, &LeftTogi1Xbm, ltogi1_bits, ltogi1_tora_bits, ltogi1_dog_bits, ++ &LeftTogi1Msk, ltogi1_mask_bits, ltogi1_mask_bits,ltogi1_dog_mask_bits }, ++ { &LeftTogi2GC, &LeftTogi2Xbm, ltogi2_bits, ltogi2_tora_bits, ltogi2_dog_bits, ++ &LeftTogi2Msk, ltogi2_mask_bits, ltogi2_mask_bits,ltogi2_dog_mask_bits }, ++ { &RightTogi1GC, &RightTogi1Xbm, rtogi1_bits, rtogi1_tora_bits, rtogi1_dog_bits, ++ &RightTogi1Msk, rtogi1_mask_bits, rtogi1_mask_bits,rtogi1_dog_mask_bits }, ++ { &RightTogi2GC, &RightTogi2Xbm, rtogi2_bits, rtogi2_tora_bits, rtogi2_dog_bits, ++ &RightTogi2Msk, rtogi2_mask_bits, rtogi2_mask_bits,rtogi2_dog_mask_bits }, + { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } + }; + +@@ -1512,8 +1506,6 @@ GetArguments(argc, argv, theDisplayName) + } + else { + char *av = argv[ArgCounter] + 1; +- if (strcmp(av, "bsd") == 0) +- av = "bsd_daemon"; + for (loop=0;loopl9g(J True $@$H$7$^$9!#(J + $@$r;H$&$3$H$KN10U$7$F$/$@$5$$!#(J + $@%O!<%I%j%s%/$"$k$$$O%=%U%H%j%s%/$K$h$C$F!"$3$N%W%m%0%i%`$r(J tora $@$H$7$F(J + $@5/F0$7$?>l9g$K$O!"%G%U%)%k%H$G(J \fB-tora\fP $@%*%W%7%g%s$,M-8z$H$J$j$^$9!#(J +-.PP +-BSD $@%G!<%b%s$O(J Marshall Kirk McKusick $@;a$NCx:nJ*$G$9!#$9$Y$F$N8"Mx$O(J +-$@J];}$5$l$F$$$^$9!#(J +-BSD Daemon Copyright 1988 by Marshall Kirk McKusick. All Rights Reserved. +-.PP +-$@LZG7K\:y$*$h$SBgF;;{CN@$$OL!2h!X%+!<%I%-%c%W%?!<$5$/$i!Y!J(JCLAMP, $@9VCL(J +-$@ ;;; Copyright © 2019 Jesse Gibbons -;;; Copyright © 2019, 2020 Timotej Lazar +;;; Copyright © 2019, 2020, 2021 Timotej Lazar ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2021 Leo Famulari ;;; @@ -21,6 +21,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages toys) + #:use-module (gnu packages) #:use-module (gnu packages bison) #:use-module (gnu packages flex) #:use-module (gnu packages gtk) @@ -36,6 +37,64 @@ #:use-module (guix packages) #:use-module (guix utils)) +(define-public oneko + (package + (name "oneko") + (version "1.2.sakura.5") + (source + (origin + (method url-fetch) + (uri (string-append + "http://www.daidouji.com/oneko/distfiles/oneko-" version ".tar.gz")) + (sha256 + (base32 "0bxjlbafn10sfi5d06420pg70rpvsiy5gdbm8kspd6qy4kqhabic")) + (patches (search-patches "oneko-remove-refs-to-nonfree-bitmaps.patch")) + (modules '((guix build utils))) + (snippet + ;; Remove bitmaps with unclear copyright status. + '(begin + (for-each delete-file-recursively + (find-files "." "(bsd|tomoyo|sakura|card|petal).*\\.xbm")) + #t)))) + (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 _ + (invoke "xmkmf") + ;; Fix incorrectly generated compiler flags. + (substitute* "Makefile" + (("(CDEBUGFLAGS = ).*" _ front) (string-append front "-O2\n"))) + #t)) + (replace 'install + (lambda* (#:key outputs make-flags #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (doc (string-append out "/share/doc/" ,name "-" ,version)) + (man (string-append out "/share/man/")) + (man6 (string-append man "/man6")) + (man6-ja (string-append man "/ja/man6"))) + (install-file "oneko" bin) + (mkdir-p man6) + (mkdir-p man6-ja) + (copy-file "oneko.man" (string-append man6 "/oneko.6")) + (copy-file "oneko.man.jp" (string-append man6-ja "/oneko.6")) + (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") -- 2.32.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 27 13:52:00 2021 Received: (at 49235) by debbugs.gnu.org; 27 Jun 2021 17:52:00 +0000 Received: from localhost ([127.0.0.1]:50358 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxYwq-0006xY-8t for submit@debbugs.gnu.org; Sun, 27 Jun 2021 13:52:00 -0400 Received: from araneo.si ([90.157.193.204]:50468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxYwp-0006xQ-0g for 49235@debbugs.gnu.org; Sun, 27 Jun 2021 13:51:59 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id dd0c2295; Sun, 27 Jun 2021 17:51:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to :subject:in-reply-to:references:date:message-id:mime-version :content-type:content-transfer-encoding; s=20180623; bh=z5ryRZIV LRaBU7RiJrQT9y1dLvo=; b=QrHDKhVFUifoDa3eigf22meLwU/Pin725CpE+5h8 jScJ6LHc7r2g4oJl/79qEJvLje4cgH9d9vnLdXrOxfqd/GChAyL/HgZVT9HuABHb 5jaMJAUcRCYQkgKBXMQe9rYWxWJyNHxFmr5Dt0vNkyuXTlJPoJBBbm7SW61qvv6s Z/+0ea78aZOyXxSigzBM4BOYZ53NW6vCCqH7tH2oSSRRdsgIUEkA5lSHPzDL9ZBh NzdlKSEYlemLRPNWjpxeVTEpo6vNWDCi73tsbnoFAD14tHuvzCIhg29ocnVuifvZ xM2gN91TiYd1fysLKiNTp+ApXGlCeYGVjliWF7V74xzVxA== Received: by araneo.si (OpenSMTPD) with ESMTPSA id d7d07e9a (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 27 Jun 2021 17:51:57 +0000 (UTC) From: Timotej Lazar To: Leo Prikler , 49235@debbugs.gnu.org Subject: Re: [PATCH] gnu: Add oneko. In-Reply-To: <2b6c8ceade7f0ced46cdc5486f26e75cc1cedb10.camel@student.tugraz.at> References: <20210626192049.20405-1-timotej.lazar@araneo.si> <87bl7ro27t.fsf@araneo.si> <2b6c8ceade7f0ced46cdc5486f26e75cc1cedb10.camel@student.tugraz.at> Date: Sun, 27 Jun 2021 19:51:57 +0200 Message-ID: <877difnqki.fsf@araneo.si> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 49235 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: -1.0 (-) Leo Prikler [2021-06-27 15:55:17+0200]: > In other words, yeah, keeping only the original neko, tora and dog is > the safest bet here. Please don't forget to also have a look at the > cursors. From what I can see only the mouse and the bone should be > fine as they relate to neko and tora or dog respectively. Good catch! I=E2=80=99ve sent a new patch which removes these bitmaps and options, and also adds the Japanese manpage. Thanks, Timotej From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 27 14:24:31 2021 Received: (at 49235) by debbugs.gnu.org; 27 Jun 2021 18:24:31 +0000 Received: from localhost ([127.0.0.1]:50367 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxZSJ-0007iq-2b for submit@debbugs.gnu.org; Sun, 27 Jun 2021 14:24:31 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:35168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxZSG-0007ig-RZ for 49235@debbugs.gnu.org; Sun, 27 Jun 2021 14:24:30 -0400 Received: from [10.0.0.4] (62-116-34-49.adsl.highway.telekom.at [62.116.34.49]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GCfK517Gnz3wmX; Sun, 27 Jun 2021 20:24:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1624818265; bh=BtV7EnVv/PH2N5L4PL7fopuzJz9qG/lwr4kxWiShiVY=; h=Subject:From:To:Date:In-Reply-To:References; b=b3SySynbUGqixcYZT3eW+RMzrWagbroJIV/qTuysECMprCKDas4/irL8gDS+lM+RX p5nLG2DSe+e106Bmwzi6KSMeEyUTWSSHdA3WtkcZQ+jKnbIDbDGofYFylXSemK2025 23PKiQzsIsZzl/tOVYOk9PTnh4J+VND8ucsqAX+E= Message-ID: <40ae5fba85021344b4c6f372af08844ba5561d06.camel@student.tugraz.at> Subject: Re: [PATCH] gnu: Add oneko. From: Leo Prikler To: Timotej Lazar , 49235@debbugs.gnu.org Date: Sun, 27 Jun 2021 20:24:04 +0200 In-Reply-To: <877difnqki.fsf@araneo.si> References: <20210626192049.20405-1-timotej.lazar@araneo.si> <87bl7ro27t.fsf@araneo.si> <2b6c8ceade7f0ced46cdc5486f26e75cc1cedb10.camel@student.tugraz.at> <877difnqki.fsf@araneo.si> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 49235 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: -3.3 (---) Am Sonntag, den 27.06.2021, 19:51 +0200 schrieb Timotej Lazar: > Leo Prikler [2021-06-27 > 15:55:17+0200]: > > In other words, yeah, keeping only the original neko, tora and dog > > is > > the safest bet here. Please don't forget to also have a look at > > the > > cursors. From what I can see only the mouse and the bone should be > > fine as they relate to neko and tora or dog respectively. > > Good catch! I’ve sent a new patch which removes these bitmaps and > options, and also adds the Japanese manpage. Is man/$LANG/man the way this should be structured? For the patch, I think that it deserves a better name + comment. The copyright in those cases is not unclear – it is very clear who owns those bitmaps, and in at least one case it's further clear that the owner doesn't want others to reuse them. W.r.t. the name, I don't think we should shorten references to "refs". Find a name, that fits into a line better without the use of abbrevs. The snippet should probably also remove the .include files, which at least seem referenced in the code. Don't forget to add me through --cc when sending mail with git-email to make sure I receive the updated version :) Regards, Leo From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 27 15:06:30 2021 Received: (at 49235) by debbugs.gnu.org; 27 Jun 2021 19:06:30 +0000 Received: from localhost ([127.0.0.1]:50398 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxa6w-0000LA-1q for submit@debbugs.gnu.org; Sun, 27 Jun 2021 15:06:30 -0400 Received: from araneo.si ([90.157.193.204]:50482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxa6t-0000Kv-DL for 49235@debbugs.gnu.org; Sun, 27 Jun 2021 15:06:28 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 0fe333fa; Sun, 27 Jun 2021 19:06:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to :subject:in-reply-to:references:date:message-id:mime-version :content-type:content-transfer-encoding; s=20180623; bh=KLTjQcnk 3Izn/B6yXpOulZxSi08=; b=sg/dxdXOD+RglvE3/F2nHY1JuF9oUVf+mYrstyft 8PLcoSd7ThFEFiqR+dwFZZhIcwGiMZYg/NppwJEaZqaE5ijicTs5Ob8315VWbDtx byF3g1TdUavTzxjlATcwvvumWKKle1AESKzVs0HEqhzcNwhLjRhdQw4lNmhPMaMP XE7vId93PBNcseyhDl82r9xwXDPrCBKbYElpH/9ES4Vzowr/1IbVsYORnqjcocfS UuZpts6dzwTffwV67U4Fttfu2PKmsg6LHuJr6+1427pF7LRPhRvk/CmDuG/UfGBN 7y1zfLXMe5rIeKuqjc326R4WTmif4e0Mp/7ikcwHwqCkVQ== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 272adcb2 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 27 Jun 2021 19:06:24 +0000 (UTC) From: Timotej Lazar To: Leo Prikler , 49235@debbugs.gnu.org Subject: Re: [PATCH] gnu: Add oneko. In-Reply-To: <40ae5fba85021344b4c6f372af08844ba5561d06.camel@student.tugraz.at> References: <20210626192049.20405-1-timotej.lazar@araneo.si> <87bl7ro27t.fsf@araneo.si> <2b6c8ceade7f0ced46cdc5486f26e75cc1cedb10.camel@student.tugraz.at> <877difnqki.fsf@araneo.si> <40ae5fba85021344b4c6f372af08844ba5561d06.camel@student.tugraz.at> Date: Sun, 27 Jun 2021 21:06:24 +0200 Message-ID: <874kdjnn4f.fsf@araneo.si> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 49235 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: -1.0 (-) Leo Prikler [2021-06-27 20:24:04+0200]: > Is man/$LANG/man the way this should be structured? I followed the pattern for existing manpages in my profile. `man -L ja oneko` also returns the correct page. On a related note, would it be a good idea to change the encoding from ISO-2022-JP to utf-8? `iconv` produces a file that at least looks correct. > For the patch, I think that it deserves a better name + comment. The > copyright in those cases is not unclear =E2=80=93 it is very clear who ow= ns > those bitmaps, and in at least one case it's further clear that the > owner doesn't want others to reuse them. I am not sure if the copyright actually covers *all* depictions of the BSD daemon (and others), or just the (variatons of) the original image. But I=E2=80=99ll reword the comment to say =E2=80=9Cnonfree=E2=80=9D instea= d. > The snippet should probably also remove the .include files, which at > least seem referenced in the code. Those includes are patched out. Just in case I=E2=80=99ll change the snippe= t to remove whole directories instead of just the *xbm files. Thanks, Timotej From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 27 15:24:08 2021 Received: (at 49235) by debbugs.gnu.org; 27 Jun 2021 19:24:08 +0000 Received: from localhost ([127.0.0.1]:50412 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxaO0-0000mM-4L for submit@debbugs.gnu.org; Sun, 27 Jun 2021 15:24:08 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:17573) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxaNw-0000m7-IU for 49235@debbugs.gnu.org; Sun, 27 Jun 2021 15:24:06 -0400 Received: from nijino.local (62-116-34-49.adsl.highway.telekom.at [62.116.34.49]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GCgds4FVvz1LB20; Sun, 27 Jun 2021 21:24:01 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GCgds4FVvz1LB20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1624821841; bh=JXGkCqLYjkUNL9fw6AQaaURyXWzXVzFm4inxaoExDc4=; h=Subject:From:To:Date:In-Reply-To:References:From; b=rvRBdnf3iJcNzhiVInI8Qede77Dv86T2P3NtAzw68HXqn1gyLDgRFWaGPM02n7TM8 7fW0djkW+St8uzX0EhkFl7+DRdX4b8n1ZOr4jIXwLl8O/zZ6bAJjjpL6Mn8k15nuUN w0MwEhEkVRjvS+3njEKtNnhX/yf8+VQQsU4XprNg= Message-ID: Subject: Re: [PATCH] gnu: Add oneko. From: Leo Prikler To: Timotej Lazar , 49235@debbugs.gnu.org Date: Sun, 27 Jun 2021 21:24:00 +0200 In-Reply-To: <874kdjnn4f.fsf@araneo.si> References: <20210626192049.20405-1-timotej.lazar@araneo.si> <87bl7ro27t.fsf@araneo.si> <2b6c8ceade7f0ced46cdc5486f26e75cc1cedb10.camel@student.tugraz.at> <877difnqki.fsf@araneo.si> <40ae5fba85021344b4c6f372af08844ba5561d06.camel@student.tugraz.at> <874kdjnn4f.fsf@araneo.si> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 49235 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: -3.3 (---) Am Sonntag, den 27.06.2021, 21:06 +0200 schrieb Timotej Lazar: > Leo Prikler [2021-06-27 > 20:24:04+0200]: > > Is man/$LANG/man the way this should be structured? > > I followed the pattern for existing manpages in my profile. `man -L > ja > oneko` also returns the correct page. On a related note, would it be > a > good idea to change the encoding from ISO-2022-JP to utf-8? `iconv` > produces a file that at least looks correct. "In that case go on" to the former and "yes" to the latter. > > For the patch, I think that it deserves a better name + > > comment. The > > copyright in those cases is not unclear – it is very clear who owns > > those bitmaps, and in at least one case it's further clear that the > > owner doesn't want others to reuse them. > > I am not sure if the copyright actually covers *all* depictions of > the > BSD daemon (and others), or just the (variatons of) the original > image. > But I’ll reword the comment to say “nonfree” instead. I think the Debian patch says it best in that there might be copyright issues. > > The snippet should probably also remove the .include files, which > > at > > least seem referenced in the code. > > Those includes are patched out. Just in case I’ll change the snippet > to > remove whole directories instead of just the *xbm files. To be fair, I only looked at the snippet, not what it produced, so it might actually be that it already did the correct thing. Are there directory, which are matched by .*\\.xbm? Regards, Leo From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 27 15:45:34 2021 Received: (at 49235) by debbugs.gnu.org; 27 Jun 2021 19:45:34 +0000 Received: from localhost ([127.0.0.1]:50418 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxaij-0001If-Vk for submit@debbugs.gnu.org; Sun, 27 Jun 2021 15:45:34 -0400 Received: from araneo.si ([90.157.193.204]:50492) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxaig-0001IT-2j for 49235@debbugs.gnu.org; Sun, 27 Jun 2021 15:45:32 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 05307aff; Sun, 27 Jun 2021 19:45:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to :subject:in-reply-to:references:date:message-id:mime-version :content-type:content-transfer-encoding; s=20180623; bh=PKB71O2F w/yzb7/8sHeYaRQHh0k=; b=JLUb2qq8sKvPFXFSXkdggj5o5ivyyPbEJ259E9Ea 62Gp9+1KXfDURPAO3wzRQvfBlrd4vO4U2Tu2UUrFg1IHYRRt+TaH9melIDtklj+i AtAt8K6Gd9jh1RAL3GRfrjsOfkXsRRdHzoaF4UaN7hjpR61v/EEKOHlBbL5OugOS 5+65YJrk7FUbcHzn4kzUO5oj0U0tuYK8XyL29K6BztzixpTyYWErvPJVcpiQlCMv y7ANoufEiEPpHFrQCpyypA8LL+ZEhRh/LORPOsNf3IhM6zIDdTg6Zv0NkmMuLBP5 hL3SBBzEkqkFs6fI2i8oSUu9d2v0OK2EM5bsDlAObZiDtg== Received: by araneo.si (OpenSMTPD) with ESMTPSA id d2548266 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 27 Jun 2021 19:45:27 +0000 (UTC) From: Timotej Lazar To: Leo Prikler , 49235@debbugs.gnu.org Subject: Re: [PATCH] gnu: Add oneko. In-Reply-To: References: <20210626192049.20405-1-timotej.lazar@araneo.si> <87bl7ro27t.fsf@araneo.si> <2b6c8ceade7f0ced46cdc5486f26e75cc1cedb10.camel@student.tugraz.at> <877difnqki.fsf@araneo.si> <40ae5fba85021344b4c6f372af08844ba5561d06.camel@student.tugraz.at> <874kdjnn4f.fsf@araneo.si> Date: Sun, 27 Jun 2021 21:45:27 +0200 Message-ID: <871r8nnlbc.fsf@araneo.si> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 49235 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: -1.0 (-) Leo Prikler [2021-06-27 21:24:00+0200]: > I think the Debian patch says it best in that there might be copyright > issues. OK, I=E2=80=99ll copy / adjust that one then. :) > To be fair, I only looked at the snippet, not what it produced, so it > might actually be that it already did the correct thing. Are there > directory, which are matched by .*\\.xbm? The snippet only deletes the *xbm files. There is also (for instance) bsd.include that #includes the relevant bitmaps and is in turn #included by the main source file. The latter #include statements are removed by the patch. I didn=E2=80=99t delete bsd.include (and others) in the snippet since they = don=E2=80=99t have copyright issues and it would make the snippet a bit messier. A COPYRIGHT file for the BSD daemon also remains. If that is problematic, I can adjust the snippet to also delete these files. In any case, none of them gets copied to the output. From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 27 15:50:45 2021 Received: (at 49235) by debbugs.gnu.org; 27 Jun 2021 19:50:45 +0000 Received: from localhost ([127.0.0.1]:50422 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxanl-0001QM-Jc for submit@debbugs.gnu.org; Sun, 27 Jun 2021 15:50:45 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:50762) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxanj-0001QD-QQ for 49235@debbugs.gnu.org; Sun, 27 Jun 2021 15:50:45 -0400 Received: from nijino.local (62-116-34-49.adsl.highway.telekom.at [62.116.34.49]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GChDc2f6tz1LWnt; Sun, 27 Jun 2021 21:50:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GChDc2f6tz1LWnt DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1624823440; bh=JJZ5CCIpu+dS9cRi90kY7R6tTkcHuXOYm1ToRfW7THE=; h=Subject:From:To:Date:In-Reply-To:References:From; b=elXJt0bRfTT7qdhHe3CFPcs1RQ+REeRGwdpYQm7Oe990j04T42bK/nqPgmw4M4SDb NwBTBlKKwVv+wg0Zegb+hteGTuSCuD6DlW2sdAOTda0NMyoOw+Uo74I2s0hgtPTL8E nKS97PpHMBmvi895puq7n1uurVJEYKpPeMvtloTc= Message-ID: <31591fdcfc6587bd0718770eba892f29a9c2f6ea.camel@student.tugraz.at> Subject: Re: [PATCH] gnu: Add oneko. From: Leo Prikler To: Timotej Lazar , 49235@debbugs.gnu.org Date: Sun, 27 Jun 2021 21:50:39 +0200 In-Reply-To: <871r8nnlbc.fsf@araneo.si> References: <20210626192049.20405-1-timotej.lazar@araneo.si> <87bl7ro27t.fsf@araneo.si> <2b6c8ceade7f0ced46cdc5486f26e75cc1cedb10.camel@student.tugraz.at> <877difnqki.fsf@araneo.si> <40ae5fba85021344b4c6f372af08844ba5561d06.camel@student.tugraz.at> <874kdjnn4f.fsf@araneo.si> <871r8nnlbc.fsf@araneo.si> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 49235 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: -3.3 (---) Am Sonntag, den 27.06.2021, 21:45 +0200 schrieb Timotej Lazar: > Leo Prikler [2021-06-27 > 21:24:00+0200]: > > I think the Debian patch says it best in that there might be > > copyright > > issues. > > OK, I’ll copy / adjust that one then. :) > > > To be fair, I only looked at the snippet, not what it produced, so > > it > > might actually be that it already did the correct thing. Are there > > directory, which are matched by .*\\.xbm? > > The snippet only deletes the *xbm files. There is also (for instance) > bsd.include that #includes the relevant bitmaps and is in turn > #included > by the main source file. The latter #include statements are removed > by > the patch. That is indeed a good way of splitting this up, but the mentioned files would still need to be deleted (see below). > I didn’t delete bsd.include (and others) in the snippet since they > don’t > have copyright issues and it would make the snippet a bit messier. A > COPYRIGHT file for the BSD daemon also remains. If that is > problematic, > I can adjust the snippet to also delete these files. In any case, > none > of them gets copied to the output. It's not just about the output, we're trying to keep `guix build -S` clean as well. I'm not sure about the copyright issues of these source files -- in any case they only serve to enable the legally questionable portions of the program, so in my opinion it's better to drop them. From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 28 13:03:46 2021 Received: (at 49235) by debbugs.gnu.org; 28 Jun 2021 17:03:46 +0000 Received: from localhost ([127.0.0.1]:52381 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxufY-0006hx-82 for submit@debbugs.gnu.org; Mon, 28 Jun 2021 13:03:46 -0400 Received: from araneo.si ([90.157.193.204]:51246) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxufS-0006hh-NR for 49235@debbugs.gnu.org; Mon, 28 Jun 2021 13:03:35 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id c8806dcb; Mon, 28 Jun 2021 17:03:28 +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=T9Vd7I0u80B67Ng3g5NqV 4dKM4U=; b=lt0GDEAxkNlxTACjae7dR/J9JBGQxGfi0WMqtadIIUI1zWReTT+Je RjVZPM9FtYs9PM3O4LQFvOJQL8Agro2olIQXbIIyownCkwoL/hkzr4SlfOaESnMA q08DJ131KyUvh0pZqVvlxjwmGmXlj0z8m2M1SvF2GRZX28UJn9s/1bsnzYgylCsY 3N6E8uPQsknBqVFH0vS+3gHur6m1dW8JQXUhqL6JsL7vZm/DGJADVHJBmyVL4wdQ 0IIJJBwMgmoZRW5CaMzRj158yDX97j1PoXviS7snUoRMFC0IEgfsT0iaK5FOE2Uj dCkPPmJnWI33kMV0j9i6/5K6lSCreO91w== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 5eb2b1b6 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 28 Jun 2021 17:03:28 +0000 (UTC) From: Timotej Lazar To: 49235@debbugs.gnu.org Subject: [PATCH v3] gnu: Add oneko. Date: Mon, 28 Jun 2021 19:02:37 +0200 Message-Id: <20210628170237.6721-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 49235 Cc: leo.prikler@student.tugraz.at, Timotej Lazar 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: -1.0 (-) * gnu/packages/toys.scm (oneko): New variable. --- I’ve changed the snippet to also delete all files related to nonfree bitmaps. I also adjusted the name & comment for the patch. On closer inspection it turns out that iconv messes up the Japanese manpage a bit, so I copied it as is. I see some other options: 1. don’t include it at all; 2. use some fork from github where this has already been done; or 3. convert and fix it manually, and include it as a patch. I’m inclined to include it as is, for the “historical value” of using the original source (1,2), and to avoid having to carry another patch in Guix (3). Let me know if you’d prefer another solution! gnu/local.mk | 1 + .../oneko-remove-nonfree-characters.patch | 307 ++++++++++++++++++ gnu/packages/toys.scm | 63 +++- 3 files changed, 370 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/oneko-remove-nonfree-characters.patch diff --git a/gnu/local.mk b/gnu/local.mk index f507fe566f..7d1fc8157c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1499,6 +1499,7 @@ dist_patch_DATA = \ %D%/packages/patches/ocaml-dose3-dont-make-printconf.patch \ %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \ %D%/packages/patches/omake-fix-non-determinism.patch \ + %D%/packages/patches/oneko-remove-nonfree-characters.patch \ %D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch \ %D%/packages/patches/opencascade-oce-glibc-2.26.patch \ %D%/packages/patches/opencv-fix-build-of-grfmt_jpeg2000.cpp.patch \ diff --git a/gnu/packages/patches/oneko-remove-nonfree-characters.patch b/gnu/packages/patches/oneko-remove-nonfree-characters.patch new file mode 100644 index 0000000000..4f80e53995 --- /dev/null +++ b/gnu/packages/patches/oneko-remove-nonfree-characters.patch @@ -0,0 +1,307 @@ +Remove options and code to use bitmaps of the BSD daemon and other characters +with copyright issues. The bitmaps themselves are deleted in a source snippet. +diff --git a/cursors/cursor.include b/cursors/cursor.include +index ef96d72..1dc3dc2 100644 +--- a/cursors/cursor.include ++++ b/cursors/cursor.include +@@ -2,9 +2,3 @@ + #include "mouse_cursor_mask.xbm" + #include "bone_cursor.xbm" + #include "bone_cursor_mask.xbm" +-#include "bsd_cursor.xbm" +-#include "bsd_cursor_mask.xbm" +-#include "card_cursor.xbm" +-#include "card_cursor_mask.xbm" +-#include "petal_cursor.xbm" +-#include "petal_cursor_mask.xbm" +diff --git a/oneko.c b/oneko.c +index d2b81fe..04fa59f 100644 +--- a/oneko.c ++++ b/oneko.c +@@ -33,7 +33,7 @@ XColor theBackgroundColor; /* $@?'(J ($@%P%C%/%0%i%&%s%I(J) */ + + int Synchronous = False; + /* Types of animals */ +-#define BITMAPTYPES 6 ++#define BITMAPTYPES 3 + typedef struct _AnimalDefaults { + char *name; + int speed, idle, bitmap_width, bitmap_height; +@@ -51,12 +51,6 @@ AnimalDefaultsData AnimalDefaultsDataTable[] = + mouse_cursor_width,mouse_cursor_height, mouse_cursor_x_hot,mouse_cursor_y_hot }, + { "dog" , 10, 6, 32, 32, 125000L, 0, 0, bone_cursor_bits,bone_cursor_mask_bits, + bone_cursor_width,bone_cursor_height, bone_cursor_x_hot,bone_cursor_y_hot }, +- { "bsd_daemon" , 16, 6, 32, 32, 300000L, 22, 20, bsd_cursor_bits,bsd_cursor_mask_bits, +- bsd_cursor_width,bsd_cursor_height, bsd_cursor_x_hot,bsd_cursor_y_hot }, +- { "sakura" , 13, 6, 32, 32, 125000L, 0, 0, card_cursor_bits,card_cursor_mask_bits, +- card_cursor_width,card_cursor_height, card_cursor_x_hot,card_cursor_y_hot }, +- { "tomoyo" , 10, 6, 32, 32, 125000L, 32, 32, petal_cursor_bits,petal_cursor_mask_bits, +- petal_cursor_width,petal_cursor_height, petal_cursor_x_hot,petal_cursor_y_hot }, + }; + + /* +@@ -154,70 +148,70 @@ typedef struct { + + BitmapGCData BitmapGCDataTable[] = + { +- { &Mati2GC, &Mati2Xbm, mati2_bits, mati2_tora_bits, mati2_dog_bits, mati2_bsd_bits, mati2_sakura_bits, mati2_tomoyo_bits, +- &Mati2Msk, mati2_mask_bits, mati2_mask_bits, mati2_dog_mask_bits, mati2_bsd_mask_bits, mati2_sakura_mask_bits, mati2_tomoyo_mask_bits }, +- { &Jare2GC, &Jare2Xbm, jare2_bits, jare2_tora_bits, jare2_dog_bits, jare2_bsd_bits, jare2_sakura_bits, jare2_tomoyo_bits, +- &Jare2Msk, jare2_mask_bits, jare2_mask_bits, jare2_dog_mask_bits, jare2_bsd_mask_bits, jare2_sakura_mask_bits, jare2_tomoyo_mask_bits }, +- { &Kaki1GC, &Kaki1Xbm, kaki1_bits, kaki1_tora_bits, kaki1_dog_bits, kaki1_bsd_bits, kaki1_sakura_bits, kaki1_tomoyo_bits, +- &Kaki1Msk, kaki1_mask_bits, kaki1_mask_bits, kaki1_dog_mask_bits, kaki1_bsd_mask_bits, kaki1_sakura_mask_bits, kaki1_tomoyo_mask_bits }, +- { &Kaki2GC, &Kaki2Xbm, kaki2_bits, kaki2_tora_bits, kaki2_dog_bits, kaki2_bsd_bits, kaki2_sakura_bits, kaki2_tomoyo_bits, +- &Kaki2Msk, kaki2_mask_bits, kaki2_mask_bits, kaki2_dog_mask_bits, kaki2_bsd_mask_bits, kaki2_sakura_mask_bits, kaki2_tomoyo_mask_bits }, +- { &Mati3GC, &Mati3Xbm, mati3_bits, mati3_tora_bits, mati3_dog_bits, mati3_bsd_bits, mati3_sakura_bits, mati3_tomoyo_bits, +- &Mati3Msk, mati3_mask_bits, mati3_mask_bits, mati3_dog_mask_bits, mati3_bsd_mask_bits, mati3_sakura_mask_bits, mati3_tomoyo_mask_bits }, +- { &Sleep1GC, &Sleep1Xbm, sleep1_bits, sleep1_tora_bits, sleep1_dog_bits, sleep1_bsd_bits, sleep1_sakura_bits, sleep1_tomoyo_bits, +- &Sleep1Msk, sleep1_mask_bits, sleep1_mask_bits, sleep1_dog_mask_bits, sleep1_bsd_mask_bits, sleep1_sakura_mask_bits, sleep1_tomoyo_mask_bits }, +- { &Sleep2GC, &Sleep2Xbm, sleep2_bits, sleep2_tora_bits, sleep2_dog_bits, sleep2_bsd_bits, sleep2_sakura_bits, sleep2_tomoyo_bits, +- &Sleep2Msk, sleep2_mask_bits, sleep2_mask_bits, sleep2_dog_mask_bits, sleep2_bsd_mask_bits, sleep2_sakura_mask_bits, sleep2_tomoyo_mask_bits }, +- { &AwakeGC, &AwakeXbm, awake_bits, awake_tora_bits, awake_dog_bits, awake_bsd_bits, awake_sakura_bits, awake_tomoyo_bits, +- &AwakeMsk, awake_mask_bits, awake_mask_bits, awake_dog_mask_bits, awake_bsd_mask_bits, awake_sakura_mask_bits, awake_tomoyo_mask_bits }, +- { &Up1GC, &Up1Xbm, up1_bits, up1_tora_bits, up1_dog_bits, up1_bsd_bits, up1_sakura_bits, up1_tomoyo_bits, +- &Up1Msk, up1_mask_bits, up1_mask_bits, up1_dog_mask_bits, up1_bsd_mask_bits, up1_sakura_mask_bits, up1_tomoyo_mask_bits }, +- { &Up2GC, &Up2Xbm, up2_bits, up2_tora_bits, up2_dog_bits, up2_bsd_bits, up2_sakura_bits, up2_tomoyo_bits, +- &Up2Msk, up2_mask_bits, up2_mask_bits, up2_dog_mask_bits, up2_bsd_mask_bits, up2_sakura_mask_bits, up2_tomoyo_mask_bits }, +- { &Down1GC, &Down1Xbm, down1_bits, down1_tora_bits, down1_dog_bits, down1_bsd_bits, down1_sakura_bits, down1_tomoyo_bits, +- &Down1Msk, down1_mask_bits, down1_mask_bits, down1_dog_mask_bits, down1_bsd_mask_bits, down1_sakura_mask_bits, down1_tomoyo_mask_bits }, +- { &Down2GC, &Down2Xbm, down2_bits, down2_tora_bits, down2_dog_bits, down2_bsd_bits, down2_sakura_bits, down2_tomoyo_bits, +- &Down2Msk, down2_mask_bits, down2_mask_bits, down2_dog_mask_bits, down2_bsd_mask_bits, down2_sakura_mask_bits, down2_tomoyo_mask_bits }, +- { &Left1GC, &Left1Xbm, left1_bits, left1_tora_bits, left1_dog_bits, left1_bsd_bits, left1_sakura_bits, left1_tomoyo_bits, +- &Left1Msk, left1_mask_bits, left1_mask_bits, left1_dog_mask_bits, left1_bsd_mask_bits, left1_sakura_mask_bits, left1_tomoyo_mask_bits }, +- { &Left2GC, &Left2Xbm, left2_bits, left2_tora_bits, left2_dog_bits, left2_bsd_bits, left2_sakura_bits, left2_tomoyo_bits, +- &Left2Msk, left2_mask_bits, left2_mask_bits, left2_dog_mask_bits, left2_bsd_mask_bits, left2_sakura_mask_bits, left2_tomoyo_mask_bits }, +- { &Right1GC, &Right1Xbm, right1_bits, right1_tora_bits, right1_dog_bits, right1_bsd_bits, right1_sakura_bits, right1_tomoyo_bits, +- &Right1Msk, right1_mask_bits, right1_mask_bits,right1_dog_mask_bits, right1_bsd_mask_bits, right1_sakura_mask_bits, right1_tomoyo_mask_bits }, +- { &Right2GC, &Right2Xbm, right2_bits, right2_tora_bits, right2_dog_bits, right2_bsd_bits, right2_sakura_bits, right2_tomoyo_bits, +- &Right2Msk, right2_mask_bits, right2_mask_bits, right2_dog_mask_bits, right2_bsd_mask_bits, right2_sakura_mask_bits, right2_tomoyo_mask_bits }, +- { &UpLeft1GC, &UpLeft1Xbm, upleft1_bits, upleft1_tora_bits, upleft1_dog_bits, upleft1_bsd_bits, upleft1_sakura_bits, upleft1_tomoyo_bits, +- &UpLeft1Msk, upleft1_mask_bits, upleft1_mask_bits, upleft1_dog_mask_bits, upleft1_bsd_mask_bits, upleft1_sakura_mask_bits, upleft1_tomoyo_mask_bits }, +- { &UpLeft2GC, &UpLeft2Xbm, upleft2_bits, upleft2_tora_bits, upleft2_dog_bits, upleft2_bsd_bits, upleft2_sakura_bits, upleft2_tomoyo_bits, +- &UpLeft2Msk, upleft2_mask_bits, upleft2_mask_bits,upleft2_dog_mask_bits, upleft2_bsd_mask_bits, upleft2_sakura_mask_bits, upleft2_tomoyo_mask_bits }, +- { &UpRight1GC, &UpRight1Xbm, upright1_bits, upright1_tora_bits, upright1_dog_bits, upright1_bsd_bits, upright1_sakura_bits, upright1_tomoyo_bits, +- &UpRight1Msk, upright1_mask_bits, upright1_mask_bits,upright1_dog_mask_bits, upright1_bsd_mask_bits, upright1_sakura_mask_bits, upright1_tomoyo_mask_bits }, +- { &UpRight2GC, &UpRight2Xbm, upright2_bits, upright2_tora_bits, upright2_dog_bits, upright2_bsd_bits, upright2_sakura_bits, upright2_tomoyo_bits, +- &UpRight2Msk, upright2_mask_bits, upright2_mask_bits,upright2_dog_mask_bits, upright2_bsd_mask_bits, upright2_sakura_mask_bits, upright2_tomoyo_mask_bits }, +- { &DownLeft1GC, &DownLeft1Xbm, dwleft1_bits, dwleft1_tora_bits, dwleft1_dog_bits, dwleft1_bsd_bits, dwleft1_sakura_bits, dwleft1_tomoyo_bits, +- &DownLeft1Msk, dwleft1_mask_bits, dwleft1_mask_bits, dwleft1_dog_mask_bits, dwleft1_bsd_mask_bits, dwleft1_sakura_mask_bits, dwleft1_tomoyo_mask_bits }, +- { &DownLeft2GC, &DownLeft2Xbm, dwleft2_bits, dwleft2_tora_bits, dwleft2_dog_bits, dwleft2_bsd_bits, dwleft2_sakura_bits, dwleft2_tomoyo_bits, +- &DownLeft2Msk, dwleft2_mask_bits, dwleft2_mask_bits, dwleft2_dog_mask_bits, dwleft2_bsd_mask_bits, dwleft2_sakura_mask_bits, dwleft2_tomoyo_mask_bits }, +- { &DownRight1GC, &DownRight1Xbm, dwright1_bits, dwright1_tora_bits, dwright1_dog_bits, dwright1_bsd_bits, dwright1_sakura_bits, dwright1_tomoyo_bits, +- &DownRight1Msk, dwright1_mask_bits, dwright1_mask_bits, dwright1_dog_mask_bits, dwright1_bsd_mask_bits, dwright1_sakura_mask_bits, dwright1_tomoyo_mask_bits }, +- { &DownRight2GC, &DownRight2Xbm, dwright2_bits, dwright2_tora_bits, dwright2_dog_bits, dwright2_bsd_bits, dwright2_sakura_bits, dwright2_tomoyo_bits, +- &DownRight2Msk, dwright2_mask_bits, dwright2_mask_bits, dwright2_dog_mask_bits, dwright2_bsd_mask_bits, dwright2_sakura_mask_bits, dwright2_tomoyo_mask_bits }, +- { &UpTogi1GC, &UpTogi1Xbm, utogi1_bits, utogi1_tora_bits, utogi1_dog_bits, utogi1_bsd_bits, utogi1_sakura_bits, utogi1_tomoyo_bits, +- &UpTogi1Msk, utogi1_mask_bits, utogi1_mask_bits, utogi1_dog_mask_bits, utogi1_bsd_mask_bits, utogi1_sakura_mask_bits, utogi1_tomoyo_mask_bits }, +- { &UpTogi2GC, &UpTogi2Xbm, utogi2_bits, utogi2_tora_bits, utogi2_dog_bits, utogi2_bsd_bits, utogi2_sakura_bits, utogi2_tomoyo_bits, +- &UpTogi2Msk, utogi2_mask_bits, utogi2_mask_bits, utogi2_dog_mask_bits, utogi2_bsd_mask_bits, utogi2_sakura_mask_bits, utogi2_tomoyo_mask_bits }, +- { &DownTogi1GC, &DownTogi1Xbm, dtogi1_bits, dtogi1_tora_bits, dtogi1_dog_bits, dtogi1_bsd_bits, dtogi1_sakura_bits, dtogi1_tomoyo_bits, +- &DownTogi1Msk, dtogi1_mask_bits, dtogi1_mask_bits, dtogi1_dog_mask_bits, dtogi1_bsd_mask_bits, dtogi1_sakura_mask_bits, dtogi1_tomoyo_mask_bits }, +- { &DownTogi2GC, &DownTogi2Xbm, dtogi2_bits, dtogi2_tora_bits, dtogi2_dog_bits, dtogi2_bsd_bits, dtogi2_sakura_bits, dtogi2_tomoyo_bits, +- &DownTogi2Msk, dtogi2_mask_bits, dtogi2_mask_bits, dtogi2_dog_mask_bits, dtogi2_bsd_mask_bits, dtogi2_sakura_mask_bits, dtogi2_tomoyo_mask_bits }, +- { &LeftTogi1GC, &LeftTogi1Xbm, ltogi1_bits, ltogi1_tora_bits, ltogi1_dog_bits, ltogi1_bsd_bits, ltogi1_sakura_bits, ltogi1_tomoyo_bits, +- &LeftTogi1Msk, ltogi1_mask_bits, ltogi1_mask_bits,ltogi1_dog_mask_bits, ltogi1_bsd_mask_bits, ltogi1_sakura_mask_bits, ltogi1_tomoyo_mask_bits }, +- { &LeftTogi2GC, &LeftTogi2Xbm, ltogi2_bits, ltogi2_tora_bits, ltogi2_dog_bits, ltogi2_bsd_bits, ltogi2_sakura_bits, ltogi2_tomoyo_bits, +- &LeftTogi2Msk, ltogi2_mask_bits, ltogi2_mask_bits,ltogi2_dog_mask_bits, ltogi2_bsd_mask_bits, ltogi2_sakura_mask_bits, ltogi2_tomoyo_mask_bits }, +- { &RightTogi1GC, &RightTogi1Xbm, rtogi1_bits, rtogi1_tora_bits, rtogi1_dog_bits, rtogi1_bsd_bits, rtogi1_sakura_bits, rtogi1_tomoyo_bits, +- &RightTogi1Msk, rtogi1_mask_bits, rtogi1_mask_bits,rtogi1_dog_mask_bits, rtogi1_bsd_mask_bits, rtogi1_sakura_mask_bits, rtogi1_tomoyo_mask_bits }, +- { &RightTogi2GC, &RightTogi2Xbm, rtogi2_bits, rtogi2_tora_bits, rtogi2_dog_bits, rtogi2_bsd_bits, rtogi2_sakura_bits, rtogi2_tomoyo_bits, +- &RightTogi2Msk, rtogi2_mask_bits, rtogi2_mask_bits,rtogi2_dog_mask_bits, rtogi2_bsd_mask_bits, rtogi2_sakura_mask_bits, rtogi2_tomoyo_mask_bits }, ++ { &Mati2GC, &Mati2Xbm, mati2_bits, mati2_tora_bits, mati2_dog_bits, ++ &Mati2Msk, mati2_mask_bits, mati2_mask_bits, mati2_dog_mask_bits }, ++ { &Jare2GC, &Jare2Xbm, jare2_bits, jare2_tora_bits, jare2_dog_bits, ++ &Jare2Msk, jare2_mask_bits, jare2_mask_bits, jare2_dog_mask_bits }, ++ { &Kaki1GC, &Kaki1Xbm, kaki1_bits, kaki1_tora_bits, kaki1_dog_bits, ++ &Kaki1Msk, kaki1_mask_bits, kaki1_mask_bits, kaki1_dog_mask_bits }, ++ { &Kaki2GC, &Kaki2Xbm, kaki2_bits, kaki2_tora_bits, kaki2_dog_bits, ++ &Kaki2Msk, kaki2_mask_bits, kaki2_mask_bits, kaki2_dog_mask_bits }, ++ { &Mati3GC, &Mati3Xbm, mati3_bits, mati3_tora_bits, mati3_dog_bits, ++ &Mati3Msk, mati3_mask_bits, mati3_mask_bits, mati3_dog_mask_bits }, ++ { &Sleep1GC, &Sleep1Xbm, sleep1_bits, sleep1_tora_bits, sleep1_dog_bits, ++ &Sleep1Msk, sleep1_mask_bits, sleep1_mask_bits, sleep1_dog_mask_bits }, ++ { &Sleep2GC, &Sleep2Xbm, sleep2_bits, sleep2_tora_bits, sleep2_dog_bits, ++ &Sleep2Msk, sleep2_mask_bits, sleep2_mask_bits, sleep2_dog_mask_bits }, ++ { &AwakeGC, &AwakeXbm, awake_bits, awake_tora_bits, awake_dog_bits, ++ &AwakeMsk, awake_mask_bits, awake_mask_bits, awake_dog_mask_bits }, ++ { &Up1GC, &Up1Xbm, up1_bits, up1_tora_bits, up1_dog_bits, ++ &Up1Msk, up1_mask_bits, up1_mask_bits, up1_dog_mask_bits }, ++ { &Up2GC, &Up2Xbm, up2_bits, up2_tora_bits, up2_dog_bits, ++ &Up2Msk, up2_mask_bits, up2_mask_bits, up2_dog_mask_bits }, ++ { &Down1GC, &Down1Xbm, down1_bits, down1_tora_bits, down1_dog_bits, ++ &Down1Msk, down1_mask_bits, down1_mask_bits, down1_dog_mask_bits }, ++ { &Down2GC, &Down2Xbm, down2_bits, down2_tora_bits, down2_dog_bits, ++ &Down2Msk, down2_mask_bits, down2_mask_bits, down2_dog_mask_bits }, ++ { &Left1GC, &Left1Xbm, left1_bits, left1_tora_bits, left1_dog_bits, ++ &Left1Msk, left1_mask_bits, left1_mask_bits, left1_dog_mask_bits }, ++ { &Left2GC, &Left2Xbm, left2_bits, left2_tora_bits, left2_dog_bits, ++ &Left2Msk, left2_mask_bits, left2_mask_bits, left2_dog_mask_bits }, ++ { &Right1GC, &Right1Xbm, right1_bits, right1_tora_bits, right1_dog_bits, ++ &Right1Msk, right1_mask_bits, right1_mask_bits,right1_dog_mask_bits }, ++ { &Right2GC, &Right2Xbm, right2_bits, right2_tora_bits, right2_dog_bits, ++ &Right2Msk, right2_mask_bits, right2_mask_bits, right2_dog_mask_bits }, ++ { &UpLeft1GC, &UpLeft1Xbm, upleft1_bits, upleft1_tora_bits, upleft1_dog_bits, ++ &UpLeft1Msk, upleft1_mask_bits, upleft1_mask_bits, upleft1_dog_mask_bits }, ++ { &UpLeft2GC, &UpLeft2Xbm, upleft2_bits, upleft2_tora_bits, upleft2_dog_bits, ++ &UpLeft2Msk, upleft2_mask_bits, upleft2_mask_bits,upleft2_dog_mask_bits }, ++ { &UpRight1GC, &UpRight1Xbm, upright1_bits, upright1_tora_bits, upright1_dog_bits, ++ &UpRight1Msk, upright1_mask_bits, upright1_mask_bits,upright1_dog_mask_bits }, ++ { &UpRight2GC, &UpRight2Xbm, upright2_bits, upright2_tora_bits, upright2_dog_bits, ++ &UpRight2Msk, upright2_mask_bits, upright2_mask_bits,upright2_dog_mask_bits }, ++ { &DownLeft1GC, &DownLeft1Xbm, dwleft1_bits, dwleft1_tora_bits, dwleft1_dog_bits, ++ &DownLeft1Msk, dwleft1_mask_bits, dwleft1_mask_bits, dwleft1_dog_mask_bits }, ++ { &DownLeft2GC, &DownLeft2Xbm, dwleft2_bits, dwleft2_tora_bits, dwleft2_dog_bits, ++ &DownLeft2Msk, dwleft2_mask_bits, dwleft2_mask_bits, dwleft2_dog_mask_bits }, ++ { &DownRight1GC, &DownRight1Xbm, dwright1_bits, dwright1_tora_bits, dwright1_dog_bits, ++ &DownRight1Msk, dwright1_mask_bits, dwright1_mask_bits, dwright1_dog_mask_bits }, ++ { &DownRight2GC, &DownRight2Xbm, dwright2_bits, dwright2_tora_bits, dwright2_dog_bits, ++ &DownRight2Msk, dwright2_mask_bits, dwright2_mask_bits, dwright2_dog_mask_bits }, ++ { &UpTogi1GC, &UpTogi1Xbm, utogi1_bits, utogi1_tora_bits, utogi1_dog_bits, ++ &UpTogi1Msk, utogi1_mask_bits, utogi1_mask_bits, utogi1_dog_mask_bits }, ++ { &UpTogi2GC, &UpTogi2Xbm, utogi2_bits, utogi2_tora_bits, utogi2_dog_bits, ++ &UpTogi2Msk, utogi2_mask_bits, utogi2_mask_bits, utogi2_dog_mask_bits }, ++ { &DownTogi1GC, &DownTogi1Xbm, dtogi1_bits, dtogi1_tora_bits, dtogi1_dog_bits, ++ &DownTogi1Msk, dtogi1_mask_bits, dtogi1_mask_bits, dtogi1_dog_mask_bits }, ++ { &DownTogi2GC, &DownTogi2Xbm, dtogi2_bits, dtogi2_tora_bits, dtogi2_dog_bits, ++ &DownTogi2Msk, dtogi2_mask_bits, dtogi2_mask_bits, dtogi2_dog_mask_bits }, ++ { &LeftTogi1GC, &LeftTogi1Xbm, ltogi1_bits, ltogi1_tora_bits, ltogi1_dog_bits, ++ &LeftTogi1Msk, ltogi1_mask_bits, ltogi1_mask_bits,ltogi1_dog_mask_bits }, ++ { &LeftTogi2GC, &LeftTogi2Xbm, ltogi2_bits, ltogi2_tora_bits, ltogi2_dog_bits, ++ &LeftTogi2Msk, ltogi2_mask_bits, ltogi2_mask_bits,ltogi2_dog_mask_bits }, ++ { &RightTogi1GC, &RightTogi1Xbm, rtogi1_bits, rtogi1_tora_bits, rtogi1_dog_bits, ++ &RightTogi1Msk, rtogi1_mask_bits, rtogi1_mask_bits,rtogi1_dog_mask_bits }, ++ { &RightTogi2GC, &RightTogi2Xbm, rtogi2_bits, rtogi2_tora_bits, rtogi2_dog_bits, ++ &RightTogi2Msk, rtogi2_mask_bits, rtogi2_mask_bits,rtogi2_dog_mask_bits }, + { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } + }; + +@@ -1512,8 +1506,6 @@ GetArguments(argc, argv, theDisplayName) + } + else { + char *av = argv[ArgCounter] + 1; +- if (strcmp(av, "bsd") == 0) +- av = "bsd_daemon"; + for (loop=0;loopl9g(J True $@$H$7$^$9!#(J + $@$r;H$&$3$H$KN10U$7$F$/$@$5$$!#(J + $@%O!<%I%j%s%/$"$k$$$O%=%U%H%j%s%/$K$h$C$F!"$3$N%W%m%0%i%`$r(J tora $@$H$7$F(J + $@5/F0$7$?>l9g$K$O!"%G%U%)%k%H$G(J \fB-tora\fP $@%*%W%7%g%s$,M-8z$H$J$j$^$9!#(J +-.PP +-BSD $@%G!<%b%s$O(J Marshall Kirk McKusick $@;a$NCx:nJ*$G$9!#$9$Y$F$N8"Mx$O(J +-$@J];}$5$l$F$$$^$9!#(J +-BSD Daemon Copyright 1988 by Marshall Kirk McKusick. All Rights Reserved. +-.PP +-$@LZG7K\:y$*$h$SBgF;;{CN@$$OL!2h!X%+!<%I%-%c%W%?!<$5$/$i!Y!J(JCLAMP, $@9VCL(J +-$@ ;;; Copyright © 2019 Jesse Gibbons -;;; Copyright © 2019, 2020 Timotej Lazar +;;; Copyright © 2019, 2020, 2021 Timotej Lazar ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2021 Leo Famulari ;;; @@ -21,6 +21,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages toys) + #:use-module (gnu packages) #:use-module (gnu packages bison) #:use-module (gnu packages flex) #:use-module (gnu packages gtk) @@ -36,6 +37,66 @@ #:use-module (guix packages) #:use-module (guix utils)) +(define-public oneko + (package + (name "oneko") + (version "1.2.sakura.5") + (source + (origin + (method url-fetch) + (uri (string-append + "http://www.daidouji.com/oneko/distfiles/oneko-" version ".tar.gz")) + (sha256 + (base32 "0bxjlbafn10sfi5d06420pg70rpvsiy5gdbm8kspd6qy4kqhabic")) + (patches (search-patches "oneko-remove-nonfree-characters.patch")) + (modules '((guix build utils))) + (snippet + ;; Remove bitmaps with copyright issues. + '(begin + (for-each delete-file-recursively + (cons* "bitmaps/bsd" "bitmaps/sakura" "bitmaps/tomoyo" + "bitmasks/bsd" "bitmasks/sakura" "bitmasks/tomoyo" + (find-files "cursors" "(bsd|card|petal).*\\.xbm"))) + #t)))) + (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 _ + (invoke "xmkmf") + ;; Fix incorrectly generated compiler flags. + (substitute* "Makefile" + (("(CDEBUGFLAGS = ).*" _ front) (string-append front "-O2\n"))) + #t)) + (replace 'install + (lambda* (#:key outputs make-flags #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (doc (string-append out "/share/doc/" ,name "-" ,version)) + (man (string-append out "/share/man")) + (man6 (string-append man "/man6")) + (man6-ja (string-append man "/ja/man6"))) + (install-file "oneko" bin) + (mkdir-p man6) + (mkdir-p man6-ja) + (copy-file "oneko.man" (string-append man6 "/oneko.6")) + (copy-file "oneko.man.jp" (string-append man6-ja "/oneko.6")) + (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") -- 2.32.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 28 15:06:00 2021 Received: (at 49235-done) by debbugs.gnu.org; 28 Jun 2021 19:06:00 +0000 Received: from localhost ([127.0.0.1]:52572 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxwZq-0003aa-Le for submit@debbugs.gnu.org; Mon, 28 Jun 2021 15:06:00 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:31077) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxwZm-0003aO-F7 for 49235-done@debbugs.gnu.org; Mon, 28 Jun 2021 15:05:49 -0400 Received: from nijino.local (62-116-34-49.adsl.highway.telekom.at [62.116.34.49]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GDHBF3V1Hz3wFK; Mon, 28 Jun 2021 21:05:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1624907141; bh=4U6C+gnKV6UX+sAIhc4rYC7ubpo5b9SVkXQjZc4BeHw=; h=Subject:From:To:Date:In-Reply-To:References; b=hkO4YdMs6agdfmi/qGkegkeJYwp3/4fnMkmGTwahLQ/6/5PozCawg72WrkssSWpsz r0OLdmpiq6j9l12wKkYoYZlgUX3Ia26HyR82Zj/lLYdg8K7iHawgju8ZzbOFXdxHM/ xHPZTtWGooOvi8Lcksd+KTZo0ibD4950KZ6gIvcs= Message-ID: <7330b804a66f60db2ce13f7a4c6935d61b0942d5.camel@student.tugraz.at> Subject: Re: [PATCH v3] gnu: Add oneko. From: Leo Prikler To: Timotej Lazar , 49235-done@debbugs.gnu.org Date: Mon, 28 Jun 2021 21:05:40 +0200 In-Reply-To: <20210628170237.6721-1-timotej.lazar@araneo.si> References: <20210628170237.6721-1-timotej.lazar@araneo.si> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 49235-done 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: -1.0 (-) Am Montag, den 28.06.2021, 19:02 +0200 schrieb Timotej Lazar: > * gnu/packages/toys.scm (oneko): New variable. > --- > I’ve changed the snippet to also delete all files related to nonfree > bitmaps. I also adjusted the name & comment for the patch. > > On closer inspection it turns out that iconv messes up the Japanese > manpage a bit, so I copied it as is. I see some other options: > > 1. don’t include it at all; > 2. use some fork from github where this has already been done; or > 3. convert and fix it manually, and include it as a patch. > > I’m inclined to include it as is, for the “historical value” of using > the original source (1,2), and to avoid having to carry another patch > in > Guix (3). Let me know if you’d prefer another solution! For now I've pushed your patch as-is, since it's not really detrimental to the functionality of the package. That being said, I do think we should seek out patches that have been made from the github forks mentioned in (2) and apply them as in (3). Perhaps we might want to cherry-pick among hunks, so as to not mention the removed bitmaps any longer. Another thing I could think is that iconv is either called with the wrong parameters or that patching the manpage actually breaks it. In the case of the latter, you'd have to add the patch as input to the package, then apply it in the snippet after running iconv. Of course, since the character encoding changes, you'd also have to update the patch, but that's a minor issue imo. Regards, Leo > gnu/local.mk | 1 + > .../oneko-remove-nonfree-characters.patch | 307 > ++++++++++++++++++ > gnu/packages/toys.scm | 63 +++- > 3 files changed, 370 insertions(+), 1 deletion(-) > create mode 100644 gnu/packages/patches/oneko-remove-nonfree- > characters.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index f507fe566f..7d1fc8157c 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1499,6 +1499,7 @@ dist_patch_DATA = > \ > %D%/packages/patches/ocaml-dose3-dont-make-printconf.patch \ > %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \ > %D%/packages/patches/omake-fix-non-determinism.patch \ > + %D%/packages/patches/oneko-remove-nonfree-characters.patch \ > %D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch > \ > %D%/packages/patches/opencascade-oce-glibc-2.26.patch > \ > %D%/packages/patches/opencv-fix-build-of-grfmt_jpeg2000.cpp.patch > \ > diff --git a/gnu/packages/patches/oneko-remove-nonfree- > characters.patch b/gnu/packages/patches/oneko-remove-nonfree- > characters.patch > new file mode 100644 > index 0000000000..4f80e53995 > --- /dev/null > +++ b/gnu/packages/patches/oneko-remove-nonfree-characters.patch > @@ -0,0 +1,307 @@ > +Remove options and code to use bitmaps of the BSD daemon and other > characters > +with copyright issues. The bitmaps themselves are deleted in a > source snippet. > +diff --git a/cursors/cursor.include b/cursors/cursor.include > +index ef96d72..1dc3dc2 100644 > +--- a/cursors/cursor.include > ++++ b/cursors/cursor.include > +@@ -2,9 +2,3 @@ > + #include "mouse_cursor_mask.xbm" > + #include "bone_cursor.xbm" > + #include "bone_cursor_mask.xbm" > +-#include "bsd_cursor.xbm" > +-#include "bsd_cursor_mask.xbm" > +-#include "card_cursor.xbm" > +-#include "card_cursor_mask.xbm" > +-#include "petal_cursor.xbm" > +-#include "petal_cursor_mask.xbm" > +diff --git a/oneko.c b/oneko.c > +index d2b81fe..04fa59f 100644 > +--- a/oneko.c > ++++ b/oneko.c > +@@ -33,7 +33,7 @@ XColor theBackgroundColor; /* > $@?'(J ($@%P%C%/%0%i%&%s%I(J) */ > + > + int Synchronous = False; > + /* Types of animals */ > +-#define BITMAPTYPES 6 > ++#define BITMAPTYPES 3 > + typedef struct _AnimalDefaults { > + char *name; > + int speed, idle, bitmap_width, bitmap_height; > +@@ -51,12 +51,6 @@ AnimalDefaultsData AnimalDefaultsDataTable[] = > + mouse_cursor_width,mouse_cursor_height, > mouse_cursor_x_hot,mouse_cursor_y_hot }, > + { "dog" , 10, 6, 32, 32, 125000L, 0, 0, > bone_cursor_bits,bone_cursor_mask_bits, > + bone_cursor_width,bone_cursor_height, > bone_cursor_x_hot,bone_cursor_y_hot }, > +- { "bsd_daemon" , 16, 6, 32, 32, 300000L, 22, 20, > bsd_cursor_bits,bsd_cursor_mask_bits, > +- bsd_cursor_width,bsd_cursor_height, > bsd_cursor_x_hot,bsd_cursor_y_hot }, > +- { "sakura" , 13, 6, 32, 32, 125000L, 0, 0, > card_cursor_bits,card_cursor_mask_bits, > +- card_cursor_width,card_cursor_height, > card_cursor_x_hot,card_cursor_y_hot }, > +- { "tomoyo" , 10, 6, 32, 32, 125000L, 32, 32, > petal_cursor_bits,petal_cursor_mask_bits, > +- petal_cursor_width,petal_cursor_height, > petal_cursor_x_hot,petal_cursor_y_hot }, > + }; > + > + /* > +@@ -154,70 +148,70 @@ typedef struct { > + > + BitmapGCData BitmapGCDataTable[] = > + { > +- { &Mati2GC, &Mati2Xbm, mati2_bits, mati2_tora_bits, > mati2_dog_bits, mati2_bsd_bits, mati2_sakura_bits, mati2_tomoyo_bits, > +- &Mati2Msk, mati2_mask_bits, mati2_mask_bits, > mati2_dog_mask_bits, mati2_bsd_mask_bits, mati2_sakura_mask_bits, > mati2_tomoyo_mask_bits }, > +- { &Jare2GC, &Jare2Xbm, jare2_bits, jare2_tora_bits, > jare2_dog_bits, jare2_bsd_bits, jare2_sakura_bits, jare2_tomoyo_bits, > +- &Jare2Msk, jare2_mask_bits, jare2_mask_bits, > jare2_dog_mask_bits, jare2_bsd_mask_bits, jare2_sakura_mask_bits, > jare2_tomoyo_mask_bits }, > +- { &Kaki1GC, &Kaki1Xbm, kaki1_bits, kaki1_tora_bits, > kaki1_dog_bits, kaki1_bsd_bits, kaki1_sakura_bits, kaki1_tomoyo_bits, > +- &Kaki1Msk, kaki1_mask_bits, kaki1_mask_bits, > kaki1_dog_mask_bits, kaki1_bsd_mask_bits, kaki1_sakura_mask_bits, > kaki1_tomoyo_mask_bits }, > +- { &Kaki2GC, &Kaki2Xbm, kaki2_bits, kaki2_tora_bits, > kaki2_dog_bits, kaki2_bsd_bits, kaki2_sakura_bits, kaki2_tomoyo_bits, > +- &Kaki2Msk, kaki2_mask_bits, kaki2_mask_bits, > kaki2_dog_mask_bits, kaki2_bsd_mask_bits, kaki2_sakura_mask_bits, > kaki2_tomoyo_mask_bits }, > +- { &Mati3GC, &Mati3Xbm, mati3_bits, mati3_tora_bits, > mati3_dog_bits, mati3_bsd_bits, mati3_sakura_bits, mati3_tomoyo_bits, > +- &Mati3Msk, mati3_mask_bits, mati3_mask_bits, > mati3_dog_mask_bits, mati3_bsd_mask_bits, mati3_sakura_mask_bits, > mati3_tomoyo_mask_bits }, > +- { &Sleep1GC, &Sleep1Xbm, sleep1_bits, sleep1_tora_bits, > sleep1_dog_bits, sleep1_bsd_bits, sleep1_sakura_bits, > sleep1_tomoyo_bits, > +- &Sleep1Msk, sleep1_mask_bits, sleep1_mask_bits, > sleep1_dog_mask_bits, sleep1_bsd_mask_bits, sleep1_sakura_mask_bits, > sleep1_tomoyo_mask_bits }, > +- { &Sleep2GC, &Sleep2Xbm, sleep2_bits, sleep2_tora_bits, > sleep2_dog_bits, sleep2_bsd_bits, sleep2_sakura_bits, > sleep2_tomoyo_bits, > +- &Sleep2Msk, sleep2_mask_bits, sleep2_mask_bits, > sleep2_dog_mask_bits, sleep2_bsd_mask_bits, sleep2_sakura_mask_bits, > sleep2_tomoyo_mask_bits }, > +- { &AwakeGC, &AwakeXbm, awake_bits, awake_tora_bits, > awake_dog_bits, awake_bsd_bits, awake_sakura_bits, awake_tomoyo_bits, > +- &AwakeMsk, awake_mask_bits, awake_mask_bits, > awake_dog_mask_bits, awake_bsd_mask_bits, awake_sakura_mask_bits, > awake_tomoyo_mask_bits }, > +- { &Up1GC, &Up1Xbm, up1_bits, up1_tora_bits, up1_dog_bits, > up1_bsd_bits, up1_sakura_bits, up1_tomoyo_bits, > +- &Up1Msk, up1_mask_bits, up1_mask_bits, up1_dog_mask_bits, > up1_bsd_mask_bits, up1_sakura_mask_bits, up1_tomoyo_mask_bits }, > +- { &Up2GC, &Up2Xbm, up2_bits, up2_tora_bits, up2_dog_bits, > up2_bsd_bits, up2_sakura_bits, up2_tomoyo_bits, > +- &Up2Msk, up2_mask_bits, up2_mask_bits, up2_dog_mask_bits, > up2_bsd_mask_bits, up2_sakura_mask_bits, up2_tomoyo_mask_bits }, > +- { &Down1GC, &Down1Xbm, down1_bits, down1_tora_bits, > down1_dog_bits, down1_bsd_bits, down1_sakura_bits, down1_tomoyo_bits, > +- &Down1Msk, down1_mask_bits, down1_mask_bits, > down1_dog_mask_bits, down1_bsd_mask_bits, down1_sakura_mask_bits, > down1_tomoyo_mask_bits }, > +- { &Down2GC, &Down2Xbm, down2_bits, down2_tora_bits, > down2_dog_bits, down2_bsd_bits, down2_sakura_bits, down2_tomoyo_bits, > +- &Down2Msk, down2_mask_bits, down2_mask_bits, > down2_dog_mask_bits, down2_bsd_mask_bits, down2_sakura_mask_bits, > down2_tomoyo_mask_bits }, > +- { &Left1GC, &Left1Xbm, left1_bits, left1_tora_bits, > left1_dog_bits, left1_bsd_bits, left1_sakura_bits, left1_tomoyo_bits, > +- &Left1Msk, left1_mask_bits, left1_mask_bits, > left1_dog_mask_bits, left1_bsd_mask_bits, left1_sakura_mask_bits, > left1_tomoyo_mask_bits }, > +- { &Left2GC, &Left2Xbm, left2_bits, left2_tora_bits, > left2_dog_bits, left2_bsd_bits, left2_sakura_bits, left2_tomoyo_bits, > +- &Left2Msk, left2_mask_bits, left2_mask_bits, > left2_dog_mask_bits, left2_bsd_mask_bits, left2_sakura_mask_bits, > left2_tomoyo_mask_bits }, > +- { &Right1GC, &Right1Xbm, right1_bits, right1_tora_bits, > right1_dog_bits, right1_bsd_bits, right1_sakura_bits, > right1_tomoyo_bits, > +- &Right1Msk, right1_mask_bits, > right1_mask_bits,right1_dog_mask_bits, right1_bsd_mask_bits, > right1_sakura_mask_bits, right1_tomoyo_mask_bits }, > +- { &Right2GC, &Right2Xbm, right2_bits, right2_tora_bits, > right2_dog_bits, right2_bsd_bits, right2_sakura_bits, > right2_tomoyo_bits, > +- &Right2Msk, right2_mask_bits, right2_mask_bits, > right2_dog_mask_bits, right2_bsd_mask_bits, right2_sakura_mask_bits, > right2_tomoyo_mask_bits }, > +- { &UpLeft1GC, &UpLeft1Xbm, upleft1_bits, upleft1_tora_bits, > upleft1_dog_bits, upleft1_bsd_bits, upleft1_sakura_bits, > upleft1_tomoyo_bits, > +- &UpLeft1Msk, upleft1_mask_bits, upleft1_mask_bits, > upleft1_dog_mask_bits, upleft1_bsd_mask_bits, > upleft1_sakura_mask_bits, upleft1_tomoyo_mask_bits }, > +- { &UpLeft2GC, &UpLeft2Xbm, upleft2_bits, upleft2_tora_bits, > upleft2_dog_bits, upleft2_bsd_bits, upleft2_sakura_bits, > upleft2_tomoyo_bits, > +- &UpLeft2Msk, upleft2_mask_bits, > upleft2_mask_bits,upleft2_dog_mask_bits, upleft2_bsd_mask_bits, > upleft2_sakura_mask_bits, upleft2_tomoyo_mask_bits }, > +- { &UpRight1GC, &UpRight1Xbm, upright1_bits, > upright1_tora_bits, upright1_dog_bits, upright1_bsd_bits, > upright1_sakura_bits, upright1_tomoyo_bits, > +- &UpRight1Msk, upright1_mask_bits, > upright1_mask_bits,upright1_dog_mask_bits, upright1_bsd_mask_bits, > upright1_sakura_mask_bits, upright1_tomoyo_mask_bits }, > +- { &UpRight2GC, &UpRight2Xbm, upright2_bits, > upright2_tora_bits, upright2_dog_bits, upright2_bsd_bits, > upright2_sakura_bits, upright2_tomoyo_bits, > +- &UpRight2Msk, upright2_mask_bits, > upright2_mask_bits,upright2_dog_mask_bits, upright2_bsd_mask_bits, > upright2_sakura_mask_bits, upright2_tomoyo_mask_bits }, > +- { &DownLeft1GC, &DownLeft1Xbm, dwleft1_bits, > dwleft1_tora_bits, dwleft1_dog_bits, dwleft1_bsd_bits, > dwleft1_sakura_bits, dwleft1_tomoyo_bits, > +- &DownLeft1Msk, dwleft1_mask_bits, dwleft1_mask_bits, > dwleft1_dog_mask_bits, dwleft1_bsd_mask_bits, > dwleft1_sakura_mask_bits, dwleft1_tomoyo_mask_bits }, > +- { &DownLeft2GC, &DownLeft2Xbm, dwleft2_bits, > dwleft2_tora_bits, dwleft2_dog_bits, dwleft2_bsd_bits, > dwleft2_sakura_bits, dwleft2_tomoyo_bits, > +- &DownLeft2Msk, dwleft2_mask_bits, dwleft2_mask_bits, > dwleft2_dog_mask_bits, dwleft2_bsd_mask_bits, > dwleft2_sakura_mask_bits, dwleft2_tomoyo_mask_bits }, > +- { &DownRight1GC, &DownRight1Xbm, dwright1_bits, > dwright1_tora_bits, dwright1_dog_bits, dwright1_bsd_bits, > dwright1_sakura_bits, dwright1_tomoyo_bits, > +- &DownRight1Msk, dwright1_mask_bits, dwright1_mask_bits, > dwright1_dog_mask_bits, dwright1_bsd_mask_bits, > dwright1_sakura_mask_bits, dwright1_tomoyo_mask_bits }, > +- { &DownRight2GC, &DownRight2Xbm, dwright2_bits, > dwright2_tora_bits, dwright2_dog_bits, dwright2_bsd_bits, > dwright2_sakura_bits, dwright2_tomoyo_bits, > +- &DownRight2Msk, dwright2_mask_bits, dwright2_mask_bits, > dwright2_dog_mask_bits, dwright2_bsd_mask_bits, > dwright2_sakura_mask_bits, dwright2_tomoyo_mask_bits }, > +- { &UpTogi1GC, &UpTogi1Xbm, utogi1_bits, utogi1_tora_bits, > utogi1_dog_bits, utogi1_bsd_bits, utogi1_sakura_bits, > utogi1_tomoyo_bits, > +- &UpTogi1Msk, utogi1_mask_bits, utogi1_mask_bits, > utogi1_dog_mask_bits, utogi1_bsd_mask_bits, utogi1_sakura_mask_bits, > utogi1_tomoyo_mask_bits }, > +- { &UpTogi2GC, &UpTogi2Xbm, utogi2_bits, utogi2_tora_bits, > utogi2_dog_bits, utogi2_bsd_bits, utogi2_sakura_bits, > utogi2_tomoyo_bits, > +- &UpTogi2Msk, utogi2_mask_bits, utogi2_mask_bits, > utogi2_dog_mask_bits, utogi2_bsd_mask_bits, utogi2_sakura_mask_bits, > utogi2_tomoyo_mask_bits }, > +- { &DownTogi1GC, &DownTogi1Xbm, dtogi1_bits, dtogi1_tora_bits, > dtogi1_dog_bits, dtogi1_bsd_bits, dtogi1_sakura_bits, > dtogi1_tomoyo_bits, > +- &DownTogi1Msk, dtogi1_mask_bits, dtogi1_mask_bits, > dtogi1_dog_mask_bits, dtogi1_bsd_mask_bits, dtogi1_sakura_mask_bits, > dtogi1_tomoyo_mask_bits }, > +- { &DownTogi2GC, &DownTogi2Xbm, dtogi2_bits, dtogi2_tora_bits, > dtogi2_dog_bits, dtogi2_bsd_bits, dtogi2_sakura_bits, > dtogi2_tomoyo_bits, > +- &DownTogi2Msk, dtogi2_mask_bits, dtogi2_mask_bits, > dtogi2_dog_mask_bits, dtogi2_bsd_mask_bits, dtogi2_sakura_mask_bits, > dtogi2_tomoyo_mask_bits }, > +- { &LeftTogi1GC, &LeftTogi1Xbm, ltogi1_bits, ltogi1_tora_bits, > ltogi1_dog_bits, ltogi1_bsd_bits, ltogi1_sakura_bits, > ltogi1_tomoyo_bits, > +- &LeftTogi1Msk, ltogi1_mask_bits, > ltogi1_mask_bits,ltogi1_dog_mask_bits, ltogi1_bsd_mask_bits, > ltogi1_sakura_mask_bits, ltogi1_tomoyo_mask_bits }, > +- { &LeftTogi2GC, &LeftTogi2Xbm, ltogi2_bits, ltogi2_tora_bits, > ltogi2_dog_bits, ltogi2_bsd_bits, ltogi2_sakura_bits, > ltogi2_tomoyo_bits, > +- &LeftTogi2Msk, ltogi2_mask_bits, > ltogi2_mask_bits,ltogi2_dog_mask_bits, ltogi2_bsd_mask_bits, > ltogi2_sakura_mask_bits, ltogi2_tomoyo_mask_bits }, > +- { &RightTogi1GC, &RightTogi1Xbm, rtogi1_bits, > rtogi1_tora_bits, rtogi1_dog_bits, rtogi1_bsd_bits, > rtogi1_sakura_bits, rtogi1_tomoyo_bits, > +- &RightTogi1Msk, rtogi1_mask_bits, > rtogi1_mask_bits,rtogi1_dog_mask_bits, rtogi1_bsd_mask_bits, > rtogi1_sakura_mask_bits, rtogi1_tomoyo_mask_bits }, > +- { &RightTogi2GC, &RightTogi2Xbm, rtogi2_bits, > rtogi2_tora_bits, rtogi2_dog_bits, rtogi2_bsd_bits, > rtogi2_sakura_bits, rtogi2_tomoyo_bits, > +- &RightTogi2Msk, rtogi2_mask_bits, > rtogi2_mask_bits,rtogi2_dog_mask_bits, rtogi2_bsd_mask_bits, > rtogi2_sakura_mask_bits, rtogi2_tomoyo_mask_bits }, > ++ { &Mati2GC, &Mati2Xbm, mati2_bits, mati2_tora_bits, > mati2_dog_bits, > ++ &Mati2Msk, mati2_mask_bits, mati2_mask_bits, > mati2_dog_mask_bits }, > ++ { &Jare2GC, &Jare2Xbm, jare2_bits, jare2_tora_bits, > jare2_dog_bits, > ++ &Jare2Msk, jare2_mask_bits, jare2_mask_bits, > jare2_dog_mask_bits }, > ++ { &Kaki1GC, &Kaki1Xbm, kaki1_bits, kaki1_tora_bits, > kaki1_dog_bits, > ++ &Kaki1Msk, kaki1_mask_bits, kaki1_mask_bits, > kaki1_dog_mask_bits }, > ++ { &Kaki2GC, &Kaki2Xbm, kaki2_bits, kaki2_tora_bits, > kaki2_dog_bits, > ++ &Kaki2Msk, kaki2_mask_bits, kaki2_mask_bits, > kaki2_dog_mask_bits }, > ++ { &Mati3GC, &Mati3Xbm, mati3_bits, mati3_tora_bits, > mati3_dog_bits, > ++ &Mati3Msk, mati3_mask_bits, mati3_mask_bits, > mati3_dog_mask_bits }, > ++ { &Sleep1GC, &Sleep1Xbm, sleep1_bits, sleep1_tora_bits, > sleep1_dog_bits, > ++ &Sleep1Msk, sleep1_mask_bits, sleep1_mask_bits, > sleep1_dog_mask_bits }, > ++ { &Sleep2GC, &Sleep2Xbm, sleep2_bits, sleep2_tora_bits, > sleep2_dog_bits, > ++ &Sleep2Msk, sleep2_mask_bits, sleep2_mask_bits, > sleep2_dog_mask_bits }, > ++ { &AwakeGC, &AwakeXbm, awake_bits, awake_tora_bits, > awake_dog_bits, > ++ &AwakeMsk, awake_mask_bits, awake_mask_bits, > awake_dog_mask_bits }, > ++ { &Up1GC, &Up1Xbm, up1_bits, up1_tora_bits, up1_dog_bits, > ++ &Up1Msk, up1_mask_bits, up1_mask_bits, up1_dog_mask_bits }, > ++ { &Up2GC, &Up2Xbm, up2_bits, up2_tora_bits, up2_dog_bits, > ++ &Up2Msk, up2_mask_bits, up2_mask_bits, up2_dog_mask_bits }, > ++ { &Down1GC, &Down1Xbm, down1_bits, down1_tora_bits, > down1_dog_bits, > ++ &Down1Msk, down1_mask_bits, down1_mask_bits, > down1_dog_mask_bits }, > ++ { &Down2GC, &Down2Xbm, down2_bits, down2_tora_bits, > down2_dog_bits, > ++ &Down2Msk, down2_mask_bits, down2_mask_bits, > down2_dog_mask_bits }, > ++ { &Left1GC, &Left1Xbm, left1_bits, left1_tora_bits, > left1_dog_bits, > ++ &Left1Msk, left1_mask_bits, left1_mask_bits, > left1_dog_mask_bits }, > ++ { &Left2GC, &Left2Xbm, left2_bits, left2_tora_bits, > left2_dog_bits, > ++ &Left2Msk, left2_mask_bits, left2_mask_bits, > left2_dog_mask_bits }, > ++ { &Right1GC, &Right1Xbm, right1_bits, right1_tora_bits, > right1_dog_bits, > ++ &Right1Msk, right1_mask_bits, > right1_mask_bits,right1_dog_mask_bits }, > ++ { &Right2GC, &Right2Xbm, right2_bits, right2_tora_bits, > right2_dog_bits, > ++ &Right2Msk, right2_mask_bits, right2_mask_bits, > right2_dog_mask_bits }, > ++ { &UpLeft1GC, &UpLeft1Xbm, upleft1_bits, upleft1_tora_bits, > upleft1_dog_bits, > ++ &UpLeft1Msk, upleft1_mask_bits, upleft1_mask_bits, > upleft1_dog_mask_bits }, > ++ { &UpLeft2GC, &UpLeft2Xbm, upleft2_bits, upleft2_tora_bits, > upleft2_dog_bits, > ++ &UpLeft2Msk, upleft2_mask_bits, > upleft2_mask_bits,upleft2_dog_mask_bits }, > ++ { &UpRight1GC, &UpRight1Xbm, upright1_bits, > upright1_tora_bits, upright1_dog_bits, > ++ &UpRight1Msk, upright1_mask_bits, > upright1_mask_bits,upright1_dog_mask_bits }, > ++ { &UpRight2GC, &UpRight2Xbm, upright2_bits, > upright2_tora_bits, upright2_dog_bits, > ++ &UpRight2Msk, upright2_mask_bits, > upright2_mask_bits,upright2_dog_mask_bits }, > ++ { &DownLeft1GC, &DownLeft1Xbm, dwleft1_bits, > dwleft1_tora_bits, dwleft1_dog_bits, > ++ &DownLeft1Msk, dwleft1_mask_bits, dwleft1_mask_bits, > dwleft1_dog_mask_bits }, > ++ { &DownLeft2GC, &DownLeft2Xbm, dwleft2_bits, > dwleft2_tora_bits, dwleft2_dog_bits, > ++ &DownLeft2Msk, dwleft2_mask_bits, dwleft2_mask_bits, > dwleft2_dog_mask_bits }, > ++ { &DownRight1GC, &DownRight1Xbm, dwright1_bits, > dwright1_tora_bits, dwright1_dog_bits, > ++ &DownRight1Msk, dwright1_mask_bits, dwright1_mask_bits, > dwright1_dog_mask_bits }, > ++ { &DownRight2GC, &DownRight2Xbm, dwright2_bits, > dwright2_tora_bits, dwright2_dog_bits, > ++ &DownRight2Msk, dwright2_mask_bits, dwright2_mask_bits, > dwright2_dog_mask_bits }, > ++ { &UpTogi1GC, &UpTogi1Xbm, utogi1_bits, utogi1_tora_bits, > utogi1_dog_bits, > ++ &UpTogi1Msk, utogi1_mask_bits, utogi1_mask_bits, > utogi1_dog_mask_bits }, > ++ { &UpTogi2GC, &UpTogi2Xbm, utogi2_bits, utogi2_tora_bits, > utogi2_dog_bits, > ++ &UpTogi2Msk, utogi2_mask_bits, utogi2_mask_bits, > utogi2_dog_mask_bits }, > ++ { &DownTogi1GC, &DownTogi1Xbm, dtogi1_bits, dtogi1_tora_bits, > dtogi1_dog_bits, > ++ &DownTogi1Msk, dtogi1_mask_bits, dtogi1_mask_bits, > dtogi1_dog_mask_bits }, > ++ { &DownTogi2GC, &DownTogi2Xbm, dtogi2_bits, dtogi2_tora_bits, > dtogi2_dog_bits, > ++ &DownTogi2Msk, dtogi2_mask_bits, dtogi2_mask_bits, > dtogi2_dog_mask_bits }, > ++ { &LeftTogi1GC, &LeftTogi1Xbm, ltogi1_bits, ltogi1_tora_bits, > ltogi1_dog_bits, > ++ &LeftTogi1Msk, ltogi1_mask_bits, > ltogi1_mask_bits,ltogi1_dog_mask_bits }, > ++ { &LeftTogi2GC, &LeftTogi2Xbm, ltogi2_bits, ltogi2_tora_bits, > ltogi2_dog_bits, > ++ &LeftTogi2Msk, ltogi2_mask_bits, > ltogi2_mask_bits,ltogi2_dog_mask_bits }, > ++ { &RightTogi1GC, &RightTogi1Xbm, rtogi1_bits, > rtogi1_tora_bits, rtogi1_dog_bits, > ++ &RightTogi1Msk, rtogi1_mask_bits, > rtogi1_mask_bits,rtogi1_dog_mask_bits }, > ++ { &RightTogi2GC, &RightTogi2Xbm, rtogi2_bits, > rtogi2_tora_bits, rtogi2_dog_bits, > ++ &RightTogi2Msk, rtogi2_mask_bits, > rtogi2_mask_bits,rtogi2_dog_mask_bits }, > + { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } > + }; > + > +@@ -1512,8 +1506,6 @@ GetArguments(argc, argv, theDisplayName) > + } > + else { > + char *av = argv[ArgCounter] + 1; > +- if (strcmp(av, "bsd") == 0) > +- av = "bsd_daemon"; > + for (loop=0;loop + if (strcmp(av,AnimalDefaultsDataTable[loop].name)==0) > + {NekoMoyou = loop;found=1;} > +diff --git a/oneko.h b/oneko.h > +index 414e12f..38281fd 100644 > +--- a/oneko.h > ++++ b/oneko.h > +@@ -36,17 +36,11 @@ > + #include "bitmaps/neko/neko.include" > + #include "bitmaps/tora/tora.include" > + #include "bitmaps/dog/dog.include" > +-#include "bitmaps/bsd/bsd.include" > +-#include "bitmaps/sakura/sakura.include" > +-#include "bitmaps/tomoyo/tomoyo.include" > + > + /* These are the bitmasks that allow the use of the shape > extension. */ > + > + #include "bitmasks/neko/neko.mask.include" > + #include "bitmasks/dog/dog.mask.include" > +-#include "bitmasks/bsd/bsd.mask.include" > +-#include "bitmasks/sakura/sakura.mask.include" > +-#include "bitmasks/tomoyo/tomoyo.mask.include" > + > + /* > + * $@Dj?tDj5A(J > +diff --git a/oneko.man b/oneko.man > +index d6d2b40..0e9b09d 100644 > +--- a/oneko.man > ++++ b/oneko.man > +@@ -3,9 +3,7 @@ > + The program oneko creates a cute cat chasing around your mouse > cursor. > + .SH SYNOPSIS > + .B oneko > +-[\fB-help\fP] [\fB-tora\fP] > +-[\fB-dog\fP] [\fB-bsd_daemon\fP] [\fB-bsd\fP] > +-[\fB-sakura\fP] [\fB-tomoyo\fP] > ++[\fB-help\fP] [\fB-tora\fP] [\fB-dog\fP] > + [\fB-time\fP \fIn\fP] [\fB-speed\fP \fIn\fP] [\fB-idle\fP \fIn\fP] > + [\fB-name\fP \fIname\fP] [\fB-towindow\fP] [\fB-toname\fP > \fIname\fP] > + [\fB-tofocus\fP] > +@@ -28,19 +26,6 @@ I don't know how to say it in English. > + .B -dog > + Runs a dog instead of a cat. > + .TP > +-.B -bsd_daemon > +-Runs a 4.3BSD daemon instead of a cat. > +-.TP > +-.B -bsd > +-Same as > +-.B -bsd_daemon. > +-.TP > +-.B -sakura > +-Runs Sakura Kinomoto instead of a cat. > +-.TP > +-.B -tomoyo > +-Runs Tomoyo Daidouji instead of a cat. > +-.TP > + .BI \-time " interval" > + Sets interval timer which determine intervals for cat animation. > + Default value is 125000 and unit is micro-second. Smaller value > makes cat > +@@ -129,12 +114,6 @@ Background color. > + While this program uses XGetDefault, be sure to use "neko.resouce" > form. > + If you run this program as "tora", by hard of soft link, the \fB- > tora\fP > + option is enabled by default. > +-.PP > +-BSD Daemon Copyright 1988 by Marshall Kirk McKusick. All Rights > Reserved. > +-.PP > +-Sakura Kinomoto and Tomoyo Daidouji are characters in a comic strip > +-"CARDCAPTOR SAKURA" (CLAMP, Kodansha), with the sanction indicated > in > +-CLAMP SCHOOL WEB CAMPUS (http://www.clamp.f-2.co.jp/). > + .SH AUTHOR > + Original > + .I xneko > +diff --git a/oneko.man.jp b/oneko.man.jp > +index 96f9e3a..9a885df 100644 > +--- a/oneko.man.jp > ++++ b/oneko.man.jp > +@@ -3,9 +3,7 @@ > + $@$+$o$$$$G-$,%^%&%9%+!<%=%k$rDI$$$+$1$k%W%m%0%i%`(J > + .SH $@=q<0(J > + .B oneko > +-[\fB-help\fP] [\fB-tora\fP] > +-[\fB-dog\fP] [\fB-bsd_daemon\fP] [\fB-bsd\fP] > +-[\fB-sakura\fP] [\fB-tomoyo\fP] > ++[\fB-help\fP] [\fB-tora\fP] [\fB-dog\fP] > + [\fB-time\fP \fIn\fP] [\fB-speed\fP \fIn\fP] [\fB-idle\fP \fIn\fP] > + [\fB-name\fP \fIname\fP] [\fB-towindow\fP] [\fB-toname\fP > \fIname\fP] > + [\fB-tofocus\fP] > +@@ -27,19 +25,6 @@ > + .B -dog > + $@G-$KBe$o$j8$$,Av$j$^$9!#(J > + .TP > +-.B -bsd_daemon > +-$@G-$KBe$o$j(J 4.3BSD $@%G!<%b%s$,Av$j$^$9!#(J > +-.TP > +-.B -bsd > +-.B -bsd_daemon > +-$@$KF1$8!#(J > +-.TP > +-.B -sakura > +-$@G-$KBe$o$jLZG7K\:y$,Av$j$^$9!#(J > +-.TP > +-.B -tomoyo > +-$@G-$KBe$o$jBgF;;{CN@$$,Av$j$^$9!#(J > +-.TP > + .BI \-time " interval" > + $@G-%"%K%a!<%7%g%s$N4V3V$r;XDj$7$^$9!#(J > + $@%G%U%)%k%HCM$O(J 125000 $@$GC10L$O%^%$%/%mIC$G$9!#(J > +@@ -127,15 +112,6 @@ SHAPE extension $@$r;H$$$?$/$J$$>l9g(J True > $@$H$7$^$9!#(J > + $@$r;H$&$3$H$KN10U$7$F$/$@$5$$!#(J > + $@%O!<%I%j%s%/$"$k$$$O%=%U%H%j%s%/$K$h$C$F!"$3$N%W%m%0%i%`$r(J > tora $@$H$7$F(J > + $@5/F0$7$?>l9g$K$O!"%G%U%)%k%H$G(J \fB-tora\fP $@%*%W%7%g%s$,M- > 8z$H$J$j$^$9!#(J > +-.PP > +-BSD $@%G!<%b%s$O(J Marshall Kirk McKusick > $@;a$NCx:nJ*$G$9!#$9$Y$F$N8"Mx$O(J > +-$@J];}$5$l$F$$$^$9!#(J > +-BSD Daemon Copyright 1988 by Marshall Kirk McKusick. All Rights > Reserved. > +-.PP > +-$@LZG7K\:y$*$h$SBgF;;{CN@$$OL!2h!X%+!<%I%- > %c%W%?!<$5$/$i!Y!J(JCLAMP, $@9VCL(J > +-$@ +-$@!J(J > http://www.clamp.f-2.co.jp/$@!K$K<($5$l$F$$$kMFG'$N$b$H$KMxMQ$5$l$F$$(J > +-$@$^$9!#(J > + .SH $@:n + $@%*%j%8%J%k$N(J > + .I xneko > diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm > index bbd5753841..a277bce453 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 < > timotej.lazar@araneo.si> > ;;; Copyright © 2020 Efraim Flashner > ;;; Copyright © 2021 Leo Famulari > ;;; > @@ -21,6 +21,7 @@ > ;;; along with GNU Guix. If not, see > ;. > > (define-module (gnu packages toys) > + #:use-module (gnu packages) > #:use-module (gnu packages bison) > #:use-module (gnu packages flex) > #:use-module (gnu packages gtk) > @@ -36,6 +37,66 @@ > #:use-module (guix packages) > #:use-module (guix utils)) > > +(define-public oneko > + (package > + (name "oneko") > + (version "1.2.sakura.5") > + (source > + (origin > + (method url-fetch) > + (uri (string-append > + "http://www.daidouji.com/oneko/distfiles/oneko-" > version ".tar.gz")) > + (sha256 > + (base32 > "0bxjlbafn10sfi5d06420pg70rpvsiy5gdbm8kspd6qy4kqhabic")) > + (patches (search-patches "oneko-remove-nonfree- > characters.patch")) > + (modules '((guix build utils))) > + (snippet > + ;; Remove bitmaps with copyright issues. > + '(begin > + (for-each delete-file-recursively > + (cons* "bitmaps/bsd" "bitmaps/sakura" > "bitmaps/tomoyo" > + "bitmasks/bsd" "bitmasks/sakura" > "bitmasks/tomoyo" > + (find-files "cursors" > "(bsd|card|petal).*\\.xbm"))) > + #t)))) > + (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 _ > + (invoke "xmkmf") > + ;; Fix incorrectly generated compiler flags. > + (substitute* "Makefile" > + (("(CDEBUGFLAGS = ).*" _ front) (string-append front > "-O2\n"))) > + #t)) > + (replace 'install > + (lambda* (#:key outputs make-flags #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (bin (string-append out "/bin")) > + (doc (string-append out "/share/doc/" ,name "-" > ,version)) > + (man (string-append out "/share/man")) > + (man6 (string-append man "/man6")) > + (man6-ja (string-append man "/ja/man6"))) > + (install-file "oneko" bin) > + (mkdir-p man6) > + (mkdir-p man6-ja) > + (copy-file "oneko.man" (string-append man6 > "/oneko.6")) > + (copy-file "oneko.man.jp" (string-append man6-ja > "/oneko.6")) > + (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") From unknown Fri Aug 15 15:33:37 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, 27 Jul 2021 11:24:05 +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