From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id MP2DF3o+2V4TMAAA0tVLHw (envelope-from ) for ; Thu, 04 Jun 2020 18:33:30 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id sPdTE3o+2V4oXwAAbx9fmQ (envelope-from ) for ; Thu, 04 Jun 2020 18:33:30 +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 1E6BC940058 for ; Thu, 4 Jun 2020 18:33:29 +0000 (UTC) Received: from localhost ([::1]:58084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jgugC-0008RL-3C for larch@yhetil.org; Thu, 04 Jun 2020 14:33:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jgufR-0007Uu-Ry for guix-devel@gnu.org; Thu, 04 Jun 2020 14:32:41 -0400 Received: from knopi.disroot.org ([178.21.23.139]:44440) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jgufO-0008LI-Ge for guix-devel@gnu.org; Thu, 04 Jun 2020 14:32:41 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id BDCC655F37; Thu, 4 Jun 2020 20:32:34 +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 3qgr6DKL1NvZ; Thu, 4 Jun 2020 20:32:32 +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=1591295552; bh=TY6XPaMEmKKsFNy9seoXC/d5n9dZN4bj1FMDreCi1M0=; h=Subject:From:To:Cc:References:Date:In-Reply-To; b=NTO6uPri1bLUhbateQRVJPLQsb9YQMRrHg7Gp+ROVtrl7IZXi8mctB4tknRLje036 JbZcCrb4RYKvGOT9qXJR0VaGBA++iKMiu01cbK8bhDfbzGMSYh1CAJKfFLML6gm2hM 5rbUcGjDX7z4TcW1ez67kloMOuEAr2oRfBG4FjUzFmE9BIvdZC6WXpgzZ0qpPuGwPI YQKLOH3uNj+7LGI0+osKX0Oj9X56p6/ReiavC8Ig7lRRoqA6sY8C4SbmcvYKeHnhPl NkYcdmJwMUxG2OGXrlDluRTH8B97aCcyqAaVCpeBZJ7nIqPFW2nGLtf4GhI+nxHeG4 3LG53q3O0H1HA== From: Raghav Gururajan To: guix-devel@gnu.org 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> 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: <30888750-2c5b-d94f-6199-f8539b2d0de0@disroot.org> Date: Thu, 4 Jun 2020 14:31:46 -0400 Mime-Version: 1.0 In-Reply-To: <1742d1f9-43ed-83a5-1354-bf1c94c2f679@disroot.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="1MZoVMv9ZNZ4UrVTeZoywnDEQ0deBQBo3" 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/06/04 14:32:34 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_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: , 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=NTO6uPri; 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: 17lYXx9k0lT1 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --1MZoVMv9ZNZ4UrVTeZoywnDEQ0deBQBo3 Content-Type: multipart/mixed; boundary="5lXG6cViUKvQbO7WkCwXGQxwfLoJZqiiM"; protected-headers="v1" From: Raghav Gururajan To: guix-devel@gnu.org Cc: =?UTF-8?Q?G=c3=a1bor_Boskovits?= , Danny Milosavljevic , Tobias Geerinckx-Rice Message-ID: <30888750-2c5b-d94f-6199-f8539b2d0de0@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> In-Reply-To: <1742d1f9-43ed-83a5-1354-bf1c94c2f679@disroot.org> --5lXG6cViUKvQbO7WkCwXGQxwfLoJZqiiM Content-Type: multipart/mixed; boundary="------------FE0DAD24E70AB3E52A2C2479" Content-Language: en-US This is a multi-part message in MIME format. --------------FE0DAD24E70AB3E52A2C2479 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable @Danny Please find attached patches. Regards, RG. --------------FE0DAD24E70AB3E52A2C2479 Content-Type: text/x-patch; charset=UTF-8; name="0011-gnu-Add-presage.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0011-gnu-Add-presage.patch" =46rom efe996a0c53ac90522498a980bd6a40beb1d9a56 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 2 Jun 2020 19:41:00 -0400 Subject: [PATCH 11/16] gnu: Add presage. * gnu/packages/fcitx.scm (presage): New variable. --- gnu/packages/fcitx.scm | 60 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/fcitx.scm b/gnu/packages/fcitx.scm index e699d7d59d..61bf36cd83 100644 --- a/gnu/packages/fcitx.scm +++ b/gnu/packages/fcitx.scm @@ -22,18 +22,78 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system cmake) + #:use-module (guix build-system glib-or-gtk) + #:use-module (gnu packages check) #:use-module (gnu packages documentation) #:use-module (gnu packages enchant) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) + #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages icu4c) #:use-module (gnu packages iso-codes) + #:use-module (gnu packages man) + #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages sqlite) #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) =20 +(define-public presage + (package + (name "presage") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri + (string-append "https://sourceforge.net/projects/presage/files/p= resage/" + version "/presage-" version ".tar.gz")) + (sha256 + (base32 "0rm3b3zaf6bd7hia0lr1wyvi1rrvxkn7hg05r5r1saj0a3ingmay"))= )) + (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) + (arguments + `(#:configure-flags + (list + "CFLAGS=3D-Wno-narrowing" + "CXXFLAGS=3D-Wno-narrowing") + #:phases + (modify-phases %standard-phases + (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/presage")) + (rename-file + (string-append out "/share/presage/html") + (string-append doc "/share/presage/html")) + #t)))))) + (native-inputs + `(("dot" ,graphviz) + ("doxygen" ,doxygen) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gtk+:bin" ,gtk+ "bin") + ("help2man" ,help2man) + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper))) + (inputs + `(("glib" ,glib) + ("gtk+" ,gtk+) + ("libx11" ,libx11) + ("sqlite" ,sqlite) + ("tinyxml" ,tinyxml))) + (synopsis "Intelligent Predictive Text Entry System") + (description "Presage generates predictions by modelling natural lan= guage as +a combination of redundant information sources. It computes probabiliti= es for +words which are most likely to be entered next by merging predictions ge= nerated +by the different predictive algorithms.") + (home-page "https://presage.sourceforge.io/") + (license gpl2+))) + (define-public fcitx (package (name "fcitx") --=20 2.26.2 --------------FE0DAD24E70AB3E52A2C2479 Content-Type: text/x-patch; charset=UTF-8; name="0012-gnu-fcitx-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0012-gnu-fcitx-Update-package-definition.patch" =46rom e9121dabc1de6cdd748a8ce2258d3cd2bb1233f9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 2 Jun 2020 20:42:46 -0400 Subject: [PATCH 12/16] gnu: fcitx: Update package definition. * gnu/packages/fcitx.scm (fcitx): Update packages definition. [arguments]<#:configure-flags>[-DENABLE_QT_GUI]: New flag. [-DGOBJECT_INTROSPECTION_GIRDIR]: New flag. [-DGOBJECT_INTROSPECTION_TYPELIBDIR]: New flag. [-DENABLE_GIR]: Remove flag. [native-inputs]: Add dot, gettext, gobject-introspection, intltool, libxml2 and python-wrapper. [inputs]: Add cairo, ecm, fontconfig, libx11, libxkbcommon, opencc, pango and presage. Remove glib and libxml2. [propagated-inputs]: Add glib. --- gnu/packages/fcitx.scm | 106 +++++++++++++++++++++++++---------------- 1 file changed, 65 insertions(+), 41 deletions(-) diff --git a/gnu/packages/fcitx.scm b/gnu/packages/fcitx.scm index 61bf36cd83..da9eabeced 100644 --- a/gnu/packages/fcitx.scm +++ b/gnu/packages/fcitx.scm @@ -24,8 +24,10 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) #:use-module (gnu packages check) + #:use-module (gnu packages compression) #:use-module (gnu packages documentation) #:use-module (gnu packages enchant) + #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages graphviz) @@ -37,9 +39,11 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages sqlite) + #:use-module (gnu packages textutils) #:use-module (gnu packages web) #:use-module (gnu packages xml) - #:use-module (gnu packages xorg)) + #:use-module (gnu packages xorg) + #:use-module (gnu packages xdisorg)) =20 (define-public presage (package @@ -98,60 +102,80 @@ by the different predictive algorithms.") (package (name "fcitx") (version "4.2.9.7") - (source (origin - (method url-fetch) - (uri (string-append "http://download.fcitx-im.org/fcitx/" - "fcitx-" version "_dict.tar.xz")) - (sha256 - (base32 - "13vg7yzfq0vj2r8zdf9ly3n243nwwggkhd5qv3z6yqdyj0m3ncyg"))= )) + (source + (origin + (method url-fetch) + (uri + (string-append "http://download.fcitx-im.org/fcitx/" + "fcitx-" version "_dict.tar.xz")) + (sha256 + (base32 "13vg7yzfq0vj2r8zdf9ly3n243nwwggkhd5qv3z6yqdyj0m3ncyg"))= )) (build-system cmake-build-system) (outputs '("out" "gtk2" "gtk3")) (arguments `(#:configure-flags - (list "-DENABLE_TEST=3DON" - (string-append "-DXKB_RULES_XML_FILE=3D" - (assoc-ref %build-inputs "xkeyboard-config")= - "/share/X11/xkb/rules/evdev.xml") - "-DENABLE_GTK2_IM_MODULE=3DON" - "-DENABLE_GTK3_IM_MODULE=3DON" - (string-append "-DGTK2_IM_MODULEDIR=3D" - (assoc-ref %outputs "gtk2") - "/lib/gtk-2.0/2.10.0/immodules") - (string-append "-DGTK3_IM_MODULEDIR=3D" - (assoc-ref %outputs "gtk3") - "/lib/gtk-3.0/3.0.0/immodules") - ;; XXX: Enable GObject Introspection and Qt4 support. - "-DENABLE_GIR=3DOFF" - "-DENABLE_QT=3DOFF" - "-DENABLE_QT_IM_MODULE=3DOFF"))) + (list + "-DENABLE_GTK2_IM_MODULE=3DON" + "-DENABLE_GTK3_IM_MODULE=3DON" + "-DENABLE_QT=3DOFF" + "-DENABLE_QT_IM_MODULE=3DOFF" + "-DENABLE_QT_GUI=3DOFF" + "-DENABLE_TEST=3DON" + (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=3D" + (assoc-ref %outputs "out") + "/share/gir-1.0") + (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=3D" + (assoc-ref %outputs "out") + "/lib/girepository-1.0") + (string-append "-DXKB_RULES_XML_FILE=3D" + (assoc-ref %build-inputs "xkeyboard-config") + "/share/X11/xkb/rules/evdev.xml") + (string-append "-DGTK2_IM_MODULEDIR=3D" + (assoc-ref %outputs "gtk2") + "/lib/gtk-2.0/2.10.0/immodules") + (string-append "-DGTK3_IM_MODULEDIR=3D" + (assoc-ref %outputs "gtk3") + "/lib/gtk-3.0/3.0.0/immodules")))) (native-inputs - `(("doxygen" ,doxygen) + `(("dot" ,graphviz) + ("doxygen" ,doxygen) ("extra-cmake-modules" ;; XXX: We can't simply #:use-module due to a cycle somewhere. ,(module-ref (resolve-interface '(gnu packages kde-frameworks)) 'extra-cmake-modules)) - ("glib:bin" ,glib "bin") ; for glib-genmarshal - ("pkg-config" ,pkg-config))) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("intltool" ,intltool) + ("libxml2" ,libxml2) + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper))) (inputs - `(("dbus" ,dbus) - ("enchant" ,enchant-1.6) - ("gettext" ,gettext-minimal) - ("gtk2" ,gtk+-2) - ("gtk3" ,gtk+) - ("icu4c" ,icu4c) - ("iso-codes" ,iso-codes) - ("json-c" ,json-c) - ("libxkbfile" ,libxkbfile) - ("libxml2" ,libxml2) + `(("cairo" ,cairo) + ("dbus" ,dbus) + ("ecm" ,ecm) + ("enchant" ,enchant-1.6) + ("fontconfig" ,fontconfig) + ("gtk2" ,gtk+-2) + ("gtk3" ,gtk+) + ("icu4c" ,icu4c) + ("iso-codes" ,iso-codes) + ("json-c" ,json-c) + ("libx11" ,libx11) + ("libxkbcommon" ,libxkbcommon) + ("libxkbfile" ,libxkbfile) + ("opencc" ,opencc) + ("pango" ,pango) + ("presage" ,presage) ("xkeyboard-config" ,xkeyboard-config))) - (home-page "https://fcitx-im.org") + (propagated-inputs + `(("glib" ,glib))) (synopsis "Input method framework") - (description - "Fcitx is an input method framework with extension support. It has= -Pinyin, Quwei and some table-based (Wubi, Cangjie, Erbi, etc.) input met= hods + (description "Fcitx is an input method framework with extension supp= ort. It +has Pinyin, Quwei and some table-based (Wubi, Cangjie, Erbi, etc.) input= methods built-in.") + (home-page "https://fcitx-im.org") (license gpl2+))) =20 (define-public fcitx-configtool --=20 2.26.2 --------------FE0DAD24E70AB3E52A2C2479 Content-Type: text/x-patch; charset=UTF-8; name="0013-gnu-gcab-Update-to-1.4.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0013-gnu-gcab-Update-to-1.4.patch" =46rom b139186350acdf7c0bf030af1a24a8289adc2ca9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 3 Jun 2020 17:13:28 -0400 Subject: [PATCH 13/16] gnu: gcab: Update to 1.4. * gnu/packages/package-management.scm (gcab): Update package definition. [version]: Update to 1.4. [source][sha256]: Modify base32 hash. [outputs]: New output 'doc'. [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Ddocs]: Remove flag. [-Dintrospection]: Remove flag. <#:phases>['move-doc]: New phase. [native-inputs]: Add gettext, gobject-introspection and gtk-doc. Remove inttool. [inputs]: Remove glib. [propagated-inputs]: Add glib. [license]: Remove gpl2+. --- gnu/packages/package-management.scm | 53 +++++++++++++++++------------ 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-m= anagement.scm index 3fc6fc404a..e117a0b6b2 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -997,36 +997,47 @@ in an isolated environment, in separate namespaces.= ") (define-public gcab (package (name "gcab") - (version "1.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/gcab/" - version "/gcab-" version ".tar.xz")) - (sha256 - (base32 - "038h5kk41si2hc9d9169rrlvp8xgsxq27kri7hv2vr39gvz9cbas"))= )) + (version "1.4") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/gcab/" + version "/gcab-" version ".tar.xz")) + (sha256 + (base32 "13q43iqld4l50yra45lhvkd376pn6qpk7rkx374zn8y9wsdzm9b7"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) + (arguments + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases + (modify-phases %standard-phases + (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 - `(("glib:bin" ,glib "bin") ; for glib-mkenums - ("intltool" ,intltool) + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config) ("vala" ,vala))) (inputs - `(("glib" ,glib) - ("zlib" ,zlib))) - (arguments - `(#:configure-flags - ;; XXX This =E2=80=98documentation=E2=80=99 is for developers, an= d fails informatively: - ;; Error in gtkdoc helper script: 'gtkdoc-mkhtml' failed with sta= tus 5 - (list "-Ddocs=3Dfalse" - "-Dintrospection=3Dfalse"))) - (home-page "https://wiki.gnome.org/msitools") ; no dedicated home pa= ge + `(("zlib" ,zlib))) + (propagated-inputs + `(("glib" ,glib))) (synopsis "Microsoft Cabinet file manipulation library") (description "The libgcab library provides GObject functions to read, write, and= modify Microsoft cabinet (.@dfn{CAB}) files.") - (license (list license:gpl2+ ; tests/testsuite.at - license:lgpl2.1+)))) ; the rest + (home-page "https://wiki.gnome.org/msitools") ; no dedicated home pa= ge + (license license:lgpl2.1+))) =20 (define-public msitools (package --=20 2.26.2 --------------FE0DAD24E70AB3E52A2C2479 Content-Type: text/x-patch; charset=UTF-8; name="0014-gnu-gcr-Update-to-3.36.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0014-gnu-gcr-Update-to-3.36.0.patch" =46rom 0defd48a4b7c6c62371f8f0be74c098e502b1bf5 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 3 Jun 2020 18:34:29 -0400 Subject: [PATCH 14/16] gnu: gcr: Update to 3.36.0. * gnu/packages/gnome.scm (gcr): Update package definition. [version]: Update to 3.36.0. [source][sha256]: Modify base32. [build-system]: Change from gnu to meson. [outputs]: New output 'doc'. [arguments]<#:glib-or-gtk?>: New argument. <#:phases>['patch-docbook-xml]: New phase. ['disable-failing-tests]: Modify phase. ['move-doc]: New phase. [native-inputs]: Add docbook-xml, gtk-doc and gtk+:bin. [synopsis]: Modify. [description]: Modify. --- gnu/packages/gnome.scm | 88 ++++++++++++++++++++++++++++-------------- 1 file changed, 58 insertions(+), 30 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d935eda499..ca66818de2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1672,56 +1672,84 @@ the font would look under various sizes.") (define-public gcr (package (name "gcr") - (version "3.34.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0925snsixzkwh49xiayqmj6fcrmklqk8kyy0jkv7m64h9abm1pr9"))= )) - (build-system gnu-build-system) + (version "3.36.0") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "00b6bzpr8rj8mvj66r2273r417wg2y21m6n88mhkq9m22z8bxyda"))= )) + (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - '(#:phases + '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas. + #:phases (modify-phases %standard-phases - ;; These fail because /var/lib/dbus/machine-id is not present i= n the - ;; build environment. + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs/reference" + (substitute* "gcr/gcr-visual-index.xml" + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml-4.3") + "/xml/dtd/docbook/"))) + (substitute* '("gcr/gcr-docs.sgml" "gck/gck-docs.sgml" + "gck/gck-pkcs11-links.xml") + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml-4.1.2") + "/xml/dtd/docbook/")))) + #t)) + ;; Some tests fail due to missing /etc/machine-id. (add-after 'unpack 'disable-failing-tests (lambda _ - (substitute* "Makefile.in" - (("[[:blank:]]+test-system-prompt\\$\\(EXEEXT\\)") + (substitute* "gcr/meson.build" + (("'system-prompt',") "")) #t)) + ;; Some tests expect to write to $HOME. (add-before 'check 'pre-check (lambda _ - ;; Some tests expect to write to $HOME. (setenv "HOME" "/tmp") - #t))))) - (inputs - `(("dbus" ,dbus) - ("gnupg" ,gnupg) ;called as a child process during= tests - ("libgcrypt" ,libgcrypt))) + #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 - `(("python" ,python-wrapper) ;for tests - ("pkg-config" ,pkg-config) + `(("docbook-xml-4.1.2" ,docbook-xml-4.1.2) + ("docbook-xml-4.3" ,docbook-xml-4.3) ("gettext" ,gettext-minimal) ("glib" ,glib "bin") ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("gtk+bin" ,gtk+ "bin") ("libxml2" ,libxml2) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) ("vala" ,vala) ("xsltproc" ,libxslt))) - ;; mentioned in gck.pc, gcr.pc and gcr-ui.pc + (inputs + `(("dbus" ,dbus) + ("gnupg" ,gnupg) + ("gnupg2" ,gnupg-2.0) + ("libgcrypt" ,libgcrypt))) (propagated-inputs `(("p11-kit" ,p11-kit) ("glib" ,glib) ("gtk+" ,gtk+))) - (home-page "https://www.gnome.org") - (synopsis "Libraries for displaying certificates and accessing key s= tores") - (description - "The GCR package contains libraries used for displaying certificate= s and -accessing key stores. It also provides the viewer for crypto files on t= he -GNOME Desktop.") + (synopsis "GCR and GCK libraries for GNOME") + (description "GCR is a library for displaying certificates, and cryp= to UI, +accessing key stores. It also provides the viewer for crypto files on t= he GNOME +desktop. GCK is a library for accessing PKCS#11 modules like smart card= s, in a +GObject oriented way.") + (home-page "https://www.gnome.org") ; No dedicated home-page (license license:lgpl2.1+))) =20 (define-public libgnome-keyring --=20 2.26.2 --------------FE0DAD24E70AB3E52A2C2479 Content-Type: text/x-patch; charset=UTF-8; name="0015-gnu-gdk-pixbuf-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0015-gnu-gdk-pixbuf-Update-package-definition.patch" =46rom c91b7f70e856915460caa85de1a6479ed5a4dc87 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 4 Jun 2020 12:49:51 -0400 Subject: [PATCH 15/16] gnu: gdk-pixbuf: Update package definition. * gnu/packages/gtk.scm (gdk-pixbuf): Update package definition. [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Djasper]: New flag. <#:phases>['patch-docbook]: New phase. ['disable-failing-tests]: Remove phase. [native-inputs]: Add docbook-xml, docbook-xsl, perl and libxslt. [inputs]: Add jasper and libpng. Remove libx11. [propagated-inputs]: Add libx11. Remove libpng. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Update to lgpl2.1+. --- gnu/packages/gtk.scm | 114 ++++++++++++++++++++++--------------------- 1 file changed, 58 insertions(+), 56 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index fb67508b09..25be5c6b7d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -494,63 +494,65 @@ highlighting and other features typical of a source= code editor.") =20 (define-public gdk-pixbuf (package - (name "gdk-pixbuf") - (version "2.40.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1rnlx9yfw970maxi2x6niaxmih5la11q1ilr7gzshz2kk585k0hm"))))= - (build-system meson-build-system) - (arguments - `(#:configure-flags '("-Dinstalled_tests=3Dfalse") - #:phases - (modify-phases %standard-phases - (add-after - 'unpack 'disable-failing-tests - (lambda _ - (substitute* "tests/meson.build" - ;; XXX FIXME: This test fails on armhf machines with: - ;; SKIP Not enough memory to load bitmap image - ;; ERROR: cve-2015-4491 - too few tests run (expected 4, go= t 2) - ((".*'cve-2015-4491'.*") "") - ;; XXX FIXME: This test fails with: - ;; ERROR:pixbuf-jpeg.c:74:test_type9_rotation_exif_tag: - ;; assertion failed (error =3D=3D NULL): Data differ - ;; (gdk-pixbuf-error-quark, 0) - ((".*'pixbuf-jpeg'.*") "")) - #t)) - ;; The slow tests take longer than the specified timeout. - ,@(if (any (cute string=3D? <> (%current-system)) - '("armhf-linux" "aarch64-linux")) - '((replace 'check - (lambda _ - (invoke "meson" "test" "--timeout-multiplier" "5")))) - '())))) - (propagated-inputs - `(;; Required by gdk-pixbuf-2.0.pc - ("glib" ,glib) - ("libpng" ,libpng) - ;; Used for testing and required at runtime. - ("shared-mime-info" ,shared-mime-info))) - (inputs - `(("libjpeg" ,libjpeg-turbo) - ("libtiff" ,libtiff) - ("libx11" ,libx11))) - (native-inputs - `(("pkg-config" ,pkg-config) + (name "gdk-pixbuf") + (version "2.40.0") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1rnlx9yfw970maxi2x6niaxmih5la11q1ilr7gzshz2kk585k0hm"))= )) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Djasper=3Dtrue" + "-Dinstalled_tests=3Dfalse") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs" + (substitute* "meson.build" + (("http://docbook.sourceforge.net/release/xsl/current/"= ) + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-1.79.1/"))) + (substitute* '("gdk-pixbuf-csource.xml" + "gdk-pixbuf-from-drawables.xml" + "gdk-pixbuf-query-loaders.xml" + "gdk-pixbuf-rendering.xml" "gdk-pixbuf.xml= ") + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t))))) + (native-inputs + `(("docbook-xml" ,docbook-xml-4.3) + ("docbook-xsl" ,docbook-xsl) ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ; glib-mkenums= , etc. - ("gobject-introspection" ,gobject-introspection))) ; g-ir-compile= r, etc. - (synopsis "GNOME image loading and manipulation library") - (description - "GdkPixbuf is a library for image loading and manipulation developed= -in the GNOME project.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/gdk-pixbuf/"))) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) + (inputs + `(("jasper" ,jasper) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libtiff" ,libtiff))) + (propagated-inputs + `(("glib" ,glib) + ("libx11" ,libx11) + ("shared-mime-info" ,shared-mime-info))) + (synopsis "Image loading library") + (description "GdkPixbuf is a library that loads image data in variou= s +formats and stores it as linear buffers in memory. The buffers can then= be +scaled, composited, modified, saved, or rendered.") + (home-page "https://wiki.gnome.org/Projects/GdkPixbuf") + (license license:lgpl2.1+))) =20 ;; To build gdk-pixbuf with SVG support, we need librsvg, and librsvg de= pends ;; on gdk-pixbuf, so this new varibale. Also, librsvg adds 90MiB to the= --=20 2.26.2 --------------FE0DAD24E70AB3E52A2C2479 Content-Type: text/x-patch; charset=UTF-8; name="0016-gnu-gdk-pixbuf-svg-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0016-gnu-gdk-pixbuf-svg-Update-package-definition.patch" =46rom 0ea983b4f4da35f9961d9b96bc6e929317216a13 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 4 Jun 2020 14:25:23 -0400 Subject: [PATCH 16/16] gnu: gdk-pixbuf+svg: Update package definition. * gnu/packages/gtk.scm (gdk-pixbuf+svg): Update package definition. [arguments]: Modify. [synopsis]: Modify. --- gnu/packages/gtk.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 25be5c6b7d..ea60a3c80d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -564,10 +564,9 @@ scaled, composited, modified, saved, or rendered.") `(("librsvg" ,librsvg) ,@(package-inputs gdk-pixbuf))) (arguments - '(#:configure-flags '("-Dinstalled-tests=3Dfalse") - #:tests? #f ; tested by the gdk-pixbuf package already - #:phases - (modify-phases %standard-phases + (substitute-keyword-arguments (package-arguments gdk-pixbuf) + ((#:phases phases) + `(modify-phases ,phases (add-after 'install 'register-svg-loader (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -581,9 +580,8 @@ scaled, composited, modified, saved, or rendered.") (apply invoke gdk-pixbuf-query-loaders "--update-cache" - loaders))))))) - (synopsis - "GNOME image loading and manipulation library, with SVG support")))= + loaders)))))))) + (synopsis "Image loading library, with SVG support"))) =20 (define-public at-spi2-core (package --=20 2.26.2 --------------FE0DAD24E70AB3E52A2C2479-- --5lXG6cViUKvQbO7WkCwXGQxwfLoJZqiiM-- --1MZoVMv9ZNZ4UrVTeZoywnDEQ0deBQBo3 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEJ0EvNKqRjepA0pQorm7zBG1ve1cFAl7ZPhIACgkQrm7zBG1v e1e05wf/fFnUxHy/VbQqQLpSHA8O046RGACpcwmkqbB8x3n0q5mP8zzCrzxJCMnC Q+qXmnZEC/GBYYV3p2DzJroeu8uLKmY4HKUejHq2NFkyLFDRjTWnXS7GAGL3nxGV Hqq1BDSlxJKbszjCmSDrgQR785K3o0W/5i1iILxXz4t1mjQe5T+cPXrpNzmg+TQR GfxzVgeMlMOHakPK/hwDWV/XqZ/7v79OVpYXjz6+IMJancWeFS1VDxiVEh2+1cfU TFeDNEtAnv7siDV4MFPDiI4pNfNENnrXSGmJQ5BaOjkOnHsrd0QbWfCobgP1PsZP p6njc+5h9mxCgrTnDaXy0SsgxImSug== =/3KS -----END PGP SIGNATURE----- --1MZoVMv9ZNZ4UrVTeZoywnDEQ0deBQBo3--