From d3e982dccbd8ec7e00a2ab3efa04bef8f1c16b9e Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 23 Oct 2022 16:25:36 -0700 Subject: gnu: Fix typos. * gnu/packages/emacs-xyz.scm (emacs-piem)[description]: Fix use of "This packages". * gnu/packages/tex.scm (texlive-hardwrap)[description]: Fix spelling of "arbitrary". * gnu/packages/cran.scm (r-shinymanager)[description]: Fix spelling of "authentication". * gnu/packages/lisp-xyz.scm (sbcl-utils-kt)[description]: Fix spelling of "developed". * gnu/packages/crates-io.scm (rust-fs-utils-1)[description]: Fix spelling of "filesystem". [synopsis]: Likewise. * gnu/packages/haxe.scm (neko)[description]: Fix spelling of "functions". * gnu/packages/animation.scm (swftools)[description]: Fix needless pluralization of "information". * gnu/packages/lisp-xyz.scm (sbcl-slot-extra-options)[description]: Fix spelling of "inheritance". * gnu/packages/emacs-xyz.scm (emacs-js-comint)[description]: Fix spelling of "interpreter". * gnu/packages/coq.scm (coq-mathcomp-finmap)[description]: Fix spelling of "library". * gnu/services/lightdm.scm (lightdm-configuration): Fix spelling of "mechanism". * gnu/packages/emacs-xyz.scm (emacs-citar-org-roam)[synopsis]: Fix spelling of "package". * gnu/packages/games.scm (freerct)[description]: Fix spelling of "responsibilities". * gnu/packages/statistics.scm (r-mixedpower)[description]: Fix spelling of "separate". * gnu/packages/accessibility.scm (espeakup)[description]: Fix spelling of "speech". * gnu/packages/bioinformatics.scm (r-skitools)[synopsis]: Fix spelling of "utilities". * gnu/packages/golang.scm (go-github-com-savsgio-gotils)[synopsis]: Fix spelling of "utilities". [description]: Likewise. * gnu/system.scm (boot-file-system-service os): Fix spelling of "utilities". --- gnu/packages/animation.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/animation.scm') diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index a1932b5f06..c029671b7e 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -559,7 +559,7 @@ stacking and changing parameters in SWFs. @item @command{swfstrings} Scans SWFs for text data. @item -@command{swfdump} Prints out various informations about SWFs. +@command{swfdump} Prints out various information about SWFs. @item @command{jpeg2swf} Takes one or more JPEG pictures and generates a SWF -- cgit 1.4.1 From ac51b9c86d58cfdb13ee643a2fdc8e979939a260 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 27 Oct 2022 14:10:27 -0700 Subject: gnu: swftools: Fix typos. * gnu/packages/animation.scm (swftools)[description]: Avoid uses of "allows to". --- gnu/packages/animation.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/animation.scm') diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index c029671b7e..9901e34b5f 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -579,14 +579,14 @@ slideshow from them. @command{font2swf} Converts font files (TTF, Type1) to SWF. @item -@command{swfbbox} Allows to read out, optimize and readjust SWF bounding boxes. +@command{swfbbox} reads out, optimizes and readjusts SWF bounding boxes. @item @command{swfc} A tool for creating SWF files from simple script files. Supports both ActionScript 2.0 aand 3.0. @item -@command{swfextract} Allows to extract Movieclips, Sounds, Images etc. from SWF +@command{swfextract} extracts Movieclips, Sounds, Images etc. from SWF files. @item -- cgit 1.4.1 From 7957fdb88c450c0802664f42d0d58b4d87de2b94 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 3 Jan 2023 23:09:51 +0100 Subject: gnu: etl: Update to 1.4.4. * gnu/packages/animation.scm (etl): Update to 1.4.4. [inputs]: Add glibmm-2.64. [native-inputs]: Add pkg-config. --- gnu/packages/animation.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu/packages/animation.scm') diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 9901e34b5f..a7f0702ac0 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2017 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2023 Ricardo Wurmus ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pkill -9 ;;; Copyright © 2020, 2021, 2022 Vinicius Monego @@ -92,7 +92,7 @@ rendering vector based animations and art in realtime.") (license license:expat))) ;; ETL, synfig, and Synfig Studio are updated in tandem. -(define synfig-version "1.2.2") +(define synfig-version "1.4.4") (define-public etl (package @@ -100,12 +100,15 @@ rendering vector based animations and art in realtime.") (version synfig-version) (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/synfig/releases/" - version "/source/ETL-" version ".tar.gz")) + (uri (string-append "https://github.com/synfig/synfig" + "/releases/download/v" version + "/ETL-" version ".tar.gz")) (sha256 (base32 - "12sd8pz8l5xcxcmapkvih3brihdhdb6xmxisr9a415lydid9rh8d")))) + "1jnahpxvrdxrll7b7av3zxabm5j3nlz6m3vg4sib2278v1wf91yc")))) (build-system gnu-build-system) + (inputs (list glibmm-2.64)) + (native-inputs (list pkg-config)) (home-page "https://www.synfig.org") (synopsis "Extended C++ template library") (description -- cgit 1.4.1 From 5c08ed09397ac01c29100c3c2a879de089f92f6f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 3 Jan 2023 23:10:57 +0100 Subject: gnu: synfig: Update to 1.4.4. * gnu/packages/animation.scm (synfig): Update to 1.4.4. [inputs]: Drop labels; remove ffmpeg. [propagated-inputs]: Drop labels; add ffmpeg-4; replace glibmm with glibmm-2.64; replace libxml++ with libxml++-2. [arguments]: Remove. --- gnu/packages/animation.scm | 83 +++++++++++++++------------------------------- 1 file changed, 26 insertions(+), 57 deletions(-) (limited to 'gnu/packages/animation.scm') diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index a7f0702ac0..e1a5ba3de1 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -123,68 +123,37 @@ C++ @dfn{Standard Template Library} (STL).") (version synfig-version) (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/synfig/releases/" - version "/source/synfig-" version - ".tar.gz")) + (uri (string-append "https://github.com/synfig/synfig" + "/releases/download/v" version + "/synfig-" version ".tar.gz")) (sha256 (base32 - "1vy27kl68sbg41sfasa58k3p2nc1xfalvzk3k9gich9h90rpnpsz")))) + "01kgfmjfjk5y0v9ldmxzc8zzvbiaakz7nzg4hkj24gj3j6h8566d")))) (build-system gnu-build-system) - (arguments - `(#:configure-flags - ;; The Boost library path is taken from the value of BOOST_LDFLAGS. - (list (string-append "BOOST_LDFLAGS=-L" - (assoc-ref %build-inputs "boost") - "/lib")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-boost-build-error - ;; A chain of Boost headers leads to this error: "make_array" is - ;; not a member of "boost::serialization". This can be avoided by - ;; loading the "array_wrapper" header first. - (lambda _ - (substitute* "src/synfig/valuenodes/valuenode_dynamic.cpp" - (("#include " match) - (string-append - "#include \n" match))) - #t)) - (add-after 'unpack 'adapt-to-libxml++-changes - (lambda _ - (substitute* "configure" - (("libxml\\+\\+-2\\.6") "libxml++-3.0")) - (substitute* (append (find-files "src/modules/" "\\.cpp$") - (find-files "src/synfig/" "\\.(cpp|h)$")) - (("add_child\\(") "add_child_element(") - (("get_child_text\\(") "get_first_child_text(") - (("set_child_text\\(") "set_first_child_text(") - (("remove_child\\(") "remove_node(")) - (substitute* "src/modules/mod_svg/svg_parser.cpp" - (("xmlpp::Node::NodeList") "xmlpp::Node::const_NodeList")) - #t))))) (inputs - `(("boost" ,boost) - ("ffmpeg" ,ffmpeg) - ("libdv" ,libdv) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libmng" ,libmng) - ("zlib" ,zlib))) - ;; synfig.pc lists the following as required: Magick++ freetype2 - ;; fontconfig fftw OpenEXR ETL glibmm-2.4 giomm-2.4 libxml++-3.0 sigc++-2.0 - ;; cairo pango pangocairo mlt++ + (list boost + libdv + libjpeg-turbo + libpng + libmng + zlib)) + ;; synfig.pc lists the following as required: Magick++ libavcodec + ;; libavformat libswscale freetype2 fontconfig OpenEXR ETL glibmm-2.4 + ;; giomm-2.4 libxml++-2.6 sigc++-2.0 cairo fftw3 pango pangocairo mlt++ (propagated-inputs - `(("cairo" ,cairo) - ("etl" ,etl) - ("fftw" ,fftw) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glibmm" ,glibmm) - ("imagemagick" ,imagemagick) - ("libxml++" ,libxml++) - ("libsigc++" ,libsigc++) - ("mlt" ,mlt-6) - ("openexr" ,openexr-2) - ("pango" ,pango))) + (list cairo + etl + ffmpeg-4 + fftw + fontconfig + freetype + glibmm-2.64 + imagemagick + libxml++-2 + libsigc++ + mlt-6 + openexr-2 + pango)) (native-inputs (list intltool pkg-config)) (home-page "https://www.synfig.org") -- cgit 1.4.1 From df116a89f95954d4ce0508b86f193e0e0494a240 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 3 Jan 2023 23:12:52 +0100 Subject: gnu: synfigstudio: Use gexp. * gnu/packages/animation.scm (synfigstudio)[arguments]: Use gexp. --- gnu/packages/animation.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu/packages/animation.scm') diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index e1a5ba3de1..e2a546b5fc 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -23,6 +23,7 @@ (define-module (gnu packages animation) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) @@ -185,17 +186,16 @@ for tweening, preventing the need to hand-draw each frame.") #t)))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - ;; This fixes the file chooser crash that happens with GTK 3. - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (gtk (assoc-ref inputs "gtk+")) - (gtk-share (string-append gtk "/share"))) - (wrap-program (string-append out "/bin/synfigstudio") - `("XDG_DATA_DIRS" ":" prefix (,gtk-share))) - #t)))))) + (list + #:phases + #~(modify-phases %standard-phases + ;; This fixes the file chooser crash that happens with GTK 3. + (add-after 'install 'wrap-program + (lambda* (#:key inputs #:allow-other-keys) + (let* ((gtk (assoc-ref inputs "gtk+")) + (gtk-share (string-append gtk "/share"))) + (wrap-program (string-append #$output "/bin/synfigstudio") + `("XDG_DATA_DIRS" ":" prefix (,gtk-share))))))))) (inputs (list gtkmm-3 gtk+ libsigc++ synfig)) (native-inputs -- cgit 1.4.1 From d63f01d3e24c4155b54cb7413381427d764c346b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 4 Jan 2023 00:10:13 +0100 Subject: gnu: synfigstudio: Update to 1.4.4. * gnu/packages/animation.scm (synfigstudio): Update to 1.4.4. [source]: Remove snippet. --- gnu/packages/animation.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'gnu/packages/animation.scm') diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index e2a546b5fc..b5a4dfccf0 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -171,19 +171,12 @@ for tweening, preventing the need to hand-draw each frame.") (version synfig-version) (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/synfig/releases/" - version "/source/synfigstudio-" version - ".tar.gz")) + (uri (string-append "https://github.com/synfig/synfig" + "/releases/download/v" version + "/synfigstudio-" version ".tar.gz")) (sha256 (base32 - "1ql92kh9z8w2j9yi3pr7hn7wh2r2j35xynwv9xlwyd7niackgykn")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "src/synfigapp/pluginmanager.cpp" - (("xmlpp::Node\\* n =") "const xmlpp::Node* n =") - (("xmlpp::Node::NodeList") "xmlpp::Node::const_NodeList")) - #t)))) + "07xjgs1qw0rwpihpcspj92rzwy5zizi86l9x2x7w6sysrj0wd4w8")))) (build-system gnu-build-system) (arguments (list -- cgit 1.4.1 From b2d0ba2b30d3b79ba97203a282b72507d3fcc4c7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Jan 2023 01:00:01 +0100 Subject: gnu: lightspark: Update to 0.8.6.1. * gnu/packages/animation.scm (lightspark): Update to 0.8.6.1. --- gnu/packages/animation.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/animation.scm') diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index b5a4dfccf0..33fc3fcce9 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -290,7 +290,7 @@ audio or video backends, ensuring good performance.") (define-public lightspark (package (name "lightspark") - (version "0.8.6") + (version "0.8.6.1") (source (origin (method git-fetch) @@ -299,7 +299,7 @@ audio or video backends, ensuring good performance.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0v7d7vwb0xqkk3v8dyks0wyk52ga57v5lg93y74v1d2wh7spmmzw")))) + (base32 "1a78l9na01pd7a77r9n8lqih893s54rllpjvrx72sh0yyal1q3gz")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;requires Adobe Flex SDK, see README.tests -- cgit 1.4.1