[PATCH] Minor fixes to interception-tools and update dual-function-keys.

DoneSubmitted by Paul A. Patience.
Details
3 participants
  • Ludovic Courtès
  • Maxime Devos
  • Paul A. Patience
Owner
unassigned
Severity
normal
P
P
Paul A. Patience wrote on 11 Jul 06:31 +0200
(name . guix-patches@gnu.org)(address . guix-patches@gnu.org)
NEIrg3jAQLk3rSccOnD0bUTFfuykBE5q-8fJunGFpO6gVZvgUk83mlAv9XWqbcG2n1XPQvGFVAI230sGJNNou14ZiV1XHoHz9aN_a9WO7R4=@apatience.com
Empty Message
From 34e0d095c51cb37a10b338586446c48eec9c7bca Mon Sep 17 00:00:00 2001From: "Paul A. Patience" <paul@apatience.com>Date: Sun, 11 Jul 2021 00:08:39 -0400Subject: [PATCH 1/3] gnu: interception-tools: Make minor fixes.
* gnu/packages/linux.scm (interception-tools)[inputs]: Move boost to...[native-inputs]: ...here. New field.[license]: gpl3+ -> gpl3.--- gnu/packages/linux.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
Toggle diff (31 lines)diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scmindex fa9451aedc..817df615b1 100644--- a/gnu/packages/linux.scm+++ b/gnu/packages/linux.scm@@ -3686,9 +3686,10 @@ devices that can inject events directly into the input subsystem.") (base32 "0k9h14a9d65nwvv7pj0kigjgzfv453mm3r4svnxfg1h5lccmy8jj")))) (build-system cmake-build-system)+ (native-inputs+ `(("boost" ,boost))) (inputs- `(("boost" ,boost)- ("libevdev" ,libevdev)+ `(("libevdev" ,libevdev) ("libudev" ,eudev) ("yaml-cpp" ,yaml-cpp))) (arguments@@ -3714,9 +3715,9 @@ devices that can inject events directly into the input subsystem.") @item @command{uinput} --- redirect device input events from stding to virtual device @item @command{mux} --- mux streams of input events @end itemize")- ;; Dual-licensed under GPLv3+ or "something else" on request, per+ ;; Dual-licensed under GPLv3 or "something else" on request, per ;; 'README.md'.- (license license:gpl3+)))+ (license license:gpl3))) (define-public interception-dual-function-keys (package-- 2.32.0
From c324fef966098f885454f5afb0687db137d4c7d0 Mon Sep 17 00:00:00 2001From: "Paul A. Patience" <paul@apatience.com>Date: Sun, 11 Jul 2021 00:22:46 -0400Subject: [PATCH 3/3] gnu: interception-dual-function-keys: Update to 1.4.0.
* gnu/packages/linux.scm (interception-dual-function-keys)[version]: Update to 1.4.0.--- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Toggle diff (24 lines)diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scmindex 8fa723bc1a..6452da9f7b 100644--- a/gnu/packages/linux.scm+++ b/gnu/packages/linux.scm@@ -3722,7 +3722,7 @@ devices that can inject events directly into the input subsystem.") (define-public interception-dual-function-keys (package (name "interception-dual-function-keys")- (version "1.3.0")+ (version "1.4.0") (home-page "https://gitlab.com/interception/linux/plugins/dual-function-keys") (source (origin (method git-fetch)@@ -3732,7 +3732,7 @@ devices that can inject events directly into the input subsystem.") (file-name (git-file-name name version)) (sha256 (base32- "1gvhkmwzl5fyyc7k8rc4rf2b9mzh05wa8wcybf9hz2x1mqkc7lmz"))))+ "0s49vbg3j4rwh78i8rx8qr7myql09p7b3lhrjl0p7dd98xp6ann6")))) (build-system gnu-build-system) (inputs `(("libevdev" ,libevdev)-- 2.32.0
From 83c06ca8d7b52c7dc7c38ed2c476ff39047f5cd2 Mon Sep 17 00:00:00 2001From: "Paul A. Patience" <paul@apatience.com>Date: Sun, 11 Jul 2021 00:19:56 -0400Subject: [PATCH 2/3] gnu: interception-dual-function-keys: Minor fixes.
* gnu/packages/linux.scm (interception-dual-function-keys)[arguments]<#:make-flags>: Make use of cc-for-target, cxx-for-target and%output.<#:phases>{check}: Undelete phase. Disable tests instead with...<#:tests?>: ...this. New field.--- gnu/packages/linux.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
Toggle diff (31 lines)diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scmindex 817df615b1..8fa723bc1a 100644--- a/gnu/packages/linux.scm+++ b/gnu/packages/linux.scm@@ -3738,8 +3738,9 @@ devices that can inject events directly into the input subsystem.") `(("libevdev" ,libevdev) ("yaml-cpp" ,yaml-cpp))) (arguments- `(#:make-flags (list "CC=gcc" "CXX=g++"- (string-append "PREFIX=" (assoc-ref %outputs "out")))+ `(#:make-flags (list ,(string-append "CC=" (cc-for-target))+ ,(string-append "CXX=" (cxx-for-target))+ (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-libevdev-path@@ -3750,9 +3751,9 @@ devices that can inject events directly into the input subsystem.") (string-append libevdev "/include/libevdev-1.0"))) #t))) ;; No configure script- (delete 'configure)- ;; No target 'check'- (delete 'check))))+ (delete 'configure))+ ;; No tests are included.+ #:tests? #f)) (synopsis "Tap for one key, hold for another") (description "Dual Function Keys is a plugin for @code{interception-tools} that allows-- 2.32.0
L
L
Ludovic Courtès wrote on 26 Jul 19:36 +0200
(name . Paul A. Patience)(address . paul@apatience.com)(address . 49520@debbugs.gnu.org)
87y29t6kqk.fsf@gnu.org
Hi,
"Paul A. Patience" <paul@apatience.com> skribis:
Toggle quote (10 lines)> From 34e0d095c51cb37a10b338586446c48eec9c7bca Mon Sep 17 00:00:00 2001> From: "Paul A. Patience" <paul@apatience.com>> Date: Sun, 11 Jul 2021 00:08:39 -0400> Subject: [PATCH 1/3] gnu: interception-tools: Make minor fixes.>> * gnu/packages/linux.scm (interception-tools)[inputs]: Move boost to...> [native-inputs]: ...here. New field.> [license]: gpl3+ -> gpl3.

[...]
Toggle quote (7 lines)> + (native-inputs> + `(("boost" ,boost)))> (inputs> - `(("boost" ,boost)> - ("libevdev" ,libevdev)> + `(("libevdev" ,libevdev)
I believe Boost should remain in ‘inputs’ or it would not be found whencross-compiling.
Toggle quote (6 lines)> - ;; Dual-licensed under GPLv3+ or "something else" on request, per> + ;; Dual-licensed under GPLv3 or "something else" on request, per> ;; 'README.md'.> - (license license:gpl3+)))> + (license license:gpl3)))
AFAICS, nothing in the source says “version 3 only”, so ‘gpl3+’ is correct.
It seems to me this patch can be dropped. WDYT?
Toggle quote (8 lines)> From c324fef966098f885454f5afb0687db137d4c7d0 Mon Sep 17 00:00:00 2001> From: "Paul A. Patience" <paul@apatience.com>> Date: Sun, 11 Jul 2021 00:22:46 -0400> Subject: [PATCH 3/3] gnu: interception-dual-function-keys: Update to 1.4.0.> > * gnu/packages/linux.scm (interception-dual-function-keys)> [version]: Update to 1.4.0.
Applied.
Toggle quote (11 lines)> From 83c06ca8d7b52c7dc7c38ed2c476ff39047f5cd2 Mon Sep 17 00:00:00 2001> From: "Paul A. Patience" <paul@apatience.com>> Date: Sun, 11 Jul 2021 00:19:56 -0400> Subject: [PATCH 2/3] gnu: interception-dual-function-keys: Minor fixes.>> * gnu/packages/linux.scm (interception-dual-function-keys)> [arguments]<#:make-flags>: Make use of cc-for-target, cxx-for-target and> %output.> <#:phases>{check}: Undelete phase. Disable tests instead with...> <#:tests?>: ...this. New field.
Applied, thanks!
Ludo’.
M
M
Maxime Devos wrote on 26 Jul 20:06 +0200
Re: [bug#49520] [PATCH] Minor fixes to interception-tools and update dual-function-keys.
(address . 49520@debbugs.gnu.org)
668d75baa21e97dd2c8ae6d6fcac6e1bf7d651f8.camel@telenet.be
Ludovic Courtès schreef op ma 26-07-2021 om 19:36 [+0200]:
Toggle quote (33 lines)> Hi,> > "Paul A. Patience" <paul@apatience.com> skribis:> > > From 34e0d095c51cb37a10b338586446c48eec9c7bca Mon Sep 17 00:00:00 2001> > From: "Paul A. Patience" <paul@apatience.com>> > Date: Sun, 11 Jul 2021 00:08:39 -0400> > Subject: [PATCH 1/3] gnu: interception-tools: Make minor fixes.> > > > * gnu/packages/linux.scm (interception-tools)[inputs]: Move boost to...> > [native-inputs]: ...here. New field.> > [license]: gpl3+ -> gpl3.> > [...]> > > + (native-inputs> > + `(("boost" ,boost)))> > (inputs> > - `(("boost" ,boost)> > - ("libevdev" ,libevdev)> > + `(("libevdev" ,libevdev)> > I believe Boost should remain in ‘inputs’ or it would not be found when> cross-compiling.> > > - ;; Dual-licensed under GPLv3+ or "something else" on request, per> > + ;; Dual-licensed under GPLv3 or "something else" on request, per> > ;; 'README.md'.> > - (license license:gpl3+)))> > + (license license:gpl3)))> > AFAICS, nothing in the source says “version 3 only”, so ‘gpl3+’ is correct.
Nothing in the source mentions any version number (aside the license text itself), so gpl1+ is correct according to section ‘14. Revised Versions of this License’:
[...]. If the Program does not specify a version number of theGNU General Public License, you may choose any version ever publishedby the Free Software Foundation.
This is probably not the intention of the author though,so maybe write license:gpl3+ anyway, and ‘someone’ should submit a bug report or patchupstream.
-- Actually, a version number is specified somewhere. In the README(https://gitlab.com/interception/linux/tools#license)there is a ‘GPLv3 Free Software’icon. So GPLv1 and GPLv2 are out. I'm not sure if GPLv4, GPLv5 ... are allowedin this case.
Greetings,Maxime.
-----BEGIN PGP SIGNATURE-----
iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYP75jRccbWF4aW1lZGV2b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7pDdAQCVi0P6SO5+zOhautS7P5M5gkyH3i/0PZYLWiH6mH/ZAQEAtTiuYs+Co07mBKN7cPvI73Dc5fEaHilrIELEiclwDAk==s714-----END PGP SIGNATURE-----

P
P
Paul A. Patience wrote on 27 Jul 01:58 +0200
Re: bug#49520: [PATCH] Minor fixes to interception-tools and update dual-function-keys.
(name . Ludovic Courtès)(address . ludo@gnu.org)(address . 49520@debbugs.gnu.org)
2tcEJXfUOhYrQrdLfdvoSn803OhFqSgbiJ3ovJvA2jKSv7ujztvc0KA6tDzzj0l-JT7CamNKiIo36FUjMJ9-eF2KBPvLgZrb6TrSRsbS55s=@apatience.com
On Monday, July 26th, 2021 at 13:36, Ludovic Courtès <ludo@gnu.org> wrote:
Toggle quote (11 lines)> "Paul A. Patience" <paul@apatience.com> skribis:>>> From 34e0d095c51cb37a10b338586446c48eec9c7bca Mon Sep 17 00:00:00 2001>> From: "Paul A. Patience" <paul@apatience.com>>> Date: Sun, 11 Jul 2021 00:08:39 -0400>> Subject: [PATCH 1/3] gnu: interception-tools: Make minor fixes.>>>> * gnu/packages/linux.scm (interception-tools)[inputs]: Move boost to...>> [native-inputs]: ...here. New field.>> [license]: gpl3+ -> gpl3.
<snip>
Toggle quote (2 lines)> It seems to me this patch can be dropped. WDYT?
Sounds good.
Thanks,Paul
L
L
Ludovic Courtès wrote on 27 Jul 12:05 +0200
Re: [bug#49520] [PATCH] Minor fixes to interception-tools and update dual-function-keys.
(name . Maxime Devos)(address . maximedevos@telenet.be)
8735s05axw.fsf@gnu.org
Hi Maxime,
Maxime Devos <maximedevos@telenet.be> skribis:
Toggle quote (2 lines)> Ludovic Courtès schreef op ma 26-07-2021 om 19:36 [+0200]:
[...]
Toggle quote (15 lines)>> > - ;; Dual-licensed under GPLv3+ or "something else" on request, per>> > + ;; Dual-licensed under GPLv3 or "something else" on request, per>> > ;; 'README.md'.>> > - (license license:gpl3+)))>> > + (license license:gpl3)))>> >> AFAICS, nothing in the source says “version 3 only”, so ‘gpl3+’ is correct.>> Nothing in the source mentions any version number (aside the license text > itself), so gpl1+ is correct according to section ‘14. Revised Versions of this License’:>> [...]. If the Program does not specify a version number of the> GNU General Public License, you may choose any version ever published> by the Free Software Foundation.
I agree, though the way we encode it in Guix is ‘gpl3+’.
Toggle quote (5 lines)> -- Actually, a version number is specified somewhere. In the README> (https://gitlab.com/interception/linux/tools#license) there is a ‘GPLv3 Free Software’> icon. So GPLv1 and GPLv2 are out. I'm not sure if GPLv4, GPLv5 ... are allowed> in this case.
My interpretation is that it’s “version 3 or later”.
Thanks,Ludo’.
L
L
Ludovic Courtès wrote on 27 Jul 12:14 +0200
control message for bug #49520
(address . control@debbugs.gnu.org)
87pmv43vxc.fsf@gnu.org
close 49520 quit
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send email to 49520@debbugs.gnu.org