[bug#50805] [PATCH] gnu: Add svkbd.

[bug#50805] [PATCH] gnu: Add svkbd.

[Antero Mejr via Guix-patches via]

* gnu/packages/suckless.scm (svkbd): New variable.
---
 gnu/packages/suckless.scm | 45 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index b24eced379..dc313c10e3 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -901,3 +901,48 @@ chat output in the background.")
 Single daemon and configuration file.  Log to stdout or syslog.  No mail
 support.")
     (license license:expat)))
+
+(define-public svkbd
+  (package
+    (name "svkbd")
+    (version "0.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://dl.suckless.org/tools/svkbd-"
+                           version ".tar.gz"))
+       (sha256
+        (base32 "0pydmf7frbn8b3zr2is212npbafkyrbs8qxg2ivwjvqwzvkmdm4g"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("locales" ,glibc-utf8-locales)))
+    (inputs
+     `(("freetype" ,freetype)
+       ("libx11" ,libx11)
+       ("libxtst" ,libxtst)
+       ("libxft" ,libxft)
+       ("libxinerama" ,libxinerama)))
+    (arguments
+     `(#:tests? #f
+       #:make-flags
+       (list (string-append "CC=" ,(cc-for-target))
+             (string-append "PREFIX=" %output))
+       #:phases
+        (modify-phases %standard-phases
+         (add-after 'unpack 'patch
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (substitute* "config.mk"
+               (("/usr/local")
+                (assoc-ref outputs "out"))
+               (("/usr/X11R6")
+                (assoc-ref inputs "libx11"))
+               (("/usr/include/freetype2")
+                (string-append (assoc-ref inputs "freetype")
+                               "/include/freetype2")))))
+         (delete 'configure))))         ; no configure script
+    (home-page "https://tools.suckless.org/x/svkbd")
+    (synopsis "Virtual on-screen keyboard")
+    (description "svkbd is a simple virtual keyboard, intended to be used in
+environments, where no keyboard is available.")
+    (license license:expat)))
-- 
2.30.2

[bug#50805] logo [PATCH] gnu: Add svkbd.

[phodina via Guix-patches via]

Hi Antero,

Thanks for the patch. The lint found one issue:

gnu/packages/suckless.scm:1007:15: svkbd@0.4: permanent redirect from https://tools.suckless.org/x/svkbd to https://tools.suckless.org/x/svkbd/

Otherwise builds and works. LGTM

Could you send updated patch please?

Petr

[bug#50805] [PATCH] gnu: Add svkbd.

[Antero Mejr via Guix-patches via]

* gnu/packages/suckless.scm (svkbd): New variable.
---
Linted and updated to version 0.4.1.

 gnu/packages/suckless.scm | 46 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 708eb2c338..f75fd8054d 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
 ;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
 ;;; Copyright © 2021 Nikolay Korotkiy <sikmir@disroot.org>
+;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1083,3 +1084,48 @@ (define-public sfeed
 various other formats.  There are also some programs and scripts included to
 import and export OPML and to fetch, filter, merge and order feed items.")
     (license license:isc)))
+
+(define-public svkbd
+  (package
+    (name "svkbd")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://dl.suckless.org/tools/svkbd-"
+                           version ".tar.gz"))
+       (sha256
+        (base32 "0nhgmr38pk1a8zrcrxd1ygh0m843a3bdchkv8phl508x7vy63hpv"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("glibc-utf8-locales" ,glibc-utf8-locales)))
+    (inputs
+     `(("freetype" ,freetype)
+       ("libx11" ,libx11)
+       ("libxtst" ,libxtst)
+       ("libxft" ,libxft)
+       ("libxinerama" ,libxinerama)))
+    (arguments
+     `(#:tests? #f
+       #:make-flags
+       (list (string-append "CC=" ,(cc-for-target))
+             (string-append "PREFIX=" %output))
+       #:phases
+        (modify-phases %standard-phases
+         (add-after 'unpack 'patch
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (substitute* "config.mk"
+               (("/usr/local")
+                (assoc-ref outputs "out"))
+               (("/usr/X11R6")
+                (assoc-ref inputs "libx11"))
+               (("/usr/include/freetype2")
+                (string-append (assoc-ref inputs "freetype")
+                               "/include/freetype2")))))
+         (delete 'configure))))         ; no configure script
+    (home-page "https://tools.suckless.org/x/svkbd/")
+    (synopsis "Virtual on-screen keyboard")
+    (description "svkbd is a simple virtual keyboard, intended to be used in
+environments, where no keyboard is available.")
+    (license license:expat)))
-- 
2.32.0

[bug#50805] [PATCH] gnu: Add svkbd.

[Antero Mejr via Guix-patches via]

Updated to use the new gexps, then re-tested.

* gnu/packages/suckless.scm (svkbd): New variable.
---
 gnu/packages/suckless.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 5aa37657b9..759643a33b 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -12,6 +12,7 @@
 ;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
 ;;; Copyright © 2021 Nikolay Korotkiy <sikmir@disroot.org>
 ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
+;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1084,3 +1085,39 @@ (define-public sfeed
 various other formats.  There are also some programs and scripts included to
 import and export OPML and to fetch, filter, merge and order feed items.")
     (license license:isc)))
+
+(define-public svkbd
+  (package
+    (name "svkbd")
+    (version "0.4.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://dl.suckless.org/tools/svkbd-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "0nhgmr38pk1a8zrcrxd1ygh0m843a3bdchkv8phl508x7vy63hpv"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list #:tests? #f
+           #:make-flags
+           #~(list (string-append "CC=" #$(cc-for-target))
+                   (string-append "PREFIX=" #$output))
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'patch
+                 (lambda* (#:key inputs outputs #:allow-other-keys)
+                   (substitute* "config.mk"
+                     (("/usr/local") #$output)
+                     (("/usr/X11R6") #$libx11)
+                     (("/usr/include/freetype2") (string-append #$freetype
+                                                  "/include/freetype2")))))
+               (delete 'configure)))) ;no configure script
+    (native-inputs (list pkg-config))
+    (inputs (list freetype libx11 libxft libxtst libxinerama))
+    (propagated-inputs (list glibc-utf8-locales))
+    (home-page "https://tools.suckless.org/x/svkbd/")
+    (synopsis "Virtual on-screen keyboard")
+    (description "svkbd is a simple virtual keyboard, intended to be used in
+environments, where no keyboard is available.")
+    (license license:expat)))
-- 
2.36.1

bug#50805: [PATCH] gnu: Add svkbd.

[宋文武 via Guix-patches via]

Antero Mejr <antero@mailbox.org> writes:

> Updated to use the new gexps, then re-tested.
>
> * gnu/packages/suckless.scm (svkbd): New variable.

Pushed, thank you!