From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id WHKNL47qG1+/FgAA0tVLHw (envelope-from ) for ; Sat, 25 Jul 2020 08:17:18 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id T1FUK47qG18vJwAAB5/wlQ (envelope-from ) for ; Sat, 25 Jul 2020 08:17:18 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DBBCD94077C for ; Sat, 25 Jul 2020 08:17:17 +0000 (UTC) Received: from localhost ([::1]:42450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jzFMq-0007kv-R9 for larch@yhetil.org; Sat, 25 Jul 2020 04:17:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzFMd-0007kb-Dm for guix-devel@gnu.org; Sat, 25 Jul 2020 04:17:03 -0400 Received: from knopi.disroot.org ([178.21.23.139]:39574) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jzFMZ-0003C6-MD for guix-devel@gnu.org; Sat, 25 Jul 2020 04:17:03 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 301CC4821E; Sat, 25 Jul 2020 10:16:57 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1H46DmrXszKZ; Sat, 25 Jul 2020 10:16:55 +0200 (CEST) Subject: Re: [OUTREACHY]: Integration of desktop environments into GNU Guix DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1595665015; bh=QhNkyNI624lEr0Pgij1xN31nefg5VUsmFq9YGY09R7Y=; h=Subject:From:To:Cc:References:Date:In-Reply-To; b=JQNmnKy6O/Npx9XsUFYGTS92ZwKUvQaj2Z2d+XFgGNl1wID2+XiFFgXk5p8H2v8Nj AR64/cMc9N8FvazKCgmQX6azsnEEu0TC2u0GqRJs2FAaKe0Pjx3c1E2c1woU+aEPyO aKErahKePZcFyFMwR8twEEYwvAH82tLEQcEkxvtcHmIflBxfQvRpviOgr61ZGnA+UB 0lFRSWiRVKZyB6juf/j8+q5KTRsC+fvzEz+b5biZ6uph3jqry8OI6JZ8yywWNjaaCC lyrVjNlTgGnvX7Q988u5wjSXTDn5JAQ3OjRQ87g2l0FTJ7tzbKBnoQnjJ8kn0dq8S1 UBgDmutfEmVBA== From: Raghav Gururajan To: Danny Milosavljevic References: <20200506051334.4558e7b3.raghavgururajan@disroot.org> <49cc7f39-7bce-f5a1-55da-5f9bca203627@disroot.org> <7fc9e1ff-de86-56e0-386b-8e1eb9d54585@disroot.org> <1742d1f9-43ed-83a5-1354-bf1c94c2f679@disroot.org> <30888750-2c5b-d94f-6199-f8539b2d0de0@disroot.org> <73cb94f7-d7b4-ec0a-5942-e701a18bdf5c@disroot.org> <20200625004018.62dd2ac5@scratchpost.org> <8c2fb558-249e-e96c-d2b2-ef53d3adfd00@disroot.org> <20200705212515.711f6327@scratchpost.org> <20200717143823.3db2405c@scratchpost.org> <39b2d7bc-f9a4-b98e-2565-ddf542acead3@disroot.org> <20200719212257.7add44f8@scratchpost.org> <9859f0c6-473f-3191-189e-5b2aa6fd02f4@disroot.org> <6c92eb83-361b-7eb3-fd63-8b582b9b41db@disroot.org> Autocrypt: addr=raghavgururajan@disroot.org; keydata= mQENBF6yxWcBCAClEApjrOYs8fSzDl8GBwMFtUzF6VCOVrWaGun1vvPDvk4AFzbB3ZV6+Jn8 VfEuqh3OOvSJGHL2cJoR28Q5gVqeOwupyaMWVdEt6TmDrHISyxriF426KVaJnklfMjYwIi0l /7j8bs3pDRyyR6uFrY6sYL9t6HFvevtt7NwgWL1MAEVy6txKkriyrK1h+qc13wRRgVx3tzl7 dNwYEDWd3yUDn+LESoDOlawJ7TQbO8d1K4FFHaqwyQ/SyaIfLBnMAz9Qd18MUWpDkktLh/9u jRfctouFx5BUr+uGgCHAWcII5D60lt867y5m6vp3Ua75TkVQrYTt7KSF/wm7NZ7L02fTABEB AAG0M1JhZ2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmFnaGF2Z3VydXJhamFuQGRpc3Jvb3Qub3Jn PokBTgQTAQgAOBYhBCdBLzSqkY3qQNKUKK5u8wRtb3tXBQJetePbAhsDBQsJCAcCBhUKCQgL AgQWAgMBAh4BAheAAAoJEK5u8wRtb3tXvWIH/3NiwaJfcrOoO/r4/reE0PmfgVWRpWP8uhdy ZiuBmcnyltxSmxZ1drlWpnbap5P7ssVyIlY6SrLTAeN7R0S70HAINkn7XvKpWajHShX0MR4b NeqjETNZg7gh2PTg6zfTnYD1UQqdNxnPMiJTSBZBLCAm/LhdEuigt559uoDA9ZEVLR5ycKh+ ny94NLUhmuRXpH/sb6Ey0FKmdMc47KNnkGQaySeGY88RwONgfv3/rriNbOJ1t12d2qsqkiOo znuxg5O3nT6obd7hCuq+EYwjzwSVrUZuMelO32UE4d2iePhiPBfiprVCNDGPFztJTe0Y+OQA ajj23CBgGIap/L1CpZ25AQ0EXrLFZwEIANGMTVaAiSGtpAbxRo9AHOc2kgatkAsH/ejtzNH0 mtGwtE0g5Gh0OKTI678KItanztmukKcZmBngPCwvUGGNQYzWWwsS+kBti5wJ3OForg+JtYuf /n9DjSAhnb7h1piL9Xi0drULl5ovVFRp/IPldkbT3R8pgc9VwAa0VVRP59dsgF6nPhoHjxfB p/XcA2QRnRfB2bN4BVCValJelPGYR0pSwkftFpmha4FRa0LrJtcMeh+PG20asPiKcE4sNGZT mH3keHkTfk5Tuds3ly5vlqmEKg7qY/zoS1yWQJj0j36JoX1/ravo+gUxszig80140a5bF2VU ERLcKO+Cp0lI4/8AEQEAAYkBNgQYAQgAIBYhBCdBLzSqkY3qQNKUKK5u8wRtb3tXBQJessVn AhsMAAoJEK5u8wRtb3tXqTIH/A9z70HLCZcAfnpluGj4APfi3haqdU7xvtrkN9eHJoPV7pwx y1luNRR8xg7YHkwcQ/9qEcvSicNIvhjRw5cSpyW9HGmOFyiZ7+KLf3XPUjC7pC5pIM+AAWyy D5GlyqakH1wBe8RC9/8vNyfZnmbV4PUvHoHvY/xZH+D/Afg1J2igdIebkQzzhFBC65TAKFeM NIWQkYIMKjq4u+nmv3sreqvRvlt8VYq0VSq24SFs0JJ+dEmuO3/s72122JIL0XEUS3ooGb/p 678RM2OpelLZcZSPG6vIIrQFKw6/NVjDtOY3DrNPtQ+h84UnFPUtaZyvQQwpGNjvtNzU/Ym+ NwsFm0Q= Message-ID: <08ded8e0-0217-ffba-e173-61c4e72a65dc@disroot.org> Date: Sat, 25 Jul 2020 04:15:21 -0400 Mime-Version: 1.0 In-Reply-To: <6c92eb83-361b-7eb3-fd63-8b582b9b41db@disroot.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="AyUpIHiqPX69ngRov5EEsTHH1peala5sl" Received-SPF: pass client-ip=178.21.23.139; envelope-from=raghavgururajan@disroot.org; helo=knopi.disroot.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/25 04:16:57 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: guix-devel@gnu.org Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=disroot.org header.s=mail header.b=JQNmnKy6; dmarc=fail reason="SPF not aligned (relaxed)" header.from=disroot.org (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Spam-Score: -1.51 X-TUID: 0XjEMXoemJAd This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --AyUpIHiqPX69ngRov5EEsTHH1peala5sl Content-Type: multipart/mixed; boundary="accAo232ZLsavPKqQZNjz05FErnOYEEJ6"; protected-headers="v1" From: Raghav Gururajan To: Danny Milosavljevic Cc: guix-devel@gnu.org, =?UTF-8?Q?G=c3=a1bor_Boskovits?= , Tobias Geerinckx-Rice Message-ID: <08ded8e0-0217-ffba-e173-61c4e72a65dc@disroot.org> Subject: Re: [OUTREACHY]: Integration of desktop environments into GNU Guix References: <20200506051334.4558e7b3.raghavgururajan@disroot.org> <8c56bfdd-4080-9444-d3c2-7bd962c4c687@disroot.org> <49cc7f39-7bce-f5a1-55da-5f9bca203627@disroot.org> <7fc9e1ff-de86-56e0-386b-8e1eb9d54585@disroot.org> <1742d1f9-43ed-83a5-1354-bf1c94c2f679@disroot.org> <30888750-2c5b-d94f-6199-f8539b2d0de0@disroot.org> <73cb94f7-d7b4-ec0a-5942-e701a18bdf5c@disroot.org> <20200625004018.62dd2ac5@scratchpost.org> <8c2fb558-249e-e96c-d2b2-ef53d3adfd00@disroot.org> <20200705212515.711f6327@scratchpost.org> <20200717143823.3db2405c@scratchpost.org> <39b2d7bc-f9a4-b98e-2565-ddf542acead3@disroot.org> <20200719212257.7add44f8@scratchpost.org> <9859f0c6-473f-3191-189e-5b2aa6fd02f4@disroot.org> <6c92eb83-361b-7eb3-fd63-8b582b9b41db@disroot.org> In-Reply-To: <6c92eb83-361b-7eb3-fd63-8b582b9b41db@disroot.org> --accAo232ZLsavPKqQZNjz05FErnOYEEJ6 Content-Type: multipart/mixed; boundary="------------6F3D55ECC70F3E6DB1BAD34B" Content-Language: en-US This is a multi-part message in MIME format. --------------6F3D55ECC70F3E6DB1BAD34B Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable @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. --------------6F3D55ECC70F3E6DB1BAD34B Content-Type: text/x-patch; charset=UTF-8; name="0009-gnu-Add-mmm.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0009-gnu-Add-mmm.patch" =46rom b5eb77e44098811bf0ddb4e6f788c029cbd9ef16 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan 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)) =20 +(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 acces= s to +framebuffer graphics, audio output and input event.") + (home-page "https://github.com/hodefoting/mrg") + (license license:isc))) + (define-public directfb (package (name "directfb") --=20 2.27.0 --------------6F3D55ECC70F3E6DB1BAD34B Content-Type: text/x-patch; charset=UTF-8; name="0010-gnu-Add-mrg.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0010-gnu-Add-mrg.patch" =46rom f273561d09f6a996730ffe70f3cf0244013a7c74 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan 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))) =20 +(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 ca= n be +used as an application writing environment or as an interactive canvas f= or part +of a larger interface.") + (home-page "https://github.com/hodefoting/mrg") + (license license:lgpl2.0+))) + (define-public babl (package (name "babl") --=20 2.27.0 --------------6F3D55ECC70F3E6DB1BAD34B Content-Type: text/x-patch; charset=UTF-8; name="0011-gnu-gegl-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0011-gnu-gegl-Update-package-definition.patch" =46rom 34496cc5a0046a28707169e469f3e121f3b35e64 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan 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, ffmpe= g, 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/g= egl/" - (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=3Dfalse"))) - ;; These are propagated to satisfy 'gegl-0.4.pc'. + (list + "-Ddocs=3Dtrue" + "-Dworkshop=3Dtrue" + "-Dsdl1=3Dauto") + #: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 infrastructur= e to -do demand based cached non destructive image editing on larger than RAM -buffers.") - ;; The library itself is licensed under LGPL while the sample comman= dline - ;; application and GUI binary gegl is licensed under GPL. - (license (list license:lgpl3+ license:gpl3+)))) + (license license:lgpl3+))) =20 (define-public gimp (package --=20 2.27.0 --------------6F3D55ECC70F3E6DB1BAD34B Content-Type: text/x-patch; charset=UTF-8; name="0036-gnu-gtk-vnc-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0036-gnu-gtk-vnc-Update-package-definition.patch" =46rom 4747df3231924e3e91ee6360e9c32fc5de31c7ed Mon Sep 17 00:00:00 2001 From: Raghav Gururajan 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][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 applicati= ons.") (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=3D3.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 th= e RFB +protocol / VNC remote desktop technology. It is built using coroutines = allowing +it to be completely asynchronous while remaining single threaded. It pr= ovides 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 vi= ewing -applications, for instance the Vinagre client, GNOME Boxes and virt-view= er. -GTK-VNC implements client side RFB protocol and authentication extension= s such -as SASL, TLS and VeNCrypt. Additionally it supports encoding extensions= =2E") (license license:lgpl2.1+))) =20 (define-public gnome-autoar --=20 2.27.0 --------------6F3D55ECC70F3E6DB1BAD34B-- --accAo232ZLsavPKqQZNjz05FErnOYEEJ6-- --AyUpIHiqPX69ngRov5EEsTHH1peala5sl Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEJ0EvNKqRjepA0pQorm7zBG1ve1cFAl8b6hkACgkQrm7zBG1v e1drcgf/cA+7WwLkQf8UUolV9/1h6E107EaGh/UXgQgMzqVfCt6QFU3ouuJFiP+G XF8yrQbU811CT3jxkVDp2GEp1zoVfuf8H4MVOtsnwapc0510LqSMq65Ty6WM1hmk HYhKflqWTDexwDgdq9VafAq6eTE4vuDu1/1RMGjzSTMWTYE5etCp+cCjlOuJhz0C oqltC15WT1PrWbSfzjiDfFm2dyHFtPl0DWj/Ot4XcZ/XSjP3BsHIti7QIY7ArLkM BxIYFnHXW1TtfGaPvlwM1EPNxrTA93GLGclU9gz8DAQJS5mhNP7v8LORZqsVfuPQ 1+xr/4Q7T+7F0yCGN28V/V2MHAQs2g== =NLyV -----END PGP SIGNATURE----- --AyUpIHiqPX69ngRov5EEsTHH1peala5sl--