From patchwork Mon Sep 27 13:54:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aleksandr Vityazev X-Patchwork-Id: 33359 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EFD4927BBE3; Mon, 27 Sep 2021 15:07:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9FC8627BBE1 for ; Mon, 27 Sep 2021 15:07:33 +0100 (BST) Received: from localhost ([::1]:55882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUrI4-0003We-ID for patchwork@mira.cbaines.net; Mon, 27 Sep 2021 10:07:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUr5z-0005bD-KG for guix-patches@gnu.org; Mon, 27 Sep 2021 09:55:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56847) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mUr5y-0001vK-P9 for guix-patches@gnu.org; Mon, 27 Sep 2021 09:55:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mUr5y-000419-Oh for guix-patches@gnu.org; Mon, 27 Sep 2021 09:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50847] [PATCH 1/5] gnu: Add iodash. References: <87wnn2ruq9.fsf@posteo.org> In-Reply-To: <87wnn2ruq9.fsf@posteo.org> Resent-From: Alexandr Vityazev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Sep 2021 13:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50847 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50847@debbugs.gnu.org Received: via spool by 50847-submit@debbugs.gnu.org id=B50847.163275087915356 (code B ref 50847); Mon, 27 Sep 2021 13:55:02 +0000 Received: (at 50847) by debbugs.gnu.org; 27 Sep 2021 13:54:39 +0000 Received: from localhost ([127.0.0.1]:40134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUr5X-0003zV-DU for submit@debbugs.gnu.org; Mon, 27 Sep 2021 09:54:39 -0400 Received: from mout02.posteo.de ([185.67.36.66]:39021) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUr5W-0003zG-07 for 50847@debbugs.gnu.org; Mon, 27 Sep 2021 09:54:34 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 405FD240101 for <50847@debbugs.gnu.org>; Mon, 27 Sep 2021 15:54:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.org; s=2017; t=1632750868; bh=IpVxA8SOkwYjg8wgbGXANyq9wNymSgbUFizc9HlqKzA=; h=From:To:Subject:Date:From; b=YRqGnPRcBBhHQ7yiGuXGWQDgJErl+gcBmts2PUIGcGUCRtExEytuYQ6l8l7XXW/C/ tgPnKLYRBQQ8QUz0Y51EVeo7lH0ZAZSUcddd5w2MoQRkdXbHtVtWqdBcXHBSHmsMSc NAW1vSMAFO7LZmDIVwH/CNn8trDrCJgqoPdlk2c39+dTs1MP9nLmwfs9m1GWegaDHj HVf9pX7uVaENjEnc9N39E93gHW/AZdPbEfB2NhS66NGQI8+F5zRgjhuNqeqY4VqdRd 8fHoAdShNMzEPe5Gm8bId7MZpTOzibsNPkosfOJDVNUsvNm1aTWG1LMdwK/CKvFMkU /lFgWCLhbDRxw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HJ3z73PJZz6tnK for <50847@debbugs.gnu.org>; Mon, 27 Sep 2021 15:54:27 +0200 (CEST) From: Alexandr Vityazev Date: Mon, 27 Sep 2021 13:54:33 +0000 Message-ID: <87v92mruna.fsf@posteo.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (iodash): New variable. --- gnu/packages/cpp.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 4af71ba93a..e3b73b1612 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Milkey Mouse ;;; Copyright © 2021 Raghav Gururajan +;;; Copyright © 2021 Alexandr Vityazev ;;; ;;; This file is part of GNU Guix. ;;; @@ -956,6 +957,49 @@ provides a number of utilities to make coding with expected cleaner.") (home-page "https://tl.tartanllama.xyz/") (license license:cc0))) +(define-public iodash + ;; there is no cpp_modules in the release version + (let ((commit "acefbb532c48108a29beb3633d4ea0c0dffb0a7b") + (revision "0") + ;; ydotool requires this version + (version "0.1.0")) + (package + (name "iodash") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/YukiWorkshop/IODash") + (commit commit) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1syfzi4g79pxj6zxajh800j8zsi3nqj5q49swykc6mn2143nkh05")))) + (build-system cmake-build-system) + (arguments + ;; No tests + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (inc (string-append out "/include")) + (lib (string-append out "/lib"))) + (install-file "libIODash.a" lib) + (with-directory-excursion "../source" + (install-file "IODash.hpp" inc) + (install-file + "cpp_modules/portable-endian/portable-endian.h" inc) + (copy-recursively "IODash" + (string-append inc "/IODash"))))))))) + (home-page "https://github.com/YukiWorkshop/IODash") + (synopsis "Lightweight C++ I/O library for POSIX operation systems") + (description "@code{IODash} is a C++ library for POSIX operation systems.") + (license license:expat)))) + (define-public magic-enum (package (name "magic-enum") From patchwork Mon Sep 27 13:54:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Vityazev X-Patchwork-Id: 33357 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F1B4927BBE3; Mon, 27 Sep 2021 14:55:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 988AB27BBE1 for ; Mon, 27 Sep 2021 14:55:33 +0100 (BST) Received: from localhost ([::1]:34528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUr6S-0005co-JB for patchwork@mira.cbaines.net; Mon, 27 Sep 2021 09:55:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUr5z-0005bE-Nz for guix-patches@gnu.org; Mon, 27 Sep 2021 09:55:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56848) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mUr5z-0001vc-7G for guix-patches@gnu.org; Mon, 27 Sep 2021 09:55:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mUr5z-00041G-6E for guix-patches@gnu.org; Mon, 27 Sep 2021 09:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50847] [PATCH 2/5] gnu: Add libuinputplus. References: <87wnn2ruq9.fsf@posteo.org> In-Reply-To: <87wnn2ruq9.fsf@posteo.org> Resent-From: Alexandr Vityazev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Sep 2021 13:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50847 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50847@debbugs.gnu.org Received: via spool by 50847-submit@debbugs.gnu.org id=B50847.163275089415388 (code B ref 50847); Mon, 27 Sep 2021 13:55:03 +0000 Received: (at 50847) by debbugs.gnu.org; 27 Sep 2021 13:54:54 +0000 Received: from localhost ([127.0.0.1]:40137 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUr5q-000408-2S for submit@debbugs.gnu.org; Mon, 27 Sep 2021 09:54:54 -0400 Received: from mout01.posteo.de ([185.67.36.65]:33355) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUr5n-0003zt-E6 for 50847@debbugs.gnu.org; Mon, 27 Sep 2021 09:54:51 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 524C9240026 for <50847@debbugs.gnu.org>; Mon, 27 Sep 2021 15:54:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.org; s=2017; t=1632750885; bh=7ffKQlOa9w8TrrXA5gB/cyKILlwNVbigMwDkpvnrMn0=; h=From:To:Subject:Date:From; b=RiWCUddie3GvZYIUPJhIp4HlXziWy0RDSS2AaqjLQVhhVufjtuFcBlVZwp7IEASwf rTWXlGDHDjaxU94X0WoulmwhI37Kmbg21eYrV9gGrsfqBhWpW5m6HxOEwlaJ7Zf/9W afXhnidt/rCQb2Je1NiE2n1+DaB0KNZ5/flXK1kB4qpR7jgXHHzcj4H7oT22VAvrZy Q9RmA4l89VpbJWMb6JtKgo/4IkXeBf0P/vXbNZEucnrrxSbJumHPtk7jL8xJ5XD0iD jjJf6BKSCN2++8w+Ufq2ZKYCULtEpwqhVExzK5rf/CtlN3zKOMgFYIzqYpX9EbwzBc Cj99Dxoa0zeCw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HJ3zS2tQDz6tmh for <50847@debbugs.gnu.org>; Mon, 27 Sep 2021 15:54:44 +0200 (CEST) From: Alexandr Vityazev Date: Mon, 27 Sep 2021 13:54:50 +0000 Message-ID: <87tui6rumt.fsf@posteo.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (libuinputplus): New variable. --- gnu/packages/cpp.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index e3b73b1612..26f933996c 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1000,6 +1000,43 @@ provides a number of utilities to make coding with expected cleaner.") (description "@code{IODash} is a C++ library for POSIX operation systems.") (license license:expat)))) +(define-public libuinputplus + (package + (name "libuinputplus") + (version "0.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/YukiWorkshop/libuInputPlus") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0sind2ghhy4h9kfkr5hsmhcq0di4ifwqyv4gac96rgj5mwvs33lp")))) + (build-system cmake-build-system) + (arguments + ;; No tests + `(#:tests? #f + #:phases + (modify-phases %standard-phases + ;; No rule to make target 'install' in version 0.2.1 + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (inc (string-append out "/include")) + (lib (string-append out "/lib"))) + (install-file "libuInputPlus.a" lib) + (with-directory-excursion "../source" + (install-file "CommonIncludes.hpp" inc) + (install-file "uInput.hpp" inc) + (install-file "uInputSetup.hpp" inc)))))))) + (home-page "https://github.com/YukiWorkshop/libuInputPlus") + (synopsis "C++ library for the Linux uinput interface") + (description "@code{libuInputPlus} is a C++ library for the Linux +uinput interface.") + (license license:expat))) + (define-public magic-enum (package (name "magic-enum") From patchwork Mon Sep 27 13:55:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Vityazev X-Patchwork-Id: 33360 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 30CCE27BBE3; Mon, 27 Sep 2021 15:08:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E6D8427BBE1 for ; Mon, 27 Sep 2021 15:08:16 +0100 (BST) Received: from localhost ([::1]:58122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUrIl-00053N-Vg for patchwork@mira.cbaines.net; Mon, 27 Sep 2021 10:08:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUr6v-0006by-Te for guix-patches@gnu.org; Mon, 27 Sep 2021 09:56:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58840) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mUr6v-0002gS-LY for guix-patches@gnu.org; Mon, 27 Sep 2021 09:56:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mUr6v-0004Yh-KO for guix-patches@gnu.org; Mon, 27 Sep 2021 09:56:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50847] [PATCH 3/5] gnu: Add libevdevplus. References: <87wnn2ruq9.fsf@posteo.org> In-Reply-To: <87wnn2ruq9.fsf@posteo.org> Resent-From: Alexandr Vityazev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Sep 2021 13:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50847 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50847@debbugs.gnu.org Received: via spool by 50847-submit@debbugs.gnu.org id=B50847.163275091315631 (code B ref 50847); Mon, 27 Sep 2021 13:56:01 +0000 Received: (at 50847) by debbugs.gnu.org; 27 Sep 2021 13:55:13 +0000 Received: from localhost ([127.0.0.1]:40257 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUr66-00043D-As for submit@debbugs.gnu.org; Mon, 27 Sep 2021 09:55:13 -0400 Received: from mout01.posteo.de ([185.67.36.65]:48117) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUr65-00041X-AG for 50847@debbugs.gnu.org; Mon, 27 Sep 2021 09:55:09 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id A75C924002B for <50847@debbugs.gnu.org>; Mon, 27 Sep 2021 15:55:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.org; s=2017; t=1632750903; bh=zJgoQKv2H23nMeUuYOsJ0C1zme1PLVmPjAUoDW9dE9Y=; h=From:To:Subject:Date:From; b=Q3ByP1zzdyG0Y8+si+x4LQ/fDPyPSC020WCeQb8NSIUM6Q7EGZ3OJ6YgjmJtYRn0x ugSCBEen4wQ5/NlJ0gydRx/EZiMlEAMo78oR54gSW3SnoYjBIzmudWkhslQF2CMoGe 5I4PQvuTwfbTY3oXyI+kN+ogatz453PZKTrXMGIhxqAnkrblDF0vkrLf+nbpUDxsmb HU5DvjKX+h0l5VNwDqf8ISvGVFtMulhGpDZgs289Y0nSydJJsxKDlBhaxwCw46PMVx pjtejJM4bg86cdJeDGk0E1vPrdyjtRL2PMfXSm7kHkLV7MkQxK5EMc2zshiiM4vMZ8 0RcFSpPS1p7JA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HJ3zq0g0Sz9rxM for <50847@debbugs.gnu.org>; Mon, 27 Sep 2021 15:55:02 +0200 (CEST) From: Alexandr Vityazev Date: Mon, 27 Sep 2021 13:55:09 +0000 Message-ID: <87sfxqruma.fsf@posteo.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (libevdevplus): New variable. --- gnu/packages/cpp.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 26f933996c..cf063fc921 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1037,6 +1037,42 @@ provides a number of utilities to make coding with expected cleaner.") uinput interface.") (license license:expat))) +(define-public libevdevplus + (package + (name "libevdevplus") + (version "0.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/YukiWorkshop/libevdevPlus") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09y65s16gch0w7fy1s9yjk9gz3bjzxix36h5wmwww6lkj2i1z3rj")))) + (build-system cmake-build-system) + (arguments + ;; No tests + `(#:tests? #f + #:phases + (modify-phases %standard-phases + ;; No rule to make target 'install' in version 0.2.1 + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (inc (string-append out "/include")) + (lib (string-append out "/lib"))) + (install-file "libevdevPlus.a" lib) + (with-directory-excursion "../source" + (install-file "CommonIncludes.hpp" inc) + (install-file "evdevPlus.hpp" inc) + (install-file "InputEvent.hpp" inc)))))))) + (home-page "https://github.com/YukiWorkshop/libevdevPlus") + (synopsis "Easy-to-use event device library in C++") + (description "@code{libevdevPlus} is a C++ event device library.") + (license license:expat))) + (define-public magic-enum (package (name "magic-enum") From patchwork Mon Sep 27 13:56:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Vityazev X-Patchwork-Id: 33358 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0624B27BBE3; Mon, 27 Sep 2021 14:57:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 952E027BBE1 for ; Mon, 27 Sep 2021 14:57:37 +0100 (BST) Received: from localhost ([::1]:37948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUr8S-000841-Gj for patchwork@mira.cbaines.net; Mon, 27 Sep 2021 09:57:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUr7u-0007zz-82 for guix-patches@gnu.org; Mon, 27 Sep 2021 09:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58845) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mUr7t-0003U3-W1 for guix-patches@gnu.org; Mon, 27 Sep 2021 09:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mUr7t-0004ac-Ua for guix-patches@gnu.org; Mon, 27 Sep 2021 09:57:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50847] [PATCH 4/5] gnu: Add cxxopts-next. References: <87wnn2ruq9.fsf@posteo.org> In-Reply-To: <87wnn2ruq9.fsf@posteo.org> Resent-From: Alexandr Vityazev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Sep 2021 13:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50847 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50847@debbugs.gnu.org Received: via spool by 50847-submit@debbugs.gnu.org id=B50847.163275098317582 (code B ref 50847); Mon, 27 Sep 2021 13:57:01 +0000 Received: (at 50847) by debbugs.gnu.org; 27 Sep 2021 13:56:23 +0000 Received: from localhost ([127.0.0.1]:42157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUr7H-0004ZW-Ll for submit@debbugs.gnu.org; Mon, 27 Sep 2021 09:56:23 -0400 Received: from mout01.posteo.de ([185.67.36.65]:39489) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUr7F-0004ZE-Ru for 50847@debbugs.gnu.org; Mon, 27 Sep 2021 09:56:22 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 3653024002A for <50847@debbugs.gnu.org>; Mon, 27 Sep 2021 15:56:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.org; s=2017; t=1632750976; bh=3uFPKiElpjcXLdDcV1NAzZ8S6exq0RYr9iaicJIQAB8=; h=From:To:Subject:Date:From; b=hfEZKvGyiCpKpN+C+4rVUBa3sN1F5ORwFdvfYtQxw++QplCnxdgEy/r/HRspYIoLD ryDfC4/EOfkARpAvs9kUmdUyEBu4ijWUyVj62Q1Mk/FTNJYDeUrMjn+uMk0AYesHRR xSY6cPjoqtA+fr94RVqWnqv3fqKfyHrjkBtfIf++iSYmaPxR4O15hSCUK68dEwiSyl MyjS0Jl/QcQPDxE8CFDVJFKzM3ryXGIEdQAtBIlYiWC9SMlvEAs+haPCWpt2sepAcY Jn3MssGAUj8xOR4f0Fv5gA+xz/wcRnhVITdddJte2QQS4jJkq7jJJQUGQJvtv5M7u4 UWCUURN4uzDHw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HJ41C4vTrz9rxN for <50847@debbugs.gnu.org>; Mon, 27 Sep 2021 15:56:15 +0200 (CEST) From: Alexandr Vityazev Date: Mon, 27 Sep 2021 13:56:21 +0000 Message-ID: <87r1daruka.fsf@posteo.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (cxxopts-next): New variable. --- gnu/packages/cpp.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index cf063fc921..30a5bb4d12 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -834,6 +834,25 @@ standard GNU style syntax for options.") (home-page "https://github.com/jarro2783/cxxopts/wiki") (license license:expat))) +(define-public cxxopts-next + ;; No release version 3.0.0 cxxopts required by ydotool, + ;; include breaking changes. + (let ((commit "2d8e17c4f88efce80e274cb03eeb902e055a91d3") + (revision "0") + (version "3.0.0")) + (package/inherit cxxopts + (name "cxxopts-next") + (version (git-version version revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jarro2783/cxxopts") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pwrac81zfqjs17g3hx8r3ds2xf04npb6mz111qjy4bx17314ib7"))))))) + (define-public folly (package (name "folly") From patchwork Mon Sep 27 13:57:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aleksandr Vityazev X-Patchwork-Id: 33361 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 93CC027BBE3; Mon, 27 Sep 2021 15:11:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D4B9F27BBE1 for ; Mon, 27 Sep 2021 15:11:13 +0100 (BST) Received: from localhost ([::1]:36570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUrLb-0001B6-RD for patchwork@mira.cbaines.net; Mon, 27 Sep 2021 10:11:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55420) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUr8s-0000tX-IZ for guix-patches@gnu.org; Mon, 27 Sep 2021 09:58:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58848) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mUr8s-00047j-B6 for guix-patches@gnu.org; Mon, 27 Sep 2021 09:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mUr8s-0004cq-AQ for guix-patches@gnu.org; Mon, 27 Sep 2021 09:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50847] [PATCH 5/5] gnu: Add ydotool. References: <87wnn2ruq9.fsf@posteo.org> In-Reply-To: <87wnn2ruq9.fsf@posteo.org> Resent-From: Alexandr Vityazev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Sep 2021 13:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50847 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50847@debbugs.gnu.org Received: via spool by 50847-submit@debbugs.gnu.org id=B50847.163275103017684 (code B ref 50847); Mon, 27 Sep 2021 13:58:02 +0000 Received: (at 50847) by debbugs.gnu.org; 27 Sep 2021 13:57:10 +0000 Received: from localhost ([127.0.0.1]:42161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUr7v-0004az-UB for submit@debbugs.gnu.org; Mon, 27 Sep 2021 09:57:10 -0400 Received: from mout02.posteo.de ([185.67.36.66]:38629) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUr7t-0004aM-4s for 50847@debbugs.gnu.org; Mon, 27 Sep 2021 09:57:02 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 64890240103 for <50847@debbugs.gnu.org>; Mon, 27 Sep 2021 15:56:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.org; s=2017; t=1632751015; bh=RV0Uoeetz87i9GZvGiiuQGn/BK+0rX4uXGS8GjIZypI=; h=From:To:Subject:Date:From; b=VqLJiQUrhXjSxoyKPrBssd0NjezRIqmkGbOZq/tSXlB9TpzW5olRIuoY5tp4FJI84 cHxM9UzX+sYv6/rcwD0EdE3h1LA+1vJF+SVOzX6G4+q7klKAfF190347UkINev5Mu3 56uqMszni+nUsrbpF/0u2DOqeaZljV4a3fQxIEkRrftpWZmQB3FlYHiaWFJBKI21nx oI6TbIsOaomJYpke49qwIkYvCr3TO6puNyMAgl/VqsnGAcmXUKu4dK3QV/wtARW8GS FpdsXp+m3AHWSVAGzVbm7F11NnoGZGdX5Pl2yBxGsS/rFH8JW2gRvv6gqIpHs/SUSj NwznvHeH/qjHQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HJ41y5gWhz6tm9 for <50847@debbugs.gnu.org>; Mon, 27 Sep 2021 15:56:54 +0200 (CEST) From: Alexandr Vityazev Date: Mon, 27 Sep 2021 13:57:01 +0000 Message-ID: <87pmsuruj6.fsf@posteo.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (ydotool): New variable. * gnu/packages/patches/ydotool-cmakelists-remove-cpm.patch: NEW FILE. * gnu/local.mk: Add ydotool-cmakelists-remove-cpm.patch to dist_patch_DATA. --- gnu/local.mk | 2 + gnu/packages/linux.scm | 36 ++++++ .../ydotool-cmakelists-remove-cpm.patch | 118 ++++++++++++++++++ 3 files changed, 156 insertions(+) create mode 100644 gnu/packages/patches/ydotool-cmakelists-remove-cpm.patch diff --git a/gnu/local.mk b/gnu/local.mk index b8ae060326..9efe2d18e9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -44,6 +44,7 @@ # Copyright © 2021 Arun Isaac # Copyright © 2021 Sharlatan Hellseher # Copyright © 2021 Dmitry Polyakov +# Copyright © 2021 Alexandr Vityazev # # This file is part of GNU Guix. # @@ -1902,6 +1903,7 @@ dist_patch_DATA = \ %D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \ %D%/packages/patches/xsane-support-ipv6.patch \ %D%/packages/patches/xsane-tighten-default-umask.patch \ + %D%/packages/patches/ydotool-cmakelists-remove-cpm.patch \ %D%/packages/patches/yggdrasil-extra-config.patch \ %D%/packages/patches/ytfzf-programs.patch \ %D%/packages/patches/ytfzf-updates.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 41b6dfd022..e260c1ee4c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -52,6 +52,7 @@ ;;; Copyright © 2020 pukkamustard ;;; Copyright © 2021 B. Wilson ;;; Copyright © 2021 Ivan Gankevich +;;; Copyright © 2021 Alexandr Vityazev ;;; ;;; This file is part of GNU Guix. ;;; @@ -145,6 +146,7 @@ #:use-module (gnu packages rsync) #:use-module (gnu packages selinux) #:use-module (gnu packages swig) + #:use-module (gnu packages cpp) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system go) @@ -8524,6 +8526,40 @@ These trace events are logged in @file{/sys/kernel/debug/tracing} and reported through standard log mechanisms like syslog.") (license license:gpl2))) +(define-public ydotool + (package + (name "ydotool") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ReimuNotMoe/ydotool") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17mgg9cqw4wjkmp9k6c8kgm7v2bvri5y49giqkbs6l2hv6ap5m9a")) + (patches (search-patches "ydotool-cmakelists-remove-cpm.patch")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;No tests + #:configure-flags + (let* ((out (assoc-ref %outputs "out"))) + (list (string-append "-DCMAKE_INSTALL_MANDIR=" out "/share/man") + (string-append "-DCMAKE_INSTALL_SYSCONFDIR=" out "/etc"))))) + (inputs + `(("libuinputplus" ,libuinputplus) + ("libevdevplus" ,libevdevplus) + ("cxxopts" ,cxxopts-next) + ("iodash" ,iodash) + ("scdoc" ,scdoc))) + (home-page "https://github.com/ReimuNotMoe/ydotool") + (synopsis "Generic Linux command-line automation tool (no X!)") + (description "@code{ydotool} is a Linux command-line tool that simulates +keyboard input, mouse actions, etc. programmatically or manually.") + (license license:agpl3+))) + (define-public libgpiod (package (name "libgpiod") diff --git a/gnu/packages/patches/ydotool-cmakelists-remove-cpm.patch b/gnu/packages/patches/ydotool-cmakelists-remove-cpm.patch new file mode 100644 index 0000000000..42ee38fd94 --- /dev/null +++ b/gnu/packages/patches/ydotool-cmakelists-remove-cpm.patch @@ -0,0 +1,118 @@ +From f68869deba8b71ff77cc0a2acd22eb449a61f7e9 Mon Sep 17 00:00:00 2001 +From: Alexandr Vityazev +Date: Sat, 25 Sep 2021 23:15:15 +0300 +Subject: [PATCH] CMakeLists: remove CPM. + +- CMakeLists: remove CPM, remove linking cxxopts - header-only library, +- add targets to install binaries; +- ADD: Daemon/80-uinput.rules, Daemon/CMakeLists, manpage/CMakeLists. + +--- + CMakeLists.txt | 48 ++++++------------------------------------ + Daemon/80-uinput.rules | 1 + + Daemon/CMakeLists.txt | 1 + + manpage/CMakeLists.txt | 9 ++++++++ + 4 files changed, 17 insertions(+), 42 deletions(-) + create mode 100644 Daemon/80-uinput.rules + create mode 100644 Daemon/CMakeLists.txt + create mode 100644 manpage/CMakeLists.txt + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3dd15bf..8a882c5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,41 +3,6 @@ project(ydotool) + + set(CMAKE_CXX_STANDARD 17) + +-set(CPM_DOWNLOAD_VERSION 0.27.5) +-set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake") +- +-if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION})) +- message(STATUS "Downloading CPM.cmake") +- file(DOWNLOAD https://github.com/TheLartians/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake ${CPM_DOWNLOAD_LOCATION}) +-endif() +- +-include(${CPM_DOWNLOAD_LOCATION}) +- +-CPMAddPackage( +- NAME IODash +- GITHUB_REPOSITORY YukiWorkshop/IODash +- VERSION 0.1.0 +-) +- +-CPMAddPackage( +- NAME libevdevPlus +- GITHUB_REPOSITORY YukiWorkshop/libevdevPlus +- VERSION 0.2.1 +-) +- +-CPMAddPackage( +- NAME libuInputPlus +- GITHUB_REPOSITORY YukiWorkshop/libuInputPlus +- VERSION 0.2.1 +-) +- +-CPMAddPackage( +- NAME cxxopts +- GITHUB_REPOSITORY jarro2783/cxxopts +- VERSION 3.0.0 +- GIT_TAG 2d8e17c4f88efce80e274cb03eeb902e055a91d3 +-) +- + set(SOURCE_FILES_LIBRARY + CommonIncludes.hpp + Library/Tool.hpp Library/Tool.cpp +@@ -59,15 +24,14 @@ set(SOURCE_FILES_CLIENT + CommonIncludes.hpp + Client/ydotool.cpp Client/ydotool.hpp) + +-include_directories(${libevdevPlus_SOURCE_DIR}) +-include_directories(${libuInputPlus_SOURCE_DIR}) +-include_directories(${IODash_SOURCE_DIR}) +-include_directories(${IODash_SOURCE_DIR}/cpp_modules/portable-endian) # FIXME +-include_directories(${cxxopts_SOURCE_DIR}/include) +- + add_executable(ydotoold ${SOURCE_FILES_DAEMON}) +-target_link_libraries(ydotoold PUBLIC cxxopts uInputPlus evdevPlus) ++target_link_libraries(ydotoold PUBLIC uInputPlus evdevPlus) ++install(TARGETS ydotoold DESTINATION ${CMAKE_INSTALL_BINDIR}) + + add_library(ydotool_library STATIC ${SOURCE_FILES_LIBRARY}) + add_executable(ydotool ${SOURCE_FILES_CLIENT}) + target_link_libraries(ydotool ydotool_library dl pthread uInputPlus evdevPlus) ++install(TARGETS ydotool DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ ++add_subdirectory(manpage) ++add_subdirectory(Daemon) +diff --git a/Daemon/80-uinput.rules b/Daemon/80-uinput.rules +new file mode 100644 +index 0000000..fad61d4 +--- /dev/null ++++ b/Daemon/80-uinput.rules +@@ -0,0 +1 @@ ++KERNEL=="uinput", GROUP="input", MODE="0660", OPTIONS+="static_node=uinput" +diff --git a/Daemon/CMakeLists.txt b/Daemon/CMakeLists.txt +new file mode 100644 +index 0000000..0f478f8 +--- /dev/null ++++ b/Daemon/CMakeLists.txt +@@ -0,0 +1 @@ ++install(FILES 80-uinput.rules DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d/) +diff --git a/manpage/CMakeLists.txt b/manpage/CMakeLists.txt +new file mode 100644 +index 0000000..c749dfc +--- /dev/null ++++ b/manpage/CMakeLists.txt +@@ -0,0 +1,9 @@ ++function(man_page section page) ++ set(src "${CMAKE_CURRENT_SOURCE_DIR}/${page}.${section}.scd") ++ set(bin "${CMAKE_CURRENT_BINARY_DIR}/${page}.${section}") ++ add_custom_target(${page}.${section} ALL COMMAND scdoc < ${src} > ${bin}) ++ install(FILES ${bin} DESTINATION ${CMAKE_INSTALL_MANDIR}/man${section}/) ++endfunction(man_page) ++ ++man_page(1 ydotool) ++man_page(8 ydotoold) +-- +2.33.0