@Danny In my previous patch-set, there has been some changes. Please use these new patches for mmm, mrg, gegl and gtk-vnc.
Regards, RG.
From b5eb77e44098811bf0ddb4e6f788c029cbd9ef16 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan <raghavgurura...@disroot.org> Date: Mon, 20 Jul 2020 11:00:41 -0400 Subject: [PATCH 09/36] gnu: Add mmm. * gnu/packages/graphics.scm (mmm): New variable. --- gnu/packages/graphics.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 9648050fa0..3a943461cc 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -68,6 +68,7 @@ #:use-module (gnu packages imagemagick) #:use-module (gnu packages jemalloc) #:use-module (gnu packages linux) + #:use-module (gnu packages lua) #:use-module (gnu packages maths) #:use-module (gnu packages mp3) #:use-module (gnu packages multiprecision) @@ -92,6 +93,7 @@ #:use-module (gnu packages xdisorg) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix git-download) @@ -100,6 +102,35 @@ #:use-module (guix packages) #:use-module (guix utils)) +(define-public mmm + (package + (name "mmm") + (version "0.1.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/hodefoting/mmm.git";) + (commit version))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "1xmcv6rwinqsbr863rgl9005h2jlmd7k2qrwsc1h4fb8r61ykpjl")))) + (build-system meson-build-system) + (native-inputs + `(("luajit" ,luajit) + ("pkg-config" ,pkg-config))) + (inputs + `(("alsa" ,alsa-lib) + ("sdl" ,sdl) + ("sdl2" ,sdl2))) + (synopsis "Memory Mapped Machine") + (description "MMM is a shared memory protocol for virtualising access to +framebuffer graphics, audio output and input event.") + (home-page "https://github.com/hodefoting/mrg";) + (license license:isc))) + (define-public directfb (package (name "directfb") -- 2.27.0
From f273561d09f6a996730ffe70f3cf0244013a7c74 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgurura...@disroot.org>
Date: Mon, 20 Jul 2020 12:21:09 -0400
Subject: [PATCH 10/36] gnu: Add mrg.
* gnu/packages/gimp.scm (mrg): New variable.
---
gnu/packages/gimp.scm | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index a6fa30ad87..417def1987 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -40,10 +40,14 @@
#:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
#:use-module (gnu packages gnome)
+ #:use-module (gnu packages graphics)
#:use-module (gnu packages image)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages compression)
#:use-module (gnu packages xml)
+ #:use-module (gnu packages linux)
+ #:use-module (gnu packages ncurses)
+ #:use-module (gnu packages patchutils)
#:use-module (gnu packages pdf)
#:use-module (gnu packages photo)
#:use-module (gnu packages python)
@@ -127,6 +131,39 @@
(home-page "https://code.google.com/archive/p/poly2tri-c/";)
(license license:bsd-3)))
+(define-public mrg
+ (package
+ (name "mrg")
+ (version "0.1.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/hodefoting/mrg.git";)
+ (commit version)))
+ (file-name
+ (git-file-name name version))
+ (sha256
+ (base32 "106qhh0c11576cc5kh90ds0ram72d3r6n9sadw0y4krnhap6dvwk"))))
+ (build-system meson-build-system)
+ (arguments
+ `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (propagated-inputs
+ `(("alsa" ,alsa-lib)
+ ("cairo" ,cairo)
+ ("gtk+" ,gtk+)
+ ("mmm" ,mmm)
+ ("x11" ,libx11)))
+ (synopsis "Microraptor GUI")
+ (description "MrG is is a C API for creating user interfaces. It can be
+used as an application writing environment or as an interactive canvas for part
+of a larger interface.")
+ (home-page "https://github.com/hodefoting/mrg";)
+ (license license:lgpl2.0+)))
+
(define-public babl
(package
(name "babl")
--
2.27.0
From 34496cc5a0046a28707169e469f3e121f3b35e64 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgurura...@disroot.org>
Date: Tue, 21 Jul 2020 03:45:21 -0400
Subject: [PATCH 11/36] gnu: gegl: Update package definition.
* gnu/packages/gimp.scm (gegl): Update package definition.
[outputs]: New output "doc".
[arguments]<#:configure-flags>[-Dintrospection]: Remove flag.
[-Ddocs]: New flag.
[-Dworkshop]: New flag.
[-Dsdl1]: New flag.
<#:phases>['patch-docbook-xml]: New phase.
['move-doc]: New phase.
[native-inputs]: Add asciidoc, docbook-xml, docbook-xsl, enscript,
gobject-introspection, gtk-doc, perl, python-pygobject, python-wrapper,
ruby and vala.
[inputs]: Add exiv2, gdk-pixbuf+svg, gexiv2, jasper, lcms, lensfun, ffmpeg,
libnsgif, libraw, librsvg, libspiro, libtiff, lua, luajit, mrg, openexr, poly2tri-c,
poppler, sdl, sdl2, suitesparse, v4l-utils and libwebp.
[synopsis]: Modify.
[description]: Modify.
[license]: Remove gpl3+.
---
gnu/packages/gimp.scm | 130 +++++++++++++++++++++++++++++++-----------
1 file changed, 98 insertions(+), 32 deletions(-)
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 417def1987..6818cfcf7f 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -35,8 +35,10 @@
#:use-module (gnu packages algebra)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
+ #:use-module (gnu packages docbook)
#:use-module (gnu packages documentation)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages fontutils)
#:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
#:use-module (gnu packages gnome)
@@ -45,13 +47,19 @@
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages compression)
#:use-module (gnu packages xml)
+ #:use-module (gnu packages lua)
+ #:use-module (gnu packages maths)
#:use-module (gnu packages linux)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages patchutils)
+ #:use-module (gnu packages perl)
#:use-module (gnu packages pdf)
#:use-module (gnu packages photo)
+ #:use-module (gnu packages pretty-print)
#:use-module (gnu packages python)
#:use-module (gnu packages ruby)
+ #:use-module (gnu packages sdl)
+ #:use-module (gnu packages video)
#:use-module (gnu packages w3m)
#:use-module (gnu packages web)
#:use-module (gnu packages xorg))
@@ -209,46 +217,104 @@ specific code paths.")
(package
(name "gegl")
(version "0.4.24")
- (source (origin
- (method url-fetch)
- (uri (list (string-append "https://download.gimp.org/pub/gegl/";
- (string-take version 3)
- "/gegl-" version ".tar.xz")
- (string-append "https://ftp.gtk.org/pub/gegl/";
- (version-major+minor version)
- "/gegl-" version ".tar.xz")
- (string-append "ftp://ftp.gtk.org/pub/gegl/";
- (version-major+minor version)
- "/gegl-" version ".tar.xz")))
- (sha256
- (base32
- "0ji57s7cba94vzy49agn7x47ca61rccm6rif0cb0s6rl4ygljrbp"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (list
+ (string-append "https://download.gimp.org/pub/gegl/";
+ (string-take version 3)
+ "/gegl-" version ".tar.xz")
+ (string-append "https://ftp.gtk.org/pub/gegl/";
+ (version-major+minor version)
+ "/gegl-" version ".tar.xz")
+ (string-append "ftp://ftp.gtk.org/pub/gegl/";
+ (version-major+minor version)
+ "/gegl-" version ".tar.xz")))
+ (sha256
+ (base32 "0ji57s7cba94vzy49agn7x47ca61rccm6rif0cb0s6rl4ygljrbp"))))
(build-system meson-build-system)
+ (outputs '("out" "doc"))
(arguments
`(#:configure-flags
- (list "-Dintrospection=false")))
- ;; These are propagated to satisfy 'gegl-0.4.pc'.
+ (list
+ "-Ddocs=true"
+ "-Dworkshop=true"
+ "-Dsdl1=auto")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "docs"
+ (substitute* "gegl-docs.xml"
+ (("http://www.oasis-open.org/docbook/xml/4.3/";)
+ (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook/"))))
+ #t))
+ (add-after 'install 'move-doc
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc")))
+ (mkdir-p (string-append doc "/share"))
+ (rename-file
+ (string-append out "/share/gtk-doc")
+ (string-append doc "/share/gtk-doc"))
+ #t))))))
+ (native-inputs
+ `(("asciidoc" ,asciidoc)
+ ("docbook-xml" ,docbook-xml-4.3)
+ ("docbook-xsl" ,docbook-xsl)
+ ("enscript" ,enscript)
+ ("glib" ,glib "bin")
+ ("gobject-introspection" ,gobject-introspection)
+ ("gtk-doc" ,gtk-doc)
+ ("intltool" ,intltool)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("pygobject" ,python-pygobject)
+ ("python" ,python-wrapper)
+ ("ruby" ,ruby)
+ ("vapigen" ,vala)))
+ (inputs
+ `(("cairo" ,cairo)
+ ("exiv2" ,exiv2)
+ ("gdk-pixbuf" ,gdk-pixbuf+svg)
+ ("gexiv2" ,gexiv2)
+ ("jasper" ,jasper)
+ ("lcms" ,lcms)
+ ("lensfun" ,lensfun)
+ ("libav" ,ffmpeg)
+ ("libnsgif" ,libnsgif)
+ ("libpng" ,libpng)
+ ("libjpeg" ,libjpeg-turbo)
+ ("libraw" ,libraw)
+ ("librsvg" ,librsvg)
+ ("libspiro" ,libspiro)
+ ("libtiff" ,libtiff)
+ ("lua" ,lua)
+ ("luajit" ,luajit)
+ ("mrg" ,mrg)
+ ("openexr" ,openexr)
+ ("pango" ,pango)
+ ;; To be enabled after upstream fixes the bug,
+ ;; https://gitlab.gnome.org/GNOME/gegl/-/issues/258
+ ;; ("poly2tri-c" ,poly2tri-c)
+ ("poppler" ,poppler)
+ ("sdl1" ,sdl)
+ ("sdl2" ,sdl2)
+ ("umfpack" ,suitesparse)
+ ("v4l" ,v4l-utils)
+ ("webp" ,libwebp)))
(propagated-inputs
`(("babl" ,babl)
("glib" ,glib)
("json-glib" ,json-glib)))
- (inputs
- `(("cairo" ,cairo)
- ("pango" ,pango)
- ("libpng" ,libpng)
- ("libjpeg" ,libjpeg-turbo)))
- (native-inputs
- `(("pkg-config" ,pkg-config)
- ("glib" ,glib "bin") ; for gtester
- ("intltool" ,intltool)))
+ (synopsis "Generic Graphics Library")
+ (description "GEGL is a data flow based image processing framework,
+providing floating point processing and non-destructive image processing
+capabilities to GNU Image Manipulation Program and other projects.")
(home-page "http://gegl.org";)
- (synopsis "Graph based image processing framework")
- (description "GEGL (Generic Graphics Library) provides infrastructure to
-do demand based cached non destructive image editing on larger than RAM
-buffers.")
- ;; The library itself is licensed under LGPL while the sample commandline
- ;; application and GUI binary gegl is licensed under GPL.
- (license (list license:lgpl3+ license:gpl3+))))
+ (license license:lgpl3+)))
(define-public gimp
(package
--
2.27.0
From 4747df3231924e3e91ee6360e9c32fc5de31c7ed Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgurura...@disroot.org>
Date: Fri, 24 Jul 2020 14:18:35 -0400
Subject: [PATCH 36/36] gnu: gtk-vnc: Update package definition.
* gnu/packages/gnome.scm (gtk-vnc) [version]: Update to 1.0.0.
[source]<origin>[sha256]: Modify base32.
[build-system]: Change from gnu to meson.
[arguments]<#:glib-or-gtk?>: New argument.
[native-inputs]: Add gjs, node and perl.
[inputs]: Add cairo, gdk-pixbuf+svg, libx11 and zlib.
[synopsis]: Modify.
[description]: Modify.
---
gnu/packages/gnome.scm | 54 ++++++++++++++++++++++++------------------
1 file changed, 31 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0a2db9545a..1c241daf7b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -143,6 +143,7 @@
#:use-module (gnu packages nettle)
#:use-module (gnu packages networking)
#:use-module (gnu packages ninja)
+ #:use-module (gnu packages node)
#:use-module (gnu packages nss)
#:use-module (gnu packages openldap)
#:use-module (gnu packages package-management)
@@ -8910,40 +8911,47 @@ like switching to windows and launching applications.")
(define-public gtk-vnc
(package
(name "gtk-vnc")
- (version "0.9.0")
+ (version "1.0.0")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://gnome/sources/" name "/"
- (version-major+minor version) "/"
- name "-" version ".tar.xz"))
+ (uri
+ (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
(sha256
- (base32
- "1dya1wc9vis8h0fv625pii1n70cckf1xjg1m2hndz989d118i6is"))))
- (build-system gnu-build-system)
+ (base32 "1060ws037v556rx1qhfrcg02859rscksrzr8fq11himdg4d1y6m8"))))
+ (build-system meson-build-system)
(arguments
- '(#:configure-flags '("--with-gtk=3.0")))
- (propagated-inputs
- `(("gtk+" ,gtk+))) ; required by gtk-vnc-2.0.pc.
- (inputs
- `(("cyrus-sasl" ,cyrus-sasl)
- ("gnutls" ,gnutls)
- ("libgcrypt" ,libgcrypt)
- ("pulseaudio" ,pulseaudio)))
+ `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas
(native-inputs
- `(("glib:bin" ,glib "bin")
+ `(("gjs" ,gjs)
+ ("glib:bin" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
("intltool" ,intltool)
+ ("node" ,node)
+ ("perl" ,perl)
("pkg-config" ,pkg-config)
- ("python-wrapper" ,python-wrapper)
+ ("python" ,python-wrapper)
("vala" ,vala)))
+ (inputs
+ `(("cairo" ,cairo)
+ ("gdk-pixbuf" ,gdk-pixbuf+svg)
+ ("glib" ,glib)
+ ("gnutls" ,gnutls)
+ ("libgcrypt" ,libgcrypt)
+ ("libsasl" ,cyrus-sasl)
+ ("pulseaudio" ,pulseaudio)
+ ("x11" ,libx11)
+ ("zlib" ,zlib)))
+ (propagated-inputs
+ `(("gtk+" ,gtk+)))
+ (synopsis "VNC client viewer widget for GTK+")
+ (description "GTK-VNC is a project providing client side APIs for the RFB
+protocol / VNC remote desktop technology. It is built using coroutines allowing
+it to be completely asynchronous while remaining single threaded. It provides a
+core C library, and bindings for Python (PyGTK).")
(home-page "https://wiki.gnome.org/Projects/gtk-vnc";)
- (synopsis "VNC viewer widget for GTK+")
- (description
- "GTK-VNC is a VNC viewer widget for GTK+, used by remote desktop viewing
-applications, for instance the Vinagre client, GNOME Boxes and virt-viewer.
-GTK-VNC implements client side RFB protocol and authentication extensions such
-as SASL, TLS and VeNCrypt. Additionally it supports encoding extensions.")
(license license:lgpl2.1+)))
(define-public gnome-autoar
--
2.27.0
signature.asc
Description: OpenPGP digital signature
