* [bug#60827] [PATCH 2/4] gnu: Add xforms.
[not found] <20230116011120.528765-1-jakeleporte@outlook.com>
@ 2023-01-16 1:11 ` Jake Leporte
2023-01-16 1:11 ` [bug#60827] [PATCH 3/4] gnu: Add xforms-gl Jake Leporte
2023-01-16 1:11 ` [bug#60827] [PATCH 4/4] gnu: Add dozenal Jake Leporte
2 siblings, 0 replies; 3+ messages in thread
From: Jake Leporte @ 2023-01-16 1:11 UTC (permalink / raw)
To: 60827; +Cc: Jake Leporte
From: Jake Leporte <jleporte@nd.edu>
* gnu/packages/xdisorg.scm (xforms): New variable.
---
gnu/packages/xdisorg.scm | 50 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 10edfc7..df82b7b 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -113,6 +113,7 @@ (define-module (gnu packages xdisorg)
#:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
+ #:use-module (gnu packages imagemagick)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages libbsd)
#:use-module (gnu packages libevent)
@@ -127,6 +128,8 @@ (define-module (gnu packages xdisorg)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages sphinx)
+ #:use-module (gnu packages tex)
+ #:use-module (gnu packages texinfo)
#:use-module (gnu packages tcl)
#:use-module (gnu packages terminals)
#:use-module (gnu packages xml)
@@ -3319,3 +3322,50 @@ (define-public wvkbd
@end itemize")
(license (list license:expat ;3 files under Expat license (see 'LICENSE')
license:gpl3+)))) ;the rest is GPLv3+
+
+(define-public xforms
+ ;; The latest stable release fails with a linker error, so use an updated
+ ;; version
+ (let ((revision "1")
+ (commit "2c1a9f151baf50887a517280645ec23379fb96f8"))
+ (package
+ (name "xforms")
+ (version (git-version "1.2.4" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.savannah.gnu.org/git/xforms.git/")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "12qc1j5g03n2zigvbwilx2zszr8sgv5wd259js7cwf8ffw4lzjf2"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-doc-makefile
+ (lambda _
+ (substitute* "doc/Makefile.am"
+ (("/bin/mkdir")
+ "mkdir")))))
+ #:configure-flags #~(list "--enable-docs")))
+ (native-inputs (list autoconf
+ automake
+ libtool
+ texinfo
+ texi2html
+ (texlive-updmap.cfg (list texlive-epsf
+ texlive-tex-texinfo))
+ imagemagick))
+ (propagated-inputs (list libx11 libxpm libjpeg-turbo))
+ (home-page "http://xforms-toolkit.org/")
+ (synopsis "GUI toolkit for X based on the X11 Xlib library")
+ (description
+ "XForms is a graphical user interface toolkit for X based on the X11 Xlib
+library. I.e., it allows you to create windows, containing all kinds of
+widgets (buttons, sliders, browsers, menus etc.) with a few lines of code and
+then attach actions to the widgets, i.e., have some function called when a
+button is pressed. To make this even easier XForms comes with a program
+called @code{fdesign} that allows you to design a GUI for a program directly
+on the screen and which then writes out the necessary C code for it.")
+ (license license:lgpl2.1+))))
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [bug#60827] [PATCH 4/4] gnu: Add dozenal.
[not found] <20230116011120.528765-1-jakeleporte@outlook.com>
2023-01-16 1:11 ` [bug#60827] [PATCH 2/4] gnu: Add xforms Jake Leporte
2023-01-16 1:11 ` [bug#60827] [PATCH 3/4] gnu: Add xforms-gl Jake Leporte
@ 2023-01-16 1:11 ` Jake Leporte
2 siblings, 0 replies; 3+ messages in thread
From: Jake Leporte @ 2023-01-16 1:11 UTC (permalink / raw)
To: 60827; +Cc: Jake Leporte
From: Jake Leporte <jleporte@nd.edu>
* gnu/packages/maths.scm (dozenal): New variable.
---
gnu/packages/maths.scm | 103 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 103 insertions(+)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index d9bc292..d9903f6 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -103,6 +103,7 @@ (define-module (gnu packages maths)
#:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
+ #:use-module (gnu packages calendar)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
@@ -124,6 +125,7 @@ (define-module (gnu packages maths)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages glib)
#:use-module (gnu packages graphviz)
+ #:use-module (gnu packages groff)
#:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
@@ -172,6 +174,7 @@ (define-module (gnu packages maths)
#:use-module (gnu packages tls)
#:use-module (gnu packages version-control)
#:use-module (gnu packages wxwidgets)
+ #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xml)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26))
@@ -455,6 +458,106 @@ (define-public dionysus
(license license:gpl3+)
(home-page "https://www.gnu.org/software/dionysus/")))
+(define-public dozenal
+ (package
+ (name "dozenal")
+ (version "12010904-3")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/dgoodmaniii/dozenal")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1i3pkljbgacg8y3is664pwl9bj3s3qj27l5immn1c7vi8ad0zfaf"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ ;; Some test scripts are included, but no makefile-driven
+ ;; tests, and they are all quite manual to run and check
+ #:tests? #f
+ ;; Running with `make -j' causes the build to fail.
+ ;; This is likely because this project uses the
+ ;; "recursive make" structure, where each
+ ;; subdirectory contains its own make file, which is
+ ;; called by the top-level makefile.
+ #:parallel-build? #f
+ #:make-flags #~(list (string-append "prefix="
+ #$output))
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda _
+ (chdir "dozenal")))
+ (add-after 'chdir 'patch-lua-references
+ (lambda _
+ (substitute* '("dozcal/call_lua.c" "dozlua/main.c")
+ (("#include<lua5.2/")
+ "#include<"))
+ (substitute* '("dozcal/Makefile" "dozlua/Makefile")
+ (("-llua5.2")
+ "-llua"))))
+ (delete 'configure)
+ (add-before 'install 'make-bin-dir
+ (lambda _
+ (mkdir-p (string-append #$output "/bin"))))
+ (add-after 'install 'install-html-docs
+ (lambda _
+ (invoke "make"
+ (string-append "prefix="
+ #$output) "installhtml")))
+ (add-after 'install-html-docs 'post-install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (dozdc (assoc-ref outputs "dozdc"))
+ (perl-tk (assoc-ref inputs "perl-tk"))
+ (perl-par (assoc-ref inputs "perl-par")))
+ (for-each (lambda (prog)
+ (let* ((orig (string-append out
+ "/bin/"
+ prog))
+ (dst (string-append dozdc
+ "/bin/"
+ prog))
+ (perl-dir
+ "/lib/perl5/site-perl")
+ (ptk (string-append perl-tk
+ perl-dir))
+ (pp (string-append perl-par
+ perl-dir)))
+ (mkdir-p (dirname dst))
+ (copy-file orig dst)
+ (delete-file orig)
+ (wrap-program dst
+ `("PERL5LIB" prefix
+ (,ptk ,pp))
+ `("PATH" prefix
+ (,(string-append
+ dozdc "/bin"))))))
+ '("dozdc" "gdozdc")) #t))))))
+ (outputs '("out" "dozdc"))
+ (native-inputs (list groff))
+ (inputs (list bash-minimal ;since wrap-program is used
+ ncurses
+ libhdate
+ lua
+ xforms))
+ (propagated-inputs (list perl perl-tk perl-par))
+ (synopsis
+ "Suite of dozenal programs, including converters, a calculator, and date
+program")
+ (description
+ "The dozenal suite is a set of programs designed to assist with
+working in the dozenal (also called \"duodecimal\" or \"base twelve\")
+system. It includes number converters (dozenal-to-decimal and
+decimal-to-dozenal), an RPN calculator, a graphical calculator, a
+metric system converter (works with imperial, U.S. customary, SI
+metric, and the dozenal TGM), a pretty-printer for dozenal numbers, a
+date-and-time program, and a dozenal calendar programs, complete with
+events and to-dos.")
+ (home-page "https://dgoodmaniii.gitlab.io/dozenal/dozenal/index.html")
+ (license license:gpl3+)))
+
(define-public dsfmt
(package
(name "dsfmt")
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread