From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:09:46 2020 Received: (at submit) by debbugs.gnu.org; 20 Aug 2020 15:09:46 +0000 Received: from localhost ([127.0.0.1]:43423 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mCD-00060P-LS for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:09:46 -0400 Received: from lists.gnu.org ([209.51.188.17]:49996) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mC7-00060D-WB for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:09:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8mC6-00051h-0Q for guix-patches@gnu.org; Thu, 20 Aug 2020 11:09:35 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:36558) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8mBw-0006UV-Oc for guix-patches@gnu.org; Thu, 20 Aug 2020 11:09:33 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 59C253360398; Thu, 20 Aug 2020 17:09:19 +0200 (CEST) From: Danny Milosavljevic To: guix-patches@gnu.org Subject: [PATCH core-updates 00/29] Big changes from wip-desktop. Date: Thu, 20 Aug 2020 17:09:14 +0200 Message-Id: <20200820150914.9443-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=85.13.145.193; envelope-from=dannym@scratchpost.org; helo=dd26836.kasserver.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/20 11:09:19 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_NONE=0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Some packages that were updated in wip-desktop have a lot of dependents: #dependents package 6206 yelp-xsl 6205 yelp-tools 6188 glib 6057 gobject-introspection 6031 pixman 6025 openjpeg 6012 cairo 5908 pango 4535 texlive-bin 2625 gdk-pixbuf 2622 vala 2607 libgsf 2602 librsvg@2.40.21 2583 atk 2582 gdk-pixbuf+svg 2581 gtk+@2.24.32 2176 wayland 2169 wayland-protocols 1932 atkmm 1931 gtkmm@2.24.5 1912 gtk-doc 1271 json-glib 1262 at-spi2-core 1260 at-spi2-atk 1258 gtk+ Update them on core-updates. Raghav Gururajan (29): gnu: yelp-xsl: Update package definition. gnu: yelp-tools: Update package definition. gnu: glib: Update package definition. gnu: glib-with-documentation: Update package definition. gnu: gobject-introspection: Update package definition. gnu: gobject-introspection: Propagate glib. gnu: gobject-introspection: Add patches back. gnu: pixman: Update package definition. gnu: openjpeg: Update package definition. gnu: cairo: Update package definition. gnu: pango: Update package definition. gnu: gdk-pixbuf: Update package definition. gnu: gdk-pixbuf: Disable failing tests. gnu: gdk-pixbuf+svg: Update package definition. gnu: vala: Update package definition. gnu: libgsf: Update package definition. gnu: librsvg@2.40.21: Update package definition. gnu: atk: Update to 2.36.0. gnu: gtk+-2: Update package definition. gnu: wayland: Update package definition. gnu: wayland-protocols: Update package definition. gnu: atkmm: Update package definition. gnu: gtk-doc: Update package definition. gnu: json-glib: Update package definition. gnu: at-spi2-core: Update package definition. gnu: at-spi2-atk: Update to 2.34.2. gnu: gtk+: Update package definition. gnu: gtk+: Propagate libcloudproviders. gnu: gtk+: Add missing input. gnu/local.mk | 3 +- gnu/packages/freedesktop.scm | 115 +- gnu/packages/glib.scm | 417 +++--- gnu/packages/gnome.scm | 401 ++++-- gnu/packages/gtk.scm | 1174 ++++++++++------- gnu/packages/image.scm | 88 +- .../patches/glib-disable-failing-tests.patch | 84 ++ gnu/packages/patches/glib-tests-timer.patch | 15 - .../patches/pango-skip-libthai-test.patch | 23 - gnu/packages/xdisorg.scm | 42 +- 10 files changed, 1337 insertions(+), 1025 deletions(-) create mode 100644 gnu/packages/patches/glib-disable-failing-tests.patch delete mode 100644 gnu/packages/patches/glib-tests-timer.patch delete mode 100644 gnu/packages/patches/pango-skip-libthai-test.patch From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:10:58 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:10:58 +0000 Received: from localhost ([127.0.0.1]:43438 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDQ-00063X-Sd for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:10:58 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42300) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDP-00063C-BN for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:10:55 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id AB5383360398; Thu, 20 Aug 2020 17:10:54 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 01/29] gnu: yelp-xsl: Update package definition. Date: Thu, 20 Aug 2020 17:10:22 +0200 Message-Id: <20200820151050.9529-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820150914.9443-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/gnome.scm (yelp-xsl) [version]: Update to 3.36.0. [source][sha256]: Modify base32. [arguments]<#:configure-flag>[--enable-doc]: New flag. [native-inputs]: Add mallard-ducktype, intltool and libxslt. [description]: Modify. [license]: Add lgpl2.1+ and expat. Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 50 ++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 116f6d660f..5dda82d295 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5698,26 +5698,44 @@ of running programs and invoke methods on those interfaces.") (define-public yelp-xsl (package (name "yelp-xsl") - (version "3.34.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc")))) + (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 "1hsfj3q3a3kca0cf9i02xlq2qd4vy12qsjb89hh4r6mp6c11rrag")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + "--enable-doc"))) (native-inputs - `(("gettext-minimal" ,gettext-minimal) + `(("ducktype" ,mallard-ducktype) + ("gettext" ,gettext-minimal) + ("intltool" ,intltool) ("itstool" ,itstool) - ("xmllint" ,libxml2))) - (home-page "https://wiki.gnome.org/Apps/Yelp") + ("xmllint" ,libxml2) + ("xsltproc" ,libxslt))) (synopsis "XSL stylesheets for Yelp") - (description - "Yelp-xsl contains XSL stylesheets that are used by the yelp help browser -to format Docbook and Mallard documents.") - (license license:gpl2+))) + (description "Yelp-XSL is a collection of programs and data files to help +you build, maintain, and distribute documentation. It provides XSLT stylesheets +that can be built upon for help viewers and publishing systems. These +stylesheets output JavaScript and CSS content, and reference images +provided by yelp-xsl. It also redistributes copies of the jQuery and +jQuery.Syntax JavaScript libraries.") + (home-page "https://wiki.gnome.org/Apps/Yelp") + (license + (list + ;; XSLT + license:gpl2+ + ;; Images + license:lgpl2.1+ + ;; JavaScript + license:expat)))) (define-public yelp (package From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:10:59 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:10:59 +0000 Received: from localhost ([127.0.0.1]:43442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDS-00063m-8L for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:10:59 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDP-00063E-KL for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:10:56 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id EC40E3360623; Thu, 20 Aug 2020 17:10:54 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 02/29] gnu: yelp-tools: Update package definition. Date: Thu, 20 Aug 2020 17:10:23 +0200 Message-Id: <20200820151050.9529-2-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/gnome.scm (yelp-tools): Update package definition. [propagated-inputs]: Move itstool, libxml2 and libxslt to ... [native-inputs]: ... here. [synopsis]: Modify. [description]: Modify. Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5dda82d295..881cfa493d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5775,31 +5775,27 @@ freedesktop.org help system specification.") (package (name "yelp-tools") (version "3.32.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q")))) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) - (propagated-inputs - ;; Needed by `yelp-build', `yelp-check' or 'yelp.m4'. `(("itstool" ,itstool) + ("pkg-config" ,pkg-config) ("xmllint" ,libxml2) ("xsltproc" ,libxslt))) (inputs `(("yelp-xsl" ,yelp-xsl))) + (synopsis "Tools for Yelp") + (description "Yelp-Tools contains small programs that help you create, edit, +manage, and publish your Mallard or DocBook documentation.") (home-page "https://wiki.gnome.org/Apps/Yelp/Tools") - (synopsis "Yelp documentation tools") - (description - "Yelp-tools is a collection of scripts and build utilities to help create, -manage, and publish documentation for Yelp and the web. Most of the heavy -lifting is done by packages like yelp-xsl and itstool. This package just -wraps things up in a developer-friendly way.") (license license:gpl2+))) (define-public libgee From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:06 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:07 +0000 Received: from localhost ([127.0.0.1]:43462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDZ-00065j-1l for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:06 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42320) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDQ-00063G-6Y for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:10:57 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 7DA453367E2C; Thu, 20 Aug 2020 17:10:55 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 04/29] gnu: glib-with-documentation: Update package definition. Date: Thu, 20 Aug 2020 17:10:25 +0200 Message-Id: <20200820151050.9529-4-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/glib.scm (glib-with-documentation): Update package definition. [properties]: Remove field. [native-inputs]: Remove libxml2. [arguments]<#:phases>['patch-docbook-xml]: New phase. ['move-doc]: Modify phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/glib.scm | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 057b90eaa1..55ffdf724e 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -291,27 +291,40 @@ threads, dynamic loading, and an object system.") ;; which in turn depends on glib. (package (inherit glib) - (properties (alist-delete 'hidden? (package-properties glib))) - (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc reference (native-inputs - `(("gtk-doc" ,gtk-doc) ; for the doc - ("docbook-xml" ,docbook-xml) - ("libxml2" ,libxml2) + `(("gtk-doc" ,gtk-doc) + ("docbook-xml-4.2" ,docbook-xml-4.2) + ("docbook-xml-4.5" ,docbook-xml) ,@(package-native-inputs glib))) + (outputs (cons "doc" (package-outputs glib))) (arguments (substitute-keyword-arguments (package-arguments glib) ((#:configure-flags flags ''()) `(cons "-Dgtk_doc=true" ,flags)) ((#:phases phases) `(modify-phases ,phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs/reference" + (substitute* '("gio/gdbus-object-manager-example/.*\\.xml" + "gio/.*\\.xml" "glib/.*\\.xml" "gobject/.*\\.xml") + (("http://www.oasis-open.org/docbook/xml/4.5/") + (string-append (assoc-ref inputs "docbook-xml-4.5") + "/xml/dtd/docbook/"))) + (substitute* "gio/gio.xml" + (("http://www.oasis-open.org/docbook/xml/4.2/") + (string-append (assoc-ref inputs "docbook-xml-4.2") + "/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")) (html (string-append "/share/gtk-doc"))) - (copy-recursively (string-append out html) - (string-append doc html)) - (delete-file-recursively (string-append out html)) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out html) + (string-append doc html)) #t))))))))) (define gobject-introspection From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:07 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:08 +0000 Received: from localhost ([127.0.0.1]:43470 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDa-00066M-KC for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:07 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDR-00063Z-Ij for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:10:58 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id E30483368069; Thu, 20 Aug 2020 17:10:56 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 09/29] gnu: openjpeg: Update package definition. Date: Thu, 20 Aug 2020 17:10:30 +0200 Message-Id: <20200820151050.9529-9-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/image.scm (openjpeg): Update package definition. [outputs]: New output "doc". [arguments]<#:tests?>: Remove argument. <#:configure-flags>[-DBUILD_DOC]: New flag. [-DBUILD_LUTS_GENERATOR]: New flag. [-DBUILD_UNIT_TESTS]: New flag. [-DBUILD_MJ2]: New flag. [-DBUILD_JPWL]: New flag. [-DBUILD_JP3D]: New flag. [-DBUILD_TESTING]: New flag. [-DOPJ_DATA_ROOT]: New flag. <#:phases>['disable-failing-tests]: New phase. ['move-docs]: New phase. [native-inputs]: Add doxygen, openjpeg-data and python-wrapper. [inputs]: Add curl and fcgi. [synopsis]: Modify. [description]: Modify. Signed-off-by: Danny Milosavljevic --- gnu/packages/image.scm | 88 +++++++++++++++++++++++++++++------------- 1 file changed, 62 insertions(+), 26 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 3fdc6db8a1..5a4425e993 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -763,35 +763,71 @@ images of initially unknown height.") (package (name "openjpeg") (version "2.3.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/uclouvain/openjpeg") - (commit (string-append "v" version)))) - (file-name (git-file-name "openjpeg" version)) - (sha256 - (base32 - "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb")))) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/uclouvain/openjpeg.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb")))) (build-system cmake-build-system) + (outputs '("out" "doc")) (arguments - '(#:tests? #f ;TODO: requires a 1.1 GiB data repository - #:configure-flags '("-DBUILD_STATIC_LIBS=OFF"))) + '(#:configure-flags + (list + "-DBUILD_DOC=ON" + "-DBUILD_STATIC_LIBS=OFF" + "-DBUILD_LUTS_GENERATOR=ON" + "-DBUILD_UNIT_TESTS=ON" + "-DBUILD_MJ2=ON" + "-DBUILD_JPWL=ON" + ;; To be enabled after Java becomes reproducible. + ;; "-DBUILD_JPIP=ON" + ;; "-DBUILD_JPIP_SERVER=ON" + ;; "-DBUILD_JAVA=ON" + "-DBUILD_JP3D=ON" + "-DBUILD_TESTING=ON" + (string-append "-DOPJ_DATA_ROOT=" + (assoc-ref %build-inputs "openjpeg-data"))) + #:phases + (modify-phases %standard-phases + ;; To be re-enabled after upstream fixes the bug, + ;; https://github.com/uclouvain/openjpeg/issues/1264 + (add-after 'unpack 'disable-failing-tests + (lambda _ + (substitute* "tests/CMakeLists.txt" + (("add_subdirectory\\(nonregression\\)") + "")) + #t)) + (add-after 'install 'move-docs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share/doc")) + (rename-file + (string-append out "/share/doc/html") + (string-append doc "/share/doc/html")) + #t)))))) + (native-inputs + `(("doxygen" ,doxygen) + ("openjpeg-data" ,openjpeg-data) ; Files for test-suite + ("python" ,python-wrapper))) (inputs - `(("lcms" ,lcms) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("zlib" ,zlib))) - (synopsis "JPEG 2000 codec") - (description - "The OpenJPEG library is a JPEG 2000 codec written in C. It has -been developed in order to promote the use of JPEG 2000, the new -still-image compression standard from the Joint Photographic Experts -Group (JPEG). - -In addition to the basic codec, various other features are under -development, among them the JP2 and MJ2 (Motion JPEG 2000) file formats, -an indexing tool useful for the JPIP protocol, JPWL-tools for -error-resilience, a Java-viewer for j2k-images, ...") + `(("curl" ,curl) + ("fcgi" ,fcgi) + ("lcms" ,lcms) + ("libpng" ,libpng) + ("libtiff" ,libtiff) + ("zlib" ,zlib))) + (synopsis "OPENJPEG Library and Applications") + (description "OpenJPEG is an implementation of JPEG 2000 codec written in C +language. It has been developed in order to promote the use of JPEG 2000, a +still-image compression standard from the Joint Photographic Experts Group +(JPEG). Since April 2015, it is officially recognized by ISO/IEC and ITU-T as a +JPEG 2000 Reference Software.") (home-page "https://github.com/uclouvain/openjpeg") (license license:bsd-2))) From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:15 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:15 +0000 Received: from localhost ([127.0.0.1]:43473 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDb-00066j-MZ for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:15 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDP-00063F-Tq for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:00 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 383853360C6A; Thu, 20 Aug 2020 17:10:55 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 03/29] gnu: glib: Update package definition. Date: Thu, 20 Aug 2020 17:10:24 +0200 Message-Id: <20200820151050.9529-3-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Raghav Gururajan * gnu/packages/glib.scm (glib) [version]: Update to 2.64.3. [source][sha256]: Modify base32. [patches]: Add glib-disable-failing-tests.patch. Remove glib-tests-timer.patch. [arguments]<#:disallowed-references>: Remove argument. <#:phases>['patch-python-references]: New phase. ['pre-check]: New phase. ['move-bin]: New phase. ['patch-dbus-launch-path]: Remove phase. ['patch-gio-launch-desktop]: Remove phase. ['pre-build]: Remove phase. ['disable-failing-tests]: Remove phase. ['check]: Remove phase. ['move-executables]: Remove phase. [native-inputs]: Add intltool, python, libxml2 and libxslt. Remove dbus. [inputs]: Add dbus and libelf. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Update to lgpl2.1+. * gnu/packages/patches/glib-disable-failing-tests.patch: New file. * gnu/packages/patches/glib-tests-timer.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust. Signed-off-by: Danny Milosavljevic --- gnu/local.mk | 2 +- gnu/packages/glib.scm | 316 ++++++------------ .../patches/glib-disable-failing-tests.patch | 84 +++++ gnu/packages/patches/glib-tests-timer.patch | 15 - 4 files changed, 194 insertions(+), 223 deletions(-) create mode 100644 gnu/packages/patches/glib-disable-failing-tests.patch delete mode 100644 gnu/packages/patches/glib-tests-timer.patch diff --git a/gnu/local.mk b/gnu/local.mk index edb4e69895..ae708248e8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1015,7 +1015,7 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ - %D%/packages/patches/glib-tests-timer.patch \ + %D%/packages/patches/glib-disable-failing-tests.patch \ %D%/packages/patches/glibc-CVE-2015-5180.patch \ %D%/packages/patches/glibc-CVE-2015-7547.patch \ %D%/packages/patches/glibc-CVE-2016-3075.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9f0721b8c2..057b90eaa1 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) + #:use-module (gnu packages elf) #:use-module (gnu packages enlightenment) #:use-module (gnu packages file) #:use-module (gnu packages flex) @@ -176,213 +177,114 @@ shared NFS home directories.") (define glib (package - (name "glib") - (version "2.62.6") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" - name "/" (string-take version 4) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh")) - (patches (search-patches "glib-tests-timer.patch")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "tests/spawn-test.c" - (("/bin/sh") "sh")) - #t)))) - (build-system meson-build-system) - (outputs '("out" ; everything - "bin")) ; glib-mkenums, gtester, etc.; depends on Python - (propagated-inputs - `(("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc - ("libffi" ,libffi) ; in the Requires.private field of gobject-2.0.pc - ;; These are in the Requires.private field of gio-2.0.pc - ("util-linux" ,util-linux "lib") ;for libmount - ("libselinux" ,libselinux) - ("zlib" ,zlib))) - (native-inputs - `(("gettext" ,gettext-minimal) - ("m4" ,m4) ; for installing m4 macros - ("dbus" ,dbus) ; for GDBus tests - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("perl" ,perl) ; needed by GIO tests - ("tzdata" ,tzdata-for-tests))) ; for tests/gdatetime.c - (arguments - `(#:disallowed-references (,tzdata-for-tests) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-dbus-launch-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((dbus (assoc-ref inputs "dbus"))) - (substitute* "gio/gdbusaddress.c" - (("command_line = g_strdup_printf \\(\"dbus-launch") - (string-append "command_line = g_strdup_printf (\"" - dbus "/bin/dbus-launch"))) - #t))) - (add-after 'unpack 'patch-gio-launch-desktop - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; See also - ;; for another future fix. - (substitute* "gio/gdesktopappinfo.c" - (("gio-launch-desktop") - (string-append out "/libexec/gio-launch-desktop"))) - #t))) - (add-before 'build 'pre-build - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; For tests/gdatetime.c. - (setenv "TZDIR" - (string-append (assoc-ref inputs "tzdata") - "/share/zoneinfo")) - - ;; Some tests want write access there. - (setenv "HOME" (getcwd)) - (setenv "XDG_CACHE_HOME" (getcwd)) - #t)) - (add-after 'unpack 'disable-failing-tests - (lambda _ - (let ((disable - (lambda (test-file test-paths) - (define pattern+procs - (map (lambda (test-path) - (cons - ;; XXX: only works for single line statements. - (format #f "g_test_add_func.*\"~a\".*" test-path) - (const ""))) - test-paths)) - (substitute test-file pattern+procs))) - (failing-tests - '(("glib/tests/thread.c" - (;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-xen-amd64 - ;; as found on hydra.gnu.org, and strace(1) doesn't - ;; recognize it. - "/thread/thread4")) - - ;; This tries to find programs in FHS directories. - ("glib/tests/utils.c" - ("/utils/find-program")) - - ;; This fails because "glib/tests/echo-script" cannot be - ;; found. - ("glib/tests/spawn-singlethread.c" - ("/gthread/spawn-script")) - - ("glib/tests/timer.c" - (;; fails if compiler optimizations are enabled, which they - ;; are by default. - "/timer/stop")) - - ("gio/tests/gapplication.c" - (;; XXX: proven to be unreliable. See: - ;; - ;; - "/gapplication/quit" - - ;; XXX: fails randomly for unknown reason. See: - ;; - "/gapplication/local-actions")) - - ("gio/tests/contenttype.c" - (;; XXX: requires shared-mime-info. - "/contenttype/guess" - "/contenttype/guess_svg_from_data" - "/contenttype/subtype" - "/contenttype/list" - "/contenttype/icon" - "/contenttype/symbolic-icon" - "/contenttype/tree")) - - ("gio/tests/appinfo.c" - (;; XXX: requires update-desktop-database. - "/appinfo/associations")) - - ("gio/tests/desktop-app-info.c" - (;; XXX: requires update-desktop-database. - "/desktop-app-info/delete" - "/desktop-app-info/default" - "/desktop-app-info/fallback" - "/desktop-app-info/lastused" - "/desktop-app-info/search")) - - ("gio/tests/gdbus-peer.c" - (;; Requires /etc/machine-id. - "/gdbus/codegen-peer-to-peer")) - - ("gio/tests/gdbus-address-get-session.c" - (;; Requires /etc/machine-id. - "/gdbus/x11-autolaunch")) - - ("gio/tests/gsocketclient-slow.c" - (;; These tests tries to resolve "localhost", and fails. - "/socket-client/happy-eyeballs/slow" - "/socket-client/happy-eyeballs/cancellation/delayed")) - - ))) - (for-each (lambda (x) (apply disable x)) failing-tests) - #t))) - (replace 'check - (lambda _ - (setenv "MESON_TESTTHREADS" - (number->string (parallel-job-count))) - ;; Do not run tests marked as "flaky". - (invoke "meson" "test" "--no-suite" "flaky"))) - ;; TODO: meson does not permit the bindir to be outside of prefix. - ;; See https://github.com/mesonbuild/meson/issues/2561 - ;; We can remove this once meson is patched. - (add-after 'install 'move-executables - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (assoc-ref outputs "bin"))) - (mkdir-p bin) - (rename-file (string-append out "/bin") - (string-append bin "/bin")) - ;; This one is an implementation detail of glib. - ;; It is wrong that that's in "/bin" in the first place, - ;; but that's what upstream is doing right now. - ;; See . - (mkdir (string-append out "/libexec")) - (rename-file (string-append bin "/bin/gio-launch-desktop") - (string-append out "/libexec/gio-launch-desktop")) - ;; Do not refer to "bindir", which points to "${prefix}/bin". - ;; We don't patch "bindir" to point to "$bin/bin", because that - ;; would create a reference cycle between the "out" and "bin" - ;; outputs. - (substitute* (list (string-append out "/lib/pkgconfig/gio-2.0.pc") - (string-append out "/lib/pkgconfig/glib-2.0.pc")) - (("bindir=\\$\\{prefix\\}/bin") "") - (("=\\$\\{bindir\\}/") "=")) - #t)))))) - ;; TODO: see above for explanation. - ;; #:configure-flags (list (string-append "--bindir=" - ;; (assoc-ref %outputs "bin") - ;; "/bin")) - - (native-search-paths - ;; This variable is not really "owned" by GLib, but several related - ;; packages refer to it: gobject-introspection's tools use it as a search - ;; path for .gir files, and it's also a search path for schemas produced - ;; by 'glib-compile-schemas'. - (list (search-path-specification - (variable "XDG_DATA_DIRS") - (files '("share"))) - ;; To load extra gio modules from glib-networking, etc. - (search-path-specification - (variable "GIO_EXTRA_MODULES") - (files '("lib/gio/modules"))))) - (search-paths native-search-paths) - (properties '((hidden? . #t))) - - (synopsis "Thread-safe general utility library; basis of GTK+ and GNOME") - (description - "GLib provides data structure handling for C, portability wrappers, -and interfaces for such runtime functionality as an event loop, threads, -dynamic loading, and an object system.") - (home-page "https://developer.gnome.org/glib/") - (license license:lgpl2.1+))) + (name "glib") + (version "2.64.3") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" + name "/" (string-take version 4) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "08pbgiv5m3rica4ydvwvpq5mrxbyswx7l1jzjc2ch52xjabvr77y")) + (patches + (search-patches "glib-disable-failing-tests.patch")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "tests/spawn-test.c" + (("/bin/sh") "sh")) + #t)))) + (build-system meson-build-system) + (outputs '("out" "bin")) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Python references are not being patched in patch-phase of build, + ;; despite using python-wrapper as input. So we patch them manually. + (add-after 'unpack 'patch-python-references + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("gio/gdbus-2.0/codegen/gdbus-codegen.in" + "glib/gtester-report.in" + "gobject/glib-genmarshal.in" + "gobject/glib-mkenums.in") + (("@PYTHON@") + (string-append (assoc-ref inputs "python") + "/bin/python" + ,(version-major+minor + (package-version python))))) + #t)) + (add-before 'check 'pre-check + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; For tests/gdatetime.c. + (setenv "TZDIR" + (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo")) + ;; Some tests want write access there. + (setenv "HOME" (getcwd)) + (setenv "XDG_CACHE_HOME" (getcwd)) + #t)) + ;; Meson does not permit the bindir to be outside of prefix. + (add-after 'install 'move-bin + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) + (mkdir-p bin) + (rename-file + (string-append out "/bin") + (string-append bin "/bin")) + ;; Do not refer to "bindir", which points to "${prefix}/bin". + ;; We don't patch "bindir" to point to "$bin/bin", because that + ;; would create a reference cycle between the "out" and "bin" + ;; outputs. + (substitute* + (list + (string-append out "/lib/pkgconfig/gio-2.0.pc") + (string-append out "/lib/pkgconfig/glib-2.0.pc")) + (("bindir=\\$\\{prefix\\}/bin") "") + (("=\\$\\{bindir\\}/") "=")) + #t)))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("libintl" ,intltool) + ("m4" ,m4) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper) + ("python" ,python) ; For 'patch-python-references + ("tzdata" ,tzdata-for-tests) + ("xmllint" ,libxml2) + ("xsltproc" ,libxslt))) + (inputs + `(("dbus" ,dbus) + ("libelf" ,libelf))) + (propagated-inputs + `(("libffi" ,libffi) + ("libselinux" ,libselinux) + ("pcre" ,pcre) + ("util-linux" ,util-linux "lib") + ("zlib" ,zlib))) + (native-search-paths + ;; This variable is not really "owned" by GLib, but several related + ;; packages refer to it: gobject-introspection's tools use it as a search + ;; path for .gir files, and it's also a search path for schemas produced + ;; by 'glib-compile-schemas'. + (list + (search-path-specification + (variable "XDG_DATA_DIRS") + (files '("share"))) + ;; To load extra gio modules from glib-networking, etc. + (search-path-specification + (variable "GIO_EXTRA_MODULES") + (files '("lib/gio/modules"))))) + (search-paths native-search-paths) + (synopsis "Low-level core library for GNOME projects") + (description "GLib provides data structure handling for C, portability +wrappers, and interfaces for such runtime functionality as an event loop, +threads, dynamic loading, and an object system.") + (home-page "https://wiki.gnome.org/Projects/GLib") + (license license:lgpl2.1+))) (define-public glib-with-documentation ;; glib's doc must be built in a separate package since it requires gtk-doc, diff --git a/gnu/packages/patches/glib-disable-failing-tests.patch b/gnu/packages/patches/glib-disable-failing-tests.patch new file mode 100644 index 0000000000..3601c42030 --- /dev/null +++ b/gnu/packages/patches/glib-disable-failing-tests.patch @@ -0,0 +1,84 @@ +From a2e6783f2278ed32b1e552691ec5d67d6940757e Mon Sep 17 00:00:00 2001 +From: Raghav Gururajan +Date: Tue, 9 Jun 2020 05:17:53 -0400 +Subject: [PATCH] PATCH: Disable failing tests. + +--- + gio/tests/meson.build | 19 ------------------- + glib/tests/meson.build | 2 -- + 2 files changed, 21 deletions(-) + +diff --git a/gio/tests/meson.build b/gio/tests/meson.build +index c7c3e3035..6e38eb39e 100644 +--- a/gio/tests/meson.build ++++ b/gio/tests/meson.build +@@ -34,7 +34,6 @@ gio_tests = { + 'buffered-output-stream' : {}, + 'cancellable' : {}, + 'contexts' : {}, +- 'contenttype' : {}, + 'converter-stream' : {}, + 'credentials' : {}, + 'data-input-stream' : {}, +@@ -78,7 +77,6 @@ gio_tests = { + 'tls-certificate' : {'extra_sources' : ['gtesttlsbackend.c']}, + 'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']}, + 'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']}, +- 'gdbus-address-get-session' : {}, + 'win32-appinfo' : {}, + } + +@@ -135,10 +133,6 @@ endif + if host_machine.system() != 'windows' + gio_tests += { + 'file' : {}, +- 'gdbus-peer' : { +- 'dependencies' : [libgdbus_example_objectmanager_dep], +- 'install_rpath' : installed_tests_execdir +- }, + 'gdbus-peer-object-manager' : {}, + 'live-g-file' : {}, + 'socket-address' : {}, +@@ -173,19 +167,6 @@ if host_machine.system() != 'windows' + } + endif + +- # Uninstalled because of the check-for-executable logic in DesktopAppInfo +- # unable to find the installed executable +- if not glib_have_cocoa +- gio_tests += { +- 'appinfo' : { +- 'install' : false, +- }, +- 'desktop-app-info' : { +- 'install' : false, +- }, +- } +- endif +- + test_extra_programs += { + 'basic-application' : {}, + 'dbus-launch' : {}, +diff --git a/glib/tests/meson.build b/glib/tests/meson.build +index 8da477d19..9fa24dd49 100644 +--- a/glib/tests/meson.build ++++ b/glib/tests/meson.build +@@ -103,7 +103,6 @@ glib_tests = { + 'utf8-pointer' : {}, + 'utf8-validate' : {}, + 'utf8-misc' : {}, +- 'utils' : {}, + 'unicode' : {}, + 'uri' : {}, + '1bit-mutex' : {}, +@@ -151,7 +150,6 @@ if host_machine.system() == 'windows' + else + glib_tests += { + 'include' : {}, +- 'unix' : {}, + } + if have_rtld_next + glib_tests += { +-- +2.26.2 + diff --git a/gnu/packages/patches/glib-tests-timer.patch b/gnu/packages/patches/glib-tests-timer.patch deleted file mode 100644 index e37425c0c8..0000000000 --- a/gnu/packages/patches/glib-tests-timer.patch +++ /dev/null @@ -1,15 +0,0 @@ -* On i686 floating-point roundoff errors could sometimes cause this check to - fail depending on the elapsed microseconds. Improve rounding by adding a - fractional bit. - ---- glib-2.40.0/glib/tests/timer.c 2014-03-05 08:05:42.000000000 -0600 -+++ glib-2.40.0/glib/tests/timer.c 2014-07-10 16:33:12.746862822 -0500 -@@ -35,7 +35,7 @@ - elapsed = g_timer_elapsed (timer, µs); - - g_assert_cmpfloat (elapsed, <, 1.0); -- g_assert_cmpuint (micros, ==, ((guint64)(elapsed * 1e6)) % 1000000); -+ g_assert_cmpuint (micros, ==, ((guint64)(elapsed * 1e6 + 0.5)) % 1000000); - - g_timer_destroy (timer); - } From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:15 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:16 +0000 Received: from localhost ([127.0.0.1]:43480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDj-00067x-KX for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:15 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDT-00063U-Pb for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:00 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 254EE3365588; Thu, 20 Aug 2020 17:10:56 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 06/29] gnu: gobject-introspection: Propagate glib. Date: Thu, 20 Aug 2020 17:10:27 +0200 Message-Id: <20200820151050.9529-6-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/glib.scm (gobject-introspection) [inputs]: Move glib to ... [propagated-inputs]: ... here. Signed-off-by: Danny Milosavljevic --- gnu/packages/glib.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index c4bf47512b..1221612fbb 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -349,10 +349,10 @@ threads, dynamic loading, and an object system.") ("glib" ,glib "bin") ("pkg-config" ,pkg-config))) (inputs - `(("glib" ,glib) - ("python" ,python-wrapper))) + `(("python" ,python-wrapper))) (propagated-inputs - `(("libffi" ,libffi))) + `(("glib" ,glib) + ("libffi" ,libffi))) (native-search-paths (list (search-path-specification (variable "GI_TYPELIB_PATH") From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:16 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:16 +0000 Received: from localhost ([127.0.0.1]:43482 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDj-000684-TZ for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:16 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDS-00063h-Sa for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:01 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 2C70F336807D; Thu, 20 Aug 2020 17:10:57 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 10/29] gnu: cairo: Update package definition. Date: Thu, 20 Aug 2020 17:10:31 +0200 Message-Id: <20200820151050.9529-10-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/gtk.scm (cairo): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output "doc". [arguments]<#:configure-flags>[--with-html-dir]: New flag. [native-inputs]: Add gobject-introspection. [inputs]: Add libdrm. Remove xorgproto and zlib. [propagated-inputs]: Add libxcb. [synopsis]: Modify. [description]: Modify. [license]: Modify. Signed-off-by: Danny Milosavljevic --- gnu/packages/gtk.scm | 114 ++++++++++++++++++++++++------------------- 1 file changed, 64 insertions(+), 50 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e3c097943f..2f939ff0bd 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -119,57 +119,71 @@ tools have full access to view and control running applications.") (define-public cairo (package - (name "cairo") - (version "1.16.0") - (source (origin - (method url-fetch) - (uri (string-append "https://cairographics.org/releases/cairo-" - version ".tar.xz")) - (sha256 - (base32 - "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy")))) - (build-system gnu-build-system) - (propagated-inputs - `(("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glib" ,glib) - ("libpng" ,libpng) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libxrender" ,libxrender) - ("pixman" ,pixman))) - (inputs - `(("ghostscript" ,ghostscript) - ("libspectre" ,libspectre) - ("poppler" ,poppler) - ("xorgproto" ,xorgproto) - ("zlib" ,zlib))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("python" ,python-wrapper))) + (name "cairo") + (version "1.16.0") + (source + (origin + (method url-fetch) + (uri + (string-append "https://cairographics.org/releases/cairo-" + version ".tar.xz")) + (sha256 + (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy")))) + (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) (arguments - `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html - #:configure-flags '("--enable-tee" ;needed for GNU Icecat - "--enable-xml" ;for cairo-xml support - "--disable-static"))) - (synopsis "2D graphics library") - (description - "Cairo is a 2D graphics library with support for multiple output devices. -Currently supported output targets include the X Window System (via both -Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file -output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB. - -Cairo is designed to produce consistent output on all output media while -taking advantage of display hardware acceleration when available -eg. through the X Render Extension). - -The cairo API provides operations similar to the drawing operators of -PostScript and PDF. Operations in cairo including stroking and filling cubic -Bézier splines, transforming and compositing translucent images, and -antialiased text rendering. All drawing operations can be transformed by any -affine transformation (scale, rotation, shear, etc.).") - (license license:lgpl2.1) ; or Mozilla Public License 1.1 - (home-page "https://cairographics.org/"))) + `(#:tests? #f ; See http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html + #:configure-flags + (list + "--disable-static" + ;; XXX: To be enabled. + ;; "--enable-gallium=yes" + ;; "--enable-gl=yes" + ;; " --enable-glesv2=yes" + ;; "--enable-glesv3=yes" + ;; "--enable-cogl=yes" + ;; "--enable-directfb=yes" + ;; "--enable-vg=yes" + "--enable-tee=yes" + "--enable-xml=yes" + (string-append "--with-html-dir=" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html")))) + (native-inputs + `(("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (inputs + `(("drm" ,libdrm) + ("ghostscript" ,ghostscript) + ("libspectre" ,libspectre) + ("poppler" ,poppler))) + (propagated-inputs + `(;; ("cogl" ,cogl) + ;; ("directfb" ,directfb) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("glib" ,glib) + ;; ("gtk+" ,gtk+) + ("libpng" ,libpng) + ;; ("librsvg" ,librsvg) + ;; ("opengl" ,mesa) + ("pixman" ,pixman) + ("x11" ,libx11) + ("xcb" ,libxcb) + ("xext" ,libxext) + ("xrender" ,libxrender))) + (synopsis "Multi-platform 2D graphics library") + (description "Cairo is a 2D graphics library with support for multiple output +devices. Currently supported output targets include the X Window System (via +both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file +output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.") + (home-page "https://cairographics.org/") + (license + ;; This project is dual-licensed. + (list + license:lgpl2.1+ + license:mpl1.1)))) (define-public cairo-xcb (package From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:18 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:18 +0000 Received: from localhost ([127.0.0.1]:43484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDk-00068B-BF for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:18 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDQ-00063R-It for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:01 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id C6F27336805A; Thu, 20 Aug 2020 17:10:55 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 05/29] gnu: gobject-introspection: Update package definition. Date: Thu, 20 Aug 2020 17:10:26 +0200 Message-Id: <20200820151050.9529-5-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/glib.scm (gobject-introspection) [version]: Update to 1.64.1. [patches]: Remove all patches. [arguments]<#:glib-or-gtk?>: New argument. <#:phases>: Remove all phases. [native-inputs]: Add bison and flex. [inputs]: Remove bison, flex and zlib. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Modify. * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: Delete file. * gnu/packages/patches/gobject-introspection-cc.patch: Delete file. * gnu/packages/patches/gobject-introspection-girepository.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove them. Signed-off-by: Danny Milosavljevic --- gnu/local.mk | 3 - gnu/packages/glib.scm | 69 ++++---- ...ct-introspection-absolute-shlib-path.patch | 166 ------------------ .../patches/gobject-introspection-cc.patch | 14 -- .../gobject-introspection-girepository.patch | 25 --- 5 files changed, 30 insertions(+), 247 deletions(-) delete mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch delete mode 100644 gnu/packages/patches/gobject-introspection-cc.patch delete mode 100644 gnu/packages/patches/gobject-introspection-girepository.patch diff --git a/gnu/local.mk b/gnu/local.mk index ae708248e8..278879334c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1065,9 +1065,6 @@ dist_patch_DATA = \ %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ %D%/packages/patches/gnutls-cross.patch \ - %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ - %D%/packages/patches/gobject-introspection-cc.patch \ - %D%/packages/patches/gobject-introspection-girepository.patch \ %D%/packages/patches/go-skip-gc-test.patch \ %D%/packages/patches/gpm-glibc-2.26.patch \ %D%/packages/patches/gpsbabel-minizip.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 55ffdf724e..c4bf47512b 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -330,56 +330,47 @@ threads, dynamic loading, and an object system.") (define gobject-introspection (package (name "gobject-introspection") - (version "1.62.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" - "gobject-introspection/" (version-major+minor version) - "/gobject-introspection-" version ".tar.xz")) - (sha256 - (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi")) - (patches (search-patches - "gobject-introspection-cc.patch" - "gobject-introspection-girepository.patch" - "gobject-introspection-absolute-shlib-path.patch")))) + (version "1.64.1") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" + name "/" (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0")))) (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'do-not-use-/usr/bin/env - (lambda _ - (substitute* "tools/g-ir-tool-template.in" - (("#!@PYTHON_CMD@") - (string-append "#!" (which "python3")))) - #t))))) - (inputs + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas + (native-inputs `(("bison" ,bison) ("flex" ,flex) - ("glib" ,glib) - ("python" ,python-wrapper) - ("zlib" ,zlib))) - (native-inputs - `(("glib" ,glib "bin") + ("glib" ,glib "bin") ("pkg-config" ,pkg-config))) + (inputs + `(("glib" ,glib) + ("python" ,python-wrapper))) (propagated-inputs - `(;; In practice, GIR users will need libffi when using - ;; gobject-introspection. - ("libffi" ,libffi))) + `(("libffi" ,libffi))) (native-search-paths (list (search-path-specification (variable "GI_TYPELIB_PATH") (files '("lib/girepository-1.0"))))) (search-paths native-search-paths) - (home-page "https://wiki.gnome.org/GObjectIntrospection") - (synopsis "Generate interface introspection data for GObject libraries") - (description - "GObject introspection is a middleware layer between C libraries (using -GObject) and language bindings. The C library can be scanned at compile time -and generate a metadata file, in addition to the actual native C library. Then -at runtime, language bindings can read this metadata and automatically provide -bindings to call into the C library.") - ; Some bits are distributed under the LGPL2+, others under the GPL2+ - (license license:gpl2+))) + (synopsis "GObject introspection tools and libraries") + (description "GObject introspection is a middleware layer between +C libraries (using GObject) and language bindings. The C library can be scanned +at compile time and generate metadata files, in addition to the actual native +C library. Then language bindings can read this metadata and automatically +provide bindings to call into the C library.") + (home-page "https://wiki.gnome.org/Projects/GObjectIntrospection") + (license + (list + ;; For library. + license:lgpl2.0+ + ;; For tools. + license:gpl2+)))) (define intltool (package diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch deleted file mode 100644 index 956fa617c3..0000000000 --- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch +++ /dev/null @@ -1,166 +0,0 @@ -# Names of libraries included in typelib files are opened by dlopen. Here we -# add the full path. -# -# This patch was provided by Luca Bruno for -# 'gobject-introspection' 1.40.0 in Nix. -# -# It has since been updated to work with newer versions of -# gobject-introspection. ---- a/giscanner/scannermain.py -+++ b/giscanner/scannermain.py -@@ -95,6 +95,39 @@ def get_windows_option_group(parser): - return group - - -+def _get_default_fallback_libpath(): -+ # Newer multiple-output-optimized stdenv has an environment variable -+ # $outputLib which in turn specifies another variable which then is used as -+ # the destination for the library contents (${!outputLib}/lib). -+ store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None -+ if store_path is None: -+ outputs = os.environ.get("outputs", "out").split() -+ if "lib" in outputs: -+ # For multiple output derivations let's try whether there is a $lib -+ # environment variable and use that as the base store path. -+ store_path = os.environ.get("lib") -+ elif "out" in outputs: -+ # Otherwise we have a single output derivation, so the libraries -+ # most certainly will end up in "$out/lib". -+ store_path = os.environ.get("out") -+ -+ if store_path is not None: -+ # Even if we have a $lib as output, there still should be a $lib/lib -+ # directory. -+ return os.path.join(store_path, 'lib') -+ else: -+ # If we haven't found a possible scenario, let's return an empty string -+ # so that the shared library won't be prepended with a path. -+ # -+ # Note that this doesn't mean that all hope is lost, because after all -+ # we can still use --fallback-library-path to set one. -+ # -+ # Also, we're not returning None, because that would make it very -+ # difficult to disable adding fallback paths altogether using something -+ # like: --fallback-library-path="" -+ return "" -+ -+ - def _get_option_parser(): - parser = optparse.OptionParser('%prog [options] sources', - version='%prog ' + giscanner.__version__) -@@ -205,6 +238,10 @@ match the namespace prefix.""") - parser.add_option("", "--filelist", - action="store", dest="filelist", default=[], - help="file containing headers and sources to be scanned") -+ parser.add_option("", "--fallback-library-path", -+ action="store", dest="fallback_libpath", -+ default=_get_default_fallback_libpath(), -+ help="Path to prepend to unknown shared libraries") - - group = get_preprocessor_option_group(parser) - parser.add_option_group(group) ---- a/giscanner/shlibs.py -+++ b/giscanner/shlibs.py -@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name): - $""" % re.escape(library_name), re.VERBOSE) - - -+def _ldd_library_guix_pattern(library_name): -+ store_dir = re.escape( -+ os.environ.get("NIX_STORE", default="/gnu/store") -+ ) -+ pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)' -+ return re.compile(pattern % (store_dir, re.escape(library_name))) -+ -+ - # This is a what we do for non-la files. We assume that we are on an - # ELF-like system where ldd exists and the soname extracted with ldd is - # a filename that can be opened with dlopen(). -@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries): - output = output.decode("utf-8", "replace") - - shlibs = resolve_from_ldd_output(libraries, output) -- return list(map(sanitize_shlib_path, shlibs)) -+ fallback_libpath = options.fallback_libpath or ""; -+ return list(map(lambda p: os.path.join(fallback_libpath, p), map(sanitize_shlib_path, shlibs))) - - - def sanitize_shlib_path(lib): -@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib): - # In case we get relative paths on macOS (like @rpath) then we fall - # back to the basename as well: - # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 -- if sys.platform == "darwin": -- if not os.path.isabs(lib): -- return os.path.basename(lib) -- return lib -- else: -+ -+ # Always use absolute paths if available -+ if not os.path.isabs(lib): - return os.path.basename(lib) -+ return lib - - - def resolve_from_ldd_output(libraries, output): - patterns = {} - for library in libraries: - if not os.path.isfile(library): -- patterns[library] = _ldd_library_pattern(library) -+ patterns[library] = (_ldd_library_pattern(library), _ldd_library_guix_pattern(library)) - if len(patterns) == 0: - return [] - -@@ -139,8 +145,12 @@ def resolve_from_ldd_output(libraries, output): - if line.endswith(':'): - continue - for word in line.split(): -- for library, pattern in patterns.items(): -- m = pattern.match(word) -+ for library, (pattern, guix_pattern) in patterns.items(): -+ store_dir = os.environ.get("NIX_STORE", default="/gnu/store") -+ if line.find(store_dir) != -1: -+ m = guix_pattern.match(word) -+ else: -+ m = pattern.match(word) - if m: - del patterns[library] - shlibs.append(m.group()) - ---- a/giscanner/utils.py -+++ b/giscanner/utils.py -@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file): - if dlname is None: - return None - -- # Darwin uses absolute paths where possible; since the libtool files never -- # contain absolute paths, use the libdir field -- if platform.system() == 'Darwin': -- dlbasename = os.path.basename(dlname) -- libdir = _extract_libdir_field(la_file) -- if libdir is None: -- return dlbasename -- return libdir + '/' + dlbasename -- # From the comments in extract_libtool(), older libtools had -- # a path rather than the raw dlname -- return os.path.basename(dlname) -+ dlbasename = os.path.basename(dlname) -+ libdir = _extract_libdir_field(la_file) -+ if libdir is None: -+ return dlbasename -+ return libdir + '/' + dlbasename - - - def extract_libtool(la_file): ---- a/tests/scanner/test_shlibs.py -+++ b/tests/scanner/test_shlibs.py -@@ -40,6 +64,7 @@ class TestLddParser(unittest.TestCase): - - self.assertEqual( - sanitize_shlib_path('/foo/bar'), -- '/foo/bar' if sys.platform == 'darwin' else 'bar') -+ # Always use an absolute filename for Guix -+ '/foo/bar') - - def test_unresolved_library(self): -output = '' diff --git a/gnu/packages/patches/gobject-introspection-cc.patch b/gnu/packages/patches/gobject-introspection-cc.patch deleted file mode 100644 index 6a86b56b44..0000000000 --- a/gnu/packages/patches/gobject-introspection-cc.patch +++ /dev/null @@ -1,14 +0,0 @@ -Use gcc as the default C compiler if CC is not set. - -diff -ru gobject-introspection-1.58.1.orig/giscanner/__init__.py gobject-introspection-1.58.1/giscanner/__init__.py ---- gobject-introspection-1.58.1.orig/giscanner/__init__.py 1970-01-01 01:00:00.000000000 +0100 -+++ gobject-introspection-1.58.1/giscanner/__init__.py 2018-12-03 13:33:28.788971299 +0100 -@@ -22,6 +22,8 @@ - builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR') - if builddir is not None: - __path__.append(os.path.join(builddir, 'giscanner')) -+if not 'CC' in os.environ: -+ os.environ['CC'] = 'gcc' - try: - from ._version import __version__ - except ImportError: diff --git a/gnu/packages/patches/gobject-introspection-girepository.patch b/gnu/packages/patches/gobject-introspection-girepository.patch deleted file mode 100644 index 380617f27f..0000000000 --- a/gnu/packages/patches/gobject-introspection-girepository.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/girepository/gitypelib.c.orig -+++ b/girepository/gitypelib.c -@@ -2296,7 +2296,22 @@ _g_typelib_do_dlopen (GITypelib *typelib) - { - GModule *module; - -+ /* 'gobject-introspection' doesn't store the path of shared -+ libraries into '.typelib' and '.gir' files. Shared -+ libraries are searched for in the dynamic linker search -+ path. In Guix we patch 'gobject-introspection' such that -+ it stores the absolute path of shared libraries in -+ '.typelib' and '.gir' files. Here, in order to minimize -+ side effects, we make sure that if the library is not -+ found at the indicated path location, we try with just -+ the basename and the system dynamic library -+ infrastructure, as per default behaviour of the -+ library. */ - module = load_one_shared_library (shlibs[i]); -+ if (module == NULL && g_path_is_absolute (shlibs[i])) -+ { -+ module = load_one_shared_library (g_basename(shlibs[i])); -+ } - - if (module == NULL) - { From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:22 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:22 +0000 Received: from localhost ([127.0.0.1]:43486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDm-00068P-GT for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:21 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42392) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDU-00064B-OU for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:01 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id ADE5B3368190; Thu, 20 Aug 2020 17:10:58 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 15/29] gnu: vala: Update package definition. Date: Thu, 20 Aug 2020 17:10:36 +0200 Message-Id: <20200820151050.9529-15-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/gnome.scm (vala) [version]: Update to 0.48.7. [source][sha256]: Modify base32. [build-system]: Change from gnu to glib-or-gtk. [arguments]<#:configure-flags>["--enable-coverage]: New flag. <#:phases>['patch-docbook-xml]: New phase. [native-inputs]: Add docbook-xml, docbook-xsl, help2man and perl. [inputs]: Remove graphviz. [propagated-inputs]: Add libgvc. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 84 +++++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 34 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 881cfa493d..7e3032022f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -131,6 +131,7 @@ #:use-module (gnu packages lirc) #:use-module (gnu packages lua) #:use-module (gnu packages mail) + #:use-module (gnu packages man) #:use-module (gnu packages mp3) #:use-module (gnu packages multiprecision) #:use-module (gnu packages music) @@ -3256,46 +3257,61 @@ passwords in the GNOME keyring.") (define-public vala (package (name "vala") - (version "0.46.5") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "07fv895sp9wq74b20qig7hic0r4ynrr5pfaqba02r44xb794fy0s")))) - (build-system gnu-build-system) + (version "0.48.7") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0lswkb7gj0chas9n3l3dbrm9l71hs77adhvm2v600id2ipi37pi8")))) + (build-system glib-or-gtk-build-system) (arguments - '(#:phases + `(#:configure-flags + (list + "--enable-coverage") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc/manual" + (substitute* '("manual.xml" "version.xml.in") + (("http://www.oasis-open.org/docbook/xml/4.4/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) (add-before 'check 'pre-check - (lambda _ - (setenv "CC" "gcc") - (substitute* "valadoc/tests/testrunner.sh" - (("export PKG_CONFIG_PATH=" m) - (string-append m "$PKG_CONFIG_PATH:"))) - ;; For missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0") - #t))))) + (lambda _ + (setenv "CC" "gcc") + (substitute* "valadoc/tests/testrunner.sh" + (("export PKG_CONFIG_PATH=" m) + (string-append m "$PKG_CONFIG_PATH:"))) + ;; For missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + #t))))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("bison" ,bison) + ("dbus" ,dbus) + ("docbook-xml" ,docbook-xml-4.4) + ("docbook-xsl" ,docbook-xsl) ("flex" ,flex) - ("bison" ,bison) - ("xsltproc" ,libxslt) - ("dbus" ,dbus) ; for dbus tests - ("gobject-introspection" ,gobject-introspection))) ; for gir tests - (inputs - `(("graphviz" ,graphviz))) + ("gobject-introspection" ,gobject-introspection) + ("help2man" ,help2man) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs - `(("glib" ,glib))) ; required by libvala-0.40.pc - (home-page "https://live.gnome.org/Vala/") - (synopsis "Compiler for the GObject type system") - (description - "Vala is a programming language that aims to bring modern programming -language features to GNOME developers without imposing any additional runtime -requirements and without using a different ABI compared to applications and -libraries written in C.") + `(("glib" ,glib) + ("libgvc" ,graphviz))) + (synopsis "Compiler using the GObject type system") + (description "Vala is a programming language using modern high level +abstractions without imposing additional runtime requirements and without using +a different ABI compared to applications and libraries written in C. Vala uses +the GObject type system and has additional code generation routines that make +targeting the GNOME stack simple.") + (home-page "https://wiki.gnome.org/Projects/Vala/") (license license:lgpl2.1+))) (define-public vala-0.48 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:22 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:22 +0000 Received: from localhost ([127.0.0.1]:43488 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDq-00068a-0S for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:22 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDV-00063U-01 for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:01 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id EBBFA3360623; Thu, 20 Aug 2020 17:10:58 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 16/29] gnu: libgsf: Update package definition. Date: Thu, 20 Aug 2020 17:10:37 +0200 Message-Id: <20200820151050.9529-16-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/gnome.scm (libgsf): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New outputs "bin" and "doc". [arguments]<#:configure-flags>[--enable-introspection]: New flag. [--with-gir-dir=]: New flag. [--with-typelib-dir=]: New flag. [--with-html-dir]: New flag. [--with-zlib]: New flag. [--with-bz2]: New flag. <#:phases>['patch-docbook-xml]: New phase. [native-inputs]: Add docbook-xml, gobject-introspection and python-wrapper. [inputs]: Add gdk-pixbuf. [propagated-inputs]: Remove gdk-pixbuf. [synopsis]: Modify. [home-page]: Modify. [license]: Modify. Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 87 +++++++++++++++++++++++++++++------------- 1 file changed, 61 insertions(+), 26 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7e3032022f..2bc70ec9c3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2247,39 +2247,74 @@ XML/CSS rendering engine.") (package (name "libgsf") (version "1.14.47") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i")))) - (build-system gnu-build-system) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i")))) + (build-system glib-or-gtk-build-system) + (outputs '("out" "bin" "doc")) (arguments - '(#:configure-flags '("--disable-static"))) + `(#:configure-flags + (list + "--disable-static" + "--enable-introspection" + (string-append "--with-gir-dir=" + (assoc-ref %outputs "out") + "/share/gir-" + ,(version-major + (package-version gobject-introspection)) + ".0") + (string-append "--with-typelib-dir=" + (assoc-ref %outputs "out") + "/lib/girepository-" + ,(version-major + (package-version gobject-introspection)) + ".0") + (string-append "--with-html-dir=" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html") + "--with-zlib" + "--with-bz2") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* "gsf-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.5/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t))))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("docbook-xml" ,docbook-xml) ("gettext" ,gettext-minimal) - - ;; For tests. + ("gobject-introspection" ,gobject-introspection) ("perl" ,perl) - ("perl-xml-parser" ,perl-xml-parser))) + ("perl-xml-parser" ,perl-xml-parser) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) (inputs - `(("zlib" ,zlib) - ("bzip2" ,bzip2))) + `(("bzip2" ,bzip2) + ("gdk-pixbuf" ,gdk-pixbuf) + ("zlib" ,zlib))) (propagated-inputs - `(("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) + `(("glib" ,glib) ("libxml2" ,libxml2))) - (home-page "https://www.gnome.org/projects/libgsf") - (synopsis "GNOME's Structured File Library") - (description - "Libgsf aims to provide an efficient extensible I/O abstraction for -dealing with different structured file formats.") - - ;; LGPLv2.1-only. - (license license:lgpl2.1))) + (synopsis "G Structured File Library") + (description "Libgsf aims to provide an efficient extensible I/O abstraction +for dealing with different structured file formats.") + (home-page "https://gitlab.gnome.org/GNOME/libgsf") + (license + (list + ;; Library + license:lgpl2.1+ + ;; Others + license:lgpl2.0+)))) (define-public librsvg (package From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:22 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:22 +0000 Received: from localhost ([127.0.0.1]:43490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDq-00068h-Dp for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:22 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDV-00063h-9t for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:02 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 7A5F933681D1; Thu, 20 Aug 2020 17:10:59 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 18/29] gnu: atk: Update to 2.36.0. Date: Thu, 20 Aug 2020 17:10:39 +0200 Message-Id: <20200820151050.9529-18-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/gtk.scm (atk): Update to 2.36.0. [version]: Update to 2.36.0. [arguments]<#:glib-or-gtk?>: New argument. [home-page]: Modify. [license]: Update to lgpl2.1+. Signed-off-by: Danny Milosavljevic --- gnu/packages/gtk.scm | 51 +++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 113ee44ad1..bc450a33f6 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -93,30 +93,33 @@ (define-public atk (package - (name "atk") - (version "2.34.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l")))) - (build-system meson-build-system) - (propagated-inputs `(("glib" ,glib))) ; required by atk.pc - (native-inputs - `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ; glib-mkenums, etc. - ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. - (synopsis "GNOME accessibility toolkit") - (description - "ATK provides the set of accessibility interfaces that are implemented -by other toolkits and applications. Using the ATK interfaces, accessibility -tools have full access to view and control running applications.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/atk/"))) + (name "atk") + (version "2.36.0") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas. + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("glib" ,glib))) + (synopsis "GNOME accessibility toolkit") + (description "ATK provides the set of accessibility interfaces that are +implemented by other toolkits and applications. Using the ATK interfaces, +accessibility tools have full access to view and control running applications.") + (home-page "https://wiki.gnome.org/Accessibility") + (license license:lgpl2.1+))) (define-public cairo (package From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:23 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:23 +0000 Received: from localhost ([127.0.0.1]:43492 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDq-00068o-Ox for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:23 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDV-00063R-QJ for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:02 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 02E9F33681E5; Thu, 20 Aug 2020 17:10:59 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 20/29] gnu: wayland: Update package definition. Date: Thu, 20 Aug 2020 17:10:41 +0200 Message-Id: <20200820151050.9529-20-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/freedesktop.scm (wayland) [version]: Update to 1.18.0. [source][sha256]: Modify base32. [build-system]: Change from gnu to meson. [outputs]: New output "doc". [arguments]<#:parallel-tests?>: Remove argument. <#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. [native-inputs]: Move here docbook-xml and docbook-xsl from ... [inputs]: ... here. Move libffi to ... [propagated-inputs]: ... here. [synopsis]: Modify. [description]: Modify. [license]: Change from x11 to expat. Signed-off-by: Danny Milosavljevic --- gnu/packages/freedesktop.scm | 87 +++++++++++++++++++++++++----------- 1 file changed, 62 insertions(+), 25 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 23cd1aabf9..880c006e15 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -637,38 +637,75 @@ Python.") (define-public wayland (package (name "wayland") - (version "1.17.0") - (source (origin - (method url-fetch) - (uri (string-append "https://wayland.freedesktop.org/releases/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "194ibzwpdcn6fvk4xngr4bf5axpciwg2bj82fdvz88kfmjw13akj")))) - (build-system gnu-build-system) + (version "1.18.0") + (source + (origin + (method url-fetch) + (uri + (string-append "https://wayland.freedesktop.org/releases/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0k995rn96xkplrapz5k648j651wc43kq817xk1x8280h16gsfxa6")))) + (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - `(#:parallel-tests? #f)) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* '("man/wl_display_connect.xml" + "publican/sources/Architecture.xml" + "publican/sources/Author_Group.xml" + "publican/sources/Book_Info.xml" + "publican/sources/Client.xml" + "publican/sources/Compositors.xml" + "publican/sources/Foreword.xml" + "publican/sources/Introduction.xml" + "publican/sources/Preface.xml" + "publican/sources/Protocol.xml" + "publican/sources/Server.xml" + "publican/sources/Wayland.xml" + "publican/sources/Xwayland.xml") + (("http://www.oasis-open.org/docbook/xml/4.5/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")) + (("http://www.oasis-open.org/docbook/xml/4.2/") + (string-append (assoc-ref inputs "docbook-xml-4.2") + "/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/doc") + (string-append doc "/share/doc")) + #t)))))) (native-inputs - `(("doxygen" ,doxygen) - ("graphviz" ,graphviz) + `(("docbook-xml-4.2" ,docbook-xml-4.2) + ("docbook-xml" ,docbook-xml) + ("docbook-xsl" ,docbook-xsl) + ("dot" ,graphviz) + ("doxygen" ,doxygen) ("pkg-config" ,pkg-config) ("xmlto" ,xmlto) ("xsltproc" ,libxslt))) (inputs - `(("docbook-xml" ,docbook-xml) - ("docbook-xsl" ,docbook-xsl) - ("expat" ,expat) - ("libffi" ,libffi) - ("libxml2" ,libxml2))) ; for XML_CATALOG_FILES + `(("expat" ,expat) + ("libxml2" ,libxml2))) + (propagated-inputs + `(("libffi" ,libffi))) + (synopsis "Core Wayland window system code and protocol") + (description "Wayland is a project to define a protocol for a compositor to +talk to its clients as well as a library implementation of the protocol. The +compositor can be a standalone display server running on Linux kernel +modesetting and evdev input devices, an X application, or a wayland client +itself. The clients can be traditional applications, X servers (rootless or +fullscreen) or other display servers.") (home-page "https://wayland.freedesktop.org/") - (synopsis "Display server protocol") - (description - "Wayland is a protocol for a compositor to talk to its clients as well as -a C library implementation of that protocol. The compositor can be a standalone -display server running on Linux kernel modesetting and evdev input devices, an X -application, or a wayland client itself. The clients can be traditional -applications, X servers (rootless or fullscreen) or other display servers.") - (license license:x11))) + (license license:expat))) (define-public wayland-protocols (package From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:23 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:23 +0000 Received: from localhost ([127.0.0.1]:43494 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDr-00068w-5l for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:23 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42404) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDV-00064Q-KZ for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:02 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id B7C3633681CC; Thu, 20 Aug 2020 17:10:59 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 19/29] gnu: gtk+-2: Update package definition. Date: Thu, 20 Aug 2020 17:10:40 +0200 Message-Id: <20200820151050.9529-19-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/gtk.scm (gtk+-2): Update package definition. [arguments]<#:phases>['disable-tests]: Remove phase. ['disable-failing-tests]: New phase. ['pre-check]: New phase. [native-inputs]: Add intltool and xorg-server-for-tests. [inputs]: Add libx11, libxext, libxkbcommon, libxrender and libxshmfence. [propagated-inputs]: Add cairo and glib. [search-paths]: New field. Signed-off-by: Danny Milosavljevic --- gnu/packages/gtk.scm | 155 +++++++++++++++++++++++++------------------ 1 file changed, 92 insertions(+), 63 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index bc450a33f6..e8ba76694c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -70,6 +70,7 @@ #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages graphics) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages libffi) @@ -718,72 +719,100 @@ is part of the GNOME accessibility project.") (define-public gtk+-2 (package - (name "gtk+") - (version "2.24.32") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0bjq7ja9gwcv6n5q4qkvdjjx40wsdiikksz1zqxvxsm5vlyskj5n")) - (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch" - "gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch" - "gtk2-theme-paths.patch")))) - (build-system gnu-build-system) - (outputs '("out" "bin" "doc")) - (propagated-inputs - `(("atk" ,atk) - ("gdk-pixbuf" ,gdk-pixbuf+svg) - ("pango" ,pango))) - (inputs - `(("cups" ,cups) - ("libxcomposite" ,libxcomposite) - ("libxcursor" ,libxcursor) - ("libxdamage" ,libxdamage) - ("libxi" ,libxi) - ("libxinerama" ,libxinerama) - ("libxrandr" ,libxrandr))) - (native-inputs - `(("perl" ,perl) - ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config) - ("python-wrapper" ,python-wrapper))) - (arguments - `(#:configure-flags - (list "--with-xinput=yes" - (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'disable-tests - (lambda _ - ;; FIXME: re-enable tests requiring an X server - (substitute* "gtk/Makefile.in" - (("SUBDIRS = theme-bits . tests") "SUBDIRS = theme-bits .")) - #t)) - (add-after 'install 'remove-cache - (lambda* (#:key outputs #:allow-other-keys) - (for-each - delete-file - (find-files (assoc-ref outputs "out") "immodules.cache")) - #t))))) - (native-search-paths - (list (search-path-specification - (variable "GUIX_GTK2_PATH") - (files '("lib/gtk-2.0"))))) - (synopsis "Cross-platform toolkit for creating graphical user interfaces") - (description - "GTK+, or the GIMP Toolkit, is a multi-platform toolkit for creating + (name "gtk+") + (version "2.24.32") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0bjq7ja9gwcv6n5q4qkvdjjx40wsdiikksz1zqxvxsm5vlyskj5n")) + (patches + (search-patches + "gtk2-respect-GUIX_GTK2_PATH.patch" + "gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch" + "gtk2-theme-paths.patch")))) + (build-system gnu-build-system) + (outputs '("out" "bin" "doc")) + (arguments + `(#:configure-flags + (list + "--with-xinput=yes" + (string-append "--with-html-dir=" (assoc-ref %outputs "doc") + "/share/gtk-doc/html")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + (substitute* "gtk/tests/recentmanager.c" + (("g_test_add_func \\(\"/recent-manager/add-many\", recent_manager_add_many\\);") + "")) + (substitute* "gtk/tests/defaultvalue.c" + (("return g_test_run\\(\\);") + "")) + #t)) + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 +extension GLX &") + (setenv "DISPLAY" ":1") + ;; Tests write to $HOME. + (setenv "HOME" (getcwd)) + ;; Tests look for $XDG_RUNTIME_DIR. + (setenv "XDG_RUNTIME_DIR" (getcwd)) + ;; For missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + #t)) + (add-after 'install 'remove-cache + (lambda* (#:key outputs #:allow-other-keys) + (for-each + delete-file + (find-files (assoc-ref outputs "out") "immodules.cache")) + #t))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("intltool" ,intltool) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper) + ("xorg-server" ,xorg-server-for-tests))) + (inputs + `(("cups" ,cups) + ("libx11" ,libx11) + ("libxcomposite" ,libxcomposite) + ("libxcursor" ,libxcursor) + ("libxext" ,libxext) + ("libxdamage" ,libxdamage) + ("libxi" ,libxi) + ("libxinerama" ,libxinerama) + ("libxkbcommon" ,libxkbcommon) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxshmfence" ,libxshmfence))) + (propagated-inputs + `(("atk" ,atk) + ("cairo" ,cairo) + ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("glib" ,glib) + ("pango" ,pango))) + (native-search-paths + (list + (search-path-specification + (variable "GUIX_GTK2_PATH") + (files '("lib/gtk-2.0"))))) + (search-paths native-search-paths) + (synopsis "Cross-platform toolkit for creating graphical user interfaces") + (description "GTK+, or the GIMP Toolkit, is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off tools to complete application suites.") - (license license:lgpl2.0+) - (home-page "https://www.gtk.org/"))) + (home-page "https://www.gtk.org/") + (license license:lgpl2.0+))) (define-public gtk+ (package (inherit gtk+-2) From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:24 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:24 +0000 Received: from localhost ([127.0.0.1]:43496 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDr-000693-LF for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:24 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42392) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDV-00064B-Sv for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:03 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 8576433681D8; Thu, 20 Aug 2020 17:11:00 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 22/29] gnu: atkmm: Update package definition. Date: Thu, 20 Aug 2020 17:10:43 +0200 Message-Id: <20200820151050.9529-22-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/gtk.scm (atkmm): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [outputs]: Add new output "doc". [arguments]<#:phases>['move-doc]: New phase. [native-inputs]: Add graphviz, doxygen, m4, mm-common, perl and libxslt. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Add gpl2+. Signed-off-by: Danny Milosavljevic --- gnu/packages/gtk.scm | 60 +++++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 17 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e8ba76694c..d595a8c7ec 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -75,6 +75,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) + #:use-module (gnu packages m4) #:use-module (gnu packages man) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) @@ -1224,24 +1225,49 @@ library.") (package (name "atkmm") (version "2.28.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c")))) - (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config))) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c")))) + (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) + (arguments + `(#: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/doc") + (string-append doc "/share/doc")) + #t)))))) + (native-inputs + `(("dot" ,graphviz) + ("doxygen" ,doxygen) + ("m4" ,m4) + ("mm-common" ,mm-common) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs - `(("glibmm" ,glibmm) ("atk" ,atk))) - (home-page "https://www.gtkmm.org") - (synopsis "C++ interface to the ATK accessibility library") - (description - "ATKmm provides a C++ programming interface to the ATK accessibility -toolkit.") - (license license:lgpl2.1+))) + `(("atk" ,atk) + ("glibmm" ,glibmm-2.64))) + (synopsis "C++ bindings for ATK") + (description "ATKmm is the C++ binding for the ATK library.") + (home-page "https://wiki.gnome.org/Accessibility") + (license + (list + ;; Library + license:lgpl2.1+ + ;; Tools + license:gpl2+)))) (define-public gtkmm (package From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:24 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:24 +0000 Received: from localhost ([127.0.0.1]:43498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDs-00069A-1l for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:24 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDW-00063Y-72 for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:03 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id A21653367F4A; Thu, 20 Aug 2020 17:10:56 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 08/29] gnu: pixman: Update package definition. Date: Thu, 20 Aug 2020 17:10:29 +0200 Message-Id: <20200820151050.9529-8-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/xdisorg.scm (pixman) [version]: Update to 0.40.0. [source][sha256]: Modify base32. [arguments]<#:configure-flags>[--enable-timers]: New flag. [--enable-gnuplot]: New flag. [synopsis]: Modify. [description]: Modify. [license]: Change from X11 to expat. Signed-off-by: Danny Milosavljevic --- gnu/packages/xdisorg.scm | 42 ++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 20702c3a4f..1765edafcd 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -469,30 +469,34 @@ following the mouse.") (define-public pixman (package (name "pixman") - (version "0.38.4") - (source (origin - (method url-fetch) - (uri (string-append - "https://www.cairographics.org/releases/pixman-" - version ".tar.gz")) - (sha256 - (base32 - "1ryxzdf048x7wsx4dlvrr1p00gzwfs7lybnhgc7ygbj0dvyxcrns")) - (patches (search-patches "pixman-CVE-2016-5296.patch")))) + (version "0.40.0") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://www.cairographics.org/releases/pixman-" + version ".tar.gz")) + (sha256 + (base32 "1z13n96m7x91j25qq9wlkxsbq04wfwjhw66ir17frna06zn0s83d")) + (patches + (search-patches "pixman-CVE-2016-5296.patch")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--disable-static"))) - (inputs - `(("libpng" ,libpng) - ("zlib" ,zlib))) + `(#:configure-flags + (list + "--disable-static" + "--enable-timers" + "--enable-gnuplot"))) (native-inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("libpng" ,libpng))) + (synopsis "Image processing and manipulation library") + (description "Pixman is a library that provides low-level pixel manipulation +features such as image compositing and trapezoid rasterization.") (home-page "http://www.pixman.org/") - (synopsis "Low-level pixel manipulation library") - (description "Pixman is a low-level software library for pixel -manipulation, providing features such as image compositing and trapezoid -rasterisation.") - (license license:x11))) + (license license:expat))) (define-public libdrm (package From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:24 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:25 +0000 Received: from localhost ([127.0.0.1]:43500 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDs-00069I-Bs for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:24 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDW-00063U-3p for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:04 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 10722336822D; Thu, 20 Aug 2020 17:11:01 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 24/29] gnu: json-glib: Update package definition. Date: Thu, 20 Aug 2020 17:10:45 +0200 Message-Id: <20200820151050.9529-24-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/gnome.scm (json-glib): Update package definition. [outputs]: New output "doc". [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Ddocs]: New flag. [-Dman]: New flag. <#:phases>['patch-docbook]: New phase. ['move-doc]: New phase. [native-inputs]: Add docbook-xml, docbook-xsl, gtk-doc and libxslt. [synopsis]: Modify. [description]: Modify. Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 71 +++++++++++++++++++++++++++++++----------- 1 file changed, 52 insertions(+), 19 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5c5b67a808..d54e66adcd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3588,30 +3588,63 @@ configuration storage systems.") (package (name "json-glib") (version "1.4.4") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0ixwyis47v5bkx6h8a1iqlw3638cxcv57ivxv4gw2gaig51my33j")))) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0ixwyis47v5bkx6h8a1iqlw3638cxcv57ivxv4gw2gaig51my33j")))) (build-system meson-build-system) + (outputs '("out" "doc")) + (arguments + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Ddocs=true" + "-Dman=true") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* "json-glib-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/"))) + (substitute* "meson.build" + (("http://docbook.sourceforge.net/release/xsl/current/") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-1.79.1/")))) + #t)) + (add-after 'install 'move-docs + (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 - `(("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal + `(("docbook-xml" ,docbook-xml-4.3) + ("docbook-xsl" ,docbook-xsl) + ("gettext" ,gettext-minimal) + ("glib" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config))) + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs - `(("glib" ,glib))) ;according to json-glib-1.0.pc - (home-page "https://wiki.gnome.org/Projects/JsonGlib") - (synopsis "Compiler for the GObject type system") - (description - "JSON-GLib is a C library based on GLib providing serialization and + `(("glib" ,glib))) + (synopsis "Glib and GObject implementation of JSON") + (description "JSON-GLib is a library providing serialization and deserialization support for the JavaScript Object Notation (JSON) format -described by RFC 4627. It provides parser and generator GObject classes and -various wrappers for the complex data types employed by JSON, such as arrays -and objects.") +described by RFC 4627. It implements a full JSON parser and generator using +GLib and GObject, and integrates JSON with GLib data types.") + (home-page "https://wiki.gnome.org/Projects/JsonGlib") (license license:lgpl2.1+))) (define-public libxklavier From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:31 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:31 +0000 Received: from localhost ([127.0.0.1]:43502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDs-00069P-Ra for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:31 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDR-00063W-23 for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:04 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 608693360398; Thu, 20 Aug 2020 17:10:56 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 07/29] gnu: gobject-introspection: Add patches back. Date: Thu, 20 Aug 2020 17:10:28 +0200 Message-Id: <20200820151050.9529-7-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Raghav Gururajan * gnu/packages/glib.scm (gobject-introspection): Add patches back. [source][patches]: Add gobject-introspection-cc.patch, gobject-introspection-girepository.patch and gobject-introspection-absolute-shlib-path.patch. * gnu/packages/patches/gobject-introspection-cc.patch: New file. * gnu/packages/patches/gobject-introspection-girepository.patch: New file. * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: New file. * gnu/local.mk (dist_patch_DATA): Add them. Signed-off-by: Danny Milosavljevic --- gnu/local.mk | 3 + gnu/packages/glib.scm | 7 +- ...ct-introspection-absolute-shlib-path.patch | 166 ++++++++++++++++++ .../patches/gobject-introspection-cc.patch | 14 ++ .../gobject-introspection-girepository.patch | 25 +++ 5 files changed, 214 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch create mode 100644 gnu/packages/patches/gobject-introspection-cc.patch create mode 100644 gnu/packages/patches/gobject-introspection-girepository.patch diff --git a/gnu/local.mk b/gnu/local.mk index 278879334c..ae708248e8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1065,6 +1065,9 @@ dist_patch_DATA = \ %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ %D%/packages/patches/gnutls-cross.patch \ + %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ + %D%/packages/patches/gobject-introspection-cc.patch \ + %D%/packages/patches/gobject-introspection-girepository.patch \ %D%/packages/patches/go-skip-gc-test.patch \ %D%/packages/patches/gpm-glibc-2.26.patch \ %D%/packages/patches/gpsbabel-minizip.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 1221612fbb..b5a37bb0cd 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -339,7 +339,12 @@ threads, dynamic loading, and an object system.") name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0")))) + (base32 "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0")) + (patches + (search-patches + "gobject-introspection-cc.patch" + "gobject-introspection-girepository.patch" + "gobject-introspection-absolute-shlib-path.patch")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch new file mode 100644 index 0000000000..956fa617c3 --- /dev/null +++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch @@ -0,0 +1,166 @@ +# Names of libraries included in typelib files are opened by dlopen. Here we +# add the full path. +# +# This patch was provided by Luca Bruno for +# 'gobject-introspection' 1.40.0 in Nix. +# +# It has since been updated to work with newer versions of +# gobject-introspection. +--- a/giscanner/scannermain.py ++++ b/giscanner/scannermain.py +@@ -95,6 +95,39 @@ def get_windows_option_group(parser): + return group + + ++def _get_default_fallback_libpath(): ++ # Newer multiple-output-optimized stdenv has an environment variable ++ # $outputLib which in turn specifies another variable which then is used as ++ # the destination for the library contents (${!outputLib}/lib). ++ store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None ++ if store_path is None: ++ outputs = os.environ.get("outputs", "out").split() ++ if "lib" in outputs: ++ # For multiple output derivations let's try whether there is a $lib ++ # environment variable and use that as the base store path. ++ store_path = os.environ.get("lib") ++ elif "out" in outputs: ++ # Otherwise we have a single output derivation, so the libraries ++ # most certainly will end up in "$out/lib". ++ store_path = os.environ.get("out") ++ ++ if store_path is not None: ++ # Even if we have a $lib as output, there still should be a $lib/lib ++ # directory. ++ return os.path.join(store_path, 'lib') ++ else: ++ # If we haven't found a possible scenario, let's return an empty string ++ # so that the shared library won't be prepended with a path. ++ # ++ # Note that this doesn't mean that all hope is lost, because after all ++ # we can still use --fallback-library-path to set one. ++ # ++ # Also, we're not returning None, because that would make it very ++ # difficult to disable adding fallback paths altogether using something ++ # like: --fallback-library-path="" ++ return "" ++ ++ + def _get_option_parser(): + parser = optparse.OptionParser('%prog [options] sources', + version='%prog ' + giscanner.__version__) +@@ -205,6 +238,10 @@ match the namespace prefix.""") + parser.add_option("", "--filelist", + action="store", dest="filelist", default=[], + help="file containing headers and sources to be scanned") ++ parser.add_option("", "--fallback-library-path", ++ action="store", dest="fallback_libpath", ++ default=_get_default_fallback_libpath(), ++ help="Path to prepend to unknown shared libraries") + + group = get_preprocessor_option_group(parser) + parser.add_option_group(group) +--- a/giscanner/shlibs.py ++++ b/giscanner/shlibs.py +@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name): + $""" % re.escape(library_name), re.VERBOSE) + + ++def _ldd_library_guix_pattern(library_name): ++ store_dir = re.escape( ++ os.environ.get("NIX_STORE", default="/gnu/store") ++ ) ++ pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)' ++ return re.compile(pattern % (store_dir, re.escape(library_name))) ++ ++ + # This is a what we do for non-la files. We assume that we are on an + # ELF-like system where ldd exists and the soname extracted with ldd is + # a filename that can be opened with dlopen(). +@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries): + output = output.decode("utf-8", "replace") + + shlibs = resolve_from_ldd_output(libraries, output) +- return list(map(sanitize_shlib_path, shlibs)) ++ fallback_libpath = options.fallback_libpath or ""; ++ return list(map(lambda p: os.path.join(fallback_libpath, p), map(sanitize_shlib_path, shlibs))) + + + def sanitize_shlib_path(lib): +@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib): + # In case we get relative paths on macOS (like @rpath) then we fall + # back to the basename as well: + # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 +- if sys.platform == "darwin": +- if not os.path.isabs(lib): +- return os.path.basename(lib) +- return lib +- else: ++ ++ # Always use absolute paths if available ++ if not os.path.isabs(lib): + return os.path.basename(lib) ++ return lib + + + def resolve_from_ldd_output(libraries, output): + patterns = {} + for library in libraries: + if not os.path.isfile(library): +- patterns[library] = _ldd_library_pattern(library) ++ patterns[library] = (_ldd_library_pattern(library), _ldd_library_guix_pattern(library)) + if len(patterns) == 0: + return [] + +@@ -139,8 +145,12 @@ def resolve_from_ldd_output(libraries, output): + if line.endswith(':'): + continue + for word in line.split(): +- for library, pattern in patterns.items(): +- m = pattern.match(word) ++ for library, (pattern, guix_pattern) in patterns.items(): ++ store_dir = os.environ.get("NIX_STORE", default="/gnu/store") ++ if line.find(store_dir) != -1: ++ m = guix_pattern.match(word) ++ else: ++ m = pattern.match(word) + if m: + del patterns[library] + shlibs.append(m.group()) + +--- a/giscanner/utils.py ++++ b/giscanner/utils.py +@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file): + if dlname is None: + return None + +- # Darwin uses absolute paths where possible; since the libtool files never +- # contain absolute paths, use the libdir field +- if platform.system() == 'Darwin': +- dlbasename = os.path.basename(dlname) +- libdir = _extract_libdir_field(la_file) +- if libdir is None: +- return dlbasename +- return libdir + '/' + dlbasename +- # From the comments in extract_libtool(), older libtools had +- # a path rather than the raw dlname +- return os.path.basename(dlname) ++ dlbasename = os.path.basename(dlname) ++ libdir = _extract_libdir_field(la_file) ++ if libdir is None: ++ return dlbasename ++ return libdir + '/' + dlbasename + + + def extract_libtool(la_file): +--- a/tests/scanner/test_shlibs.py ++++ b/tests/scanner/test_shlibs.py +@@ -40,6 +64,7 @@ class TestLddParser(unittest.TestCase): + + self.assertEqual( + sanitize_shlib_path('/foo/bar'), +- '/foo/bar' if sys.platform == 'darwin' else 'bar') ++ # Always use an absolute filename for Guix ++ '/foo/bar') + + def test_unresolved_library(self): +output = '' diff --git a/gnu/packages/patches/gobject-introspection-cc.patch b/gnu/packages/patches/gobject-introspection-cc.patch new file mode 100644 index 0000000000..6a86b56b44 --- /dev/null +++ b/gnu/packages/patches/gobject-introspection-cc.patch @@ -0,0 +1,14 @@ +Use gcc as the default C compiler if CC is not set. + +diff -ru gobject-introspection-1.58.1.orig/giscanner/__init__.py gobject-introspection-1.58.1/giscanner/__init__.py +--- gobject-introspection-1.58.1.orig/giscanner/__init__.py 1970-01-01 01:00:00.000000000 +0100 ++++ gobject-introspection-1.58.1/giscanner/__init__.py 2018-12-03 13:33:28.788971299 +0100 +@@ -22,6 +22,8 @@ + builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR') + if builddir is not None: + __path__.append(os.path.join(builddir, 'giscanner')) ++if not 'CC' in os.environ: ++ os.environ['CC'] = 'gcc' + try: + from ._version import __version__ + except ImportError: diff --git a/gnu/packages/patches/gobject-introspection-girepository.patch b/gnu/packages/patches/gobject-introspection-girepository.patch new file mode 100644 index 0000000000..380617f27f --- /dev/null +++ b/gnu/packages/patches/gobject-introspection-girepository.patch @@ -0,0 +1,25 @@ +--- a/girepository/gitypelib.c.orig ++++ b/girepository/gitypelib.c +@@ -2296,7 +2296,22 @@ _g_typelib_do_dlopen (GITypelib *typelib) + { + GModule *module; + ++ /* 'gobject-introspection' doesn't store the path of shared ++ libraries into '.typelib' and '.gir' files. Shared ++ libraries are searched for in the dynamic linker search ++ path. In Guix we patch 'gobject-introspection' such that ++ it stores the absolute path of shared libraries in ++ '.typelib' and '.gir' files. Here, in order to minimize ++ side effects, we make sure that if the library is not ++ found at the indicated path location, we try with just ++ the basename and the system dynamic library ++ infrastructure, as per default behaviour of the ++ library. */ + module = load_one_shared_library (shlibs[i]); ++ if (module == NULL && g_path_is_absolute (shlibs[i])) ++ { ++ module = load_one_shared_library (g_basename(shlibs[i])); ++ } + + if (module == NULL) + { From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:32 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:32 +0000 Received: from localhost ([127.0.0.1]:43504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDz-00069e-GP for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:32 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDW-00064m-EK for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:04 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 4FD593368233; Thu, 20 Aug 2020 17:11:01 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 25/29] gnu: at-spi2-core: Update package definition. Date: Thu, 20 Aug 2020 17:10:46 +0200 Message-Id: <20200820151050.9529-25-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/gtk.scm (at-spi2-core): Update to 2.36.0. [version]: Update to 2.36.0. [arguments]<#:glib-or-gtk?>: New argument. [arguments]<#:phases>['patch-docbook-sgml]: New phase. [native-inputs]: Add docbook-xml and python-wrapper. [propagated-inputs]: Add libx11. [home-page]: Modify. [license]: Update to lgpl2.1+. Signed-off-by: Danny Milosavljevic --- gnu/packages/gtk.scm | 144 ++++++++++++++++++++++++------------------- 1 file changed, 79 insertions(+), 65 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 7e32b7623b..5198754b2c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -594,72 +594,86 @@ scaled, composited, modified, saved, or rendered.") (define-public at-spi2-core (package - (name "at-spi2-core") - (version "2.34.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1ihixwhh3c16q6253qj9gf69741rb2pi51822a4rylsfcyywsafn")))) - (build-system meson-build-system) - (outputs '("out" "doc")) - (arguments - '(#:configure-flags - (list "-Ddocs=true") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-documentation-path - (lambda* (#:key outputs #:allow-other-keys) - ;; Ensure that the cross-references point to the "doc" output. - (substitute* "doc/libatspi/meson.build" - (("docpath =.*") - (string-append "docpath = '" (assoc-ref outputs "doc") "/share/gtk-doc/html'\n"))) - #t)) - (add-before 'install 'prepare-doc-directory - (lambda* (#:key outputs #:allow-other-keys) - (mkdir-p (string-append (assoc-ref outputs "doc") "/share")) - #t)) - (add-after 'install 'move-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (copy-recursively - (string-append out "/share/gtk-doc") - (string-append doc "/share/gtk-doc")) - (delete-file-recursively - (string-append out "/share/gtk-doc"))) - #t)) - (add-after 'install 'check - (lambda _ - (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME - ;; Run test-suite under a dbus session. - (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service - (string-append %output "/share")) - ;; Don't fail on missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0") ; - (invoke "dbus-launch" "ninja" "test"))) + (name "at-spi2-core") + (version "2.36.0") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0nn0lnf07ayysq8c8irmvc91c2dszn04m5qs6jy60g3y1bg5gnl8")))) + (build-system meson-build-system) + (outputs '("out" "doc")) + (arguments + '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas. + #:configure-flags + (list + "-Ddocs=true") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-documentation-path + (lambda* (#:key outputs #:allow-other-keys) + ;; Ensure that the cross-references point to the "doc" output. + (substitute* "doc/libatspi/meson.build" + (("docpath =.*") + (string-append "docpath = '" (assoc-ref outputs "doc") + "/share/gtk-doc/html'\n"))) + #t)) + (add-before 'install 'prepare-doc-directory + (lambda* (#:key outputs #:allow-other-keys) + (mkdir-p (string-append (assoc-ref outputs "doc") + "/share")) + #t)) + (add-after 'unpack 'patch-docbook-sgml + (lambda* (#:key inputs #:allow-other-keys) + (let* ((xmldoc (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook"))) + (substitute* "doc/libatspi/libatspi-docs.sgml" + (("http://.*/docbookx\\.dtd") + (string-append xmldoc "/docbookx.dtd"))) + #t))) + (add-after 'install 'move-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (copy-recursively + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")) + (delete-file-recursively + (string-append out "/share/gtk-doc"))) + #t)) + (add-after 'install 'check + (lambda _ + (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME + ;; Run test-suite under a dbus session. + (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service + (string-append %output "/share")) + ;; Don't fail on missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") ; + (invoke "dbus-launch" "ninja" "test"))) (delete 'check)))) - (propagated-inputs - ;; atspi-2.pc refers to all these. - `(("dbus" ,dbus) - ("glib" ,glib) - ("libxi" ,libxi) - ("libxtst" ,libxtst))) - (native-inputs - `(("gettext" ,gettext-minimal) - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) - ("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) - (synopsis "Assistive Technology Service Provider Interface, core components") - (description - "The Assistive Technology Service Provider Interface, core components, -is part of the GNOME accessibility project.") - (license license:lgpl2.0+) - (home-page "https://projects.gnome.org/accessibility/"))) + (native-inputs + `(("docbook-xml" ,docbook-xml-4.3) + ("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("glib" ,glib "bin") + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper))) + (propagated-inputs + `(("dbus" ,dbus) + ("glib" ,glib) + ("libx11" ,libx11) + ("libxi" ,libxi) + ("libxtst" ,libxtst))) + (synopsis "Assistive Technology Service Provider Interface, core components") + (description "The Assistive Technology Service Provider Interface, +core components, is part of the GNOME accessibility project.") + (home-page "https://wiki.gnome.org/Accessibility/") + (license license:lgpl2.1+))) ;;; A minimal variant used to prevent a cycle with Inkscape. (define at-spi2-core-minimal From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:32 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:32 +0000 Received: from localhost ([127.0.0.1]:43506 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mE0-00069m-2v for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:32 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDS-00063Z-Ri for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:04 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id AB7F03368088; Thu, 20 Aug 2020 17:10:57 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 12/29] gnu: gdk-pixbuf: Update package definition. Date: Thu, 20 Aug 2020 17:10:33 +0200 Message-Id: <20200820151050.9529-12-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * 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+. Signed-off-by: Danny Milosavljevic --- 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 c7bc9cf1a4..9af6e73e8a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -491,63 +491,65 @@ highlighting and other features typical of a source code editor.") (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=false") - #: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, got 2) - ((".*'cve-2015-4491'.*") "") - ;; XXX FIXME: This test fails with: - ;; ERROR:pixbuf-jpeg.c:74:test_type9_rotation_exif_tag: - ;; assertion failed (error == NULL): Data differ - ;; (gdk-pixbuf-error-quark, 0) - ((".*'pixbuf-jpeg'.*") "")) - #t)) - ;; The slow tests take longer than the specified timeout. - ,@(if (any (cute string=? <> (%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=true" + "-Dinstalled_tests=false") + #: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-compiler, 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 various +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+))) ;; To build gdk-pixbuf with SVG support, we need librsvg, and librsvg depends ;; on gdk-pixbuf, so this new varibale. Also, librsvg adds 90MiB to the From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:32 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:33 +0000 Received: from localhost ([127.0.0.1]:43508 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mE0-00069t-Ic for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:32 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDX-00063R-64 for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:05 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 27D103368292; Thu, 20 Aug 2020 17:11:02 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 28/29] gnu: gtk+: Propagate libcloudproviders. Date: Thu, 20 Aug 2020 17:10:49 +0200 Message-Id: <20200820151050.9529-28-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/gtk.scm (gtk+) [inputs]: Move libcloudproviders to ... [propagated-inputs]: ... here. Signed-off-by: Danny Milosavljevic --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index fcb0f8a2a7..9326f3d4e3 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -923,7 +923,6 @@ application suites.") ("harfbuzz" ,harfbuzz) ("iso-codes" ,iso-codes) ("json-glib" ,json-glib) - ("libcloudproviders" ,libcloudproviders) ("libxml2" ,libxml2) ("papi" ,papi) ("rest" ,rest))) @@ -936,6 +935,7 @@ application suites.") ("freetype" ,freetype) ("gdk-pixbuf" ,gdk-pixbuf+svg) ("glib" ,glib) + ("libcloudproviders" ,libcloudproviders) ("libepoxy" ,libepoxy) ("libx11" ,libx11) ("libxcomposite" ,libxcomposite) From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:33 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:33 +0000 Received: from localhost ([127.0.0.1]:43510 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mE0-0006A0-Rx for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:33 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDX-000658-GV for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:05 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 6EC563368321; Thu, 20 Aug 2020 17:11:02 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 29/29] gnu: gtk+: Add missing input. Date: Thu, 20 Aug 2020 17:10:50 +0200 Message-Id: <20200820151050.9529-29-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/package/gtk.scm (gtk+) [native-inputs]: Add hicolor-icon-theme. Signed-off-by: Danny Milosavljevic --- gnu/packages/gtk.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 9326f3d4e3..d3602b5db5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -909,6 +909,7 @@ application suites.") ("gettext" ,gettext-minimal) ("glib" ,glib "bin") ("gobject-introspection" ,gobject-introspection) + ("hicolor-icon-theme" ,hicolor-icon-theme) ("intltool" ,intltool) ("perl" ,perl) ("pkg-config" ,pkg-config) From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:33 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:33 +0000 Received: from localhost ([127.0.0.1]:43512 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mE1-0006A7-5D for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:33 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDW-00063h-Lg for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:05 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id D69C43368278; Thu, 20 Aug 2020 17:11:01 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 27/29] gnu: gtk+: Update package definition. Date: Thu, 20 Aug 2020 17:10:48 +0200 Message-Id: <20200820151050.9529-27-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/gtk.scm (gtk+): Remove inheritance from gtk+-2. [version]: Update to 3.24.20. [source]: Modify base32. [arguments]<#:configure-flags>[--enable-cloudproviders]: New flag. <#:phases>['pre-configure]: Remove phase. ['pre-check]: New phase. ['disable-failing-tests]: New phase. [native-inputs]: Add docbook-xml, intltool, sassc and libxslt. [inputs]: Add graphene, harfbuzz, iso-codes, libcloudproviders and papi. [propagated-inputs]: Add cairo, fribidi, fontconfig, freetype, glib, libx11, libxcomposite, libxext, libxfixes and libxrender. Signed-off-by: Danny Milosavljevic --- gnu/packages/gtk.scm | 218 ++++++++++++++++++++++++++----------------- 1 file changed, 132 insertions(+), 86 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 9b69f788bb..fcb0f8a2a7 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -73,6 +73,7 @@ #:use-module (gnu packages graphics) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) + #:use-module (gnu packages iso-codes) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) #:use-module (gnu packages m4) @@ -81,11 +82,14 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pretty-print) + #:use-module (gnu packages profiling) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages cups) + #:use-module (gnu packages version-control) + #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) @@ -833,92 +837,134 @@ application suites.") (license license:lgpl2.0+))) (define-public gtk+ - (package (inherit gtk+-2) - (name "gtk+") - (version "3.24.20") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1wqxkd3xnqwihcawncp9mkf9bv5a5fg5i4ahm6klpl782vvnkb1d")) - (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" - "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) - (propagated-inputs - `(("at-spi2-atk" ,at-spi2-atk) - ("atk" ,atk) - ("gdk-pixbuf" ,gdk-pixbuf+svg) - ("libepoxy" ,libepoxy) - ("libxcursor" ,libxcursor) - ("libxi" ,libxi) - ("libxinerama" ,libxinerama) - ("libxkbcommon" ,libxkbcommon) - ("libxdamage" ,libxdamage) - ("libxrandr" ,libxrandr) - ("mesa" ,mesa) - ("pango" ,pango) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols))) - (inputs - `(("libxml2" ,libxml2) - ;; XXX: colord depends on mozjs (through polkit), which fails on - ;; on non-intel systems now. - ;;("colord" ,colord) - ("cups" ,cups) ;for printing support - ;; XXX: rest depends on p11-kit, which fails on mips64el now. - ;;("rest" ,rest) - ("json-glib" ,json-glib))) - (native-inputs - `(("perl" ,perl) - ("glib" ,glib "bin") - ("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config) - ("gobject-introspection" ,gobject-introspection) - ("python-wrapper" ,python-wrapper) - ;; By using a special xorg-server for GTK+'s tests, we reduce the impact - ;; of updating xorg-server directly on the master branch. - ("xorg-server" ,xorg-server-for-tests))) - (arguments - `(#:disallowed-references (,xorg-server-for-tests) - ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB goes - ;; to "doc". - #:configure-flags (list (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html") - ;; The header file is required - ;; by gnome-control-center - "--enable-wayland-backend" - ;; This is necessary to build both backends. - "--enable-x11-backend" - ;; This enables the HTML5 websocket backend. - "--enable-broadway-backend") - #:phases (modify-phases %standard-phases - (add-before 'configure 'pre-configure - (lambda _ - ;; Disable most tests, failing in the chroot with the message: - ;; D-Bus library appears to be incorrectly set up; failed to read - ;; machine uuid: Failed to open "/etc/machine-id": No such file or - ;; directory. - ;; See the manual page for dbus-uuidgen to correct this issue. - (substitute* "testsuite/Makefile.in" - (("SUBDIRS = gdk gtk a11y css reftests") - "SUBDIRS = gdk")) - #t)) - (add-after 'install 'move-desktop-files - ;; Move desktop files into 'bin' to avoid cycle references. - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (assoc-ref outputs "bin"))) - (mkdir-p (string-append bin "/share")) - (rename-file (string-append out "/share/applications") - (string-append bin "/share/applications")) - #t)))))) - (native-search-paths - (list (search-path-specification - (variable "GUIX_GTK3_PATH") - (files '("lib/gtk-3.0"))))))) + (package + (name "gtk+") + (version "3.24.20") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1wqxkd3xnqwihcawncp9mkf9bv5a5fg5i4ahm6klpl782vvnkb1d")) + (patches + (search-patches + "gtk3-respect-GUIX_GTK3_PATH.patch" + "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) + (build-system gnu-build-system) + (outputs '("out" "bin" "doc")) + (arguments + `(#:configure-flags + (list + "--enable-x11-backend" + "--enable-broadway-backend" + "--enable-wayland-backend" + "--enable-cloudproviders" + (string-append "--with-html-dir=" (assoc-ref %outputs "doc") + "/share/gtk-doc/html")) + #:phases + (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 +extension GLX &") + (setenv "DISPLAY" ":1") + ;; Tests write to $HOME. + (setenv "HOME" (getcwd)) + ;; Tests look for $XDG_RUNTIME_DIR. + (setenv "XDG_RUNTIME_DIR" (getcwd)) + ;; For missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + #t)) + (add-after 'unpack 'disable-failing-tests + (lambda _ + (substitute* "testsuite/gtk/Makefile.in" + (("builderparser cellarea check-icon-names check-cursor-names") + "builderparser cellarea check-cursor-names") + (("notify no-gtk-init object objects-finalize papersize rbtree") + "no-gtk-init papersize rbtree") + (("stylecontext templates textbuffer textiter treemodel treepath") + "stylecontext textbuffer textiter treemodel treepath")) + (substitute* "testsuite/a11y/Makefile.in" + (("accessibility-dump tree-performance text children derive") + "tree-performance text children derive")) + (substitute* "testsuite/reftests/Makefile.in" + (("TEST_PROGS = gtk-reftest") + "TEST_PROGS = ")) + #t)) + ;; Move desktop files into 'bin' to avoid cycle references. + (add-after 'install 'move-desktop-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) + (mkdir-p (string-append bin "/share")) + (rename-file + (string-append out "/share/applications") + (string-append bin "/share/applications")) + #t)))))) + (native-inputs + `(("docbook-xml" ,docbook-xml-4.1.2) + ("gettext" ,gettext-minimal) + ("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("intltool" ,intltool) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper) + ("sassc" ,sassc) + ("xorg-server" ,xorg-server-for-tests) + ("xsltproc" ,libxslt))) + (inputs + `(("colord" ,colord) + ("cups" ,cups) + ("graphene" ,graphene) + ("harfbuzz" ,harfbuzz) + ("iso-codes" ,iso-codes) + ("json-glib" ,json-glib) + ("libcloudproviders" ,libcloudproviders) + ("libxml2" ,libxml2) + ("papi" ,papi) + ("rest" ,rest))) + (propagated-inputs + `(("atk" ,atk) + ("at-spi2-atk" ,at-spi2-atk) + ("cairo" ,cairo) + ("fribidi" ,fribidi) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("glib" ,glib) + ("libepoxy" ,libepoxy) + ("libx11" ,libx11) + ("libxcomposite" ,libxcomposite) + ("libxcursor" ,libxcursor) + ("libxdamage" ,libxdamage) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxi" ,libxi) + ("libxinerama" ,libxinerama) + ("libxkbcommon" ,libxkbcommon) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("mesa" ,mesa) + ("pango" ,pango) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols))) + (native-search-paths + (list + (search-path-specification + (variable "GUIX_GTK3_PATH") + (files '("lib/gtk-3.0"))))) + (search-paths native-search-paths) + (synopsis "Cross-platform toolkit for creating graphical user interfaces") + (description "GTK+, or the GIMP Toolkit, is a multi-platform toolkit for creating +graphical user interfaces. Offering a complete set of widgets, GTK+ is +suitable for projects ranging from small one-off tools to complete +application suites.") + (home-page "https://www.gtk.org/") + (license license:lgpl2.0+))) ;;; ;;; Guile bindings. From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:34 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:34 +0000 Received: from localhost ([127.0.0.1]:43514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mE1-0006AF-OC for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:33 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDY-00063y-2i for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:06 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id ECC563368155; Thu, 20 Aug 2020 17:10:57 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 13/29] gnu: gdk-pixbuf: Disable failing tests. Date: Thu, 20 Aug 2020 17:10:34 +0200 Message-Id: <20200820151050.9529-13-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/gtk.scm (gdk-pixbuf): Disable failing tests. [arguments]<#:phases>['disable-failing-tests]: New phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/gtk.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 9af6e73e8a..4e1145002e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -525,7 +525,14 @@ highlighting and other features typical of a source code editor.") (("http://www.oasis-open.org/docbook/xml/4.3/") (string-append (assoc-ref inputs "docbook-xml") "/xml/dtd/docbook/")))) - #t))))) + #t)) + (add-before 'configure 'disable-failing-tests + (lambda _ + (substitute* "tests/meson.build" + (("\\[ 'pixbuf-fail', \\['conform', 'slow'\\], \\],") + "")) + #t)) + ))) (native-inputs `(("docbook-xml" ,docbook-xml-4.3) ("docbook-xsl" ,docbook-xsl) From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:34 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:34 +0000 Received: from localhost ([127.0.0.1]:43516 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mE2-0006AM-1J for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:34 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42410) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDZ-00064d-4v for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:06 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 42FE633681FD; Thu, 20 Aug 2020 17:11:00 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 21/29] gnu: wayland-protocols: Update package definition. Date: Thu, 20 Aug 2020 17:10:42 +0200 Message-Id: <20200820151050.9529-21-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/freedesktop.scm (wayland-protocols) [version]: Update to 1.20. [source][sha256]: Modify base32. [description]: Modify. Signed-off-by: Danny Milosavljevic --- gnu/packages/freedesktop.scm | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 880c006e15..8a2dcfbab7 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -710,22 +710,26 @@ fullscreen) or other display servers.") (define-public wayland-protocols (package (name "wayland-protocols") - (version "1.18") - (source (origin - (method url-fetch) - (uri (string-append - "https://wayland.freedesktop.org/releases/" - "wayland-protocols-" version ".tar.xz")) - (sha256 - (base32 - "1cvl93h83ymbfhb567jv5gzyq08181w7c46rsw4xqqqpcvkvfwrx")))) + (version "1.20") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://wayland.freedesktop.org/releases/" + "wayland-protocols-" version ".tar.xz")) + (sha256 + (base32 "1rsdgvkkvxs3cjhpl6agvbkm53vm7k8rg127j9y2vn33m2hvg0lp")))) (build-system gnu-build-system) - (inputs - `(("wayland" ,wayland))) (native-inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("wayland" ,wayland))) (synopsis "Wayland protocols") - (description "This package contains XML definitions of the Wayland protocols.") + (description "Wayland-Protocols contains Wayland protocols that add +functionality not available in the Wayland core protocol. Such protocols either +add completely new functionality, or extend the functionality of some other +protocol either in Wayland core, or some other protocol in wayland-protocols.") (home-page "https://wayland.freedesktop.org") (license license:expat))) From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:34 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:34 +0000 Received: from localhost ([127.0.0.1]:43518 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mE2-0006AU-Bz for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:34 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDZ-00064C-LB for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:06 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 336433368076; Thu, 20 Aug 2020 17:10:58 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 14/29] gnu: gdk-pixbuf+svg: Update package definition. Date: Thu, 20 Aug 2020 17:10:35 +0200 Message-Id: <20200820151050.9529-14-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/gtk.scm (gdk-pixbuf+svg): Update package definition. [arguments]: Modify. [synopsis]: Modify. Signed-off-by: Danny Milosavljevic --- 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 4e1145002e..113ee44ad1 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -568,10 +568,9 @@ scaled, composited, modified, saved, or rendered.") `(("librsvg" ,librsvg) ,@(package-inputs gdk-pixbuf))) (arguments - '(#:configure-flags '("-Dinstalled-tests=false") - #: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")) @@ -585,9 +584,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"))) (define-public at-spi2-core (package From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:38 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:38 +0000 Received: from localhost ([127.0.0.1]:43520 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mE2-0006Ab-M1 for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:38 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDW-00063k-W6 for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:08 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 69F5C336807F; Thu, 20 Aug 2020 17:10:57 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 11/29] gnu: pango: Update package definition. Date: Thu, 20 Aug 2020 17:10:32 +0200 Message-Id: <20200820151050.9529-11-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/gtk.scm (pango): Update package definition. [arguments]<#:glib-or-gtk?>: New argument. [native-inputs]: Add help2man, perl and python-wrapper. [propagated-inputs]: Add libthai and libxrender. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. * gnu/packages/patches/pango-skip-libthai-test.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Danny Milosavljevic --- gnu/local.mk | 1 - gnu/packages/gtk.scm | 99 ++++++++++--------- .../patches/pango-skip-libthai-test.patch | 23 ----- 3 files changed, 51 insertions(+), 72 deletions(-) delete mode 100644 gnu/packages/patches/pango-skip-libthai-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index ae708248e8..3732e56acc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1378,7 +1378,6 @@ dist_patch_DATA = \ %D%/packages/patches/p7zip-remove-unused-code.patch \ %D%/packages/patches/pam-krb5-CVE-2020-10595.patch \ %D%/packages/patches/pam-mount-luks2-support.patch \ - %D%/packages/patches/pango-skip-libthai-test.patch \ %D%/packages/patches/pciutils-hurd-configure.patch \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/sdl-pango-api_additions.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 2f939ff0bd..c7bc9cf1a4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -74,6 +74,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) + #:use-module (gnu packages man) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -240,54 +241,56 @@ output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.") (define-public pango (package - (name "pango") - (version "1.44.7") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/pango/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (patches (search-patches "pango-skip-libthai-test.patch")) - (sha256 - (base32 - "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6")))) - (build-system meson-build-system) - (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-cantarell-tests - (lambda _ - (substitute* "tests/meson.build" - ;; XXX FIXME: These tests require "font-cantarell", but - ;; adding it here would introduce a circular dependency. - (("\\[ 'test-harfbuzz'.*") "") - (("\\[ 'test-itemize'.*") "") - (("\\[ 'test-layout'.*") "")) - #t))))) - (propagated-inputs - ;; These are all in Requires or Requires.private of the '.pc' files. - `(("cairo" ,cairo) - ("fribidi" ,fribidi) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glib" ,glib) - ("harfbuzz" ,harfbuzz) - - ;; Some packages, such as Openbox, expect Pango to be built with the - ;; optional libxft support. - ("libxft" ,libxft))) - (inputs - `(("zlib" ,zlib))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ; glib-mkenums, etc. - ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. - (synopsis "GNOME text and font handling library") - (description - "Pango is the core text and font handling library used in GNOME -applications. It has extensive support for the different writing systems -used throughout the world.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/pango/"))) + (name "pango") + (version "1.44.7") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/pango/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + (substitute* "tests/meson.build" + (("\\[ 'test-harfbuzz'.*") "") + (("\\[ 'test-itemize'.*") "") + (("\\[ 'test-layout'.*") "")) + #t))))) + (native-inputs + `(("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("help2man" ,help2man) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (inputs + `(("zlib" ,zlib))) + (propagated-inputs + `(("cairo" ,cairo) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("fribidi" ,fribidi) + ("glib" ,glib) + ("harfbuzz" ,harfbuzz) + ("libthai" ,libthai) + ("libxft" ,libxft) + ("libxrender" ,libxrender))) + (synopsis "Text and font handling library") + (description "Pango is a library for laying out and rendering of text, with +an emphasis on internationalization. Pango can be used anywhere that text +layout is needed, though most of the work on Pango so far has been done in the +context of the GTK+ widget toolkit. Pango forms the core of text and font +handling for GTK+-2.x.") + (home-page "https://pango.gnome.org/") + (license license:lgpl2.0+))) (define-public pango-1.42 (package diff --git a/gnu/packages/patches/pango-skip-libthai-test.patch b/gnu/packages/patches/pango-skip-libthai-test.patch deleted file mode 100644 index 98732b5391..0000000000 --- a/gnu/packages/patches/pango-skip-libthai-test.patch +++ /dev/null @@ -1,23 +0,0 @@ -Skip Thai character test when libthai is unavailable. - -Taken from upstream bug tracker: -https://gitlab.gnome.org/GNOME/pango/merge_requests/161 -https://gitlab.gnome.org/GNOME/pango/commit/b73284747ac937e31dc9191f84ed6e24284c88ee - -diff --git a/tests/test-break.c b/tests/test-break.c -index 8549b678bba69360d07dce3af21d915412f20d51..47fa3009165e19a331aa04a0df4351ae2323933b 100644 ---- a/tests/test-break.c -+++ b/tests/test-break.c -@@ -305,6 +305,12 @@ main (int argc, char *argv[]) - if (!strstr (name, "break")) - continue; - -+#ifndef HAVE_LIBTHAI -+ /* four.break involves Thai, so only test it when we have libthai */ -+ if (strstr (name, "four.break")) -+ continue; -+#endif -+ - path = g_strdup_printf ("/break/%s", name); - g_test_add_data_func_full (path, g_test_build_filename (G_TEST_DIST, "breaks", name, NULL), - test_break, g_free); From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:11:56 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:57 +0000 Received: from localhost ([127.0.0.1]:43522 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mEO-0006BA-3j for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:56 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDa-00064K-77 for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:10 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 3B2BB3368187; Thu, 20 Aug 2020 17:10:59 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 17/29] gnu: librsvg@2.40.21: Update package definition. Date: Thu, 20 Aug 2020 17:10:38 +0200 Message-Id: <20200820151050.9529-17-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) From: Raghav Gururajan * gnu/packages/gnome.scm (librsvg): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output "doc". [arguments]<#:configure-flags>[--with-html-dir]: New flag. <#:phases>['patch-docbook]: New phase. ['remove-failing-tests]: Modify phase. [native-inputs]: Add docbook-xml and python-wrapper. [inputs]: Add fontconfig, freetype and harfbuzz. [synopsis]: Modify. [description]: Modify. [license]: Update to lgpl2.1+. Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 79 +++++++++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 32 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2bc70ec9c3..5c5b67a808 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2320,21 +2320,35 @@ for dealing with different structured file formats.") (package (name "librsvg") (version "2.40.21") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1fljkag2gr7c4k5mn798lgf9903xslz8h51bgvl89nnay42qjqpp")))) - (build-system gnu-build-system) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1fljkag2gr7c4k5mn798lgf9903xslz8h51bgvl89nnay42qjqpp")))) + (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) (arguments `(#:configure-flags - (list "--disable-static" - "--enable-vala") ; needed for e.g. gnome-mines + (list + "--disable-static" + "--enable-vala" + (string-append "--with-html-dir=" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html")) #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* "rsvg-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) (add-before 'configure 'pre-configure (lambda* (#:key inputs #:allow-other-keys) (substitute* "gdk-pixbuf-loader/Makefile.in" @@ -2343,7 +2357,7 @@ for dealing with different structured file formats.") (("gdk_pixbuf_moduledir = .*$") (string-append "gdk_pixbuf_moduledir = " "$(prefix)/lib/gdk-pixbuf-2.0/2.10.0/" - "loaders\n")) + "loaders\n")) ;; Drop the 'loaders.cache' file, it's in gdk-pixbuf+svg. (("gdk_pixbuf_cache_file = .*$") "gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n")) @@ -2352,37 +2366,38 @@ for dealing with different structured file formats.") (lambda _ (with-directory-excursion "tests/fixtures/reftests" (for-each delete-file - '(;; This test fails on i686: - "svg1.1/masking-path-04-b.svg" - ;; This test fails on armhf: - "svg1.1/masking-mask-01-b.svg" - ;; This test fails on aarch64: + '("bugs/340047.svg" + "bugs/587721-text-transform.svg" + "bugs/749415.svg" "bugs/777834-empty-text-children.svg"))) #t))))) (native-inputs - `(("pkg-config" ,pkg-config) - ("vala" ,vala) - ("glib" ,glib "bin") ; glib-mkenums, etc. - ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. + `(("docbook-xml" ,docbook-xml-4.3) + ("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("vala" ,vala))) (inputs - `(;; XXX: 1.44 causes some test failures, so we stick with 1.42 for - ;; this ancient version of librsvg. - ("pango" ,pango-1.42) + `(("bzip2" ,bzip2) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("harfbuzz" ,harfbuzz) ("libcroco" ,libcroco) - ("bzip2" ,bzip2) ("libgsf" ,libgsf) - ("libxml2" ,libxml2))) + ("libxml2" ,libxml2) + ("pango" ,pango))) (propagated-inputs - ;; librsvg-2.0.pc refers to all of that. `(("cairo" ,cairo) ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib))) + (synopsis "SVG rendering library") + (description "Librsvg is a library to render SVG images to Cairo surfaces. +GNOME uses this to render SVG icons. Outside of GNOME, other desktop +environments use it for similar purposes. Wikimedia uses it for Wikipedia's SVG +diagrams.") (home-page "https://wiki.gnome.org/LibRsvg") - (synopsis "Render SVG files using Cairo") - (description - "Librsvg is a C library to render SVG files using the Cairo 2D graphics -library.") - (license license:lgpl2.0+))) + (license license:lgpl2.1+))) (define-public librsvg-next (package From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:12:04 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:12:04 +0000 Received: from localhost ([127.0.0.1]:43524 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mEO-0006BD-Se for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:12:04 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDb-00064f-48 for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:12 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id C731F3368211; Thu, 20 Aug 2020 17:11:00 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 23/29] gnu: gtk-doc: Update package definition. Date: Thu, 20 Aug 2020 17:10:44 +0200 Message-Id: <20200820151050.9529-23-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Raghav Gururajan * gnu/packages/gtk.scm (gtk-doc) [version]: Update to 1.32. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output 'help'. [arguments]<#:configure-flags>[--with-help-dir]: New flag. <#:phases>['patch-test-out]: Remove phase. ['disable-failing-tests]: New phase. [native-inputs]: Add glib:bin, perl and python-wrapper. [inputs]: Add python-anytree, python-lxml, python-parameterized, python-pygments, python-unittest2 and yelp-tools. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Add fdl1.1+. Signed-off-by: Danny Milosavljevic --- gnu/packages/gtk.scm | 124 ++++++++++++++++++++++++------------------- 1 file changed, 70 insertions(+), 54 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d595a8c7ec..7e32b7623b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1633,48 +1633,48 @@ information.") (define-public gtk-doc (package (name "gtk-doc") - (version "1.28") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "05apmwibkmn1icx05l8aw241lhymcx01zvk5i499cb150bijj7li")))) - (build-system gnu-build-system) + (version "1.32") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0z4h1dggpimygdp719l457jvqilps4qcfpk31jmj3jqpzcsg03ny")))) + (build-system glib-or-gtk-build-system) + (outputs '("out" "help")) (arguments - `(#:parallel-tests? #f + `(#:configure-flags + (list + (string-append "--with-xml-catalog=" + (assoc-ref %build-inputs "docbook-xml") + "/xml/dtd/docbook/catalog.xml") + (string-append "--with-help-dir=" + (assoc-ref %outputs "help") + "/share/help")) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-gtk-doc-scan (lambda* (#:key inputs #:allow-other-keys) (substitute* "gtk-doc.xsl" - (("http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/html/chunk.xsl")) - (("http://docbook.sourceforge.net/release/xsl/current/common/en.xml") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/common/en.xml"))) + (("http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/html/chunk.xsl")) + (("http://docbook.sourceforge.net/release/xsl/current/common/en.xml") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/common/en.xml"))) #t)) - (add-after 'patch-gtk-doc-scan 'patch-test-out + (add-after 'unpack 'disable-failing-tests (lambda _ - ;; sanity.sh counts the number of status lines. Since our - ;; texlive regenerates the fonts every time and the font - ;; generator metafont outputs a lot of extra lines, this - ;; test would always fail. Disable it for now. (substitute* "tests/Makefile.in" - (("empty.sh sanity.sh") "empty.sh")) - #t)) - (add-before 'build 'set-HOME - (lambda _ - ;; FIXME: dblatex with texlive-union does not find the built - ;; metafonts, so it tries to generate them in HOME. - (setenv "HOME" "/tmp") + (("annotations.sh bugs.sh empty.sh fail.sh gobject.sh program.sh") + "")) #t)) (add-before 'configure 'fix-docbook (lambda* (#:key inputs #:allow-other-keys) @@ -1691,6 +1691,12 @@ information.") "^catalog.xml$")) " \"http://docbook.sourceforge.net/release/xsl/"))) #t)) + (add-before 'build 'set-HOME + (lambda _ + ;; FIXME: dblatex with texlive-union does not find the built + ;; metafonts, so it tries to generate them in HOME. + (setenv "HOME" "/tmp") + #t)) (add-after 'install 'wrap-executables (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -1698,34 +1704,44 @@ information.") (wrap-program prog `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))) (find-files (string-append out "/bin"))) - #t)))) - #:configure-flags - (list (string-append "--with-xml-catalog=" - (assoc-ref %build-inputs "docbook-xml") - "/xml/dtd/docbook/catalog.xml")))) + #t)))))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) ("itstool" ,itstool) - ("libxml" ,libxml2) - ("gettext" ,gettext-minimal) - ("bc" ,bc))) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper))) (inputs - `(("perl" ,perl) - ("python" ,python) - ("xsltproc" ,libxslt) + `(("bc" ,bc) ("dblatex" ,dblatex) ("docbook-xml" ,docbook-xml-4.3) ("docbook-xsl" ,docbook-xsl) - ("source-highlight" ,source-highlight) ("glib" ,glib) - ("python-six" ,python-six))) - (home-page "https://www.gtk.org/gtk-doc/") - (synopsis "Documentation generator from C source code") - (description - "GTK-Doc generates API documentation from comments added to C code. It is -typically used to document the public API of GTK+ and GNOME libraries, but it -can also be used to document application code.") - (license license:gpl2+))) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("python" ,python) + ("python-anytree" ,python-anytree) + ("python-lxml" ,python-lxml) + ("python-parameterized" ,python-parameterized) + ("python-pygments" ,python-pygments) + ("python-unittest2" ,python-unittest2) + ("source-highlight" ,source-highlight) + ("yelp-tools" ,yelp-tools))) + (synopsis "GTK+ DocBook Documentation Generator") + (description "GtkDoc is a tool used to extract API documentation from C-code +like Doxygen, but handles documentation of GObject (including signals and +properties) that makes it very suitable for GTK+ apps and libraries. It uses +docbook for intermediate files and can produce html by default and pdf/man-pages +with some extra work.") + (home-page "https://wiki.gnome.org/DocumentationProject/GtkDoc") + (license + (list + ;; Docs. + license:fdl1.1+ + ;; Others. + license:gpl2+)))) (define-public gtk-engines (package From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 11:12:13 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:12:13 +0000 Received: from localhost ([127.0.0.1]:43534 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mEW-0006CS-HL for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:12:13 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42422) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDa-00064v-0H for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:16 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 94CE13368238; Thu, 20 Aug 2020 17:11:01 +0200 (CEST) From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: [PATCH core-updates 26/29] gnu: at-spi2-atk: Update to 2.34.2. Date: Thu, 20 Aug 2020 17:10:47 +0200 Message-Id: <20200820151050.9529-26-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Raghav Gururajan * gnu/packages/gtk.scm (at-spi2-atk): Update to 2.34.2. [version]: Update to 2.34.2. [arguments]<#:glib-or-gtk?>: New argument. [native-inputs]: Add gobject-introspection. [inputs]: Add glib. [home-page]: Modify. [license]: Update to lgpl2.1+. Signed-off-by: Danny Milosavljevic --- gnu/packages/gtk.scm | 75 +++++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5198754b2c..9b69f788bb 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -695,42 +695,45 @@ core components, is part of the GNOME accessibility project.") (define-public at-spi2-atk (package - (name "at-spi2-atk") - (version "2.34.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "05ncp7s5nddjinffs26mcvpbd63vk1m3cv5y530p3plgfhqgjvbp")))) - (build-system meson-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - ;; Run test-suite under a dbus session. - (lambda _ - (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "meson" "test")))))) - (propagated-inputs - ;; TODO: Replace by at-spi2-core-minimal in the next staging window, or - ;; when Inkscape 0.92 is upgraded to 1.0 to avoid a cycle. - `(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc - (inputs - `(("atk" ,atk))) - (native-inputs - `(("pkg-config" ,pkg-config) - ;; For tests. - ("dbus" ,dbus) - ("libxml2" ,libxml2))) - (synopsis "Assistive Technology Service Provider Interface, ATK bindings") - (description - "The Assistive Technology Service Provider Interface -is part of the GNOME accessibility project.") - (license license:lgpl2.0+) - (home-page "https://projects.gnome.org/accessibility/"))) + (name "at-spi2-atk") + (version "2.34.2") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1w7l4xg00qx3dwhn0zaa64daiv5f073hdvjdxh0mrw7fw37264wh")))) + (build-system meson-build-system) + (arguments + '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas. + #:phases + (modify-phases %standard-phases + (replace 'check + ;; Run test-suite under a dbus session. + (lambda _ + (setenv "DBUS_FATAL_WARNINGS" "0") + (invoke "dbus-launch" "meson" "test")))))) + (native-inputs + `(("dbus" ,dbus) ; For tests + ("gobject-introspection" ,gobject-introspection) + ("libxml2" ,libxml2) + ("pkg-config" ,pkg-config))) + (inputs + `(("atk" ,atk) + ("glib" ,glib))) + (propagated-inputs + ;; TODO: Replace by at-spi2-core-minimal in the next staging window, or + ;; when Inkscape 0.92 is upgraded to 1.0 to avoid a cycle. + `(("at-spi2-core" ,at-spi2-core))) + (synopsis "Assistive Technology Service Provider Interface, ATK bindings") + (description "The Assistive Technology Service Provider Interface is part of +the GNOME accessibility project.") + (home-page "https://wiki.gnome.org/Accessibility/") + (license license:lgpl2.1+))) (define-public gtk+-2 (package From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 12:28:03 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 16:28:03 +0000 Received: from localhost ([127.0.0.1]:43671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8nQ2-0006Kn-PL for submit@debbugs.gnu.org; Thu, 20 Aug 2020 12:28:02 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:48888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8nQ0-0006KM-9M for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 12:28:01 -0400 Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id D8242336337B; Thu, 20 Aug 2020 18:27:57 +0200 (CEST) Date: Thu, 20 Aug 2020 18:27:56 +0200 From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: Re: [PATCH core-updates 11/29] gnu: pango: Update package definition. Message-ID: <20200820182756.008c4f62@scratchpost.org> In-Reply-To: <20200820151050.9529-11-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> <20200820151050.9529-11-dannym@scratchpost.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Oca_aK8crOLTOPZVOSyh998"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/Oca_aK8crOLTOPZVOSyh998 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable misses libthai, but that's in master as of 5c57328ef73. --Sig_/Oca_aK8crOLTOPZVOSyh998 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl8+pIwACgkQ5xo1VCww uqVNwwf/dgSaKH7X2a8EokEY2xwDehtmWALPSV3rTJIRTgccNABGW9hu3gLFz3uE ZZWfuvNmrUis3Lye5Rk4gSSTn601Hk6xmf5oW/LcQ++WNr9uv7ByAQ4hU9CQDblm rWOWrBiTe6ifvI2Awj/C3D4lV+/zsmVJquhArJPDGzVK34hJgTx4CWMls4aqCPSF /7dpJBlD9svFouiGRFCzR8J2qpohcf3rxjbwmyp/fgv3y9tNsUNqmDtChzIGxtn6 SdALXOlQvUcpxXl6iyWrOmXOJXa1MwoABlHKwGyBE7W/KDPcwPP+KKRo5i22bfZb jzjWZEw/OD+UeyZreYKekPxyk2bkBg== =/OkL -----END PGP SIGNATURE----- --Sig_/Oca_aK8crOLTOPZVOSyh998-- From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 12:29:45 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 16:29:45 +0000 Received: from localhost ([127.0.0.1]:43704 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8nRg-0006Q4-Vt for submit@debbugs.gnu.org; Thu, 20 Aug 2020 12:29:45 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:49090) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8nRf-0006Pw-AL for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 12:29:43 -0400 Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 9CDE7336219F; Thu, 20 Aug 2020 18:29:42 +0200 (CEST) Date: Thu, 20 Aug 2020 18:29:41 +0200 From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: Re: [PATCH core-updates 11/29] gnu: pango: Update package definition. Message-ID: <20200820182941.327c66f0@scratchpost.org> In-Reply-To: <20200820182756.008c4f62@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> <20200820151050.9529-11-dannym@scratchpost.org> <20200820182756.008c4f62@scratchpost.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/oxcSZ3TMD6Gzzfid=e4A.l1"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/oxcSZ3TMD6Gzzfid=e4A.l1 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable libthai requires libdatrie, which is on master as commit 20842b795e2. --Sig_/oxcSZ3TMD6Gzzfid=e4A.l1 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl8+pPUACgkQ5xo1VCww uqUbbwgAggT9O3bEkzdRGBKq4ImjyUC/fSA3+bIYk18o63EccLRlKS9X15s9P+LI yzlg3xm/gqTxsitbbJA6WQ15BEIccntHvu4oZyhAJpFJJYc22u7Ag04+OqnbGp30 4/meptxbVDzmnOmg1d/PIEJFxswIUVJeqGpKqTBoEVJds7S4oRtnnaB+14LTsm4f ey2YKKRnuvboiOGec8DgokSoLQZzSg3OkE9vBux0ON5785pJfE7WHePKmncAd8Bu +6jpXMGjBgtvzshkVHwml96VKC7PD6hhfBrlZA8omkHA6/NU2VnvfIHRHzGzBeTc /NpLlti7HmprSJATnNb6jJSJrR8KGw== =Kog6 -----END PGP SIGNATURE----- --Sig_/oxcSZ3TMD6Gzzfid=e4A.l1-- From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 12:44:47 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 16:44:47 +0000 Received: from localhost ([127.0.0.1]:43800 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8ngE-0006tb-Mz for submit@debbugs.gnu.org; Thu, 20 Aug 2020 12:44:46 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:50404) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8ngC-0006tS-LS for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 12:44:45 -0400 Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 0D776336219F; Thu, 20 Aug 2020 18:44:43 +0200 (CEST) Date: Thu, 20 Aug 2020 18:44:41 +0200 From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: Re: [PATCH core-updates 27/29] gnu: gtk+: Update package definition. Message-ID: <20200820184441.6c970ada@scratchpost.org> In-Reply-To: <20200820151050.9529-27-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> <20200820151050.9529-27-dannym@scratchpost.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/hCehJ17vJ+vYLsdlAK4cRqZ"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/hCehJ17vJ+vYLsdlAK4cRqZ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable libcloudprovider is not in guix core-updates yet. guix master commit that added libcloudprovider is 63d71ff0061c2e761fbad6e67f322208d8fdf25b. --Sig_/hCehJ17vJ+vYLsdlAK4cRqZ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl8+qHkACgkQ5xo1VCww uqUzrgf+OgXehu0lFwMfSAj8MfvMZNivCtAUVl91e8LNIIXONAunKUGRrWcUI5v0 5nFk65/wLKDkKHXi026pp1lnLluFs5zTsMnz4PWLXDATAJ+FGtQ+V6yyhLikLFWa Wxc8zhole+txNbtlRwOnTZcJwzVf0pXSaaFjBkyjJkdcAghp2lEZ/X7ke8vQH4dP 33lqbWQvH/80MPlftiFfdhrazzzh8n13s9cwUVmCLwjxVvVZKfaqSa0azFM6RxBM oKmCXLJxJuSkKpo4NMmcbnzsUkmB5JsYchAD2iXXmAm+BTW27zlrrYkfkC/NDkqU V3AV0R3fuyDQATmXll9EHIrD11lhkg== =SLfG -----END PGP SIGNATURE----- --Sig_/hCehJ17vJ+vYLsdlAK4cRqZ-- From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 12:45:04 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 16:45:04 +0000 Received: from localhost ([127.0.0.1]:43804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8ngV-0006ww-W5 for submit@debbugs.gnu.org; Thu, 20 Aug 2020 12:45:04 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:50430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8ngU-0006uK-Bz for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 12:45:02 -0400 Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 8E28C336219F; Thu, 20 Aug 2020 18:45:01 +0200 (CEST) Date: Thu, 20 Aug 2020 18:45:00 +0200 From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: Re: [PATCH core-updates 22/29] gnu: atkmm: Update package definition. Message-ID: <20200820184500.26ace660@scratchpost.org> In-Reply-To: <20200820151050.9529-22-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> <20200820151050.9529-22-dannym@scratchpost.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/cMGr5JA_d9rIWTkhpGHvti5"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/cMGr5JA_d9rIWTkhpGHvti5 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable missing import (gnu packages graphviz) --Sig_/cMGr5JA_d9rIWTkhpGHvti5 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl8+qIwACgkQ5xo1VCww uqUiqwf8CFby8jsq9ujbG96+U0wcMIAElxnf2m2fdI6iXkFZJ/DPYNBP+eZyAraq Q+dw8tmSAm1dfuTUb0dc2l/nJiuaplpxv9VrDB0BWrUmtktEqlOaBOn9hMj9yOyZ RiI4NThKn+XoKBIk7xVXDO3NnjR7Z4BuXqEHbY/ZL7x6l7S+ybdopeRVsU+sNrDR ZJ42ZXOE8i9X0wtPSXfUwJu7MeMCn+pDR5fwCfuW4r4Sxn7vTYIsVy2Yasu3EuwC y8AmlF4JiZ8sya9lfzTQ0aJuLtWPn/pmkB2MCa/WlkbOCAFzfNEACK6KLXgcCQVA 69dNZkG0G4dFXEEdcnf6yeJQ93RwTA== =f2ys -----END PGP SIGNATURE----- --Sig_/cMGr5JA_d9rIWTkhpGHvti5-- From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 12:45:48 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 16:45:48 +0000 Received: from localhost ([127.0.0.1]:43807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8nhE-0007dx-Am for submit@debbugs.gnu.org; Thu, 20 Aug 2020 12:45:48 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:50564) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8nhD-0007ct-GX for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 12:45:47 -0400 Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id C2735336219F; Thu, 20 Aug 2020 18:45:46 +0200 (CEST) Date: Thu, 20 Aug 2020 18:45:46 +0200 From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: Re: [PATCH core-updates 09/29] gnu: openjpeg: Update package definition. Message-ID: <20200820184546.560af1cc@scratchpost.org> In-Reply-To: <20200820151050.9529-9-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> <20200820151050.9529-9-dannym@scratchpost.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/MOHhu.E+Btd1npq3yk8gSdz"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/MOHhu.E+Btd1npq3yk8gSdz Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable openjpeg-data is not in guix core-updates yet, but it's in guix master. guix master commit 3f03bd372871a95e2ebb50197172f7a95329feed added openjpeg-= data. --Sig_/MOHhu.E+Btd1npq3yk8gSdz Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl8+qLoACgkQ5xo1VCww uqVZagf+MUmK6ypVs8on+nFalFzvZXAqOtJJRsUqGhS0LnsTwhP0J4/vv1ezbx8h Q+R5gIg3aXS7O/fBQFWzFtJskJ8dRwI3GwXwkKue6H3DFg+dPFvHE0kBCTXcAeCr Bvig5/1qgs96Ves1fRrVWaht+r6rvPwaxXSGtAlhyfy46H6OwmYSYKetEpbV0d1T DONUsuW+w7SxS6FD/xuKPRUvxONo1TqI8sNPFtll1de0k2+fATB5zEpVz0J4pXRj H0wN3tdAIRN9r7s4zgfdUj4GoL8l0conGjLBN0ehuzJkk4UHRBm9EedK2PkejERU qPbT6iDt9P1/gtNj4hMCAuyAUUsxOA== =MKhJ -----END PGP SIGNATURE----- --Sig_/MOHhu.E+Btd1npq3yk8gSdz-- From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 20 12:48:17 2020 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 16:48:17 +0000 Received: from localhost ([127.0.0.1]:43812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8njd-0000lT-Lg for submit@debbugs.gnu.org; Thu, 20 Aug 2020 12:48:17 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:50774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8njc-0000lM-Fd for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 12:48:16 -0400 Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id AFCB4336219F; Thu, 20 Aug 2020 18:48:15 +0200 (CEST) Date: Thu, 20 Aug 2020 18:48:14 +0200 From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: Re: [PATCH core-updates 22/29] gnu: atkmm: Update package definition. Message-ID: <20200820184814.3f7a04db@scratchpost.org> In-Reply-To: <20200820151050.9529-22-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> <20200820151050.9529-22-dannym@scratchpost.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/OgJjHSokIcjkuiyLh_zdE3U"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/OgJjHSokIcjkuiyLh_zdE3U Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable This uses glibmm-2.64 which is not in guix core-updates yet. However, glibmm-2.64 has been added to guix master as commit 5173bb55ad4. --Sig_/OgJjHSokIcjkuiyLh_zdE3U Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl8+qU4ACgkQ5xo1VCww uqXncQf/ex8Uh0vcQfbCEy4hGOajc6UbvsUbPz71rBnJmVQtVLCBYvpw3iurSxf+ 7vOEkhBV6pO6gdSUP6rGteaudtW9eyRet/0GebXQ6XtjSx2mdrTBQC5vrHJY+rFS BkYsGXfFEzVkKs6+Smugao/hbasbz+7VhADK0Qhk03LDpUKnOF+E69LobGs0yQys vqSh/+YLcKObKvbm3aNgpfXoxP+AuuePRELALXsD/ifMPA0M4vij7T7nd8GKfTdh 6mhwslUMrVvQ68JlWPh2CKbqp54ZarTbIDUk6+2Z3x5OSnoGC5KRDmDVaLr37c0Y u63a94JainBfwPOsMLjjOFcuVFrEnA== =xyNK -----END PGP SIGNATURE----- --Sig_/OgJjHSokIcjkuiyLh_zdE3U-- From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 23 20:20:00 2020 Received: (at 42958) by debbugs.gnu.org; 24 Aug 2020 00:20:00 +0000 Received: from localhost ([127.0.0.1]:55374 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kA0DQ-0005vN-Ea for submit@debbugs.gnu.org; Sun, 23 Aug 2020 20:20:00 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:52248) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kA0DO-0005vG-Sf for 42958@debbugs.gnu.org; Sun, 23 Aug 2020 20:19:59 -0400 Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 0C13C33602E1; Mon, 24 Aug 2020 02:19:58 +0200 (CEST) Date: Mon, 24 Aug 2020 02:19:56 +0200 From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: Re: [PATCH core-updates 12/29] gnu: gdk-pixbuf: Update package definition. Message-ID: <20200824021956.6ab8cdd2@scratchpost.org> In-Reply-To: <20200820151050.9529-12-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> <20200820151050.9529-12-dannym@scratchpost.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/jVQZPcujPDUh//xzFSYI9gx"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/jVQZPcujPDUh//xzFSYI9gx Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Should be "/xml/xsl/docbook-xsl-1.79.2/" instead of "/xml/xsl/docbook-xsl-1= .79.1/", otherwise fails with: FAILED: docs/gdk-pixbuf-csource.1=20 /gnu/store/8mcjhrc6yir9gzrp0y71nj254giw75bd-libxslt-1.1.34/bin/xsltproc --n= onet --stringparam man.output.quietly 1 --stringparam funcsynopsis.style an= si --stringparam man.th.extra1.suppress 1 --stringparam man.authors.section= .enabled 0 --stringparam man.copyright.section.enabled 0 -o docs/gdk-pixbuf= -csource.1 /gnu/store/6jxdry6q9yj4rw7ska0aniqjf42b6ply-docbook-xsl-1.79.2/x= ml/xsl/docbook-xsl-1.79.1/manpages/docbook.xsl ../gdk-pixbuf-2.40.0/docs/gd= k-pixbuf-csource.xml warning: failed to load external entity "/gnu/store/6jxdry6q9yj4rw7ska0aniq= jf42b6ply-docbook-xsl-1.79.2/xml/xsl/docbook-xsl-1.79.1/manpages/docbook.xs= l" cannot parse /gnu/store/6jxdry6q9yj4rw7ska0aniqjf42b6ply-docbook-xsl-1.79.2= /xml/xsl/docbook-xsl-1.79.1/manpages/docbook.xsl [4/152] Compiling C object 'gdk-pixbuf/pixops/a255f19@@timescale@exe/timesc= ale.c.o'. [5/152] Generating gdk-pixbuf-enum-types.h with a meson_exe.py custom comma= nd. [6/152] Compiling C object 'gdk-pixbuf/pixops/a255f19@@pixops@sta/pixops.c.= o'. ninja: build stopped: subcommand failed. command "ninja" "-j" "4" failed with status 1 builder for `/gnu/store/8j55f3i81w274iif5pnsbyxp170s9814-gdk-pixbuf-2.40.0.= drv' failed with exit code 1 build of /gnu/store/8j55f3i81w274iif5pnsbyxp170s9814-gdk-pixbuf-2.40.0.drv = failed View build log at '/var/log/guix/drvs/8j/55f3i81w274iif5pnsbyxp170s9814-gdk= -pixbuf-2.40.0.drv.bz2'. guix build: error: build of `/gnu/store/8j55f3i81w274iif5pnsbyxp170s9814-gd= k-pixbuf-2.40.0.drv' failed --Sig_/jVQZPcujPDUh//xzFSYI9gx Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl9DB6wACgkQ5xo1VCww uqX6Kwf/RYkC3DlT7mfDrR/p6H8FVaRhL7MmlNYqt90yfTAlPnXUGxLZ0mRSARdr gt7+TeQGVjAYgZUgCpXitZdl5GAV6Narnm/y2wV+7Zbh95uvrHybyoqq8dLnuQYG ZjDuHnYbRF+QnZzT/bqrfjXtFW7G1B03TkbTAaTUwJSbJPK2/76hWSeTuoVcQU4k 7hM92gyK6OkZcQZEzyQ3ExksDStRfYBLmQR4N2ubHULybJPyEeXL7copxPH1ZDQF jSXDV5oA04So3bSGWyZBsuI8GPDfn6jI1nDsSbB6Ebk53mv/pQ8h5D4D4FYFO8AT xnsEOCr1F5VKqOnS2iSrek6qjxI1zg== =TceB -----END PGP SIGNATURE----- --Sig_/jVQZPcujPDUh//xzFSYI9gx-- From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 30 16:54:33 2020 Received: (at 42958) by debbugs.gnu.org; 30 Aug 2020 20:54:33 +0000 Received: from localhost ([127.0.0.1]:50840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kCULR-00077A-CN for submit@debbugs.gnu.org; Sun, 30 Aug 2020 16:54:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kCULQ-00076q-AZ for 42958@debbugs.gnu.org; Sun, 30 Aug 2020 16:54:32 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44999) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCULK-0005eW-FA; Sun, 30 Aug 2020 16:54:26 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=43790 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kCULJ-0008Vt-3e; Sun, 30 Aug 2020 16:54:26 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Danny Milosavljevic Subject: Re: [bug#42958] [PATCH core-updates 02/29] gnu: yelp-tools: Update package definition. References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> <20200820151050.9529-2-dannym@scratchpost.org> Date: Sun, 30 Aug 2020 22:54:22 +0200 In-Reply-To: <20200820151050.9529-2-dannym@scratchpost.org> (Danny Milosavljevic's message of "Thu, 20 Aug 2020 17:10:23 +0200") Message-ID: <87y2lvg8ht.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan , 42958@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi! Danny Milosavljevic skribis: > From: Raghav Gururajan > > * gnu/packages/gnome.scm (yelp-tools): Update package definition. > [propagated-inputs]: Move itstool, libxml2 and libxslt to ... > [native-inputs]: ... here. > [synopsis]: Modify. > [description]: Modify. > > Signed-off-by: Danny Milosavljevic I think =E2=80=9CUpdate package definition=E2=80=9D is not descriptive: it = should be either =E2=80=9CUpdate to 3.36=E2=80=9D (for a version update), or =E2=80= =9CMove build-time tool to 'native-inputs'=E2=80=9D, or =E2=80=9CTweak synopsis and description=E2= =80=9D. But then, these are different kinds of changes (I know, you=E2=80=99ll hate me for suggesting another rebase=E2=80=A6). I find it important to clearly commun= icate among us what a change does. WDYT? Also, while it=E2=80=99s maybe more convenient for Outreachy, I think many = of these changes could have gone one by one on =E2=80=98master=E2=80=99 over t= ime, like Raghav used to do. That avoids the pressure associated with a 29-patch review. > + (synopsis "Tools for Yelp") > + (description "Yelp-Tools contains small programs that help you creat= e, edit, > +manage, and publish your Mallard or DocBook documentation.") > (home-page "https://wiki.gnome.org/Apps/Yelp/Tools") > - (synopsis "Yelp documentation tools") > - (description > - "Yelp-tools is a collection of scripts and build utilities to help = create, > -manage, and publish documentation for Yelp and the web. Most of the hea= vy > -lifting is done by packages like yelp-xsl and itstool. This package just > -wraps things up in a developer-friendly way.") This particular change is questionable IMO. Anyhow, thanks to the two of you for all the work! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 23 09:41:12 2020 Received: (at 42958) by debbugs.gnu.org; 23 Sep 2020 13:41:12 +0000 Received: from localhost ([127.0.0.1]:34880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kL51D-0003dd-Rl for submit@debbugs.gnu.org; Wed, 23 Sep 2020 09:41:12 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:52146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kL518-0003dL-P6 for 42958@debbugs.gnu.org; Wed, 23 Sep 2020 09:41:09 -0400 Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id C62C73364118; Wed, 23 Sep 2020 15:41:04 +0200 (CEST) Date: Wed, 23 Sep 2020 15:40:12 +0200 From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: Re: [PATCH core-updates 05/29] gnu: gobject-introspection: Update package definition. Message-ID: <20200923154012.3c206bbd@scratchpost.org> In-Reply-To: <20200820151050.9529-5-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> <20200820151050.9529-5-dannym@scratchpost.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/3PDRgMcQgo7CvtYZv9dsDET"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/3PDRgMcQgo7CvtYZv9dsDET Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable TODO: Enable meson flag "doctool" (and store it in an extra output maybe, depending on how big it is). Maybe create extra package "gobject-introspection-doctool" if it's too big. --Sig_/3PDRgMcQgo7CvtYZv9dsDET Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl9rUDwACgkQ5xo1VCww uqVxrwf/YknL0mBFbn/Vo5M/iYFruySFpfT2ZbmHRpi/fraEEWDtJoIwGfZflYp+ yjjb1ANNItKqk+0FwJ9YV62T5dA/J6/QjiC+4u3x6flzXUTnUqkIfG6UGs6QfDS7 WmJDSsOhDdo97UsBq8Rs3bhpGMYMs5cf8qYDfNnbUNoG3f2SDHV1pJiBUNSDu0UJ 9EBf8HNvMGrm/MOgQijPQ6GlhBV3jLL7NtIPTTW4GADtFEL/bPaae0VBaI043xjL w3NlzvcThfA43mbn7/JqvGoosSBS2/c//YcSbPppcalJteJLtrG1NPOf+gzxThu+ hNJ8Reym3t82DTVkGTS8ra/KlBMgdQ== =WIws -----END PGP SIGNATURE----- --Sig_/3PDRgMcQgo7CvtYZv9dsDET-- From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 23 09:46:17 2020 Received: (at 42958) by debbugs.gnu.org; 23 Sep 2020 13:46:17 +0000 Received: from localhost ([127.0.0.1]:34888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kL569-0003ou-Kj for submit@debbugs.gnu.org; Wed, 23 Sep 2020 09:46:17 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:52568) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kL568-0003on-IF for 42958@debbugs.gnu.org; Wed, 23 Sep 2020 09:46:17 -0400 Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 4902833612A7; Wed, 23 Sep 2020 15:46:15 +0200 (CEST) Date: Wed, 23 Sep 2020 15:45:52 +0200 From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: Re: [PATCH core-updates 05/29] gnu: gobject-introspection: Update package definition. Message-ID: <20200923154552.24020f49@scratchpost.org> In-Reply-To: <20200923154012.3c206bbd@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> <20200820151050.9529-5-dannym@scratchpost.org> <20200923154012.3c206bbd@scratchpost.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/G5=i2IJqaEiiDKTB7CIotFC"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/G5=i2IJqaEiiDKTB7CIotFC Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Wed, 23 Sep 2020 15:40:12 +0200 Danny Milosavljevic wrote: > TODO: Enable meson flag "doctool" (and store it in an extra output maybe, > depending on how big it is). Maybe create extra package > "gobject-introspection-doctool" if it's too big. That would require python-mako, python-markdown. --Sig_/G5=i2IJqaEiiDKTB7CIotFC Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl9rUZAACgkQ5xo1VCww uqX+wAgAoluXpISy1ldlgKAVIUMZbZKlGAvYTavm63NZE7whOajGg7URd1swv8sd eZq3oiCpFNG27xixFhnq5dahrqCLiEucF4YtUEq3ewYB5FgXc0ZKAqXNeyPxWkt4 YtcLMhicmA4qiTlrxNYB1B3mI2Lax1erLGMZTT8eTEc4dWb1BVrlJx3Twsc8PYRS zOkO9JLMnwZf+VwFx2+3QyjVrQn/Vfoh2qug5kFkbGnPMTS5ecQOqC6aiGxLwyx+ ICllB2Uia73U2lyGDnEDIvL07Dp1zDopzpPr+NsQQnO1Shtbp/nay9OLdPvwoBIh 2Rs11m4cgweMAWLqiZbyfybPI9i+qw== =MYaF -----END PGP SIGNATURE----- --Sig_/G5=i2IJqaEiiDKTB7CIotFC-- From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 24 07:36:49 2020 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 11:36:49 +0000 Received: from localhost ([127.0.0.1]:38740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLPYP-0005jD-1M for submit@debbugs.gnu.org; Thu, 24 Sep 2020 07:36:49 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:54992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLPYL-0005j2-ID for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 07:36:47 -0400 Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id C13E63368196; Thu, 24 Sep 2020 13:36:43 +0200 (CEST) Date: Thu, 24 Sep 2020 13:36:20 +0200 From: Danny Milosavljevic To: 42958@debbugs.gnu.org Subject: Re: [PATCH core-updates 05/29] gnu: gobject-introspection: Update package definition. Message-ID: <20200924133620.2ceea7d8@scratchpost.org> In-Reply-To: <20200923154552.24020f49@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> <20200820151050.9529-5-dannym@scratchpost.org> <20200923154012.3c206bbd@scratchpost.org> <20200923154552.24020f49@scratchpost.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/sLGHhiMOHJ2NrMaY4nd/jOV"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: Raghav Gururajan X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/sLGHhiMOHJ2NrMaY4nd/jOV Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable I think doctool should not be included in gobject-introspection itself, so = this patchset is unaffected by it. --Sig_/sLGHhiMOHJ2NrMaY4nd/jOV Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl9shLQACgkQ5xo1VCww uqVamwf8C37SnmZIMjBrJZEpXqSSD+s3BouwQlAxa8R86xVccHHMtFohEF359MSy ocEtkz0+s9GVV4kk8sOiYp6HC9VvqAK0Yu1CBzZJa9kUqp5EenqKTJkuSbJm3hL2 up2E91Pvj+VgkWNVsTDSiuD5rrKo+PgnTgjxln7Nq+Jt8z4sTsnViQ7nwyBuhMFr azQCtX4vv/PS9bvx4grgGEDc85+NtYl/Uj5WB0hRWW8Fxricsy18aZogBdBTuR/g VD5L9Pnbe9SfF2ZR4XBbvXTi5dr68zmiwms4UdRrJHHS+ZXfYbCrh1HDGaJcC4+H VcMspMlzr0/fh4nFirngnR/HL9Yq5Q== =kQMh -----END PGP SIGNATURE----- --Sig_/sLGHhiMOHJ2NrMaY4nd/jOV-- From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 24 08:26:32 2020 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 12:26:32 +0000 Received: from localhost ([127.0.0.1]:38833 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLQKV-0006ur-S2 for submit@debbugs.gnu.org; Thu, 24 Sep 2020 08:26:32 -0400 Received: from knopi.disroot.org ([178.21.23.139]:57384) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLQKT-0006uh-4g for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 08:26:30 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 9A6BC51C43 for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 14:26:27 +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 z95nQdR4vee5 for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 14:26:25 +0200 (CEST) To: 42958@debbugs.gnu.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1600950385; bh=rTlpkFUFKdPZdh9BbC1h0yxHsE+OCZh4FizVzoKnk3U=; h=To:From:Subject:Date; b=A1KaDpBeMNxl4hxjuYdAsA00F5Yzr+o9Pblyp4+eHx99TqKBzhWmZhaT7L5sV360S mxDQY7DYnpqvJNtowhpeLZklt4kjyykno2WMNBX0QU2grdV1eu6d6wknI3tSQP15zf abn8X5NShn14otslHJqncFExwDlQLUpxa8pwdxY1uyzWjSvb+zm1LeH69FoUOi1sCQ q0/9/NpRbu3ym7XpL00TV/G6UxyLp1FsbkHc4FAzJWwWe3B8SRq7YrpXY1xX5uwQEU rb4Qbr10Jd+5+GTmd02/lpDRr5J6kHQ5tWQisKXy2RWfAldd4618VmZ8rRWZ24+T6O qwJolhT+yXflQ== From: Raghav Gururajan Subject: Re: [PATCH core-updates 01/29] gnu: yelp-xsl: Update package definition. Message-ID: <1b553328-6cdc-ab8d-1ea5-f046ac3d3e95@disroot.org> Date: Thu, 24 Sep 2020 08:26:24 -0400 Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------3625450B66D6490F6836C124" Content-Language: en-US X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42958 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------3625450B66D6490F6836C124 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit @Danny Please find the attached split patches. Regards, RG. --------------3625450B66D6490F6836C124 Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-yelp-xsl-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-gnu-yelp-xsl-Make-some-cosmetic-changes.patch" >From c52b87ec16822fb3cea3b8937c9bc7042e1553b8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:02:14 -0400 Subject: [PATCH 01/11] gnu: yelp-xsl: Make some cosmetic changes. * gnu/packages/gnome.scm (yelp-xsl): Make some cosmetic changes. --- gnu/packages/gnome.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bc0a4e859e..eca2d74f71 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6445,24 +6445,25 @@ of running programs and invoke methods on those interfaces.") (package (name "yelp-xsl") (version "3.34.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc")))) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc")))) (build-system gnu-build-system) (native-inputs `(("gettext-minimal" ,gettext-minimal) ("itstool" ,itstool) ("xmllint" ,libxml2))) - (home-page "https://wiki.gnome.org/Apps/Yelp") (synopsis "XSL stylesheets for Yelp") (description "Yelp-xsl contains XSL stylesheets that are used by the yelp help browser to format Docbook and Mallard documents.") + (home-page "https://wiki.gnome.org/Apps/Yelp") (license license:gpl2+))) (define-public yelp -- 2.28.0 --------------3625450B66D6490F6836C124 Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-yelp-xsl-Update-to-3.36.0.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0002-gnu-yelp-xsl-Update-to-3.36.0.patch" >From bd5e10ef62b19933b03c2263f99eb83523ccaca4 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:04:27 -0400 Subject: [PATCH 02/11] gnu: yelp-xsl: Update to 3.36.0. * gnu/packages/gnome.scm (yelp-xsl) [version]: Update to 3.36.0. [source][sha256]: Modify base32. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eca2d74f71..8418fd91ed 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6444,7 +6444,7 @@ of running programs and invoke methods on those interfaces.") (define-public yelp-xsl (package (name "yelp-xsl") - (version "3.34.2") + (version "3.36.0") (source (origin (method url-fetch) @@ -6453,7 +6453,7 @@ of running programs and invoke methods on those interfaces.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc")))) + (base32 "1hsfj3q3a3kca0cf9i02xlq2qd4vy12qsjb89hh4r6mp6c11rrag")))) (build-system gnu-build-system) (native-inputs `(("gettext-minimal" ,gettext-minimal) -- 2.28.0 --------------3625450B66D6490F6836C124 Content-Type: text/x-patch; charset=UTF-8; name="0003-gnu-yelp-xsl-Enable-documentation.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0003-gnu-yelp-xsl-Enable-documentation.patch" >From 17bb39d17b1585bfb98b1b6d2fbbe718784eeb0d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:08:12 -0400 Subject: [PATCH 03/11] gnu: yelp-xsl: Enable documentation. * gnu/packages/gnome.scm (yelp-xsl) [arguments]<#:configure-flag>[--enable-doc]: New flag. [native-inputs]: Add mallard-ducktype, intltool and libxslt. --- gnu/packages/gnome.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8418fd91ed..987ac895b7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6455,10 +6455,17 @@ of running programs and invoke methods on those interfaces.") (sha256 (base32 "1hsfj3q3a3kca0cf9i02xlq2qd4vy12qsjb89hh4r6mp6c11rrag")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + "--enable-doc"))) (native-inputs - `(("gettext-minimal" ,gettext-minimal) + `(("ducktype" ,mallard-ducktype) + ("gettext-minimal" ,gettext-minimal) + ("intltool" ,intltool) ("itstool" ,itstool) - ("xmllint" ,libxml2))) + ("xmllint" ,libxml2) + ("xsltproc" ,libxslt))) (synopsis "XSL stylesheets for Yelp") (description "Yelp-xsl contains XSL stylesheets that are used by the yelp help browser -- 2.28.0 --------------3625450B66D6490F6836C124 Content-Type: text/x-patch; charset=UTF-8; name="0004-gnu-yelp-xsl-Update-description.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0004-gnu-yelp-xsl-Update-description.patch" >From 46e64da9a742a845b690b09fbb976573ff7302b0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:09:42 -0400 Subject: [PATCH 04/11] gnu: yelp-xsl: Update description. * gnu/packages/gnome.scm (yelp-xsl) [description]: Modify. --- gnu/packages/gnome.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 987ac895b7..9903fd85b3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6467,9 +6467,12 @@ of running programs and invoke methods on those interfaces.") ("xmllint" ,libxml2) ("xsltproc" ,libxslt))) (synopsis "XSL stylesheets for Yelp") - (description - "Yelp-xsl contains XSL stylesheets that are used by the yelp help browser -to format Docbook and Mallard documents.") + (description "Yelp-XSL is a collection of programs and data files to help +you build, maintain, and distribute documentation. It provides XSLT stylesheets +that can be built upon for help viewers and publishing systems. These +stylesheets output JavaScript and CSS content, and reference images +provided by yelp-xsl. It also redistributes copies of the jQuery and +jQuery.Syntax JavaScript libraries.") (home-page "https://wiki.gnome.org/Apps/Yelp") (license license:gpl2+))) -- 2.28.0 --------------3625450B66D6490F6836C124 Content-Type: text/x-patch; charset=UTF-8; name="0005-gnu-yelp-xsl-Update-license.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0005-gnu-yelp-xsl-Update-license.patch" >From 994119569069ca88d225b44221b0f50bb61d21b0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:11:14 -0400 Subject: [PATCH 05/11] gnu: yelp-xsl: Update license. * gnu/packages/gnome.scm (yelp-xsl) [license]: Add lgpl2.1+ and expat. --- gnu/packages/gnome.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9903fd85b3..d6a807dfa9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6474,7 +6474,14 @@ stylesheets output JavaScript and CSS content, and reference images provided by yelp-xsl. It also redistributes copies of the jQuery and jQuery.Syntax JavaScript libraries.") (home-page "https://wiki.gnome.org/Apps/Yelp") - (license license:gpl2+))) + (license + (list + ;; XSLT + license:gpl2+ + ;; Images + license:lgpl2.1+ + ;; JavaScript + license:expat)))) (define-public yelp (package -- 2.28.0 --------------3625450B66D6490F6836C124-- From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 24 08:27:47 2020 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 12:27:47 +0000 Received: from localhost ([127.0.0.1]:38838 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLQLj-0006wi-D8 for submit@debbugs.gnu.org; Thu, 24 Sep 2020 08:27:47 -0400 Received: from knopi.disroot.org ([178.21.23.139]:32984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLQLi-0006wb-9b for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 08:27:46 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 85FD551BEB for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 14:27:45 +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 TE-927MbuwZf for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 14:27:43 +0200 (CEST) To: 42958@debbugs.gnu.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1600950463; bh=fGpgvU4QcIIkJ8UFCfCPHU/2JMeqHDhydCb98iLxwIE=; h=To:From:Subject:Date; b=OQ18bWGvHjOPXzuqrfDxr62PyI7Qy5FVRGp6iOzVMaM3mHLq5P387uOcE5x2b3hom bJNvu4XPYbr6EnkyJyrqkxTH4vW5++oRr5ytEZMYuuRQoA/upkAY4uG4T4C8/fG+Lw TVHAzSMqChUvhl1XTwgieuKOSO114gXTsbd4QGH+j38RgiOKZofDDrjbz5GlPv+0D5 Sdzuuw1Oi9rKS5KGEDKH7Bl73VJpJQMarTrUE5E4QBHETWZ8aYSlQE1bN4zJQaLNN3 gLBxwBtre+U0eiPDUYsdt8z0w29MIj3PEVW39A+OOpbZ6ACvG3NjBIf1ISzUcTYnoG gS4cCsaXoHRgg== From: Raghav Gururajan Subject: Re: [PATCH core-updates 02/29] gnu: yelp-tools: Update package definition. Message-ID: Date: Thu, 24 Sep 2020 08:27:42 -0400 Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------82D4D5B30775EF7DF1D0A35E" Content-Language: en-US X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42958 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------82D4D5B30775EF7DF1D0A35E Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit @Danny Please find the attached split patches. Regards, RG. --------------82D4D5B30775EF7DF1D0A35E Content-Type: text/x-patch; charset=UTF-8; name="0006-gnu-yelp-tools-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0006-gnu-yelp-tools-Make-some-cosmetic-changes.patch" >From 23ecff1ec2c70f5d6e5b306a7a6c991b3c5d0e03 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:14:35 -0400 Subject: [PATCH 06/11] gnu: yelp-tools: Make some cosmetic changes. * gnu/packages/gnome.scm (yelp-tools): Make some cosmetic changes. --- gnu/packages/gnome.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d6a807dfa9..a4b88105be 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6521,31 +6521,31 @@ freedesktop.org help system specification.") (package (name "yelp-tools") (version "3.32.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q")))) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("yelp-xsl" ,yelp-xsl))) (propagated-inputs - ;; Needed by `yelp-build', `yelp-check' or 'yelp.m4'. `(("itstool" ,itstool) ("xmllint" ,libxml2) ("xsltproc" ,libxslt))) - (inputs - `(("yelp-xsl" ,yelp-xsl))) - (home-page "https://wiki.gnome.org/Apps/Yelp/Tools") (synopsis "Yelp documentation tools") (description "Yelp-tools is a collection of scripts and build utilities to help create, manage, and publish documentation for Yelp and the web. Most of the heavy lifting is done by packages like yelp-xsl and itstool. This package just wraps things up in a developer-friendly way.") + (home-page "https://wiki.gnome.org/Apps/Yelp/Tools") (license license:gpl2+))) (define-public libgee -- 2.28.0 --------------82D4D5B30775EF7DF1D0A35E Content-Type: text/x-patch; charset=UTF-8; name="0007-gnu-yelp-tools-De-propagate-some-inputs.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0007-gnu-yelp-tools-De-propagate-some-inputs.patch" >From d88a41e2c29aeaa2895b57b4c44f81ab6f4daa70 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:17:52 -0400 Subject: [PATCH 07/11] gnu: yelp-tools: De-propagate some inputs. * gnu/packages/gnome.scm (yelp-tools) [propagated-inputs]: Move itstool, libxml2 and libxslt to ... [native-inputs]: ... here. --- gnu/packages/gnome.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a4b88105be..3f211e0de6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6532,13 +6532,12 @@ freedesktop.org help system specification.") (base32 "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("yelp-xsl" ,yelp-xsl))) - (propagated-inputs `(("itstool" ,itstool) + ("pkg-config" ,pkg-config) ("xmllint" ,libxml2) ("xsltproc" ,libxslt))) + (inputs + `(("yelp-xsl" ,yelp-xsl))) (synopsis "Yelp documentation tools") (description "Yelp-tools is a collection of scripts and build utilities to help create, -- 2.28.0 --------------82D4D5B30775EF7DF1D0A35E Content-Type: text/x-patch; charset=UTF-8; name="0008-gnu-yelp-tools-Update-synopsis-and-description.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0008-gnu-yelp-tools-Update-synopsis-and-description.patch" >From 0305b57724002260954b3c95b7932e93980f77c0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:19:55 -0400 Subject: [PATCH 08/11] gnu: yelp-tools: Update synopsis and description. * gnu/packages/gnome.scm (yelp-tools) [synopsis]: Modify. [description]: Modify. --- gnu/packages/gnome.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3f211e0de6..5b7df6ab1d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6538,12 +6538,9 @@ freedesktop.org help system specification.") ("xsltproc" ,libxslt))) (inputs `(("yelp-xsl" ,yelp-xsl))) - (synopsis "Yelp documentation tools") - (description - "Yelp-tools is a collection of scripts and build utilities to help create, -manage, and publish documentation for Yelp and the web. Most of the heavy -lifting is done by packages like yelp-xsl and itstool. This package just -wraps things up in a developer-friendly way.") + (synopsis "Tools for Yelp") + (description "Yelp-Tools contains small programs that help you create, edit, +manage, and publish your Mallard or DocBook documentation.") (home-page "https://wiki.gnome.org/Apps/Yelp/Tools") (license license:gpl2+))) -- 2.28.0 --------------82D4D5B30775EF7DF1D0A35E-- From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 24 08:29:05 2020 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 12:29:05 +0000 Received: from localhost ([127.0.0.1]:38843 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLQMq-0006yU-ST for submit@debbugs.gnu.org; Thu, 24 Sep 2020 08:29:05 -0400 Received: from knopi.disroot.org ([178.21.23.139]:32948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLQMm-0006yJ-Fu for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 08:28:56 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id C109051BEB for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 14:28:51 +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 dkp7aI0jHmAt for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 14:28:48 +0200 (CEST) To: 42958@debbugs.gnu.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1600950526; bh=wdlshdPeya3Tjavwrc6kgqYl52eDRrZzpj4jdBWHmZA=; h=To:From:Subject:Date; b=H1m5+5t+VZ89HAORL112ENYLkIguo2web9t1SkJxJJmhOaWrD9h/dZ+6d/ex3z/Na dWWvsywF6gYQKSWglCBY22Pkl2XJwTDaZJu/oC2zV9BUvo8eMW3+n0xMC69+qFsBuX 457K9I4GHpPWkOpAB/BB8rPTsnmOe8WlHtIQf7HK90VoDKohYoNG7i94MoSpivN8R3 qs26ZIqKs5hgoyGwtCbCq9EiU6KkYcH/SQAcmKITgRF9cKM1asNuJbQ8nJ72ub62gT U9b/qXPIElBqQdYsVE/O5rxOPLuOWw3R/wLHhqyvOvAAP/wvviXzNcZxiwRgdgn9no EVb2JcNPbyNYw== From: Raghav Gururajan Subject: Re: [PATCH core-updates 03/29] gnu: glib: Update package definition. Message-ID: <5acf11ff-2410-d336-4037-8e7665c78083@disroot.org> Date: Thu, 24 Sep 2020 08:28:45 -0400 Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------50BA6B1176403916C0EC24C7" Content-Language: en-US X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42958 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------50BA6B1176403916C0EC24C7 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit @Danny Please find the attached split patches. Regards, RG. --------------50BA6B1176403916C0EC24C7 Content-Type: text/x-patch; charset=UTF-8; name="0009-gnu-glib-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0009-gnu-glib-Make-some-cosmetic-changes.patch" >From 8cd190b19c52da07c6b400be1a703f27ceaf142d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:34:05 -0400 Subject: [PATCH 09/11] gnu: glib: Make some cosmetic changes. * gnu/packages/glib.scm (glib): Make some cosmetic changes. --- gnu/packages/glib.scm | 390 ++++++++++++++++++++---------------------- 1 file changed, 185 insertions(+), 205 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index ca037d3b24..21b39b94e8 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -176,213 +176,193 @@ shared NFS home directories.") (define glib (package - (name "glib") - (version "2.62.6") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" - name "/" (string-take version 4) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh")) - (patches (search-patches "glib-tests-timer.patch")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "tests/spawn-test.c" - (("/bin/sh") "sh")) - #t)))) - (build-system meson-build-system) - (outputs '("out" ; everything - "bin")) ; glib-mkenums, gtester, etc.; depends on Python - (propagated-inputs - `(("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc - ("libffi" ,libffi) ; in the Requires.private field of gobject-2.0.pc - ;; These are in the Requires.private field of gio-2.0.pc - ("util-linux" ,util-linux "lib") ;for libmount - ("libselinux" ,libselinux) - ("zlib" ,zlib))) - (native-inputs - `(("gettext" ,gettext-minimal) - ("m4" ,m4) ; for installing m4 macros - ("dbus" ,dbus) ; for GDBus tests - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("perl" ,perl) ; needed by GIO tests - ("tzdata" ,tzdata-for-tests))) ; for tests/gdatetime.c - (arguments - `(#:disallowed-references (,tzdata-for-tests) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-dbus-launch-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((dbus (assoc-ref inputs "dbus"))) - (substitute* "gio/gdbusaddress.c" - (("command_line = g_strdup_printf \\(\"dbus-launch") - (string-append "command_line = g_strdup_printf (\"" - dbus "/bin/dbus-launch"))) - #t))) - (add-after 'unpack 'patch-gio-launch-desktop - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; See also - ;; for another future fix. - (substitute* "gio/gdesktopappinfo.c" - (("gio-launch-desktop") - (string-append out "/libexec/gio-launch-desktop"))) - #t))) - (add-before 'build 'pre-build - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; For tests/gdatetime.c. - (setenv "TZDIR" - (string-append (assoc-ref inputs "tzdata") - "/share/zoneinfo")) - - ;; Some tests want write access there. - (setenv "HOME" (getcwd)) - (setenv "XDG_CACHE_HOME" (getcwd)) - #t)) - (add-after 'unpack 'disable-failing-tests - (lambda _ - (let ((disable - (lambda (test-file test-paths) - (define pattern+procs - (map (lambda (test-path) - (cons - ;; XXX: only works for single line statements. - (format #f "g_test_add_func.*\"~a\".*" test-path) - (const ""))) - test-paths)) - (substitute test-file pattern+procs))) - (failing-tests - '(("glib/tests/thread.c" - (;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-xen-amd64 - ;; as found on hydra.gnu.org, and strace(1) doesn't - ;; recognize it. - "/thread/thread4")) - - ;; This tries to find programs in FHS directories. - ("glib/tests/utils.c" - ("/utils/find-program")) - - ;; This fails because "glib/tests/echo-script" cannot be - ;; found. - ("glib/tests/spawn-singlethread.c" - ("/gthread/spawn-script")) - - ("glib/tests/timer.c" - (;; fails if compiler optimizations are enabled, which they - ;; are by default. - "/timer/stop")) - - ("gio/tests/gapplication.c" - (;; XXX: proven to be unreliable. See: - ;; - ;; - "/gapplication/quit" - - ;; XXX: fails randomly for unknown reason. See: - ;; - "/gapplication/local-actions")) - - ("gio/tests/contenttype.c" - (;; XXX: requires shared-mime-info. - "/contenttype/guess" - "/contenttype/guess_svg_from_data" - "/contenttype/subtype" - "/contenttype/list" - "/contenttype/icon" - "/contenttype/symbolic-icon" - "/contenttype/tree")) - - ("gio/tests/appinfo.c" - (;; XXX: requires update-desktop-database. - "/appinfo/associations")) - - ("gio/tests/desktop-app-info.c" - (;; XXX: requires update-desktop-database. - "/desktop-app-info/delete" - "/desktop-app-info/default" - "/desktop-app-info/fallback" - "/desktop-app-info/lastused" - "/desktop-app-info/search")) - - ("gio/tests/gdbus-peer.c" - (;; Requires /etc/machine-id. - "/gdbus/codegen-peer-to-peer")) - - ("gio/tests/gdbus-address-get-session.c" - (;; Requires /etc/machine-id. - "/gdbus/x11-autolaunch")) - - ("gio/tests/gsocketclient-slow.c" - (;; These tests tries to resolve "localhost", and fails. - "/socket-client/happy-eyeballs/slow" - "/socket-client/happy-eyeballs/cancellation/delayed")) - - ))) - (for-each (lambda (x) (apply disable x)) failing-tests) - #t))) - (replace 'check - (lambda _ - (setenv "MESON_TESTTHREADS" - (number->string (parallel-job-count))) - ;; Do not run tests marked as "flaky". - (invoke "meson" "test" "--no-suite" "flaky"))) - ;; TODO: meson does not permit the bindir to be outside of prefix. - ;; See https://github.com/mesonbuild/meson/issues/2561 - ;; We can remove this once meson is patched. - (add-after 'install 'move-executables - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (assoc-ref outputs "bin"))) - (mkdir-p bin) - (rename-file (string-append out "/bin") - (string-append bin "/bin")) - ;; This one is an implementation detail of glib. - ;; It is wrong that that's in "/bin" in the first place, - ;; but that's what upstream is doing right now. - ;; See . - (mkdir (string-append out "/libexec")) - (rename-file (string-append bin "/bin/gio-launch-desktop") - (string-append out "/libexec/gio-launch-desktop")) - ;; Do not refer to "bindir", which points to "${prefix}/bin". - ;; We don't patch "bindir" to point to "$bin/bin", because that - ;; would create a reference cycle between the "out" and "bin" - ;; outputs. - (substitute* (list (string-append out "/lib/pkgconfig/gio-2.0.pc") - (string-append out "/lib/pkgconfig/glib-2.0.pc")) - (("bindir=\\$\\{prefix\\}/bin") "") - (("=\\$\\{bindir\\}/") "=")) - #t)))))) - ;; TODO: see above for explanation. - ;; #:configure-flags (list (string-append "--bindir=" - ;; (assoc-ref %outputs "bin") - ;; "/bin")) - - (native-search-paths - ;; This variable is not really "owned" by GLib, but several related - ;; packages refer to it: gobject-introspection's tools use it as a search - ;; path for .gir files, and it's also a search path for schemas produced - ;; by 'glib-compile-schemas'. - (list (search-path-specification - (variable "XDG_DATA_DIRS") - (files '("share"))) - ;; To load extra gio modules from glib-networking, etc. - (search-path-specification - (variable "GIO_EXTRA_MODULES") - (files '("lib/gio/modules"))))) - (search-paths native-search-paths) - (properties '((hidden? . #t))) - - (synopsis "Thread-safe general utility library; basis of GTK+ and GNOME") - (description - "GLib provides data structure handling for C, portability wrappers, + (properties '((hidden? . #t))) + (name "glib") + (version "2.62.6") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" + name "/" (string-take version 4) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh")) + (patches (search-patches "glib-tests-timer.patch")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "tests/spawn-test.c" + (("/bin/sh") "sh")) + #t)))) + (build-system meson-build-system) + (outputs '("out" "bin")) + (arguments + `(#:disallowed-references (,tzdata-for-tests) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-dbus-launch-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((dbus (assoc-ref inputs "dbus"))) + (substitute* "gio/gdbusaddress.c" + (("command_line = g_strdup_printf \\(\"dbus-launch") + (string-append "command_line = g_strdup_printf (\"" + dbus "/bin/dbus-launch"))) + #t))) + (add-after 'unpack 'patch-gio-launch-desktop + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; See also + ;; for another future fix. + (substitute* "gio/gdesktopappinfo.c" + (("gio-launch-desktop") + (string-append out "/libexec/gio-launch-desktop"))) + #t))) + (add-before 'build 'pre-build + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; For tests/gdatetime.c. + (setenv "TZDIR" + (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo")) + ;; Some tests want write access there. + (setenv "HOME" (getcwd)) + (setenv "XDG_CACHE_HOME" (getcwd)) + #t)) + (add-after 'unpack 'disable-failing-tests + (lambda _ + (let ((disable + (lambda (test-file test-paths) + (define pattern+procs + (map (lambda (test-path) + (cons + ;; XXX: only works for single line statements. + (format #f "g_test_add_func.*\"~a\".*" test-path) + (const ""))) + test-paths)) + (substitute test-file pattern+procs))) + (failing-tests + '(("glib/tests/thread.c" + ( ;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-xen-amd64 + ;; as found on hydra.gnu.org, and strace(1) doesn't + ;; recognize it. + "/thread/thread4")) + ;; This tries to find programs in FHS directories. + ("glib/tests/utils.c" + ("/utils/find-program")) + ;; This fails because "glib/tests/echo-script" cannot be + ;; found. + ("glib/tests/spawn-singlethread.c" + ("/gthread/spawn-script")) + ("glib/tests/timer.c" + ( ;; fails if compiler optimizations are enabled, which they + ;; are by default. + "/timer/stop")) + ("gio/tests/gapplication.c" + ( ;; XXX: proven to be unreliable. See: + ;; + ;; + "/gapplication/quit" + ;; XXX: fails randomly for unknown reason. See: + ;; + "/gapplication/local-actions")) + ("gio/tests/contenttype.c" + ( ;; XXX: requires shared-mime-info. + "/contenttype/guess" + "/contenttype/guess_svg_from_data" + "/contenttype/subtype" + "/contenttype/list" + "/contenttype/icon" + "/contenttype/symbolic-icon" + "/contenttype/tree")) + ("gio/tests/appinfo.c" + ( ;; XXX: requires update-desktop-database. + "/appinfo/associations")) + ("gio/tests/desktop-app-info.c" + ( ;; XXX: requires update-desktop-database. + "/desktop-app-info/delete" + "/desktop-app-info/default" + "/desktop-app-info/fallback" + "/desktop-app-info/lastused" + "/desktop-app-info/search")) + ("gio/tests/gdbus-peer.c" + ( ;; Requires /etc/machine-id. + "/gdbus/codegen-peer-to-peer")) + ("gio/tests/gdbus-address-get-session.c" + ( ;; Requires /etc/machine-id. + "/gdbus/x11-autolaunch")) + ("gio/tests/gsocketclient-slow.c" + ( ;; These tests tries to resolve "localhost", and fails. + "/socket-client/happy-eyeballs/slow" + "/socket-client/happy-eyeballs/cancellation/delayed")) + ))) + (for-each (lambda (x) (apply disable x)) failing-tests) + #t))) + (replace 'check + (lambda _ + (setenv "MESON_TESTTHREADS" + (number->string (parallel-job-count))) + ;; Do not run tests marked as "flaky". + (invoke "meson" "test" "--no-suite" "flaky"))) + ;; TODO: meson does not permit the bindir to be outside of prefix. + ;; See https://github.com/mesonbuild/meson/issues/2561 + ;; We can remove this once meson is patched. + (add-after 'install 'move-executables + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) + (mkdir-p bin) + (rename-file (string-append out "/bin") + (string-append bin "/bin")) + ;; This one is an implementation detail of glib. + ;; It is wrong that that's in "/bin" in the first place, + ;; but that's what upstream is doing right now. + ;; See . + (mkdir (string-append out "/libexec")) + (rename-file (string-append bin "/bin/gio-launch-desktop") + (string-append out "/libexec/gio-launch-desktop")) + ;; Do not refer to "bindir", which points to "${prefix}/bin". + ;; We don't patch "bindir" to point to "$bin/bin", because that + ;; would create a reference cycle between the "out" and "bin" + ;; outputs. + (substitute* (list (string-append out "/lib/pkgconfig/gio-2.0.pc") + (string-append out "/lib/pkgconfig/glib-2.0.pc")) + (("bindir=\\$\\{prefix\\}/bin") "") + (("=\\$\\{bindir\\}/") "=")) + #t)))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("m4" ,m4) + ("dbus" ,dbus) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("perl" ,perl) + ("tzdata" ,tzdata-for-tests))) + (propagated-inputs + `(("pcre" ,pcre) + ("libffi" ,libffi) + ("util-linux" ,util-linux "lib") + ("libselinux" ,libselinux) + ("zlib" ,zlib))) + (native-search-paths + ;; This variable is not really "owned" by GLib, but several related + ;; packages refer to it: gobject-introspection's tools use it as a search + ;; path for .gir files, and it's also a search path for schemas produced + ;; by 'glib-compile-schemas'. + (list (search-path-specification + (variable "XDG_DATA_DIRS") + (files '("share"))) + ;; To load extra gio modules from glib-networking, etc. + (search-path-specification + (variable "GIO_EXTRA_MODULES") + (files '("lib/gio/modules"))))) + (search-paths native-search-paths) + (synopsis "Thread-safe general utility library; basis of GTK+ and GNOME") + (description + "GLib provides data structure handling for C, portability wrappers, and interfaces for such runtime functionality as an event loop, threads, dynamic loading, and an object system.") - (home-page "https://developer.gnome.org/glib/") - (license license:lgpl2.1+))) + (home-page "https://developer.gnome.org/glib/") + (license license:lgpl2.1+))) (define-public glib-with-documentation ;; glib's doc must be built in a separate package since it requires gtk-doc, -- 2.28.0 --------------50BA6B1176403916C0EC24C7 Content-Type: text/x-patch; charset=UTF-8; name="0010-gnu-glib-Update-to-2.64.3.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0010-gnu-glib-Update-to-2.64.3.patch" >From 67bad944e2b775ebe2bd0101220b78b2a07c8bdf Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:44:59 -0400 Subject: [PATCH 10/11] gnu: glib: Update to 2.64.3. * gnu/packages/glib.scm (glib) [version]: Update to 2.64.3. [source][sha256]: Modify base32. [patches]: Add glib-disable-failing-tests.patch. Remove glib-tests-timer.patch. [arguments]<#:disallowed-references>: Remove argument. <#:phases>['patch-python-references]: New phase. ['pre-check]: New phase. ['move-bin]: New phase. ['patch-dbus-launch-path]: Remove phase. ['patch-gio-launch-desktop]: Remove phase. ['pre-build]: Remove phase. ['disable-failing-tests]: Remove phase. ['check]: Remove phase. ['move-executables]: Remove phase. [native-inputs]: Add intltool, python, libxml2 and libxslt. Remove dbus. [inputs]: Add dbus and libelf. * gnu/packages/patches/glib-disable-failing-tests.patch: New file. * gnu/packages/patches/glib-tests-timer.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust. --- gnu/local.mk | 2 +- gnu/packages/glib.scm | 179 +++++------------- .../patches/glib-disable-failing-tests.patch | 84 ++++++++ gnu/packages/patches/glib-tests-timer.patch | 15 -- 4 files changed, 136 insertions(+), 144 deletions(-) create mode 100644 gnu/packages/patches/glib-disable-failing-tests.patch delete mode 100644 gnu/packages/patches/glib-tests-timer.patch diff --git a/gnu/local.mk b/gnu/local.mk index f3b5b17e84..2fc47ca2ec 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1034,7 +1034,7 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ - %D%/packages/patches/glib-tests-timer.patch \ + %D%/packages/patches/glib-disable-failing-tests.patch \ %D%/packages/patches/glibc-CVE-2018-11236.patch \ %D%/packages/patches/glibc-CVE-2018-11237.patch \ %D%/packages/patches/glibc-CVE-2019-7309.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 21b39b94e8..be5d45596d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -178,7 +178,7 @@ shared NFS home directories.") (package (properties '((hidden? . #t))) (name "glib") - (version "2.62.6") + (version "2.64.3") (source (origin (method url-fetch) @@ -187,8 +187,9 @@ shared NFS home directories.") name "/" (string-take version 4) "/" name "-" version ".tar.xz")) (sha256 - (base32 "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh")) - (patches (search-patches "glib-tests-timer.patch")) + (base32 "08pbgiv5m3rica4ydvwvpq5mrxbyswx7l1jzjc2ch52xjabvr77y")) + (patches + (search-patches "glib-disable-failing-tests.patch")) (modules '((guix build utils))) (snippet '(begin @@ -198,27 +199,23 @@ shared NFS home directories.") (build-system meson-build-system) (outputs '("out" "bin")) (arguments - `(#:disallowed-references (,tzdata-for-tests) - #:phases + `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-dbus-launch-path + ;; Python references are not being patched in patch-phase of build, + ;; despite using python-wrapper as input. So we patch them manually. + (add-after 'unpack 'patch-python-references (lambda* (#:key inputs #:allow-other-keys) - (let ((dbus (assoc-ref inputs "dbus"))) - (substitute* "gio/gdbusaddress.c" - (("command_line = g_strdup_printf \\(\"dbus-launch") - (string-append "command_line = g_strdup_printf (\"" - dbus "/bin/dbus-launch"))) - #t))) - (add-after 'unpack 'patch-gio-launch-desktop - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; See also - ;; for another future fix. - (substitute* "gio/gdesktopappinfo.c" - (("gio-launch-desktop") - (string-append out "/libexec/gio-launch-desktop"))) - #t))) - (add-before 'build 'pre-build + (substitute* '("gio/gdbus-2.0/codegen/gdbus-codegen.in" + "glib/gtester-report.in" + "gobject/glib-genmarshal.in" + "gobject/glib-mkenums.in") + (("@PYTHON@") + (string-append (assoc-ref inputs "python") + "/bin/python" + ,(version-major+minor + (package-version python))))) + #t)) + (add-before 'check 'pre-check (lambda* (#:key inputs outputs #:allow-other-keys) ;; For tests/gdatetime.c. (setenv "TZDIR" @@ -228,133 +225,59 @@ shared NFS home directories.") (setenv "HOME" (getcwd)) (setenv "XDG_CACHE_HOME" (getcwd)) #t)) - (add-after 'unpack 'disable-failing-tests - (lambda _ - (let ((disable - (lambda (test-file test-paths) - (define pattern+procs - (map (lambda (test-path) - (cons - ;; XXX: only works for single line statements. - (format #f "g_test_add_func.*\"~a\".*" test-path) - (const ""))) - test-paths)) - (substitute test-file pattern+procs))) - (failing-tests - '(("glib/tests/thread.c" - ( ;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-xen-amd64 - ;; as found on hydra.gnu.org, and strace(1) doesn't - ;; recognize it. - "/thread/thread4")) - ;; This tries to find programs in FHS directories. - ("glib/tests/utils.c" - ("/utils/find-program")) - ;; This fails because "glib/tests/echo-script" cannot be - ;; found. - ("glib/tests/spawn-singlethread.c" - ("/gthread/spawn-script")) - ("glib/tests/timer.c" - ( ;; fails if compiler optimizations are enabled, which they - ;; are by default. - "/timer/stop")) - ("gio/tests/gapplication.c" - ( ;; XXX: proven to be unreliable. See: - ;; - ;; - "/gapplication/quit" - ;; XXX: fails randomly for unknown reason. See: - ;; - "/gapplication/local-actions")) - ("gio/tests/contenttype.c" - ( ;; XXX: requires shared-mime-info. - "/contenttype/guess" - "/contenttype/guess_svg_from_data" - "/contenttype/subtype" - "/contenttype/list" - "/contenttype/icon" - "/contenttype/symbolic-icon" - "/contenttype/tree")) - ("gio/tests/appinfo.c" - ( ;; XXX: requires update-desktop-database. - "/appinfo/associations")) - ("gio/tests/desktop-app-info.c" - ( ;; XXX: requires update-desktop-database. - "/desktop-app-info/delete" - "/desktop-app-info/default" - "/desktop-app-info/fallback" - "/desktop-app-info/lastused" - "/desktop-app-info/search")) - ("gio/tests/gdbus-peer.c" - ( ;; Requires /etc/machine-id. - "/gdbus/codegen-peer-to-peer")) - ("gio/tests/gdbus-address-get-session.c" - ( ;; Requires /etc/machine-id. - "/gdbus/x11-autolaunch")) - ("gio/tests/gsocketclient-slow.c" - ( ;; These tests tries to resolve "localhost", and fails. - "/socket-client/happy-eyeballs/slow" - "/socket-client/happy-eyeballs/cancellation/delayed")) - ))) - (for-each (lambda (x) (apply disable x)) failing-tests) - #t))) - (replace 'check - (lambda _ - (setenv "MESON_TESTTHREADS" - (number->string (parallel-job-count))) - ;; Do not run tests marked as "flaky". - (invoke "meson" "test" "--no-suite" "flaky"))) - ;; TODO: meson does not permit the bindir to be outside of prefix. - ;; See https://github.com/mesonbuild/meson/issues/2561 - ;; We can remove this once meson is patched. - (add-after 'install 'move-executables + ;; Meson does not permit the bindir to be outside of prefix. + (add-after 'install 'move-bin (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (assoc-ref outputs "bin"))) + (let* ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) (mkdir-p bin) - (rename-file (string-append out "/bin") - (string-append bin "/bin")) - ;; This one is an implementation detail of glib. - ;; It is wrong that that's in "/bin" in the first place, - ;; but that's what upstream is doing right now. - ;; See . - (mkdir (string-append out "/libexec")) - (rename-file (string-append bin "/bin/gio-launch-desktop") - (string-append out "/libexec/gio-launch-desktop")) + (rename-file + (string-append out "/bin") + (string-append bin "/bin")) ;; Do not refer to "bindir", which points to "${prefix}/bin". ;; We don't patch "bindir" to point to "$bin/bin", because that ;; would create a reference cycle between the "out" and "bin" ;; outputs. - (substitute* (list (string-append out "/lib/pkgconfig/gio-2.0.pc") - (string-append out "/lib/pkgconfig/glib-2.0.pc")) + (substitute* + (list + (string-append out "/lib/pkgconfig/gio-2.0.pc") + (string-append out "/lib/pkgconfig/glib-2.0.pc")) (("bindir=\\$\\{prefix\\}/bin") "") (("=\\$\\{bindir\\}/") "=")) #t)))))) (native-inputs `(("gettext" ,gettext-minimal) + ("libintl" ,intltool) ("m4" ,m4) - ("dbus" ,dbus) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) ("perl" ,perl) - ("tzdata" ,tzdata-for-tests))) + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper) + ("python" ,python) ; For 'patch-python-references + ("tzdata" ,tzdata-for-tests) + ("xmllint" ,libxml2) + ("xsltproc" ,libxslt))) + (inputs + `(("dbus" ,dbus) + ("libelf" ,libelf))) (propagated-inputs - `(("pcre" ,pcre) - ("libffi" ,libffi) - ("util-linux" ,util-linux "lib") + `(("libffi" ,libffi) ("libselinux" ,libselinux) + ("pcre" ,pcre) + ("util-linux" ,util-linux "lib") ("zlib" ,zlib))) (native-search-paths ;; This variable is not really "owned" by GLib, but several related ;; packages refer to it: gobject-introspection's tools use it as a search ;; path for .gir files, and it's also a search path for schemas produced ;; by 'glib-compile-schemas'. - (list (search-path-specification - (variable "XDG_DATA_DIRS") - (files '("share"))) - ;; To load extra gio modules from glib-networking, etc. - (search-path-specification - (variable "GIO_EXTRA_MODULES") - (files '("lib/gio/modules"))))) + (list + (search-path-specification + (variable "XDG_DATA_DIRS") + (files '("share"))) + ;; To load extra gio modules from glib-networking, etc. + (search-path-specification + (variable "GIO_EXTRA_MODULES") + (files '("lib/gio/modules"))))) (search-paths native-search-paths) (synopsis "Thread-safe general utility library; basis of GTK+ and GNOME") (description diff --git a/gnu/packages/patches/glib-disable-failing-tests.patch b/gnu/packages/patches/glib-disable-failing-tests.patch new file mode 100644 index 0000000000..3601c42030 --- /dev/null +++ b/gnu/packages/patches/glib-disable-failing-tests.patch @@ -0,0 +1,84 @@ +From a2e6783f2278ed32b1e552691ec5d67d6940757e Mon Sep 17 00:00:00 2001 +From: Raghav Gururajan +Date: Tue, 9 Jun 2020 05:17:53 -0400 +Subject: [PATCH] PATCH: Disable failing tests. + +--- + gio/tests/meson.build | 19 ------------------- + glib/tests/meson.build | 2 -- + 2 files changed, 21 deletions(-) + +diff --git a/gio/tests/meson.build b/gio/tests/meson.build +index c7c3e3035..6e38eb39e 100644 +--- a/gio/tests/meson.build ++++ b/gio/tests/meson.build +@@ -34,7 +34,6 @@ gio_tests = { + 'buffered-output-stream' : {}, + 'cancellable' : {}, + 'contexts' : {}, +- 'contenttype' : {}, + 'converter-stream' : {}, + 'credentials' : {}, + 'data-input-stream' : {}, +@@ -78,7 +77,6 @@ gio_tests = { + 'tls-certificate' : {'extra_sources' : ['gtesttlsbackend.c']}, + 'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']}, + 'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']}, +- 'gdbus-address-get-session' : {}, + 'win32-appinfo' : {}, + } + +@@ -135,10 +133,6 @@ endif + if host_machine.system() != 'windows' + gio_tests += { + 'file' : {}, +- 'gdbus-peer' : { +- 'dependencies' : [libgdbus_example_objectmanager_dep], +- 'install_rpath' : installed_tests_execdir +- }, + 'gdbus-peer-object-manager' : {}, + 'live-g-file' : {}, + 'socket-address' : {}, +@@ -173,19 +167,6 @@ if host_machine.system() != 'windows' + } + endif + +- # Uninstalled because of the check-for-executable logic in DesktopAppInfo +- # unable to find the installed executable +- if not glib_have_cocoa +- gio_tests += { +- 'appinfo' : { +- 'install' : false, +- }, +- 'desktop-app-info' : { +- 'install' : false, +- }, +- } +- endif +- + test_extra_programs += { + 'basic-application' : {}, + 'dbus-launch' : {}, +diff --git a/glib/tests/meson.build b/glib/tests/meson.build +index 8da477d19..9fa24dd49 100644 +--- a/glib/tests/meson.build ++++ b/glib/tests/meson.build +@@ -103,7 +103,6 @@ glib_tests = { + 'utf8-pointer' : {}, + 'utf8-validate' : {}, + 'utf8-misc' : {}, +- 'utils' : {}, + 'unicode' : {}, + 'uri' : {}, + '1bit-mutex' : {}, +@@ -151,7 +150,6 @@ if host_machine.system() == 'windows' + else + glib_tests += { + 'include' : {}, +- 'unix' : {}, + } + if have_rtld_next + glib_tests += { +-- +2.26.2 + diff --git a/gnu/packages/patches/glib-tests-timer.patch b/gnu/packages/patches/glib-tests-timer.patch deleted file mode 100644 index e37425c0c8..0000000000 --- a/gnu/packages/patches/glib-tests-timer.patch +++ /dev/null @@ -1,15 +0,0 @@ -* On i686 floating-point roundoff errors could sometimes cause this check to - fail depending on the elapsed microseconds. Improve rounding by adding a - fractional bit. - ---- glib-2.40.0/glib/tests/timer.c 2014-03-05 08:05:42.000000000 -0600 -+++ glib-2.40.0/glib/tests/timer.c 2014-07-10 16:33:12.746862822 -0500 -@@ -35,7 +35,7 @@ - elapsed = g_timer_elapsed (timer, µs); - - g_assert_cmpfloat (elapsed, <, 1.0); -- g_assert_cmpuint (micros, ==, ((guint64)(elapsed * 1e6)) % 1000000); -+ g_assert_cmpuint (micros, ==, ((guint64)(elapsed * 1e6 + 0.5)) % 1000000); - - g_timer_destroy (timer); - } -- 2.28.0 --------------50BA6B1176403916C0EC24C7 Content-Type: text/x-patch; charset=UTF-8; name="0011-gnu-glib-Update-synopsis-and-description.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0011-gnu-glib-Update-synopsis-and-description.patch" >From 2976c0ac467b692da996332f719df3abf90c2a9e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 08:16:48 -0400 Subject: [PATCH 11/11] gnu: glib: Update synopsis and description. * gnu/packages/glib.scm (glib) [synopsis]: Modify. [description]: Modify. --- gnu/packages/glib.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index be5d45596d..2cda6cd000 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -279,12 +279,11 @@ shared NFS home directories.") (variable "GIO_EXTRA_MODULES") (files '("lib/gio/modules"))))) (search-paths native-search-paths) - (synopsis "Thread-safe general utility library; basis of GTK+ and GNOME") - (description - "GLib provides data structure handling for C, portability wrappers, -and interfaces for such runtime functionality as an event loop, threads, -dynamic loading, and an object system.") - (home-page "https://developer.gnome.org/glib/") + (synopsis "Low-level core library for GNOME projects") + (description "GLib provides data structure handling for C, portability +wrappers, and interfaces for such runtime functionality as an event loop, +threads, dynamic loading, and an object system.") + (home-page "https://wiki.gnome.org/Projects/GLib") (license license:lgpl2.1+))) (define-public glib-with-documentation -- 2.28.0 --------------50BA6B1176403916C0EC24C7-- From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 24 08:41:58 2020 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 12:41:58 +0000 Received: from localhost ([127.0.0.1]:38885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLQZS-0007Ip-0F for submit@debbugs.gnu.org; Thu, 24 Sep 2020 08:41:58 -0400 Received: from knopi.disroot.org ([178.21.23.139]:46562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLQZP-0007If-Mr for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 08:41:56 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id BEAB551BD9 for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 14:41:53 +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 RyFB4HH8FdHv for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 14:41:52 +0200 (CEST) To: 42958@debbugs.gnu.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1600951312; bh=gKm9+EUEdsySViDj8pRtii9fyQEVjeW2AhYpE9rOldk=; h=To:From:Subject:Date; b=Zo0attPakR2eeBGkyMX18qE2qnsC8xM7gv/NK624b5k37fiwmTKyTsEik12oS9rPL 8Ge22Sz3DdBLXNXaLDq0QCC2WQINnymMx+9g0c77Z1ke7kpepg+cUej4u+WLAacETR pV8/cdEjpLuOFJ0FuHqYRX957D5AMqm3u+/VdIDdxvG5iahNwWv6RnZlyZAVa4AjGt c9BMCpSpRjOJJe9Yqb+ecrmIO9uPtJhklb89u+vNMPF+lOCWX6hmz8tWoykGRJBcbR 0Uhf7yqqN3zRWx/B82ZgAMq9x+iTBmxVnM5N14mAfKpgJk714AFLoHOtLBFhHdofOL Joi3THk+YpAKw== From: Raghav Gururajan Subject: Re: [PATCH core-updates 04/29] gnu: glib-with-documentation: Update, package definition. Message-ID: <8922c4a6-4f24-923b-2509-d3cf89b15ea6@disroot.org> Date: Thu, 24 Sep 2020 08:41:50 -0400 Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------E4D6D1AEF5173968E9AE0766" Content-Language: en-US X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42958 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------E4D6D1AEF5173968E9AE0766 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit @Danny Please find the attached split patches. Regards, RG. --------------E4D6D1AEF5173968E9AE0766 Content-Type: text/x-patch; charset=UTF-8; name="0012-gnu-glib-with-documentation-Make-some-cosmetic-chang.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0012-gnu-glib-with-documentation-Make-some-cosmetic-chang.pa"; filename*1="tch" >From 0ce2e68413bf0e43081552f52692eb0fc4facf24 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 08:35:29 -0400 Subject: [PATCH 12/13] gnu: glib-with-documentation: Make some cosmetic changes. * gnu/packages/glib.scm (glib-with-documentation): Make some cosmetic changes. --- gnu/packages/glib.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 2cda6cd000..9aebfb7e63 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -292,12 +292,7 @@ threads, dynamic loading, and an object system.") (package (inherit glib) (properties (alist-delete 'hidden? (package-properties glib))) - (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc reference - (native-inputs - `(("gtk-doc" ,gtk-doc) ; for the doc - ("docbook-xml" ,docbook-xml) - ("libxml2" ,libxml2) - ,@(package-native-inputs glib))) + (outputs (cons "doc" (package-outputs glib))) (arguments (substitute-keyword-arguments (package-arguments glib) ((#:configure-flags flags ''()) @@ -312,7 +307,12 @@ threads, dynamic loading, and an object system.") (copy-recursively (string-append out html) (string-append doc html)) (delete-file-recursively (string-append out html)) - #t))))))))) + #t))))))) + (native-inputs + `(("docbook-xml" ,docbook-xml) + ("gtk-doc" ,gtk-doc) + ("libxml2" ,libxml2) + ,@(package-native-inputs glib))))) (define gobject-introspection (package -- 2.28.0 --------------E4D6D1AEF5173968E9AE0766 Content-Type: text/x-patch; charset=UTF-8; name="0013-gnu-glib-with-documentation-Fix-documentation.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0013-gnu-glib-with-documentation-Fix-documentation.patch" >From 160c6a756386e0464938e6784f579c156d6e2c2e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 08:39:00 -0400 Subject: [PATCH 13/13] gnu: glib-with-documentation: Fix documentation. * gnu/packages/glib.scm (glib-with-documentation) [arguments]<#:phases>['patch-docbook-xml]: New phase. ['move-doc]: Modify phase. --- gnu/packages/glib.scm | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9aebfb7e63..b15c75a740 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -299,14 +299,28 @@ threads, dynamic loading, and an object system.") `(cons "-Dgtk_doc=true" ,flags)) ((#:phases phases) `(modify-phases ,phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs/reference" + (substitute* '("gio/gdbus-object-manager-example/.*\\.xml" + "gio/.*\\.xml" "glib/.*\\.xml" "gobject/.*\\.xml") + (("http://www.oasis-open.org/docbook/xml/4.5/") + (string-append (assoc-ref inputs "docbook-xml-4.5") + "/xml/dtd/docbook/"))) + (substitute* "gio/gio.xml" + (("http://www.oasis-open.org/docbook/xml/4.2/") + (string-append (assoc-ref inputs "docbook-xml-4.2") + "/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")) - (html (string-append "/share/gtk-doc"))) - (copy-recursively (string-append out html) - (string-append doc html)) - (delete-file-recursively (string-append out html)) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (html (string-append "/share/gtk-doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out html) + (string-append doc html)) #t))))))) (native-inputs `(("docbook-xml" ,docbook-xml) -- 2.28.0 --------------E4D6D1AEF5173968E9AE0766-- From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 24 08:51:33 2020 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 12:51:33 +0000 Received: from localhost ([127.0.0.1]:38895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLQij-0007XB-0T for submit@debbugs.gnu.org; Thu, 24 Sep 2020 08:51:33 -0400 Received: from flashner.co.il ([178.62.234.194]:54694) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLQih-0007Ww-1N for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 08:51:32 -0400 Received: from localhost (unknown [31.210.181.177]) by flashner.co.il (Postfix) with ESMTPSA id AFF6340217; Thu, 24 Sep 2020 12:51:24 +0000 (UTC) Date: Thu, 24 Sep 2020 15:50:47 +0300 From: Efraim Flashner To: Raghav Gururajan Subject: Re: [bug#42958] [PATCH core-updates 04/29] gnu: glib-with-documentation: Update, package definition. Message-ID: <20200924125047.GB1473@E5400> References: <20200820150914.9443-1-dannym@scratchpost.org> <8922c4a6-4f24-923b-2509-d3cf89b15ea6@disroot.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="l76fUT7nc3MelDdI" Content-Disposition: inline In-Reply-To: <8922c4a6-4f24-923b-2509-d3cf89b15ea6@disroot.org> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Thu, Sep 24, 2020 at 08:41:50AM -0400, Raghav Gururajan wrote: > @Danny > > Please find the attached split patches. > > Regards, > RG. > From 0ce2e68413bf0e43081552f52692eb0fc4facf24 Mon Sep 17 00:00:00 2001 > From: Raghav Gururajan > Date: Thu, 24 Sep 2020 08:35:29 -0400 > Subject: [PATCH 12/13] gnu: gl [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [31.210.181.177 listed in zen.spamhaus.org] X-Debbugs-Envelope-To: 42958 Cc: 42958@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Thu, Sep 24, 2020 at 08:41:50AM -0400, Raghav Gururajan wrote: > @Danny > > Please find the attached split patches. > > Regards, > RG. > From 0ce2e68413bf0e43081552f52692eb0fc4facf24 Mon Sep 17 00:00:00 2001 > From: Raghav Gururajan > Date: Thu, 24 Sep 2020 08:35:29 -0400 > Subject: [PATCH 12/13] gnu: gl [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [31.210.181.177 listed in zen.spamhaus.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --l76fUT7nc3MelDdI Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Sep 24, 2020 at 08:41:50AM -0400, Raghav Gururajan wrote: > @Danny >=20 > Please find the attached split patches. >=20 > Regards, > RG. > From 0ce2e68413bf0e43081552f52692eb0fc4facf24 Mon Sep 17 00:00:00 2001 > From: Raghav Gururajan > Date: Thu, 24 Sep 2020 08:35:29 -0400 > Subject: [PATCH 12/13] gnu: glib-with-documentation: Make some cosmetic > changes. >=20 > * gnu/packages/glib.scm (glib-with-documentation): Make some cosmetic cha= nges. > --- > gnu/packages/glib.scm | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) >=20 > diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm > index 2cda6cd000..9aebfb7e63 100644 > --- a/gnu/packages/glib.scm > +++ b/gnu/packages/glib.scm > @@ -292,12 +292,7 @@ threads, dynamic loading, and an object system.") > (package > (inherit glib) > (properties (alist-delete 'hidden? (package-properties glib))) > - (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc re= ference > - (native-inputs > - `(("gtk-doc" ,gtk-doc) ; for the doc > - ("docbook-xml" ,docbook-xml) > - ("libxml2" ,libxml2) > - ,@(package-native-inputs glib))) > + (outputs (cons "doc" (package-outputs glib))) > (arguments > (substitute-keyword-arguments (package-arguments glib) > ((#:configure-flags flags ''()) > @@ -312,7 +307,12 @@ threads, dynamic loading, and an object system.") > (copy-recursively (string-append out html) > (string-append doc html)) > (delete-file-recursively (string-append out html)) > - #t))))))))) > + #t))))))) > + (native-inputs > + `(("docbook-xml" ,docbook-xml) > + ("gtk-doc" ,gtk-doc) > + ("libxml2" ,libxml2) > + ,@(package-native-inputs glib))))) > =20 > (define gobject-introspection > (package > --=20 > 2.28.0 >=20 > From 160c6a756386e0464938e6784f579c156d6e2c2e Mon Sep 17 00:00:00 2001 > From: Raghav Gururajan > Date: Thu, 24 Sep 2020 08:39:00 -0400 > Subject: [PATCH 13/13] gnu: glib-with-documentation: Fix documentation. >=20 > * gnu/packages/glib.scm (glib-with-documentation) [arguments]<#:phases>['= patch-docbook-xml]: New phase. > ['move-doc]: Modify phase. > --- > gnu/packages/glib.scm | 26 ++++++++++++++++++++------ > 1 file changed, 20 insertions(+), 6 deletions(-) >=20 > diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm > index 9aebfb7e63..b15c75a740 100644 > --- a/gnu/packages/glib.scm > +++ b/gnu/packages/glib.scm > @@ -299,14 +299,28 @@ threads, dynamic loading, and an object system.") > `(cons "-Dgtk_doc=3Dtrue" ,flags)) > ((#:phases phases) > `(modify-phases ,phases > + (add-after 'unpack 'patch-docbook-xml > + (lambda* (#:key inputs #:allow-other-keys) > + (with-directory-excursion "docs/reference" > + (substitute* '("gio/gdbus-object-manager-example/.*\\.x= ml" > + "gio/.*\\.xml" "glib/.*\\.xml" "gobject/= =2E*\\.xml") Does that regex actually work? Yes or no, the following is much cleaner: (substitute* (find-files "." "\\.xml$") If it does have to be those directories specifically then I'd go with: (append (find-files "gio/gdbus-object-manager-example" "\\.xml") (find-files "(gio|glib|gobject)" "\\.xml$")) > + (("http://www.oasis-open.org/docbook/xml/4.5/") > + (string-append (assoc-ref inputs "docbook-xml-4.5") > + "/xml/dtd/docbook/"))) > + (substitute* "gio/gio.xml" > + (("http://www.oasis-open.org/docbook/xml/4.2/") > + (string-append (assoc-ref inputs "docbook-xml-4.2") > + "/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")) > - (html (string-append "/share/gtk-doc"))) > - (copy-recursively (string-append out html) > - (string-append doc html)) > - (delete-file-recursively (string-append out html)) > + (let* ((out (assoc-ref outputs "out")) > + (doc (assoc-ref outputs "doc")) > + (html (string-append "/share/gtk-doc"))) This doesn't need to be let*, let should do it. Also, html doesn't need string-append, it's not being joined to anything :) > + (mkdir-p (string-append doc "/share")) > + (rename-file > + (string-append out html) > + (string-append doc html)) > #t))))))) > (native-inputs > `(("docbook-xml" ,docbook-xml) > --=20 > 2.28.0 >=20 --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --l76fUT7nc3MelDdI Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl9sliMACgkQQarn3Mo9 g1E2cg//QkzyBttiIYfKTY2gtWgZlaVRNhGM/gWrFkr2856YWM2+9BHDNs3oVRYr TnVha7k2K81m4UatFH63gjp9jdYeoNM6p7b08CYysAGBZnP0SO/3Iljeh5hyAiYp 7YktNjMqzQiZqS3TI6MOka764lEP0HCagnAjHpoQoTdrudbfyv71lrXbpL7RLnFn fqdsR/rOac8tZ+wposkI/xyv0F0BEWNzhR+AHhe9Z+45FXV0eKSU6TiAdV6J9DWD UMt1ZTEm35T6MVCoD2ZvUXYAafq7b1Gg3Zurd7xRg0UQA3CL58M6EICvgBpxMJmz lr8HSbI406aZFwb3Og6vzkCKFvTM+wICZNey+Drjy8fD1o0n6x7A1uhbVJGiICZz dBeW0I3YoEPYpt9NfJrAeuOl+Z1j618BSkR6dcWztuUJiD7TjIXMXHgI1kY6T+QE gGYkzN5/slNfJ1jFNzKFvSBVvEuSuUN7Hl/vPgODVO0BPHqhPG48U2KFLba6mzod 8ifu9FrgoxLfOwqO+jByjzZ2U5DxF/zVrKsAWIefmzHqQXf3pba4cg83w72uyJvF JHkznN+q3KMrhRm+/WzJz8uxBaEmTIKJZDAgF2t4GJzN2WtShA6h5I3/dY8Y83PS L5M33qDmvnCzdfP1A3Zt6zm6GCyaut3rdetLxTkUKa+WCwfOeSA= =15/Y -----END PGP SIGNATURE----- --l76fUT7nc3MelDdI-- From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 24 08:56:46 2020 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 12:56:46 +0000 Received: from localhost ([127.0.0.1]:38915 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLQne-0007fS-7P for submit@debbugs.gnu.org; Thu, 24 Sep 2020 08:56:46 -0400 Received: from flashner.co.il ([178.62.234.194]:54706) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLQnY-0007fA-LP for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 08:56:36 -0400 Received: from localhost (unknown [31.210.181.177]) by flashner.co.il (Postfix) with ESMTPSA id AB10940217; Thu, 24 Sep 2020 12:56:26 +0000 (UTC) Date: Thu, 24 Sep 2020 15:55:53 +0300 From: Efraim Flashner To: Raghav Gururajan Subject: Re: [bug#42958] [PATCH core-updates 03/29] gnu: glib: Update package definition. Message-ID: <20200924125553.GC1473@E5400> References: <20200820150914.9443-1-dannym@scratchpost.org> <5acf11ff-2410-d336-4037-8e7665c78083@disroot.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="da4uJneut+ArUgXk" Content-Disposition: inline In-Reply-To: <5acf11ff-2410-d336-4037-8e7665c78083@disroot.org> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Thu, Sep 24, 2020 at 08:28:45AM -0400, Raghav Gururajan wrote: > From 67bad944e2b775ebe2bd0101220b78b2a07c8bdf Mon Sep 17 00:00:00 2001 > From: Raghav Gururajan > Date [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [31.210.181.177 listed in zen.spamhaus.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 42958 Cc: 42958@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --da4uJneut+ArUgXk Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Sep 24, 2020 at 08:28:45AM -0400, Raghav Gururajan wrote: > From 67bad944e2b775ebe2bd0101220b78b2a07c8bdf Mon Sep 17 00:00:00 2001 > From: Raghav Gururajan > Date: Thu, 24 Sep 2020 04:44:59 -0400 > Subject: [PATCH 10/11] gnu: glib: Update to 2.64.3. >=20 > * gnu/packages/glib.scm (glib) [version]: Update to 2.64.3. > [source][sha256]: Modify base32. > [patches]: Add glib-disable-failing-tests.patch. > Remove glib-tests-timer.patch. > [arguments]<#:disallowed-references>: Remove argument. > <#:phases>['patch-python-references]: New phase. > ['pre-check]: New phase. > ['move-bin]: New phase. > ['patch-dbus-launch-path]: Remove phase. > ['patch-gio-launch-desktop]: Remove phase. > ['pre-build]: Remove phase. > ['disable-failing-tests]: Remove phase. > ['check]: Remove phase. > ['move-executables]: Remove phase. > [native-inputs]: Add intltool, python, libxml2 and libxslt. > Remove dbus. > [inputs]: Add dbus and libelf. > * gnu/packages/patches/glib-disable-failing-tests.patch: New file. > * gnu/packages/patches/glib-tests-timer.patch: Delete file. > * gnu/local.mk (dist_patch_DATA): Adjust. > --- > gnu/local.mk | 2 +- > gnu/packages/glib.scm | 179 +++++------------- > .../patches/glib-disable-failing-tests.patch | 84 ++++++++ > gnu/packages/patches/glib-tests-timer.patch | 15 -- > 4 files changed, 136 insertions(+), 144 deletions(-) > create mode 100644 gnu/packages/patches/glib-disable-failing-tests.patch > delete mode 100644 gnu/packages/patches/glib-tests-timer.patch >=20 > diff --git a/gnu/local.mk b/gnu/local.mk > index f3b5b17e84..2fc47ca2ec 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1034,7 +1034,7 @@ dist_patch_DATA =3D \ > %D%/packages/patches/ghostscript-no-header-id.patch \ > %D%/packages/patches/ghostscript-no-header-uuid.patch \ > %D%/packages/patches/ghostscript-no-header-creationdate.patch \ > - %D%/packages/patches/glib-tests-timer.patch \ > + %D%/packages/patches/glib-disable-failing-tests.patch \ > %D%/packages/patches/glibc-CVE-2018-11236.patch \ > %D%/packages/patches/glibc-CVE-2018-11237.patch \ > %D%/packages/patches/glibc-CVE-2019-7309.patch \ > diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm > index 21b39b94e8..be5d45596d 100644 > --- a/gnu/packages/glib.scm > +++ b/gnu/packages/glib.scm > @@ -178,7 +178,7 @@ shared NFS home directories.") > (package > (properties '((hidden? . #t))) > (name "glib") > - (version "2.62.6") > + (version "2.64.3") > (source > (origin > (method url-fetch) > @@ -187,8 +187,9 @@ shared NFS home directories.") > name "/" (string-take version 4) "/" > name "-" version ".tar.xz")) > (sha256 > - (base32 "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh")) > - (patches (search-patches "glib-tests-timer.patch")) > + (base32 "08pbgiv5m3rica4ydvwvpq5mrxbyswx7l1jzjc2ch52xjabvr77y")) > + (patches > + (search-patches "glib-disable-failing-tests.patch")) > (modules '((guix build utils))) > (snippet > '(begin > @@ -198,27 +199,23 @@ shared NFS home directories.") > (build-system meson-build-system) > (outputs '("out" "bin")) > (arguments > - `(#:disallowed-references (,tzdata-for-tests) > - #:phases > + `(#:phases > (modify-phases %standard-phases > - (add-after 'unpack 'patch-dbus-launch-path > + ;; Python references are not being patched in patch-phase of bu= ild, > + ;; despite using python-wrapper as input. So we patch them manu= ally. > + (add-after 'unpack 'patch-python-references > (lambda* (#:key inputs #:allow-other-keys) > - (let ((dbus (assoc-ref inputs "dbus"))) > - (substitute* "gio/gdbusaddress.c" > - (("command_line =3D g_strdup_printf \\(\"dbus-launch") > - (string-append "command_line =3D g_strdup_printf (\"" > - dbus "/bin/dbus-launch"))) > - #t))) > - (add-after 'unpack 'patch-gio-launch-desktop > - (lambda* (#:key outputs #:allow-other-keys) > - (let ((out (assoc-ref outputs "out"))) > - ;; See also > - ;; for another future fix. > - (substitute* "gio/gdesktopappinfo.c" > - (("gio-launch-desktop") > - (string-append out "/libexec/gio-launch-desktop"))) > - #t))) > - (add-before 'build 'pre-build > + (substitute* '("gio/gdbus-2.0/codegen/gdbus-codegen.in" > + "glib/gtester-report.in" > + "gobject/glib-genmarshal.in" > + "gobject/glib-mkenums.in") > + (("@PYTHON@") > + (string-append (assoc-ref inputs "python") > + "/bin/python" > + ,(version-major+minor > + (package-version python))))) If you substitute it with (which "python") then you don't need to work out the python version, and it looks like you don't need to add python as an input (and you can keep using just python-wrapper). > + #t)) > + (add-before 'check 'pre-check > (lambda* (#:key inputs outputs #:allow-other-keys) > ;; For tests/gdatetime.c. > (setenv "TZDIR" > @@ -228,133 +225,59 @@ shared NFS home directories.") > (setenv "HOME" (getcwd)) > (setenv "XDG_CACHE_HOME" (getcwd)) > #t)) > - (add-after 'unpack 'disable-failing-tests > - (lambda _ > - (let ((disable > - (lambda (test-file test-paths) > - (define pattern+procs > - (map (lambda (test-path) > - (cons > - ;; XXX: only works for single line state= ments. > - (format #f "g_test_add_func.*\"~a\".*" t= est-path) > - (const ""))) > - test-paths)) > - (substitute test-file pattern+procs))) > - (failing-tests > - '(("glib/tests/thread.c" > - ( ;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-= xen-amd64 > - ;; as found on hydra.gnu.org, and strace(1) does= n't > - ;; recognize it. > - "/thread/thread4")) > - ;; This tries to find programs in FHS directories. > - ("glib/tests/utils.c" > - ("/utils/find-program")) > - ;; This fails because "glib/tests/echo-script" can= not be > - ;; found. > - ("glib/tests/spawn-singlethread.c" > - ("/gthread/spawn-script")) > - ("glib/tests/timer.c" > - ( ;; fails if compiler optimizations are enabled,= which they > - ;; are by default. > - "/timer/stop")) > - ("gio/tests/gapplication.c" > - ( ;; XXX: proven to be unreliable. See: > - ;; > - ;; > - "/gapplication/quit" > - ;; XXX: fails randomly for unknown reason. See: > - ;; > - "/gapplication/local-actions")) > - ("gio/tests/contenttype.c" > - ( ;; XXX: requires shared-mime-info. > - "/contenttype/guess" > - "/contenttype/guess_svg_from_data" > - "/contenttype/subtype" > - "/contenttype/list" > - "/contenttype/icon" > - "/contenttype/symbolic-icon" > - "/contenttype/tree")) > - ("gio/tests/appinfo.c" > - ( ;; XXX: requires update-desktop-database. > - "/appinfo/associations")) > - ("gio/tests/desktop-app-info.c" > - ( ;; XXX: requires update-desktop-database. > - "/desktop-app-info/delete" > - "/desktop-app-info/default" > - "/desktop-app-info/fallback" > - "/desktop-app-info/lastused" > - "/desktop-app-info/search")) > - ("gio/tests/gdbus-peer.c" > - ( ;; Requires /etc/machine-id. > - "/gdbus/codegen-peer-to-peer")) > - ("gio/tests/gdbus-address-get-session.c" > - ( ;; Requires /etc/machine-id. > - "/gdbus/x11-autolaunch")) > - ("gio/tests/gsocketclient-slow.c" > - ( ;; These tests tries to resolve "localhost", an= d fails. > - "/socket-client/happy-eyeballs/slow" > - "/socket-client/happy-eyeballs/cancellation/dela= yed")) > - ))) > - (for-each (lambda (x) (apply disable x)) failing-tests) > - #t))) > - (replace 'check > - (lambda _ > - (setenv "MESON_TESTTHREADS" > - (number->string (parallel-job-count))) > - ;; Do not run tests marked as "flaky". > - (invoke "meson" "test" "--no-suite" "flaky"))) > - ;; TODO: meson does not permit the bindir to be outside of pref= ix. > - ;; See https://github.com/mesonbuild/meson/issues/2561 > - ;; We can remove this once meson is patched. > - (add-after 'install 'move-executables > + ;; Meson does not permit the bindir to be outside of prefix. > + (add-after 'install 'move-bin > (lambda* (#:key outputs #:allow-other-keys) > - (let ((out (assoc-ref outputs "out")) > - (bin (assoc-ref outputs "bin"))) > + (let* ((out (assoc-ref outputs "out")) > + (bin (assoc-ref outputs "bin"))) > (mkdir-p bin) > - (rename-file (string-append out "/bin") > - (string-append bin "/bin")) > - ;; This one is an implementation detail of glib. > - ;; It is wrong that that's in "/bin" in the first place, > - ;; but that's what upstream is doing right now. > - ;; See . > - (mkdir (string-append out "/libexec")) > - (rename-file (string-append bin "/bin/gio-launch-desktop") > - (string-append out "/libexec/gio-launch-desk= top")) > + (rename-file > + (string-append out "/bin") > + (string-append bin "/bin")) > ;; Do not refer to "bindir", which points to "${prefix}/b= in". > ;; We don't patch "bindir" to point to "$bin/bin", becaus= e that > ;; would create a reference cycle between the "out" and "= bin" > ;; outputs. > - (substitute* (list (string-append out "/lib/pkgconfig/gio= -2.0.pc") > - (string-append out "/lib/pkgconfig/gli= b-2.0.pc")) > + (substitute* > + (list > + (string-append out "/lib/pkgconfig/gio-2.0.pc") > + (string-append out "/lib/pkgconfig/glib-2.0.pc")) > (("bindir=3D\\$\\{prefix\\}/bin") "") > (("=3D\\$\\{bindir\\}/") "=3D")) > #t)))))) > (native-inputs > `(("gettext" ,gettext-minimal) > + ("libintl" ,intltool) > ("m4" ,m4) > - ("dbus" ,dbus) > - ("pkg-config" ,pkg-config) > - ("python" ,python-wrapper) > ("perl" ,perl) > - ("tzdata" ,tzdata-for-tests))) > + ("pkg-config" ,pkg-config) > + ("python-wrapper" ,python-wrapper) > + ("python" ,python) ; For 'patch-python-references > + ("tzdata" ,tzdata-for-tests) > + ("xmllint" ,libxml2) > + ("xsltproc" ,libxslt))) > + (inputs > + `(("dbus" ,dbus) > + ("libelf" ,libelf))) > (propagated-inputs > - `(("pcre" ,pcre) > - ("libffi" ,libffi) > - ("util-linux" ,util-linux "lib") > + `(("libffi" ,libffi) > ("libselinux" ,libselinux) > + ("pcre" ,pcre) > + ("util-linux" ,util-linux "lib") > ("zlib" ,zlib))) > (native-search-paths > ;; This variable is not really "owned" by GLib, but several related > ;; packages refer to it: gobject-introspection's tools use it as a = search > ;; path for .gir files, and it's also a search path for schemas pro= duced > ;; by 'glib-compile-schemas'. > - (list (search-path-specification > - (variable "XDG_DATA_DIRS") > - (files '("share"))) > - ;; To load extra gio modules from glib-networking, etc. > - (search-path-specification > - (variable "GIO_EXTRA_MODULES") > - (files '("lib/gio/modules"))))) > + (list > + (search-path-specification > + (variable "XDG_DATA_DIRS") > + (files '("share"))) > + ;; To load extra gio modules from glib-networking, etc. > + (search-path-specification > + (variable "GIO_EXTRA_MODULES") > + (files '("lib/gio/modules"))))) > (search-paths native-search-paths) > (synopsis "Thread-safe general utility library; basis of GTK+ and GN= OME") > (description > diff --git a/gnu/packages/patches/glib-disable-failing-tests.patch b/gnu/= packages/patches/glib-disable-failing-tests.patch > new file mode 100644 > index 0000000000..3601c42030 > --- /dev/null > +++ b/gnu/packages/patches/glib-disable-failing-tests.patch > @@ -0,0 +1,84 @@ > +From a2e6783f2278ed32b1e552691ec5d67d6940757e Mon Sep 17 00:00:00 2001 > +From: Raghav Gururajan > +Date: Tue, 9 Jun 2020 05:17:53 -0400 > +Subject: [PATCH] PATCH: Disable failing tests. > + > +--- > + gio/tests/meson.build | 19 ------------------- > + glib/tests/meson.build | 2 -- > + 2 files changed, 21 deletions(-) > + > +diff --git a/gio/tests/meson.build b/gio/tests/meson.build > +index c7c3e3035..6e38eb39e 100644 > +--- a/gio/tests/meson.build > ++++ b/gio/tests/meson.build > +@@ -34,7 +34,6 @@ gio_tests =3D { > + 'buffered-output-stream' : {}, > + 'cancellable' : {}, > + 'contexts' : {}, > +- 'contenttype' : {}, > + 'converter-stream' : {}, > + 'credentials' : {}, > + 'data-input-stream' : {}, > +@@ -78,7 +77,6 @@ gio_tests =3D { > + 'tls-certificate' : {'extra_sources' : ['gtesttlsbackend.c']}, > + 'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']}, > + 'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']}, > +- 'gdbus-address-get-session' : {}, > + 'win32-appinfo' : {}, > + } > +=20 > +@@ -135,10 +133,6 @@ endif > + if host_machine.system() !=3D 'windows' > + gio_tests +=3D { > + 'file' : {}, > +- 'gdbus-peer' : { > +- 'dependencies' : [libgdbus_example_objectmanager_dep], > +- 'install_rpath' : installed_tests_execdir > +- }, > + 'gdbus-peer-object-manager' : {}, > + 'live-g-file' : {}, > + 'socket-address' : {}, > +@@ -173,19 +167,6 @@ if host_machine.system() !=3D 'windows' > + } > + endif > +=20 > +- # Uninstalled because of the check-for-executable logic in DesktopApp= Info > +- # unable to find the installed executable > +- if not glib_have_cocoa > +- gio_tests +=3D { > +- 'appinfo' : { > +- 'install' : false, > +- }, > +- 'desktop-app-info' : { > +- 'install' : false, > +- }, > +- } > +- endif > +- > + test_extra_programs +=3D { > + 'basic-application' : {}, > + 'dbus-launch' : {}, > +diff --git a/glib/tests/meson.build b/glib/tests/meson.build > +index 8da477d19..9fa24dd49 100644 > +--- a/glib/tests/meson.build > ++++ b/glib/tests/meson.build > +@@ -103,7 +103,6 @@ glib_tests =3D { > + 'utf8-pointer' : {}, > + 'utf8-validate' : {}, > + 'utf8-misc' : {}, > +- 'utils' : {}, > + 'unicode' : {}, > + 'uri' : {}, > + '1bit-mutex' : {}, > +@@ -151,7 +150,6 @@ if host_machine.system() =3D=3D 'windows' > + else > + glib_tests +=3D { > + 'include' : {}, > +- 'unix' : {}, > + } > + if have_rtld_next > + glib_tests +=3D { > +--=20 > +2.26.2 > + > diff --git a/gnu/packages/patches/glib-tests-timer.patch b/gnu/packages/p= atches/glib-tests-timer.patch > deleted file mode 100644 > index e37425c0c8..0000000000 > --- a/gnu/packages/patches/glib-tests-timer.patch > +++ /dev/null > @@ -1,15 +0,0 @@ > -* On i686 floating-point roundoff errors could sometimes cause this chec= k to > - fail depending on the elapsed microseconds. Improve rounding by addin= g a > - fractional bit. > - > ---- glib-2.40.0/glib/tests/timer.c 2014-03-05 08:05:42.000000000 -0600 > -+++ glib-2.40.0/glib/tests/timer.c 2014-07-10 16:33:12.746862822 -0500 > -@@ -35,7 +35,7 @@ > - elapsed =3D g_timer_elapsed (timer, µs); > -=20 > - g_assert_cmpfloat (elapsed, <, 1.0); > -- g_assert_cmpuint (micros, =3D=3D, ((guint64)(elapsed * 1e6)) % 100000= 0); > -+ g_assert_cmpuint (micros, =3D=3D, ((guint64)(elapsed * 1e6 + 0.5)) % = 1000000); > -=20 > - g_timer_destroy (timer); > - } > --=20 > 2.28.0 >=20 --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --da4uJneut+ArUgXk Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl9sl1kACgkQQarn3Mo9 g1G3/Q//bH2XG3QfadStD+zyOCnrXWT06BfeJbyNDiwiKXgn+kaKiBxd6FtcJOKp Iw9HsF9BkB0ygfHmeSzXSVfMRMhqL2ERXbhDnEglmIA04kV4jmkG5BzuSyDc2o8I E3551cYvliqTdILAb4eF5asnlcpzWi2LWCJdSJitb44rjYaGFCGuiFchZh3fYowG xdU3u/6+Hl6PVpCKxK+0nOrGXZBKxkMPbi1C8m3m+/Q8ZaZd/kDWcDxiBEb6pH5n 9yX77gvsMD7qfcj8GDo9gnwTRdZMmU4QCkErf6swrBXgHJCJu5f5ivX36HIHfxuN ll98YKAj56fHJlwjFt3UYmdQwhauadmxVBpD5O5+rgGKMjfzHmalaOovPCzveO11 5DurZPtpxWEiOecTd6ZR1YgdkUjGCI4JT/D+FRr0DMVoLO9iSpOsXONU+IylTtMt DoNGu55k3+X4vK/8BipQeVlB7aC6DI65kEnXLZs862lKo947YoSA72iuJfARLxnz kMVPoRcs9tN5VhG9vLgu8vUooiHlGKLCWLeDN90KaMTByYnmZ8a7030IcWuKSHKB OtB1jRS3G/7TXpFJe72kRid9G+aDfcIEtvWMu/DoeYvfdmGKdEFhMxWPRS9+S4G9 jn52Re3KosVtGJOtgqVIaoeO7ZFWSdDTKf+5dSXQQOcBOWI6VbA= =VIjz -----END PGP SIGNATURE----- --da4uJneut+ArUgXk-- From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 24 09:15:19 2020 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 13:15:19 +0000 Received: from localhost ([127.0.0.1]:38963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLR5b-0008A6-HG for submit@debbugs.gnu.org; Thu, 24 Sep 2020 09:15:19 -0400 Received: from knopi.disroot.org ([178.21.23.139]:54692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLR5W-00089s-8n for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 09:15:10 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id A68F251B1C for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 15:15:04 +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 sD06BmE8sOFP for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 15:15:02 +0200 (CEST) To: 42958@debbugs.gnu.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1600953302; bh=rdVWDBjOz7hXVzpeMJhB7tSPt4I9lVCiw5oosSv1FUA=; h=To:From:Subject:Date; b=JplHxhQ/CmlT3R5u09ZiBXRZoBQhtZyg4Mxrqj8pSJ3UGBDSJnPeV/pTWKJB+5HTr 5nsu/wk81nBgMkKKRzlDl6aGKbb4FcVrrhmH828PBlgl1syxrQ8j7fOqxlp/W5hunb HBrDIFwLauGD2CB1PbAKNA8hwHzSG8WmpvG+pdJiEE6c6TOlkFdKN4doz3xhzsdgzb NmNKlxKKc8PRSpsRuatWHWyIWlZz+3DQKeH8AwPtl9gqMnCWKxXt5Kd3LcVdrkYsIH /2VJBcDOgunXuVXGllaKCeY8V4q2IFnFLK2QHijeUqNoPBGf92Go6CkJ/zfjnxrRM3 +8s6sD21u6XFQ== From: Raghav Gururajan Subject: Re: [PATCH core-updates 05/29] gnu: gobject-introspection: Update package, definition. Message-ID: <99547ba6-ba27-7b8f-a6da-ba0b3ccb9965@disroot.org> Date: Thu, 24 Sep 2020 09:14:58 -0400 Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------F97D5CBB1D1645C714E251B1" Content-Language: en-US X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42958 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------F97D5CBB1D1645C714E251B1 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit @Danny Please find the attached split patches. Regards, RG. --------------F97D5CBB1D1645C714E251B1 Content-Type: text/x-patch; charset=UTF-8; name="0014-gnu-gobject-introspection-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0014-gnu-gobject-introspection-Make-some-cosmetic-changes.pa"; filename*1="tch" >From ddef11acfd31b50a7dfaf81a0890ae6c76fb2ee8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 08:58:26 -0400 Subject: [PATCH 14/16] gnu: gobject-introspection: Make some cosmetic changes. * gnu/packages/glib.scm (gobject-introspection): Make some cosmetic changes. --- gnu/packages/glib.scm | 45 ++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b15c75a740..549145e799 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -332,17 +332,20 @@ threads, dynamic loading, and an object system.") (package (name "gobject-introspection") (version "1.62.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" - "gobject-introspection/" (version-major+minor version) - "/gobject-introspection-" version ".tar.xz")) - (sha256 - (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi")) - (patches (search-patches - "gobject-introspection-cc.patch" - "gobject-introspection-girepository.patch" - "gobject-introspection-absolute-shlib-path.patch")))) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" + "gobject-introspection/" (version-major+minor version) + "/gobject-introspection-" version ".tar.xz")) + (sha256 + (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi")) + (patches + (search-patches + "gobject-introspection-cc.patch" + "gobject-introspection-girepository.patch" + "gobject-introspection-absolute-shlib-path.patch")))) (build-system meson-build-system) (arguments `(#:phases @@ -353,25 +356,23 @@ threads, dynamic loading, and an object system.") (("#!@PYTHON_CMD@") (string-append "#!" (which "python3")))) #t))))) + (native-inputs + `(("glib" ,glib "bin") + ("pkg-config" ,pkg-config))) (inputs `(("bison" ,bison) ("flex" ,flex) ("glib" ,glib) ("python" ,python-wrapper) ("zlib" ,zlib))) - (native-inputs - `(("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) (propagated-inputs - `(;; In practice, GIR users will need libffi when using - ;; gobject-introspection. - ("libffi" ,libffi))) + `(("libffi" ,libffi))) (native-search-paths - (list (search-path-specification - (variable "GI_TYPELIB_PATH") - (files '("lib/girepository-1.0"))))) + (list + (search-path-specification + (variable "GI_TYPELIB_PATH") + (files '("lib/girepository-1.0"))))) (search-paths native-search-paths) - (home-page "https://wiki.gnome.org/GObjectIntrospection") (synopsis "Generate interface introspection data for GObject libraries") (description "GObject introspection is a middleware layer between C libraries (using @@ -379,7 +380,7 @@ GObject) and language bindings. The C library can be scanned at compile time and generate a metadata file, in addition to the actual native C library. Then at runtime, language bindings can read this metadata and automatically provide bindings to call into the C library.") - ; Some bits are distributed under the LGPL2+, others under the GPL2+ + (home-page "https://wiki.gnome.org/GObjectIntrospection") (license license:gpl2+))) (define intltool -- 2.28.0 --------------F97D5CBB1D1645C714E251B1 Content-Type: text/x-patch; charset=UTF-8; name="0015-gnu-gobject-introspection-Update-to-1.64.1.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0015-gnu-gobject-introspection-Update-to-1.64.1.patch" >From 387b7bcdbcbdd873a9352f4f36d56296133d9861 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 09:06:12 -0400 Subject: [PATCH 15/16] gnu: gobject-introspection: Update to 1.64.1. * gnu/packages/glib.scm (gobject-introspection) [version]: Update to 1.64.1. [source][sha256]: Modify base32. [patches]: Remove gobject-introspection-absolute-shlib-path.patch and gobject-introspection-cc.patch. [arguments]<#:glib-or-gtk?>: New argument. <#:phases>['do-not-use-/usr/bin/env]: Remove phase. [native-inputs]: Add bison and flex. [inputs]: Remove bison, flex and zlib. * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: Delete file. * gnu/packages/patches/gobject-introspection-cc.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 2 - gnu/packages/glib.scm | 30 ++-- ...ct-introspection-absolute-shlib-path.patch | 166 ------------------ .../patches/gobject-introspection-cc.patch | 14 -- 4 files changed, 10 insertions(+), 202 deletions(-) delete mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch delete mode 100644 gnu/packages/patches/gobject-introspection-cc.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2fc47ca2ec..ae2064b5fa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1075,8 +1075,6 @@ dist_patch_DATA = \ %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ %D%/packages/patches/gnutls-cross.patch \ - %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ - %D%/packages/patches/gobject-introspection-cc.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ %D%/packages/patches/go-skip-gc-test.patch \ %D%/packages/patches/gpm-glibc-2.26.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 549145e799..fa43bc06a8 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -331,7 +331,7 @@ threads, dynamic loading, and an object system.") (define gobject-introspection (package (name "gobject-introspection") - (version "1.62.0") + (version "1.64.1") (source (origin (method url-fetch) @@ -340,33 +340,23 @@ threads, dynamic loading, and an object system.") "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi")) + (base32 "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0")) (patches (search-patches - "gobject-introspection-cc.patch" - "gobject-introspection-girepository.patch" - "gobject-introspection-absolute-shlib-path.patch")))) + "gobject-introspection-girepository.patch")))) (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'do-not-use-/usr/bin/env - (lambda _ - (substitute* "tools/g-ir-tool-template.in" - (("#!@PYTHON_CMD@") - (string-append "#!" (which "python3")))) - #t))))) + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas (native-inputs - `(("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) - (inputs `(("bison" ,bison) ("flex" ,flex) - ("glib" ,glib) - ("python" ,python-wrapper) - ("zlib" ,zlib))) + ("glib" ,glib "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("python" ,python-wrapper))) (propagated-inputs - `(("libffi" ,libffi))) + `(("glib" ,glib) + ("libffi" ,libffi))) (native-search-paths (list (search-path-specification diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch deleted file mode 100644 index 956fa617c3..0000000000 --- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch +++ /dev/null @@ -1,166 +0,0 @@ -# Names of libraries included in typelib files are opened by dlopen. Here we -# add the full path. -# -# This patch was provided by Luca Bruno for -# 'gobject-introspection' 1.40.0 in Nix. -# -# It has since been updated to work with newer versions of -# gobject-introspection. ---- a/giscanner/scannermain.py -+++ b/giscanner/scannermain.py -@@ -95,6 +95,39 @@ def get_windows_option_group(parser): - return group - - -+def _get_default_fallback_libpath(): -+ # Newer multiple-output-optimized stdenv has an environment variable -+ # $outputLib which in turn specifies another variable which then is used as -+ # the destination for the library contents (${!outputLib}/lib). -+ store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None -+ if store_path is None: -+ outputs = os.environ.get("outputs", "out").split() -+ if "lib" in outputs: -+ # For multiple output derivations let's try whether there is a $lib -+ # environment variable and use that as the base store path. -+ store_path = os.environ.get("lib") -+ elif "out" in outputs: -+ # Otherwise we have a single output derivation, so the libraries -+ # most certainly will end up in "$out/lib". -+ store_path = os.environ.get("out") -+ -+ if store_path is not None: -+ # Even if we have a $lib as output, there still should be a $lib/lib -+ # directory. -+ return os.path.join(store_path, 'lib') -+ else: -+ # If we haven't found a possible scenario, let's return an empty string -+ # so that the shared library won't be prepended with a path. -+ # -+ # Note that this doesn't mean that all hope is lost, because after all -+ # we can still use --fallback-library-path to set one. -+ # -+ # Also, we're not returning None, because that would make it very -+ # difficult to disable adding fallback paths altogether using something -+ # like: --fallback-library-path="" -+ return "" -+ -+ - def _get_option_parser(): - parser = optparse.OptionParser('%prog [options] sources', - version='%prog ' + giscanner.__version__) -@@ -205,6 +238,10 @@ match the namespace prefix.""") - parser.add_option("", "--filelist", - action="store", dest="filelist", default=[], - help="file containing headers and sources to be scanned") -+ parser.add_option("", "--fallback-library-path", -+ action="store", dest="fallback_libpath", -+ default=_get_default_fallback_libpath(), -+ help="Path to prepend to unknown shared libraries") - - group = get_preprocessor_option_group(parser) - parser.add_option_group(group) ---- a/giscanner/shlibs.py -+++ b/giscanner/shlibs.py -@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name): - $""" % re.escape(library_name), re.VERBOSE) - - -+def _ldd_library_guix_pattern(library_name): -+ store_dir = re.escape( -+ os.environ.get("NIX_STORE", default="/gnu/store") -+ ) -+ pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)' -+ return re.compile(pattern % (store_dir, re.escape(library_name))) -+ -+ - # This is a what we do for non-la files. We assume that we are on an - # ELF-like system where ldd exists and the soname extracted with ldd is - # a filename that can be opened with dlopen(). -@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries): - output = output.decode("utf-8", "replace") - - shlibs = resolve_from_ldd_output(libraries, output) -- return list(map(sanitize_shlib_path, shlibs)) -+ fallback_libpath = options.fallback_libpath or ""; -+ return list(map(lambda p: os.path.join(fallback_libpath, p), map(sanitize_shlib_path, shlibs))) - - - def sanitize_shlib_path(lib): -@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib): - # In case we get relative paths on macOS (like @rpath) then we fall - # back to the basename as well: - # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 -- if sys.platform == "darwin": -- if not os.path.isabs(lib): -- return os.path.basename(lib) -- return lib -- else: -+ -+ # Always use absolute paths if available -+ if not os.path.isabs(lib): - return os.path.basename(lib) -+ return lib - - - def resolve_from_ldd_output(libraries, output): - patterns = {} - for library in libraries: - if not os.path.isfile(library): -- patterns[library] = _ldd_library_pattern(library) -+ patterns[library] = (_ldd_library_pattern(library), _ldd_library_guix_pattern(library)) - if len(patterns) == 0: - return [] - -@@ -139,8 +145,12 @@ def resolve_from_ldd_output(libraries, output): - if line.endswith(':'): - continue - for word in line.split(): -- for library, pattern in patterns.items(): -- m = pattern.match(word) -+ for library, (pattern, guix_pattern) in patterns.items(): -+ store_dir = os.environ.get("NIX_STORE", default="/gnu/store") -+ if line.find(store_dir) != -1: -+ m = guix_pattern.match(word) -+ else: -+ m = pattern.match(word) - if m: - del patterns[library] - shlibs.append(m.group()) - ---- a/giscanner/utils.py -+++ b/giscanner/utils.py -@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file): - if dlname is None: - return None - -- # Darwin uses absolute paths where possible; since the libtool files never -- # contain absolute paths, use the libdir field -- if platform.system() == 'Darwin': -- dlbasename = os.path.basename(dlname) -- libdir = _extract_libdir_field(la_file) -- if libdir is None: -- return dlbasename -- return libdir + '/' + dlbasename -- # From the comments in extract_libtool(), older libtools had -- # a path rather than the raw dlname -- return os.path.basename(dlname) -+ dlbasename = os.path.basename(dlname) -+ libdir = _extract_libdir_field(la_file) -+ if libdir is None: -+ return dlbasename -+ return libdir + '/' + dlbasename - - - def extract_libtool(la_file): ---- a/tests/scanner/test_shlibs.py -+++ b/tests/scanner/test_shlibs.py -@@ -40,6 +64,7 @@ class TestLddParser(unittest.TestCase): - - self.assertEqual( - sanitize_shlib_path('/foo/bar'), -- '/foo/bar' if sys.platform == 'darwin' else 'bar') -+ # Always use an absolute filename for Guix -+ '/foo/bar') - - def test_unresolved_library(self): -output = '' diff --git a/gnu/packages/patches/gobject-introspection-cc.patch b/gnu/packages/patches/gobject-introspection-cc.patch deleted file mode 100644 index 6a86b56b44..0000000000 --- a/gnu/packages/patches/gobject-introspection-cc.patch +++ /dev/null @@ -1,14 +0,0 @@ -Use gcc as the default C compiler if CC is not set. - -diff -ru gobject-introspection-1.58.1.orig/giscanner/__init__.py gobject-introspection-1.58.1/giscanner/__init__.py ---- gobject-introspection-1.58.1.orig/giscanner/__init__.py 1970-01-01 01:00:00.000000000 +0100 -+++ gobject-introspection-1.58.1/giscanner/__init__.py 2018-12-03 13:33:28.788971299 +0100 -@@ -22,6 +22,8 @@ - builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR') - if builddir is not None: - __path__.append(os.path.join(builddir, 'giscanner')) -+if not 'CC' in os.environ: -+ os.environ['CC'] = 'gcc' - try: - from ._version import __version__ - except ImportError: -- 2.28.0 --------------F97D5CBB1D1645C714E251B1 Content-Type: text/x-patch; charset=UTF-8; name="0016-gnu-gobject-introspection-Update-synopsis-descriptio.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0016-gnu-gobject-introspection-Update-synopsis-descriptio.pa"; filename*1="tch" >From 7e1d0b398fe428f5ce3fb62382d8261787c84029 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 09:11:30 -0400 Subject: [PATCH 16/16] gnu: gobject-introspection: Update synopsis, description, home-page and license. * gnu/packages/glib.scm (gobject-introspection) [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Modify. --- gnu/packages/glib.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index fa43bc06a8..23ef233bd6 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -363,15 +363,19 @@ threads, dynamic loading, and an object system.") (variable "GI_TYPELIB_PATH") (files '("lib/girepository-1.0"))))) (search-paths native-search-paths) - (synopsis "Generate interface introspection data for GObject libraries") - (description - "GObject introspection is a middleware layer between C libraries (using -GObject) and language bindings. The C library can be scanned at compile time -and generate a metadata file, in addition to the actual native C library. Then -at runtime, language bindings can read this metadata and automatically provide -bindings to call into the C library.") - (home-page "https://wiki.gnome.org/GObjectIntrospection") - (license license:gpl2+))) + (synopsis "GObject introspection tools and libraries") + (description "GObject introspection is a middleware layer between +C libraries (using GObject) and language bindings. The C library can be scanned +at compile time and generate metadata files, in addition to the actual native +C library. Then language bindings can read this metadata and automatically +provide bindings to call into the C library.") + (home-page "https://wiki.gnome.org/Projects/GObjectIntrospection") + (license + (list + ;; For library. + license:lgpl2.0+ + ;; For tools. + license:gpl2+)))) (define intltool (package -- 2.28.0 --------------F97D5CBB1D1645C714E251B1-- From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 24 09:20:30 2020 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 13:20:30 +0000 Received: from localhost ([127.0.0.1]:38972 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLRAk-0008IN-Dw for submit@debbugs.gnu.org; Thu, 24 Sep 2020 09:20:30 -0400 Received: from knopi.disroot.org ([178.21.23.139]:58202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLRAi-0008IE-Hl for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 09:20:29 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 3FDEE4F728 for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 15:20:27 +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 Uy-48Ap_n6_c for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 15:20:26 +0200 (CEST) To: 42958@debbugs.gnu.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1600953610; bh=hS09jbWZ3NPSeS9VMZkZ21DIzvO0Z/LLBmNsbP/m+3A=; h=To:From:Subject:Date; b=BsV3FbePosF7UTQ7ay1s8qT5RZxS0OS39PUZuHnd1iQi78rpexO787ltFV8bp49Ot NasRYBItKRXd8MTxrU4QKtFp/AEIrVGSRKOy9HW4QkgCszLGjqerhqTDxzsDRHQ8Dg HFngoxAMLCOt2jVmwCsEXCtOTtOB8vFP9uBhNTQ1TaIHUZSfGr/dJ3qSqGjuj7J6VR lx6bUpFNR5tw6TJTzaiy6uiN+oY+JXP+8a6SmOYtlNHkPpwjWw6e7GBBUf4eNlqJl+ qDQIAkrT4sddPWjSzMvPKn/SZ/t7h02YlvHU3zI7QYdj28HpJg2BQCKASBVbjt0mw6 rsQ+tfBBec/kQ== From: Raghav Gururajan Subject: Re: [PATCH core-updates 06/29] gnu: gobject-introspection: Propagate glib. Message-ID: Date: Thu, 24 Sep 2020 09:20:09 -0400 Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42958 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) @Danny This patch is no longer required, as the change has been made to the patch 05/29. Regards, RG. From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 24 09:32:44 2020 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 13:32:44 +0000 Received: from localhost ([127.0.0.1]:38978 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLRMZ-00008G-Gq for submit@debbugs.gnu.org; Thu, 24 Sep 2020 09:32:43 -0400 Received: from knopi.disroot.org ([178.21.23.139]:57490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLRMV-000085-75 for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 09:32:42 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 8350E51C08 for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 15:32:37 +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 UTF8SMTP id euQYQ9ZWwczT for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 15:32:35 +0200 (CEST) Subject: Re: [PATCH core-updates 05/29] gnu: gobject-introspection: Update package, definition. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1600954350; bh=CUrJ1M5wAwiZq/4LjiARZRWh6IYWXgv37Isxay9eog8=; h=Subject:From:To:References:Date:In-Reply-To; b=Ccvw/5psNQpKXXesMcQkFvTCmIRNyJ+I9fjQLjx+3xQKJChwZUMTNUp1mdIFh/65T G3weB1p4ylejQXweQAI+oCtNaCJtAgs9hlDqK9wvq6qu8Kwb+EngZ31rwUsXbfFT2D 4cxCTKki4H6NxNyf7J54RXlFX9HLpi4EHgxcuJl0EfBdM1dJSBwn9JobI7hSjs0E/9 spAfwYm/S02O4C3SqbfodQFhFrV3eRLTlGkwNDM70w62rkULR/HBIkO9F6ruEoKFWv TyVvofVieEASoh7cp/c+R/v6ydrHUCi6lkqkwYoSfB6OTDdSNWxDOFn3bktAe0a42j ERG60GUYV9o5A== From: Raghav Gururajan To: 42958@debbugs.gnu.org References: <99547ba6-ba27-7b8f-a6da-ba0b3ccb9965@disroot.org> Message-ID: Date: Thu, 24 Sep 2020 09:32:28 -0400 Mime-Version: 1.0 In-Reply-To: <99547ba6-ba27-7b8f-a6da-ba0b3ccb9965@disroot.org> Content-Type: multipart/mixed; boundary="------------0DFAC8C7B8AAC0F6CEAB8657" Content-Language: en-US X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42958 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------0DFAC8C7B8AAC0F6CEAB8657 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit @Danny Please find the attached revised split patches. Regards, RG. --------------0DFAC8C7B8AAC0F6CEAB8657 Content-Type: text/x-patch; charset=UTF-8; name="0014-gnu-gobject-introspection-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0014-gnu-gobject-introspection-Make-some-cosmetic-changes.pa"; filename*1="tch" >From ddef11acfd31b50a7dfaf81a0890ae6c76fb2ee8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 08:58:26 -0400 Subject: [PATCH 14/16] gnu: gobject-introspection: Make some cosmetic changes. * gnu/packages/glib.scm (gobject-introspection): Make some cosmetic changes. --- gnu/packages/glib.scm | 45 ++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b15c75a740..549145e799 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -332,17 +332,20 @@ threads, dynamic loading, and an object system.") (package (name "gobject-introspection") (version "1.62.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" - "gobject-introspection/" (version-major+minor version) - "/gobject-introspection-" version ".tar.xz")) - (sha256 - (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi")) - (patches (search-patches - "gobject-introspection-cc.patch" - "gobject-introspection-girepository.patch" - "gobject-introspection-absolute-shlib-path.patch")))) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" + "gobject-introspection/" (version-major+minor version) + "/gobject-introspection-" version ".tar.xz")) + (sha256 + (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi")) + (patches + (search-patches + "gobject-introspection-cc.patch" + "gobject-introspection-girepository.patch" + "gobject-introspection-absolute-shlib-path.patch")))) (build-system meson-build-system) (arguments `(#:phases @@ -353,25 +356,23 @@ threads, dynamic loading, and an object system.") (("#!@PYTHON_CMD@") (string-append "#!" (which "python3")))) #t))))) + (native-inputs + `(("glib" ,glib "bin") + ("pkg-config" ,pkg-config))) (inputs `(("bison" ,bison) ("flex" ,flex) ("glib" ,glib) ("python" ,python-wrapper) ("zlib" ,zlib))) - (native-inputs - `(("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) (propagated-inputs - `(;; In practice, GIR users will need libffi when using - ;; gobject-introspection. - ("libffi" ,libffi))) + `(("libffi" ,libffi))) (native-search-paths - (list (search-path-specification - (variable "GI_TYPELIB_PATH") - (files '("lib/girepository-1.0"))))) + (list + (search-path-specification + (variable "GI_TYPELIB_PATH") + (files '("lib/girepository-1.0"))))) (search-paths native-search-paths) - (home-page "https://wiki.gnome.org/GObjectIntrospection") (synopsis "Generate interface introspection data for GObject libraries") (description "GObject introspection is a middleware layer between C libraries (using @@ -379,7 +380,7 @@ GObject) and language bindings. The C library can be scanned at compile time and generate a metadata file, in addition to the actual native C library. Then at runtime, language bindings can read this metadata and automatically provide bindings to call into the C library.") - ; Some bits are distributed under the LGPL2+, others under the GPL2+ + (home-page "https://wiki.gnome.org/GObjectIntrospection") (license license:gpl2+))) (define intltool -- 2.28.0 --------------0DFAC8C7B8AAC0F6CEAB8657 Content-Type: text/x-patch; charset=UTF-8; name="0015-gnu-gobject-introspection-Update-to-1.64.1.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0015-gnu-gobject-introspection-Update-to-1.64.1.patch" >From d3fe71f442d71dc4e4ee1479a62043e86d8e2084 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 09:27:48 -0400 Subject: [PATCH 15/16] gnu: gobject-introspection: Update to 1.64.1. * gnu/packages/glib.scm (gobject-introspection) [version]: Update to 1.64.1. [arguments]<#:glib-or-gtk?>: New argument. <#:phases>: Remove all phases. [native-inputs]: Add bison and flex. [inputs]: Remove bison, flex, glib and zlib. [propagated-inputs]: Add glib. --- gnu/packages/glib.scm | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 549145e799..cda8a97d5f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -331,7 +331,7 @@ threads, dynamic loading, and an object system.") (define gobject-introspection (package (name "gobject-introspection") - (version "1.62.0") + (version "1.64.1") (source (origin (method url-fetch) @@ -340,7 +340,7 @@ threads, dynamic loading, and an object system.") "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi")) + (base32 "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0")) (patches (search-patches "gobject-introspection-cc.patch" @@ -348,25 +348,17 @@ threads, dynamic loading, and an object system.") "gobject-introspection-absolute-shlib-path.patch")))) (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'do-not-use-/usr/bin/env - (lambda _ - (substitute* "tools/g-ir-tool-template.in" - (("#!@PYTHON_CMD@") - (string-append "#!" (which "python3")))) - #t))))) + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas (native-inputs - `(("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) - (inputs `(("bison" ,bison) ("flex" ,flex) - ("glib" ,glib) - ("python" ,python-wrapper) - ("zlib" ,zlib))) + ("glib" ,glib "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("python" ,python-wrapper))) (propagated-inputs - `(("libffi" ,libffi))) + `(("glib" ,glib) + ("libffi" ,libffi))) (native-search-paths (list (search-path-specification -- 2.28.0 --------------0DFAC8C7B8AAC0F6CEAB8657 Content-Type: text/x-patch; charset=UTF-8; name="0016-gnu-gobject-introspection-Update-synopsis-descriptio.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0016-gnu-gobject-introspection-Update-synopsis-descriptio.pa"; filename*1="tch" >From a6268885731b9e66e834cd241e52920690196e73 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 09:30:21 -0400 Subject: [PATCH 16/16] gnu: gobject-introspection: Update synopsis, description, home-page and license. * gnu/packages/glib.scm (gobject-introspection) [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Modify. --- gnu/packages/glib.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index cda8a97d5f..f7a3a866bf 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -365,15 +365,19 @@ threads, dynamic loading, and an object system.") (variable "GI_TYPELIB_PATH") (files '("lib/girepository-1.0"))))) (search-paths native-search-paths) - (synopsis "Generate interface introspection data for GObject libraries") - (description - "GObject introspection is a middleware layer between C libraries (using -GObject) and language bindings. The C library can be scanned at compile time -and generate a metadata file, in addition to the actual native C library. Then -at runtime, language bindings can read this metadata and automatically provide -bindings to call into the C library.") - (home-page "https://wiki.gnome.org/GObjectIntrospection") - (license license:gpl2+))) + (synopsis "GObject introspection tools and libraries") + (description "GObject introspection is a middleware layer between +C libraries (using GObject) and language bindings. The C library can be scanned +at compile time and generate metadata files, in addition to the actual native +C library. Then language bindings can read this metadata and automatically +provide bindings to call into the C library.") + (home-page "https://wiki.gnome.org/Projects/GObjectIntrospection") + (license + (list + ;; For library. + license:lgpl2.0+ + ;; For tools. + license:gpl2+)))) (define intltool (package -- 2.28.0 --------------0DFAC8C7B8AAC0F6CEAB8657-- From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 24 09:33:57 2020 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 13:33:57 +0000 Received: from localhost ([127.0.0.1]:38983 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLRNl-0000A6-2g for submit@debbugs.gnu.org; Thu, 24 Sep 2020 09:33:57 -0400 Received: from knopi.disroot.org ([178.21.23.139]:36116) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLRNj-00009w-Nq for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 09:33:56 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 01DB151BDA for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 15:33:55 +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 PlRvWtOOD0n6 for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 15:33:53 +0200 (CEST) To: 42958@debbugs.gnu.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1600954433; bh=EljvWy8gJnz/er2Kg6ToiMNFKgjdoGeqCVWs/g9tPoo=; h=To:From:Subject:Date; b=I/suHoQvUDPNzgrxIu+cds0G2sPUNLXSXm9CeABzc7nNK3g6L1luhgC5sYvxZh+Kk b4iWkRbDD0igk+CWJ0js2fiHC8IU89i2T+ZsBtzo3W0OG2PaqsgetOySrRQ98Kzc6J kVPamrcvR8UFMezeaNjfvHNWMbXTALCzWYeyql/tiBQ+zenIAhcmBk75fKdG5EUL7u AEbxKFLDvD85FKGAE5/bt9KxIKzK1ArhOet6NqNFhB2ay6sb3OF3FQ1S5x8GhGg9o3 EJGpoLZIsMHzOC2H35GD3Edxr9xMOmvMEBArPnimqscdi0uQBr866L1YbETW7HYzAa SFt+o1MKYvPuA== From: Raghav Gururajan Subject: Re: [PATCH core-updates 07/29] gnu: gobject-introspection: Add patches, back. Message-ID: <8fe01c0a-01e0-c2df-9ea4-14c8c2b5bb4b@disroot.org> Date: Thu, 24 Sep 2020 09:33:52 -0400 Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42958 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) @Danny This patch is no longer required, as the change has been made in the patch 05/29. Regards, RG. From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 24 09:53:20 2020 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 13:53:21 +0000 Received: from localhost ([127.0.0.1]:39060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLRgW-0000fP-Nz for submit@debbugs.gnu.org; Thu, 24 Sep 2020 09:53:20 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:40412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLRgU-0000fF-ER for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 09:53:18 -0400 Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 4DA673368196; Thu, 24 Sep 2020 15:53:16 +0200 (CEST) Date: Thu, 24 Sep 2020 15:52:52 +0200 From: Danny Milosavljevic To: Raghav Gururajan Subject: Re: [bug#42958] [PATCH core-updates 05/29] gnu: gobject-introspection: Update package, definition. Message-ID: <20200924155252.1888885f@scratchpost.org> In-Reply-To: <99547ba6-ba27-7b8f-a6da-ba0b3ccb9965@disroot.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <99547ba6-ba27-7b8f-a6da-ba0b3ccb9965@disroot.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/FliGXwGpJBoaRFAh/qHU/y2"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: 42958@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/FliGXwGpJBoaRFAh/qHU/y2 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi, for Patch 14 in your attachment, >-;; In practice, GIR users will need libffi when using >-;; gobject-introspection. Why was this comment removed? Is it not true anymore? >- ; Some bits are distributed under the LGPL2+, others under the GPL2+ Why was this comment removed? Is it now under GPL2+ entirely? For patch 15, was zlib always unnecessary? Or has upstream removed functionality? Or do we remove functionality? Otherwise looks good. Heads-up to everyone: If this patchset is reviewed, it will go to MASTER, as was discussed here in this thread. Btw: It has over 6000 dependents. --Sig_/FliGXwGpJBoaRFAh/qHU/y2 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl9spLQACgkQ5xo1VCww uqUgFAf+J+q8/kVsUfl38aLx2EzqtjkGQTDgigOmBJhru+Y/mNQhJooxmU4R9fzD CioAZ8pkT8wZmtr1OmCcTVaYvR3xYZ+VbgrYKTTrCQX6NURTtgv3xfQAI38TMZyt B2F7vCG4p9V2v7/KnwGo9tnXIWfhps8I/mcmV1BZdODekIcylLwBQxVhAfp7O27U iIUrK8BaMtl0g2syXmvh+WxNSHII9rI2dgpivJYQJQdg1NvXqOOqyD3jQv6zKvyj GRHQtWMimmk/9rhny6k4FQI0wCXNm/pPBADYDwRLs7CW1HiQt0uTgwY17l/nhVA4 7DKTyPsheFT4zalSePRbVU5F/usdsw== =GkoN -----END PGP SIGNATURE----- --Sig_/FliGXwGpJBoaRFAh/qHU/y2-- From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 24 10:17:32 2020 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 14:17:32 +0000 Received: from localhost ([127.0.0.1]:41140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLS3w-0001n2-0M for submit@debbugs.gnu.org; Thu, 24 Sep 2020 10:17:32 -0400 Received: from knopi.disroot.org ([178.21.23.139]:43252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLS3u-0001ms-CA for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 10:17:31 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 83BB651CA7; Thu, 24 Sep 2020 16:17:28 +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 A51mE9hDUPl4; Thu, 24 Sep 2020 16:17:27 +0200 (CEST) Subject: Re: [bug#42958] [PATCH core-updates 05/29] gnu: gobject-introspection: Update package, definition. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1600957045; bh=XFV0CRCOC4onphBFpUEz+wlg4vxvBWND5e/uVdnlNdg=; h=Subject:To:Cc:References:From:Date:In-Reply-To; b=WfgZd9AHgyHMS+UwicivHF4bg0yHOO2XZ4Tbr7R0Z6LdL3Lam41331vmisf8N8oK7 nXRlWDuPZm47jkisS1cI4SaWho4z9ZIHBmnWKrEuGbbqXcTB/iS2DY3DigBOMnSG7M y7868A3az8AWOTcwH7HVSHbE1D5JEFDe4ai5KViC37hjlQbOLB9UF6nOEAWBVjCff6 G6G3rXmGVOHp4HsZguem568v0zB976o2AQ69goPoIZeSgURgsCQmt9xz3sT+k4p5gG CY6yvaEKZeqBDkC3D2qeRxfVsem4pRFndQ3qJE7B84elfHfbWtmygDU14src+90HiD 2PWd5sfYOO8qg== To: Danny Milosavljevic References: <20200820150914.9443-1-dannym@scratchpost.org> <99547ba6-ba27-7b8f-a6da-ba0b3ccb9965@disroot.org> <20200924155252.1888885f@scratchpost.org> From: Raghav Gururajan Message-ID: <3448eb22-e974-d264-30c4-50353a202a93@disroot.org> Date: Thu, 24 Sep 2020 10:17:24 -0400 Mime-Version: 1.0 In-Reply-To: <20200924155252.1888885f@scratchpost.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42958 Cc: 42958@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Danny! >> -;; In practice, GIR users will need libffi when using >> -;; gobject-introspection. > > Why was this comment removed? Is it not true anymore? The libffi is required to use gobject-introspection. I thought separate comment is not needed to say that something is a dependency or requirement, as it is trivial to presume so. :-) >> - ; Some bits are distributed under the LGPL2+, others under the GPL2+ > > Why was this comment removed? Is it now under GPL2+ entirely? The next patch updates the license field. > For patch 15, was zlib always unnecessary? > Or has upstream removed functionality? > Or do we remove functionality? Upstream removed zlib as a dependency. > Otherwise looks good. Thanks! Regards, RG. From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 24 10:34:10 2020 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 14:34:10 +0000 Received: from localhost ([127.0.0.1]:41173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLSK1-0002ER-Sc for submit@debbugs.gnu.org; Thu, 24 Sep 2020 10:34:10 -0400 Received: from knopi.disroot.org ([178.21.23.139]:44642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLSJy-0002EG-HN for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 10:34:08 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 90ABA51C22 for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 16:34:04 +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 pI2WrxVZpA3O for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 16:34:01 +0200 (CEST) To: 42958@debbugs.gnu.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1600958041; bh=qxO+0DB/nrsuLnTOryD7dP1Znr7AMkQBE3ItII62ERk=; h=To:From:Subject:Date; b=iIwfxFvZYKLmvJu6efk/5gqiWO3jJE5gwtAAef/e9nO4pr03PJq1WnwBzTRNojCpA Jktp0XveutINGcT3C3ZU0Kc0mrr7onAKNpWvHfVZXvtyYn6wGlNUC19VV6poxIE/Gu hWG7O8zf/wzFDbUP45pAVFCGioVREqmSBx7SyQAXvV0VbjlMJIrXqcFDjDcjJ2kTre V7uMyp+0BnD27zD4ectPVgAJ02azMcycDS4z710uHlQNd0A0zKE8i3XV5RF7ZSzKgF /xnR2OornAWx7icMaUInJKwN4ZRlWHxT5ra+W5vwH2KOkCpcRYVsAd1Ah9mWY4Vzvh KAswGZVWbpImg== From: Raghav Gururajan Subject: Re: [PATCH core-updates 08/29] gnu: pixman: Update package definition. Message-ID: Date: Thu, 24 Sep 2020 10:33:59 -0400 Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------EA6001687AE95B0B3B513402" Content-Language: en-US X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42958 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------EA6001687AE95B0B3B513402 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit @Danny Please find the attached split patches. Regards, RG. --------------EA6001687AE95B0B3B513402 Content-Type: text/x-patch; charset=UTF-8; name="0017-gnu-pixman-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0017-gnu-pixman-Make-some-cosmetic-changes.patch" >From 4d2b26892bcb2be8aaea78e860ed64a06dc533d6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 10:25:06 -0400 Subject: [PATCH 17/20] gnu: pixman: Make some cosmetic changes. * gnu/packages/xdisorg.org (pixman): Make some cosmetic changes. --- gnu/packages/xdisorg.scm | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 44f903ccb0..fdb92f9b4c 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -471,28 +471,31 @@ following the mouse.") (package (name "pixman") (version "0.38.4") - (source (origin - (method url-fetch) - (uri (string-append - "https://www.cairographics.org/releases/pixman-" - version ".tar.gz")) - (sha256 - (base32 - "1ryxzdf048x7wsx4dlvrr1p00gzwfs7lybnhgc7ygbj0dvyxcrns")) - (patches (search-patches "pixman-CVE-2016-5296.patch")))) + (source + (origin + (method url-fetch) + (uri + (string-append + "https://www.cairographics.org/releases/pixman-" + version ".tar.gz")) + (sha256 + (base32 "1ryxzdf048x7wsx4dlvrr1p00gzwfs7lybnhgc7ygbj0dvyxcrns")) + (patches + (search-patches + "pixman-CVE-2016-5296.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) + (native-inputs + `(("pkg-config" ,pkg-config))) (inputs `(("libpng" ,libpng) ("zlib" ,zlib))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "http://www.pixman.org/") (synopsis "Low-level pixel manipulation library") (description "Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterisation.") + (home-page "http://www.pixman.org/") (license license:x11))) (define-public libdrm -- 2.28.0 --------------EA6001687AE95B0B3B513402 Content-Type: text/x-patch; charset=UTF-8; name="0018-gnu-pixman-Update-to-0.40.0.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0018-gnu-pixman-Update-to-0.40.0.patch" >From 0cbf6f42497baca4e799199362ff0fdfed908d95 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 10:26:59 -0400 Subject: [PATCH 18/20] gnu: pixman: Update to 0.40.0. * gnu/packages/xdisorg.scm (pixman) [version]: Update to 0.40.0. [source][sha256]: Modify base32. [license]: Change from X11 to expat. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index fdb92f9b4c..337c787ad0 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -470,7 +470,7 @@ following the mouse.") (define-public pixman (package (name "pixman") - (version "0.38.4") + (version "0.40.0") (source (origin (method url-fetch) @@ -496,7 +496,7 @@ following the mouse.") manipulation, providing features such as image compositing and trapezoid rasterisation.") (home-page "http://www.pixman.org/") - (license license:x11))) + (license license:expat))) (define-public libdrm (package -- 2.28.0 --------------EA6001687AE95B0B3B513402 Content-Type: text/x-patch; charset=UTF-8; name="0019-gnu-pixman-Enable-some-features.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0019-gnu-pixman-Enable-some-features.patch" >From 71095ce9261ebfbe90fcfaf22d5e24b54a9ec758 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 10:29:13 -0400 Subject: [PATCH 19/20] gnu: pixman: Enable some features. * gnu/packages/xdisorg.scm (pixman) [arguments]<#:configure-flags>[--enable-timers]: New flag. [--enable-gnuplot]: New flag. --- gnu/packages/xdisorg.scm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 337c787ad0..2dc999d19a 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -484,19 +484,22 @@ following the mouse.") (search-patches "pixman-CVE-2016-5296.patch")))) (build-system gnu-build-system) - (arguments - '(#:configure-flags '("--disable-static"))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("libpng" ,libpng) - ("zlib" ,zlib))) - (synopsis "Low-level pixel manipulation library") - (description "Pixman is a low-level software library for pixel + `(#:configure-flags + (list + "--disable-static" + "--enable-timers" + "--enable-gnuplot"))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libpng" ,libpng) + ("zlib" ,zlib))) + (synopsis "Low-level pixel manipulation library") + (description "Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterisation.") - (home-page "http://www.pixman.org/") - (license license:expat))) + (home-page "http://www.pixman.org/") + (license license:expat))) (define-public libdrm (package -- 2.28.0 --------------EA6001687AE95B0B3B513402 Content-Type: text/x-patch; charset=UTF-8; name="0020-gnu-pixman-Update-synopsis-and-description.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0020-gnu-pixman-Update-synopsis-and-description.patch" >From e6064f2f4bb116b893869d8813548b87f77bec95 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 10:31:34 -0400 Subject: [PATCH 20/20] gnu: pixman: Update synopsis and description. * gnu/packages/xdisorg.scm (pixman) [synopsis]: Modify. [description]: Modify. --- gnu/packages/xdisorg.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 2dc999d19a..09bd4428bf 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -494,10 +494,9 @@ following the mouse.") (inputs `(("libpng" ,libpng) ("zlib" ,zlib))) - (synopsis "Low-level pixel manipulation library") - (description "Pixman is a low-level software library for pixel -manipulation, providing features such as image compositing and trapezoid -rasterisation.") + (synopsis "Image processing and manipulation library") + (description "Pixman is a library that provides low-level pixel manipulation +features such as image compositing and trapezoid rasterization.") (home-page "http://www.pixman.org/") (license license:expat))) -- 2.28.0 --------------EA6001687AE95B0B3B513402-- From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 24 11:04:04 2020 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 15:04:04 +0000 Received: from localhost ([127.0.0.1]:41245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLSmx-00056y-An for submit@debbugs.gnu.org; Thu, 24 Sep 2020 11:04:03 -0400 Received: from knopi.disroot.org ([178.21.23.139]:56004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLSmt-00056J-GD for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 11:04:01 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 270B55291B for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 17:03:58 +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 AgFpDaNqNo3b for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 17:03:56 +0200 (CEST) To: 42958@debbugs.gnu.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1600959832; bh=IX71SdYPf7TrSMJZ4/iq1uau7Yb8dWz/ssx95Td/Bag=; h=To:From:Subject:Date; b=f+alyjYJbF2gA6FOzg7OXpUWuj8ekSc7scvaLJZmf5QyXqm9YolcuejuroSoBpyPv CWjNeHVmbWyi8XF8DqP4kHz8YvUe4bMWcbekjlRzKJqNVRkgN25Ly9TynXoMErGMmq 0OF5jHlhemmKPgiX7/NBOMcbofIEIeoA3skj00/d5eQhAIldErQTwQrDpk2gfF4QBf JCwY02/HCtrmD7MquKdN0eJMY4mAZLTDaEEe48BMvo7RirbsfPwT29sdlGYuToPCcb L5weUrifqogCp153gaZh6UZVbaT7ZAZy729xhfeGWTEoAHMn/HaeOeKEsQc2IY7ro0 EhQvAfQBJpBsw== From: Raghav Gururajan Subject: Re: [PATCH core-updates 09/29] gnu: openjpeg: Update package definition. Message-ID: <17717f6c-0dc7-4675-4421-16044d772248@disroot.org> Date: Thu, 24 Sep 2020 11:03:51 -0400 Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------5FE83E8820CCEF5CF5DDABF9" Content-Language: en-US X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42958 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------5FE83E8820CCEF5CF5DDABF9 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit @Danny Please find the attached split patches. Regards, RG. --------------5FE83E8820CCEF5CF5DDABF9 Content-Type: text/x-patch; charset=UTF-8; name="0021-gnu-openjpeg-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0021-gnu-openjpeg-Make-some-cosmetic-changes.patch" >From c644a020006d314d27414be5bd901b9774ca53f8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 10:39:25 -0400 Subject: [PATCH 21/25] gnu: openjpeg: Make some cosmetic changes. * gnu/packages/images.scm (openjpeg): Make some cosmetic changes. --- gnu/packages/image.scm | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index ff434bb6c9..e6b5fd6bda 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -807,31 +807,33 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC (package (name "openjpeg") (version "2.3.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/uclouvain/openjpeg") - (commit (string-append "v" version)))) - (file-name (git-file-name "openjpeg" version)) - (sha256 - (base32 - "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb")))) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/uclouvain/openjpeg") + (commit + (string-append "v" version)))) + (file-name + (git-file-name "openjpeg" version)) + (sha256 + (base32 "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb")))) (build-system cmake-build-system) (arguments - '(#:tests? #f ;TODO: requires a 1.1 GiB data repository + '(#:tests? #f ;TODO: requires a 1.1 GiB data repository #:configure-flags '("-DBUILD_STATIC_LIBS=OFF"))) (inputs - `(("lcms" ,lcms) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("zlib" ,zlib))) + `(("lcms" ,lcms) + ("libpng" ,libpng) + ("libtiff" ,libtiff) + ("zlib" ,zlib))) (synopsis "JPEG 2000 codec") (description - "The OpenJPEG library is a JPEG 2000 codec written in C. It has + "The OpenJPEG library is a JPEG 2000 codec written in C. It has been developed in order to promote the use of JPEG 2000, the new still-image compression standard from the Joint Photographic Experts Group (JPEG). - In addition to the basic codec, various other features are under development, among them the JP2 and MJ2 (Motion JPEG 2000) file formats, an indexing tool useful for the JPIP protocol, JPWL-tools for -- 2.28.0 --------------5FE83E8820CCEF5CF5DDABF9 Content-Type: text/x-patch; charset=UTF-8; name="0022-gnu-openjpeg-Enable-tests.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0022-gnu-openjpeg-Enable-tests.patch" >From 162e90e9df45096a0bd6324ba039da69aa4e0492 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 10:48:08 -0400 Subject: [PATCH 22/25] gnu: openjpeg: Enable tests. * gnu/packages/image.scm (openjpeg) [arguments]<#:tests?>: Remove argument. <#:configure-flags>[-DBUILD_UNIT_TESTS]: New flag. [-DBUILD_TESTING]: New flag. [-DOPJ_DATA_ROOT]: New flag. <#:phases>['disable-failing-tests]: New phase. [native-inputs]: Add openjpeg-data. --- gnu/packages/image.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index e6b5fd6bda..2e97f04f8a 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -821,8 +821,25 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC (base32 "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb")))) (build-system cmake-build-system) (arguments - '(#:tests? #f ;TODO: requires a 1.1 GiB data repository - #:configure-flags '("-DBUILD_STATIC_LIBS=OFF"))) + `(#:configure-flags + (list + "-DBUILD_STATIC_LIBS=OFF" + "-DBUILD_UNIT_TESTS=ON" + "-DBUILD_TESTING=ON" + (string-append "-DOPJ_DATA_ROOT=" + (assoc-ref %build-inputs "openjpeg-data"))) + #:phases + (modify-phases %standard-phases + ;; To be re-enabled after upstream fixes the bug, + ;; https://github.com/uclouvain/openjpeg/issues/1264 + (add-after 'unpack 'disable-failing-tests + (lambda _ + (substitute* "tests/CMakeLists.txt" + (("add_subdirectory\\(nonregression\\)") + "")) + #t))))) + (native-inputs + `(("openjpeg-data" ,openjpeg-data))) ; Files for test-suite (inputs `(("lcms" ,lcms) ("libpng" ,libpng) -- 2.28.0 --------------5FE83E8820CCEF5CF5DDABF9 Content-Type: text/x-patch; charset=UTF-8; name="0023-gnu-openjpeg-Enable-documentation.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0023-gnu-openjpeg-Enable-documentation.patch" >From 03e33cb0d15508c5644451345a112c19e18552cf Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 10:53:00 -0400 Subject: [PATCH 23/25] gnu: openjpeg: Enable documentation. * gnu/packages/image.scm (openjpeg) [outputs]: New output "doc". [arguments]<#:configure-flags>[-DBUILD_DOC]: New flag. <#:phases>['move-docs]: New phase. [native-inputs]: Add doxygen. --- gnu/packages/image.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 2e97f04f8a..26ed0d7616 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -820,9 +820,11 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC (sha256 (base32 "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb")))) (build-system cmake-build-system) + (outputs '("out" "doc")) (arguments `(#:configure-flags (list + "-DBUILD_DOC=ON" "-DBUILD_STATIC_LIBS=OFF" "-DBUILD_UNIT_TESTS=ON" "-DBUILD_TESTING=ON" @@ -837,9 +839,19 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC (substitute* "tests/CMakeLists.txt" (("add_subdirectory\\(nonregression\\)") "")) - #t))))) + #t)) + (add-after 'install 'move-docs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share/doc")) + (rename-file + (string-append out "/share/doc/html") + (string-append doc "/share/doc/html")) + #t)))))) (native-inputs - `(("openjpeg-data" ,openjpeg-data))) ; Files for test-suite + `(("doxygen" ,doxygen) + ("openjpeg-data" ,openjpeg-data))) ; Files for test-suite (inputs `(("lcms" ,lcms) ("libpng" ,libpng) -- 2.28.0 --------------5FE83E8820CCEF5CF5DDABF9 Content-Type: text/x-patch; charset=UTF-8; name="0024-gnu-openjpeg-Enable-some-features.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0024-gnu-openjpeg-Enable-some-features.patch" >From 26bdc80f2da072437e58fe305feb038f8b9c722e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 10:57:23 -0400 Subject: [PATCH 24/25] gnu: openjpeg: Enable some features. * gnu/packages/image.scm (openjpeg) <#:configure-flags>[-DBUILD_LUTS_GENERATOR]: New flag. [-DBUILD_MJ2]: New flag. [-DBUILD_JPWL]: New flag. [-DBUILD_JP3D]: New flag. [native-inputs]: Add python-wrapper. [inputs]: Add curl and fcgi. --- gnu/packages/image.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 26ed0d7616..3c2718bc3b 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -826,7 +826,15 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC (list "-DBUILD_DOC=ON" "-DBUILD_STATIC_LIBS=OFF" + "-DBUILD_LUTS_GENERATOR=ON" "-DBUILD_UNIT_TESTS=ON" + "-DBUILD_MJ2=ON" + "-DBUILD_JPWL=ON" + ;; To be enabled after Java becomes reproducible. + ;; "-DBUILD_JPIP=ON" + ;; "-DBUILD_JPIP_SERVER=ON" + ;; "-DBUILD_JAVA=ON" + "-DBUILD_JP3D=ON" "-DBUILD_TESTING=ON" (string-append "-DOPJ_DATA_ROOT=" (assoc-ref %build-inputs "openjpeg-data"))) @@ -851,9 +859,12 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC #t)))))) (native-inputs `(("doxygen" ,doxygen) - ("openjpeg-data" ,openjpeg-data))) ; Files for test-suite + ("openjpeg-data" ,openjpeg-data) ; Files for test-suite + ("python" ,python-wrapper))) (inputs - `(("lcms" ,lcms) + `(("curl" ,curl) + ("fcgi" ,fcgi) + ("lcms" ,lcms) ("libpng" ,libpng) ("libtiff" ,libtiff) ("zlib" ,zlib))) -- 2.28.0 --------------5FE83E8820CCEF5CF5DDABF9 Content-Type: text/x-patch; charset=UTF-8; name="0025-gnu-openjpeg-Update-synopsis-and-description.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0025-gnu-openjpeg-Update-synopsis-and-description.patch" >From c48f3fa4344b5ee13b1fc2ca873587e4a9a46a6a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 10:59:47 -0400 Subject: [PATCH 25/25] gnu: openjpeg: Update synopsis and description. * gnu/packages/image.scm (openjpeg) [synopsis]: Modify. [description]: Modify. --- gnu/packages/image.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 3c2718bc3b..7a03cdcd46 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -868,16 +868,12 @@ test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC ("libpng" ,libpng) ("libtiff" ,libtiff) ("zlib" ,zlib))) - (synopsis "JPEG 2000 codec") - (description - "The OpenJPEG library is a JPEG 2000 codec written in C. It has -been developed in order to promote the use of JPEG 2000, the new -still-image compression standard from the Joint Photographic Experts -Group (JPEG). -In addition to the basic codec, various other features are under -development, among them the JP2 and MJ2 (Motion JPEG 2000) file formats, -an indexing tool useful for the JPIP protocol, JPWL-tools for -error-resilience, a Java-viewer for j2k-images, ...") + (synopsis "OPENJPEG Library and Applications") + (description "OpenJPEG is an implementation of JPEG 2000 codec written in C +language. It has been developed in order to promote the use of JPEG 2000, a +still-image compression standard from the Joint Photographic Experts Group +(JPEG). Since April 2015, it is officially recognized by ISO/IEC and ITU-T as a +JPEG 2000 Reference Software.") (home-page "https://github.com/uclouvain/openjpeg") (license license:bsd-2))) -- 2.28.0 --------------5FE83E8820CCEF5CF5DDABF9-- From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 24 11:35:18 2020 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 15:35:19 +0000 Received: from localhost ([127.0.0.1]:41361 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLTHC-00085i-Au for submit@debbugs.gnu.org; Thu, 24 Sep 2020 11:35:18 -0400 Received: from knopi.disroot.org ([178.21.23.139]:60288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLTH8-00085X-Sz for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 11:35:16 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 50921528CF for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 17:35:13 +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 K1qVa_gub_Kr for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 17:35:11 +0200 (CEST) To: 42958@debbugs.gnu.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1600961711; bh=Ly1EUP0EsVnfyoiI4oIAoQ8gNfkFZ0np77OsjDiWpsY=; h=To:From:Subject:Date; b=dGuuO44pf7Pv7Y4uZY+VwDnYEzUArM/Td54fH+qSs+3Efu+M0G/OhFqzgJRtoalPP kncWn36RdV2pnUJHwM+1WtpYV00DY6nkxp8R4b7Ni4Ar8lgdIuomFHIMPXFm0jRHgl MWKev/4HzuBUmi+b6o5CXVvL+lBms74N4uWVr7nUKsJhlrepU7aBj/20PBrUEeBNiB DemiJh8OZbi/wHM3Et6Wdi7MaVNtCrbPa4YmYRiSUlS6NNXNdhD0BHMpmyP2jwCL0o tndQVibEJV3qyvf1yh9bpJD3ARSQKDFipsKcI03oWBkLgulObTjSq8ZrM+Ujhd8dVa Y0vHnd+wm04BA== From: Raghav Gururajan Subject: Re: [PATCH core-updates 10/29] gnu: cairo: Update package definition. Message-ID: Date: Thu, 24 Sep 2020 11:35:09 -0400 Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------AEEA8D00193F1253BBF7698C" Content-Language: en-US X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42958 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------AEEA8D00193F1253BBF7698C Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit @Danny Please find the attached split patches. Regards, RG. --------------AEEA8D00193F1253BBF7698C Content-Type: text/x-patch; charset=UTF-8; name="0026-gnu-cairo-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0026-gnu-cairo-Make-some-cosmetic-changes.patch" >From 4e13823ff058adfed4422b3208ee1547bb7e3cc2 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 11:18:50 -0400 Subject: [PATCH 26/30] gnu: cairo: Make some cosmetic changes. * gnu/packages/gtk.scm (cairo): Make some cosmetic changes. --- gnu/packages/gtk.scm | 78 ++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index ff8547d00b..ea4ca684bf 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -121,57 +121,57 @@ tools have full access to view and control running applications.") (define-public cairo (package - (name "cairo") - (version "1.16.0") - (source (origin - (method url-fetch) - (uri (string-append "https://cairographics.org/releases/cairo-" - version ".tar.xz")) - (sha256 - (base32 - "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy")))) - (build-system gnu-build-system) - (propagated-inputs - `(("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glib" ,glib) - ("libpng" ,libpng) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libxrender" ,libxrender) - ("pixman" ,pixman))) - (inputs - `(("ghostscript" ,ghostscript) - ("libspectre" ,libspectre) - ("poppler" ,poppler) - ("xorgproto" ,xorgproto) - ("zlib" ,zlib))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("python" ,python-wrapper))) + (name "cairo") + (version "1.16.0") + (source + (origin + (method url-fetch) + (uri + (string-append "https://cairographics.org/releases/cairo-" + version ".tar.xz")) + (sha256 + (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy")))) + (build-system gnu-build-system) (arguments - `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html - #:configure-flags '("--enable-tee" ;needed for GNU Icecat - "--enable-xml" ;for cairo-xml support - "--disable-static"))) - (synopsis "2D graphics library") - (description - "Cairo is a 2D graphics library with support for multiple output devices. + `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html + #:configure-flags + (list "--enable-tee" + "--enable-xml" + "--disable-static"))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (inputs + `(("ghostscript" ,ghostscript) + ("libspectre" ,libspectre) + ("poppler" ,poppler) + ("xorgproto" ,xorgproto) + ("zlib" ,zlib))) + (propagated-inputs + `(("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("glib" ,glib) + ("libpng" ,libpng) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxrender" ,libxrender) + ("pixman" ,pixman))) + (synopsis "2D graphics library") + (description + "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB. - Cairo is designed to produce consistent output on all output media while taking advantage of display hardware acceleration when available eg. through the X Render Extension). - The cairo API provides operations similar to the drawing operators of PostScript and PDF. Operations in cairo including stroking and filling cubic Bézier splines, transforming and compositing translucent images, and antialiased text rendering. All drawing operations can be transformed by any affine transformation (scale, rotation, shear, etc.).") - (license license:lgpl2.1) ; or Mozilla Public License 1.1 - (home-page "https://cairographics.org/"))) + (home-page "https://cairographics.org/") + (license license:lgpl2.1))) (define-public cairo-xcb (package -- 2.28.0 --------------AEEA8D00193F1253BBF7698C Content-Type: text/x-patch; charset=UTF-8; name="0027-gnu-cairo-Change-build-system.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0027-gnu-cairo-Change-build-system.patch" >From 6639868a35a88667ea103c965d12138bebacb12c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 11:20:07 -0400 Subject: [PATCH 27/30] gnu: cairo: Change build-system. * gnu/packages/gtk.scm (cairo) [build-system]: Change from gnu to glib-or-gtk. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index ea4ca684bf..fea6695821 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -131,7 +131,7 @@ tools have full access to view and control running applications.") version ".tar.xz")) (sha256 (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy")))) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html #:configure-flags -- 2.28.0 --------------AEEA8D00193F1253BBF7698C Content-Type: text/x-patch; charset=UTF-8; name="0028-gnu-cairo-Move-documentation-to-separate-output.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0028-gnu-cairo-Move-documentation-to-separate-output.patch" >From 82afad9ea3ca75e07c5c43c77daa7af5ff99e49c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 11:24:36 -0400 Subject: [PATCH 28/30] gnu: cairo: Move documentation to separate output. * gnu/packages/gtk.scm (cairo) [outputs]: New output "doc". [arguments]<#:configure-flags>[--with-html-dir]: New flag. --- gnu/packages/gtk.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index fea6695821..eb76b11e91 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -132,12 +132,17 @@ tools have full access to view and control running applications.") (sha256 (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy")))) (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) (arguments `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html #:configure-flags - (list "--enable-tee" - "--enable-xml" - "--disable-static"))) + (list + "--enable-tee" + "--enable-xml" + "--disable-static" + (string-append "--with-html-dir=" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html")))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python-wrapper))) -- 2.28.0 --------------AEEA8D00193F1253BBF7698C Content-Type: text/x-patch; charset=UTF-8; name="0029-gnu-cairo-Enable-some-features.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0029-gnu-cairo-Enable-some-features.patch" >From a3ad002396f7b112bb9117d5c4879bf720c40fd4 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 11:27:34 -0400 Subject: [PATCH 29/30] gnu: cairo: Enable some features. * gnu/packages/gtk.scm (cairo) [native-inputs]: Add gobject-introspection. [inputs]: Add libdrm. Remove xorgproto and zlib. [propagated-inputs]: Add libxcb. --- gnu/packages/gtk.scm | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index eb76b11e91..f7184acb23 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -137,30 +137,44 @@ tools have full access to view and control running applications.") `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html #:configure-flags (list - "--enable-tee" - "--enable-xml" "--disable-static" + ;; XXX: To be enabled. + ;; "--enable-gallium=yes" + ;; "--enable-gl=yes" + ;; " --enable-glesv2=yes" + ;; "--enable-glesv3=yes" + ;; "--enable-cogl=yes" + ;; "--enable-directfb=yes" + ;; "--enable-vg=yes" + "--enable-tee=yes" + "--enable-xml=yes" (string-append "--with-html-dir=" (assoc-ref %outputs "doc") "/share/gtk-doc/html")))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (inputs - `(("ghostscript" ,ghostscript) + `(("drm" ,libdrm) + ("ghostscript" ,ghostscript) ("libspectre" ,libspectre) - ("poppler" ,poppler) - ("xorgproto" ,xorgproto) - ("zlib" ,zlib))) + ("poppler" ,poppler))) (propagated-inputs - `(("fontconfig" ,fontconfig) + `( ;; ("cogl" ,cogl) + ;; ("directfb" ,directfb) + ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("glib" ,glib) + ;; ("gtk+" ,gtk+) ("libpng" ,libpng) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libxrender" ,libxrender) - ("pixman" ,pixman))) + ;; ("librsvg" ,librsvg) + ;; ("opengl" ,mesa) + ("pixman" ,pixman) + ("x11" ,libx11) + ("xcb" ,libxcb) + ("xext" ,libxext) + ("xrender" ,libxrender))) (synopsis "2D graphics library") (description "Cairo is a 2D graphics library with support for multiple output devices. -- 2.28.0 --------------AEEA8D00193F1253BBF7698C Content-Type: text/x-patch; charset=UTF-8; name="0030-gnu-cairo-Update-synopsis-description-and-license.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename*0="0030-gnu-cairo-Update-synopsis-description-and-license.patch" >From 97ed550e5a5c56184722fc14b8795c9030998cfd Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 11:31:47 -0400 Subject: [PATCH 30/30] gnu: cairo: Update synopsis, description and license. * gnu/packages/gtk.scm (cairo) [synopsis]: Modify. [description]: Modify. [license]: Modify. --- gnu/packages/gtk.scm | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f7184acb23..2afd3489d7 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -175,22 +175,17 @@ tools have full access to view and control running applications.") ("xcb" ,libxcb) ("xext" ,libxext) ("xrender" ,libxrender))) - (synopsis "2D graphics library") - (description - "Cairo is a 2D graphics library with support for multiple output devices. -Currently supported output targets include the X Window System (via both -Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file -output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB. -Cairo is designed to produce consistent output on all output media while -taking advantage of display hardware acceleration when available -eg. through the X Render Extension). -The cairo API provides operations similar to the drawing operators of -PostScript and PDF. Operations in cairo including stroking and filling cubic -Bézier splines, transforming and compositing translucent images, and -antialiased text rendering. All drawing operations can be transformed by any -affine transformation (scale, rotation, shear, etc.).") + (synopsis "Multi-platform 2D graphics library") + (description "Cairo is a 2D graphics library with support for multiple output +devices. Currently supported output targets include the X Window System (via +both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file +output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.") (home-page "https://cairographics.org/") - (license license:lgpl2.1))) + (license + ;; This project is dual-licensed. + (list + license:lgpl2.1+ + license:mpl1.1)))) (define-public cairo-xcb (package -- 2.28.0 --------------AEEA8D00193F1253BBF7698C-- From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 27 06:12:43 2020 Received: (at 42958) by debbugs.gnu.org; 27 Sep 2020 10:12:43 +0000 Received: from localhost ([127.0.0.1]:48402 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMTff-0006zq-9g for submit@debbugs.gnu.org; Sun, 27 Sep 2020 06:12:43 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:44652) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMTfc-0006zf-EX for 42958@debbugs.gnu.org; Sun, 27 Sep 2020 06:12:42 -0400 Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id BB4B733682CD; Sun, 27 Sep 2020 12:12:38 +0200 (CEST) Date: Sun, 27 Sep 2020 12:12:13 +0200 From: Danny Milosavljevic To: Raghav Gururajan Subject: Re: [bug#42958] [PATCH core-updates 03/29] gnu: glib: Update package definition. Message-ID: <20200927121213.0b3bed11@scratchpost.org> In-Reply-To: <5acf11ff-2410-d336-4037-8e7665c78083@disroot.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <5acf11ff-2410-d336-4037-8e7665c78083@disroot.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Har5qfMqiL_L0shcDiWlTJd"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: 42958@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/Har5qfMqiL_L0shcDiWlTJd Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable What about those failed tests? Can we fix those? If not, please add a comment in the embedded patch (where it disables the t= est) why the test is disabled. --Sig_/Har5qfMqiL_L0shcDiWlTJd Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl9wZX0ACgkQ5xo1VCww uqUFcwf9GcyyY4bJhj1Yuz8/SnWu+RZys4jZUCtH1c6qnEGMPAQdmfPS/JiVYfwo +O3u5/Hg3xRCWl3PTa4mbgt9QTWKGSOsZM6XdzABIn/iRMZ7U11Atm6UGWP7nHCs 8WN42w315lvNinWYOknGTY5RHD3AipdsPfpkym4Wea9PlKjI6OiNI32hTqv1WWDQ QCybAwhwKvd9okkg54nNV6VmUA9xQ0qWdJvwXqEUXMtyeH+Rkytky8jyWgQvyr2u X6gUQPu2NZqUSbhyO7wf5sXbF4XSX9ARpHZvwZhKAxBfZO2ovOS0f55TRYBzjYjO 5t+Fj48MKm6Bwsc9hZHoHgf+UR1lPw== =5Y+7 -----END PGP SIGNATURE----- --Sig_/Har5qfMqiL_L0shcDiWlTJd-- From debbugs-submit-bounces@debbugs.gnu.org Sun Nov 29 07:21:17 2020 Received: (at 42958) by debbugs.gnu.org; 29 Nov 2020 12:21:17 +0000 Received: from localhost ([127.0.0.1]:49948 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjLhd-0004Qv-6J for submit@debbugs.gnu.org; Sun, 29 Nov 2020 07:21:17 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:40648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjLhb-0004Qk-Am for 42958@debbugs.gnu.org; Sun, 29 Nov 2020 07:21:15 -0500 Received: from localhost (80-110-127-97.cgn.dynamic.surfer.at [80.110.127.97]) by dd26836.kasserver.com (Postfix) with ESMTPSA id C6CFF336578B; Sun, 29 Nov 2020 13:21:12 +0100 (CET) Date: Sun, 29 Nov 2020 13:21:10 +0100 From: Danny Milosavljevic To: Raghav Gururajan Subject: Re: [bug#42958] [PATCH core-updates 03/29] gnu: glib: Update package definition. Message-ID: <20201129132110.644acc27@scratchpost.org> In-Reply-To: <20200924125553.GC1473@E5400> References: <20200820150914.9443-1-dannym@scratchpost.org> <5acf11ff-2410-d336-4037-8e7665c78083@disroot.org> <20200924125553.GC1473@E5400> X-Mailer: Claws Mail 3.17.7 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/bjY1rTq=DRrdGFBVAMDtP3J"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42958 Cc: 42958@debbugs.gnu.org, Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/bjY1rTq=DRrdGFBVAMDtP3J Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Raghav, could you consider updating the patch to incorporate Efraim's changes, if desired? --Sig_/bjY1rTq=DRrdGFBVAMDtP3J Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl/DkjYACgkQ5xo1VCww uqVbVAf9G2kj1oGvqZcPjUgEeyUgJoehVyGUDsaz+0PS9F7n+EbbHy+74m4YBnNY 0m7JHXZQzM/Rt/wV+QmoVx2tFzFKdtVseJ8yNnMQgUcnEwxG1Jl4X46oFOUHCcvw 5dNfCKd4NrV/VZV0yc0r7a8nVUIQ/Ei5DACqGsCHrNSzppDQZPNUZI/lxO8Mg//z dm3Cdu6qIC9k0GC+uHSp2iG+rSaNOAgP6kQMLIp+jjExUHSxMAjxFB6bn/ykp1QA I6XFfoX2D0BJHD0FUlhtgYnMsI1Ufyar2M9YwzzFetEY8tMTqCeHJekqDz0wE0EQ MNuJWbNsV03ZcF010xR5tyDoAHRFzQ== =iELi -----END PGP SIGNATURE----- --Sig_/bjY1rTq=DRrdGFBVAMDtP3J-- From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 01 16:08:01 2020 Received: (at 42958) by debbugs.gnu.org; 1 Dec 2020 21:08:01 +0000 Received: from localhost ([127.0.0.1]:33366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkCsT-0004BE-Ba for submit@debbugs.gnu.org; Tue, 01 Dec 2020 16:08:01 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:52148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkCsQ-0004Az-QV for 42958@debbugs.gnu.org; Tue, 01 Dec 2020 16:08:00 -0500 Received: from localhost (80-110-127-97.cgn.dynamic.surfer.at [80.110.127.97]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 705863365798 for <42958@debbugs.gnu.org>; Tue, 1 Dec 2020 22:07:57 +0100 (CET) Date: Tue, 1 Dec 2020 22:07:55 +0100 From: Danny Milosavljevic Subject: Re: bug#42958: ([PATCH core-updates 00/29] Big changes from wip-desktop.) Message-ID: <20201201220755.7970ee1e@scratchpost.org> In-Reply-To: References: <20200820150914.9443-1-dannym@scratchpost.org> X-Mailer: Claws Mail 3.17.7 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/qSGaqpwcVsYpbl5yJnLkNvu"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 42958 Cc: 42958@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) --Sig_/qSGaqpwcVsYpbl5yJnLkNvu Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Pushed all these changes to guix master, except for: 0009-gnu-glib-Make-some-cosmetic-changes.patch 0010-gnu-glib-Update-to-2.64.3.patch 0011-gnu-glib-Update-synopsis-and-description.patch 0012-gnu-glib-with-documentation-Make-some-cosmetic-chang.patch 0013-gnu-glib-with-documentation-Fix-documentation.patch 0023-gnu-openjpeg-Enable-documentation.patch 0024-gnu-openjpeg-Enable-some-features.patch 0026-gnu-cairo-Make-some-cosmetic-changes.patch 0027-gnu-cairo-Change-build-system.patch 0028-gnu-cairo-Move-documentation-to-separate-output.patch 0029-gnu-cairo-Enable-some-features.patch 0030-gnu-cairo-Update-synopsis-description-and-license.patch *-gnu-pixman-Update-synopsis-and-description.patch Mostly because these did not apply to master cleanly, and I've only tested = the set that did apply cleanly. Note: first uninvolved past commit on guix master is now commit af1225a3663e73458bf8941d8373c68f9ad6bae2. --Sig_/qSGaqpwcVsYpbl5yJnLkNvu Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl/GsKsACgkQ5xo1VCww uqVCoAf+OCe0Y55rxg4yM1nc/un/jxNDL4VpdOGVgELuU4dsm0vOmdBK9STxCqqJ YWA8k3ZVwfeb9Ux09Zt20ngGibqYEv7xRK5C3xDjOX5AnarvlyY14R4x7Zj4OUEt LdoY0qwTSR9QmNVOhzTzEYAsXPwGCHWOTy8bNFLE5MUndRF5d+07D88el4XTYqHl 1fUi1wg0g9kfmM+eqc0aPhSfeB61MQoZxPPyOoKdH1VvcKJtj+h6Nk56RRzNyT50 4cXuBh4FW1Az66d9nUx9T/XvYyu4y6N5x2k11YPggjh156IYbjwKJeg7vEQibq+o 1HDS8Jpd7BoRe/08rI6MhLIZxVzAYQ== =LvgI -----END PGP SIGNATURE----- --Sig_/qSGaqpwcVsYpbl5yJnLkNvu-- From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 04 01:08:51 2020 Received: (at 42958) by debbugs.gnu.org; 4 Dec 2020 06:08:51 +0000 Received: from localhost ([127.0.0.1]:42417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kl4Gx-0004uM-0v for submit@debbugs.gnu.org; Fri, 04 Dec 2020 01:08:51 -0500 Received: from knopi.disroot.org ([178.21.23.139]:40138) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kl4Gu-0004uD-Sl for 42958@debbugs.gnu.org; Fri, 04 Dec 2020 01:08:49 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 8D4FE528B4; Fri, 4 Dec 2020 07:08:47 +0100 (CET) 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 XoQjDMfH2uPA; Fri, 4 Dec 2020 07:08:44 +0100 (CET) Mime-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1607062124; bh=7O2q8Sg2egn2KXdeQtxhP1InhIDjQ172+nioBmLzloE=; h=Date:From:Subject:To:Cc:In-Reply-To:References; b=TdvDMIzwot5yg21haWKg9Wscq6LRyvXVenobaH7vE7/H2dt4I1wMVZyr6Yq16jhCz VWpqAQ0Xqf1alT8CjeFgvaAm2ynQsKBzm3TsJsZ+m3hz2IYrobnCxH51GCN2Sms3j5 w0zZWleT78wbHM8LbkfoSAvTGDOnxL68AjjQ2+az+9tgZQIJyYvOCJX4YS+NSk12U9 rfbCa2ZoFmSyeNEbXUnQrNGLL5AtjczrGan5tcBZRuIwJHgHornShdmtpzmue9u1gp 9Ea2cblu6KoGUbMnVzq1SubismL2BM+pTqsEUOlo22/nIYF/2EsQ+c99oGuSwW2TGi CX7QPXYpvfcYg== Date: Fri, 04 Dec 2020 06:08:44 +0000 Content-Type: multipart/mixed; boundary="--=_RainLoop_185_971689866.1607062124" From: "Raghav Gururajan" Message-ID: <17d09dcc473fbea9ad54ff5dbf58a381@disroot.org> Subject: Re: [bug#42958] To: "Danny Milosavljevic" In-Reply-To: <20201129132110.644acc27@scratchpost.org> References: <20201129132110.644acc27@scratchpost.org> <20200820150914.9443-1-dannym@scratchpost.org> <5acf11ff-2410-d336-4037-8e7665c78083@disroot.org> <20200924125553.GC1473@E5400> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42958 Cc: 42958@debbugs.gnu.org, Efraim Flashner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) ----=_RainLoop_185_971689866.1607062124 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable @Danny=0A=0A> could you consider updating the patch to incorporate Efraim= 's changes,=0A> if desired?=0A=0APlease find the revised patches attached= , for glib and cairo.=0A=0ARegards,=0ARG. ----=_RainLoop_185_971689866.1607062124 Content-Type: application/octet-stream; name="0001-gnu-glib-Make-some-cosmetic-changes.patch" Content-Disposition: attachment; filename="0001-gnu-glib-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: base64 RnJvbSAxMDdjNjQ5ZmY2YzFkYjZlMzI1MjE3YTJhN2Y4MzQxYjU1MjZlMWI1IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFq YW5AZGlzcm9vdC5vcmc+CkRhdGU6IFR1ZSwgMSBEZWMgMjAyMCAxODo1MjowOSAtMDUwMApT dWJqZWN0OiBbUEFUQ0ggMDEvMTFdIGdudTogZ2xpYjogTWFrZSBzb21lIGNvc21ldGljIGNo YW5nZXMuCgoqIGdudS9wYWNrYWdlcy9nbGliLnNjbSAoZ2xpYik6IE1ha2Ugc29tZSBjb3Nt ZXRpYyBjaGFuZ2VzLgotLS0KIGdudS9wYWNrYWdlcy9nbGliLnNjbSB8IDQwMSArKysrKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAx OTMgaW5zZXJ0aW9ucygrKSwgMjA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9w YWNrYWdlcy9nbGliLnNjbSBiL2dudS9wYWNrYWdlcy9nbGliLnNjbQppbmRleCA0MzUyM2U1 MTZkLi41ZWYwYTRlNTE1IDEwMDY0NAotLS0gYS9nbnUvcGFja2FnZXMvZ2xpYi5zY20KKysr IGIvZ251L3BhY2thZ2VzL2dsaWIuc2NtCkBAIC0xNzksMjE0ICsxNzksMTk5IEBAIHNoYXJl ZCBORlMgaG9tZSBkaXJlY3Rvcmllcy4iKQogCiAoZGVmaW5lIGdsaWIKICAgKHBhY2thZ2UK LSAgIChuYW1lICJnbGliIikKLSAgICh2ZXJzaW9uICIyLjYyLjYiKQotICAgKHJlcGxhY2Vt ZW50IGdsaWItd2l0aC1naW8tcGF0Y2gpCi0gICAoc291cmNlIChvcmlnaW4KLSAgICAgICAg ICAgIChtZXRob2QgdXJsLWZldGNoKQotICAgICAgICAgICAgKHVyaSAoc3RyaW5nLWFwcGVu ZCAibWlycm9yOi8vZ25vbWUvc291cmNlcy8iCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIG5hbWUgIi8iIChzdHJpbmctdGFrZSB2ZXJzaW9uIDQpICIvIgotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBuYW1lICItIiB2ZXJzaW9uICIudGFyLnh6IikpCi0g ICAgICAgICAgICAoc2hhMjU2Ci0gICAgICAgICAgICAgKGJhc2UzMgotICAgICAgICAgICAg ICAiMTc0YnNtYm1jdmF3NjlmZjlnNjBxNXN4MGZuMjNya2hxY3dxejE3aDVzN3NwcnBzNGtx aCIpKQotICAgICAgICAgICAgKHBhdGNoZXMgKHNlYXJjaC1wYXRjaGVzICJnbGliLXRlc3Rz LXRpbWVyLnBhdGNoIikpCi0gICAgICAgICAgICAobW9kdWxlcyAnKChndWl4IGJ1aWxkIHV0 aWxzKSkpCi0gICAgICAgICAgICAoc25pcHBldAotICAgICAgICAgICAgICcoYmVnaW4KLSAg ICAgICAgICAgICAgICAoc3Vic3RpdHV0ZSogInRlc3RzL3NwYXduLXRlc3QuYyIKLSAgICAg ICAgICAgICAgICAgICgoIi9iaW4vc2giKSAic2giKSkKLSAgICAgICAgICAgICAgICAjdCkp KSkKLSAgIChidWlsZC1zeXN0ZW0gbWVzb24tYnVpbGQtc3lzdGVtKQotICAgKG91dHB1dHMg Jygib3V0IiAgICAgICAgICAgOyBldmVyeXRoaW5nCi0gICAgICAgICAgICAgICJiaW4iKSkg ICAgICAgICA7IGdsaWItbWtlbnVtcywgZ3Rlc3RlciwgZXRjLjsgZGVwZW5kcyBvbiBQeXRo b24KLSAgIChwcm9wYWdhdGVkLWlucHV0cwotICAgIGAoKCJwY3JlIiAscGNyZSkgIDsgaW4g dGhlIFJlcXVpcmVzLnByaXZhdGUgZmllbGQgb2YgZ2xpYi0yLjAucGMKLSAgICAgICgibGli ZmZpIiAsbGliZmZpKSA7IGluIHRoZSBSZXF1aXJlcy5wcml2YXRlIGZpZWxkIG9mIGdvYmpl Y3QtMi4wLnBjCi0gICAgICA7OyBUaGVzZSBhcmUgaW4gdGhlIFJlcXVpcmVzLnByaXZhdGUg ZmllbGQgb2YgZ2lvLTIuMC5wYwotICAgICAgKCJ1dGlsLWxpbnV4IiAsdXRpbC1saW51eCAi bGliIikgIDtmb3IgbGlibW91bnQKLSAgICAgICgibGlic2VsaW51eCIgLGxpYnNlbGludXgp Ci0gICAgICAoInpsaWIiICx6bGliKSkpCi0gICAobmF0aXZlLWlucHV0cwotICAgIGAoKCJn ZXR0ZXh0IiAsZ2V0dGV4dC1taW5pbWFsKQotICAgICAgKCJtNCIgLG00KSA7IGZvciBpbnN0 YWxsaW5nIG00IG1hY3JvcwotICAgICAgKCJkYnVzIiAsZGJ1cykgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICA7IGZvciBHREJ1cyB0ZXN0cwotICAgICAgKCJwa2ctY29uZmlnIiAs cGtnLWNvbmZpZykKLSAgICAgICgicHl0aG9uIiAscHl0aG9uLXdyYXBwZXIpCi0gICAgICAo InBlcmwiICxwZXJsKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDsgbmVlZGVkIGJ5 IEdJTyB0ZXN0cwotICAgICAgKCJ0emRhdGEiICx0emRhdGEtZm9yLXRlc3RzKSkpICAgICAg ICAgICAgICAgICAgOyBmb3IgdGVzdHMvZ2RhdGV0aW1lLmMKLSAgIChhcmd1bWVudHMKLSAg ICBgKCM6ZGlzYWxsb3dlZC1yZWZlcmVuY2VzICgsdHpkYXRhLWZvci10ZXN0cykKLSAgICAg ICM6cGhhc2VzCi0gICAgICAobW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzCi0gICAg ICAgIChhZGQtYWZ0ZXIgJ3VucGFjayAncGF0Y2gtZGJ1cy1sYXVuY2gtcGF0aAotICAgICAg ICAgIChsYW1iZGEqICgjOmtleSBpbnB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQotICAgICAg ICAgICAgKGxldCAoKGRidXMgKGFzc29jLXJlZiBpbnB1dHMgImRidXMiKSkpCi0gICAgICAg ICAgICAgIChzdWJzdGl0dXRlKiAiZ2lvL2dkYnVzYWRkcmVzcy5jIgotICAgICAgICAgICAg ICAgICgoImNvbW1hbmRfbGluZSA9IGdfc3RyZHVwX3ByaW50ZiBcXChcImRidXMtbGF1bmNo IikKLSAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgImNvbW1hbmRfbGluZSA9IGdf c3RyZHVwX3ByaW50ZiAoXCIiCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRi dXMgIi9iaW4vZGJ1cy1sYXVuY2giKSkpCi0gICAgICAgICAgICAgICN0KSkpCi0gICAgICAg IChhZGQtYWZ0ZXIgJ3VucGFjayAncGF0Y2gtZ2lvLWxhdW5jaC1kZXNrdG9wCi0gICAgICAg ICAgKGxhbWJkYSogKCM6a2V5IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQotICAgICAg ICAgICAgKGxldCAoKG91dCAoYXNzb2MtcmVmIG91dHB1dHMgIm91dCIpKSkKLSAgICAgICAg ICAgICAgOzsgU2VlIGFsc28gPGh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbGli L2lzc3Vlcy8xNjMzPgotICAgICAgICAgICAgICA7OyBmb3IgYW5vdGhlciBmdXR1cmUgZml4 LgotICAgICAgICAgICAgICAoc3Vic3RpdHV0ZSogImdpby9nZGVza3RvcGFwcGluZm8uYyIK LSAgICAgICAgICAgICAgICgoImdpby1sYXVuY2gtZGVza3RvcCIpCi0gICAgICAgICAgICAg ICAgKHN0cmluZy1hcHBlbmQgb3V0ICIvbGliZXhlYy9naW8tbGF1bmNoLWRlc2t0b3AiKSkp Ci0gICAgICAgICAgICAgICN0KSkpCi0gICAgICAgIChhZGQtYmVmb3JlICdidWlsZCAncHJl LWJ1aWxkCi0gICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyBvdXRwdXRzICM6YWxs b3ctb3RoZXIta2V5cykKLSAgICAgICAgICAgIDs7IEZvciB0ZXN0cy9nZGF0ZXRpbWUuYy4K LSAgICAgICAgICAgIChzZXRlbnYgIlRaRElSIgotICAgICAgICAgICAgICAgICAgICAoc3Ry aW5nLWFwcGVuZCAoYXNzb2MtcmVmIGlucHV0cyAidHpkYXRhIikKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIi9zaGFyZS96b25laW5mbyIpKQotCi0gICAgICAgICAg ICA7OyBTb21lIHRlc3RzIHdhbnQgd3JpdGUgYWNjZXNzIHRoZXJlLgotICAgICAgICAgICAg KHNldGVudiAiSE9NRSIgKGdldGN3ZCkpCi0gICAgICAgICAgICAoc2V0ZW52ICJYREdfQ0FD SEVfSE9NRSIgKGdldGN3ZCkpCi0gICAgICAgICAgICAjdCkpCi0gICAgICAgIChhZGQtYWZ0 ZXIgJ3VucGFjayAnZGlzYWJsZS1mYWlsaW5nLXRlc3RzCi0gICAgICAgICAgKGxhbWJkYSBf Ci0gICAgICAgICAgICAobGV0ICgoZGlzYWJsZQotICAgICAgICAgICAgICAgICAgIChsYW1i ZGEgKHRlc3QtZmlsZSB0ZXN0LXBhdGhzKQotICAgICAgICAgICAgICAgICAgICAgKGRlZmlu ZSBwYXR0ZXJuK3Byb2NzCi0gICAgICAgICAgICAgICAgICAgICAgIChtYXAgKGxhbWJkYSAo dGVzdC1wYXRoKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGNvbnMKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICA7OyBYWFg6IG9ubHkgd29ya3MgZm9yIHNpbmds ZSBsaW5lIHN0YXRlbWVudHMuCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGZv cm1hdCAjZiAiZ190ZXN0X2FkZF9mdW5jLipcIn5hXCIuKiIgdGVzdC1wYXRoKQotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIChjb25zdCAiIikpKQotICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHRlc3QtcGF0aHMpKQotICAgICAgICAgICAgICAgICAgICAgKHN1YnN0 aXR1dGUgdGVzdC1maWxlIHBhdHRlcm4rcHJvY3MpKSkKLSAgICAgICAgICAgICAgICAgIChm YWlsaW5nLXRlc3RzCi0gICAgICAgICAgICAgICAgICAgJygoImdsaWIvdGVzdHMvdGhyZWFk LmMiCi0gICAgICAgICAgICAgICAgICAgICAgKDs7IHBybGltaXQoMikgcmV0dXJucyBFTk9T WVMgb24gTGludXggMi42LjMyLTUteGVuLWFtZDY0Ci0gICAgICAgICAgICAgICAgICAgICAg IDs7IGFzIGZvdW5kIG9uIGh5ZHJhLmdudS5vcmcsIGFuZCBzdHJhY2UoMSkgZG9lc24ndAot ICAgICAgICAgICAgICAgICAgICAgICA7OyByZWNvZ25pemUgaXQuCi0gICAgICAgICAgICAg ICAgICAgICAgICIvdGhyZWFkL3RocmVhZDQiKSkKLQotICAgICAgICAgICAgICAgICAgICAg OzsgVGhpcyB0cmllcyB0byBmaW5kIHByb2dyYW1zIGluIEZIUyBkaXJlY3Rvcmllcy4KLSAg ICAgICAgICAgICAgICAgICAgICgiZ2xpYi90ZXN0cy91dGlscy5jIgotICAgICAgICAgICAg ICAgICAgICAgICgiL3V0aWxzL2ZpbmQtcHJvZ3JhbSIpKQotCi0gICAgICAgICAgICAgICAg ICAgICA7OyBUaGlzIGZhaWxzIGJlY2F1c2UgImdsaWIvdGVzdHMvZWNoby1zY3JpcHQiIGNh bm5vdCBiZQotICAgICAgICAgICAgICAgICAgICAgOzsgZm91bmQuCi0gICAgICAgICAgICAg ICAgICAgICAoImdsaWIvdGVzdHMvc3Bhd24tc2luZ2xldGhyZWFkLmMiCi0gICAgICAgICAg ICAgICAgICAgICAgKCIvZ3RocmVhZC9zcGF3bi1zY3JpcHQiKSkKLQotICAgICAgICAgICAg ICAgICAgICAgKCJnbGliL3Rlc3RzL3RpbWVyLmMiCi0gICAgICAgICAgICAgICAgICAgICAg KDs7IGZhaWxzIGlmIGNvbXBpbGVyIG9wdGltaXphdGlvbnMgYXJlIGVuYWJsZWQsIHdoaWNo IHRoZXkKLSAgICAgICAgICAgICAgICAgICAgICAgOzsgYXJlIGJ5IGRlZmF1bHQuCi0gICAg ICAgICAgICAgICAgICAgICAgICIvdGltZXIvc3RvcCIpKQotCi0gICAgICAgICAgICAgICAg ICAgICAoImdpby90ZXN0cy9nYXBwbGljYXRpb24uYyIKLSAgICAgICAgICAgICAgICAgICAg ICAoOzsgWFhYOiBwcm92ZW4gdG8gYmUgdW5yZWxpYWJsZS4gIFNlZToKLSAgICAgICAgICAg ICAgICAgICAgICAgOzsgIDxodHRwczovL2J1Z3MuZGViaWFuLm9yZy83NTYyNzM+Ci0gICAg ICAgICAgICAgICAgICAgICAgIDs7ICA8aHR0cDovL2J1Z3MuZ251Lm9yZy8xODQ0NT4KLSAg ICAgICAgICAgICAgICAgICAgICAgIi9nYXBwbGljYXRpb24vcXVpdCIKLQotICAgICAgICAg ICAgICAgICAgICAgICA7OyBYWFg6IGZhaWxzIHJhbmRvbWx5IGZvciB1bmtub3duIHJlYXNv bi4gU2VlOgotICAgICAgICAgICAgICAgICAgICAgICA7OyAgPGh0dHBzOi8vbGlzdHMuZ251 Lm9yZy9hcmNoaXZlL2h0bWwvZ3VpeC1kZXZlbC8yMDE2LTA0L21zZzAwMjE1Lmh0bWw+Ci0g ICAgICAgICAgICAgICAgICAgICAgICIvZ2FwcGxpY2F0aW9uL2xvY2FsLWFjdGlvbnMiKSkK LQotICAgICAgICAgICAgICAgICAgICAgKCJnaW8vdGVzdHMvY29udGVudHR5cGUuYyIKLSAg ICAgICAgICAgICAgICAgICAgICAoOzsgWFhYOiByZXF1aXJlcyBzaGFyZWQtbWltZS1pbmZv LgotICAgICAgICAgICAgICAgICAgICAgICAiL2NvbnRlbnR0eXBlL2d1ZXNzIgotICAgICAg ICAgICAgICAgICAgICAgICAiL2NvbnRlbnR0eXBlL2d1ZXNzX3N2Z19mcm9tX2RhdGEiCi0g ICAgICAgICAgICAgICAgICAgICAgICIvY29udGVudHR5cGUvc3VidHlwZSIKLSAgICAgICAg ICAgICAgICAgICAgICAgIi9jb250ZW50dHlwZS9saXN0IgotICAgICAgICAgICAgICAgICAg ICAgICAiL2NvbnRlbnR0eXBlL2ljb24iCi0gICAgICAgICAgICAgICAgICAgICAgICIvY29u dGVudHR5cGUvc3ltYm9saWMtaWNvbiIKLSAgICAgICAgICAgICAgICAgICAgICAgIi9jb250 ZW50dHlwZS90cmVlIikpCi0KLSAgICAgICAgICAgICAgICAgICAgICgiZ2lvL3Rlc3RzL2Fw cGluZm8uYyIKLSAgICAgICAgICAgICAgICAgICAgICAoOzsgWFhYOiByZXF1aXJlcyB1cGRh dGUtZGVza3RvcC1kYXRhYmFzZS4KLSAgICAgICAgICAgICAgICAgICAgICAgIi9hcHBpbmZv L2Fzc29jaWF0aW9ucyIpKQotCi0gICAgICAgICAgICAgICAgICAgICAoImdpby90ZXN0cy9k ZXNrdG9wLWFwcC1pbmZvLmMiCi0gICAgICAgICAgICAgICAgICAgICAgKDs7IFhYWDogcmVx dWlyZXMgdXBkYXRlLWRlc2t0b3AtZGF0YWJhc2UuCi0gICAgICAgICAgICAgICAgICAgICAg ICIvZGVza3RvcC1hcHAtaW5mby9kZWxldGUiCi0gICAgICAgICAgICAgICAgICAgICAgICIv ZGVza3RvcC1hcHAtaW5mby9kZWZhdWx0IgotICAgICAgICAgICAgICAgICAgICAgICAiL2Rl c2t0b3AtYXBwLWluZm8vZmFsbGJhY2siCi0gICAgICAgICAgICAgICAgICAgICAgICIvZGVz a3RvcC1hcHAtaW5mby9sYXN0dXNlZCIKLSAgICAgICAgICAgICAgICAgICAgICAgIi9kZXNr dG9wLWFwcC1pbmZvL3NlYXJjaCIpKQotCi0gICAgICAgICAgICAgICAgICAgICAoImdpby90 ZXN0cy9nZGJ1cy1wZWVyLmMiCi0gICAgICAgICAgICAgICAgICAgICAgKDs7IFJlcXVpcmVz IC9ldGMvbWFjaGluZS1pZC4KLSAgICAgICAgICAgICAgICAgICAgICAgIi9nZGJ1cy9jb2Rl Z2VuLXBlZXItdG8tcGVlciIpKQotCi0gICAgICAgICAgICAgICAgICAgICAoImdpby90ZXN0 cy9nZGJ1cy1hZGRyZXNzLWdldC1zZXNzaW9uLmMiCi0gICAgICAgICAgICAgICAgICAgICAg KDs7IFJlcXVpcmVzIC9ldGMvbWFjaGluZS1pZC4KLSAgICAgICAgICAgICAgICAgICAgICAg Ii9nZGJ1cy94MTEtYXV0b2xhdW5jaCIpKQotCi0gICAgICAgICAgICAgICAgICAgICAoImdp by90ZXN0cy9nc29ja2V0Y2xpZW50LXNsb3cuYyIKLSAgICAgICAgICAgICAgICAgICAgICAo OzsgVGhlc2UgdGVzdHMgdHJpZXMgdG8gcmVzb2x2ZSAibG9jYWxob3N0IiwgYW5kIGZhaWxz LgotICAgICAgICAgICAgICAgICAgICAgICAiL3NvY2tldC1jbGllbnQvaGFwcHktZXllYmFs bHMvc2xvdyIKLSAgICAgICAgICAgICAgICAgICAgICAgIi9zb2NrZXQtY2xpZW50L2hhcHB5 LWV5ZWJhbGxzL2NhbmNlbGxhdGlvbi9kZWxheWVkIikpCi0KLSAgICAgICAgICAgICAgICAg ICAgICkpKQotICAgICAgICAgICAgICAoZm9yLWVhY2ggKGxhbWJkYSAoeCkgKGFwcGx5IGRp c2FibGUgeCkpIGZhaWxpbmctdGVzdHMpCi0gICAgICAgICAgICAgICN0KSkpCi0gICAgICAg IChyZXBsYWNlICdjaGVjawotICAgICAgICAgIChsYW1iZGEgXwotICAgICAgICAgICAgKHNl dGVudiAiTUVTT05fVEVTVFRIUkVBRFMiCi0gICAgICAgICAgICAgICAgICAgIChudW1iZXIt PnN0cmluZyAocGFyYWxsZWwtam9iLWNvdW50KSkpCi0gICAgICAgICAgICA7OyBEbyBub3Qg cnVuIHRlc3RzIG1hcmtlZCBhcyAiZmxha3kiLgotICAgICAgICAgICAgKGludm9rZSAibWVz b24iICJ0ZXN0IiAiLS1uby1zdWl0ZSIgImZsYWt5IikpKQotICAgICAgICA7OyBUT0RPOiBt ZXNvbiBkb2VzIG5vdCBwZXJtaXQgdGhlIGJpbmRpciB0byBiZSBvdXRzaWRlIG9mIHByZWZp eC4KLSAgICAgICAgOzsgU2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9tZXNvbmJ1aWxkL21lc29u L2lzc3Vlcy8yNTYxCi0gICAgICAgIDs7IFdlIGNhbiByZW1vdmUgdGhpcyBvbmNlIG1lc29u IGlzIHBhdGNoZWQuCi0gICAgICAgIChhZGQtYWZ0ZXIgJ2luc3RhbGwgJ21vdmUtZXhlY3V0 YWJsZXMKLSAgICAgICAgICAobGFtYmRhKiAoIzprZXkgb3V0cHV0cyAjOmFsbG93LW90aGVy LWtleXMpCi0gICAgICAgICAgICAobGV0ICgob3V0IChhc3NvYy1yZWYgb3V0cHV0cyAib3V0 IikpCi0gICAgICAgICAgICAgICAgICAoYmluIChhc3NvYy1yZWYgb3V0cHV0cyAiYmluIikp KQotICAgICAgICAgICAgICAobWtkaXItcCBiaW4pCi0gICAgICAgICAgICAgIChyZW5hbWUt ZmlsZSAoc3RyaW5nLWFwcGVuZCBvdXQgIi9iaW4iKQotICAgICAgICAgICAgICAgICAgICAg ICAgICAgKHN0cmluZy1hcHBlbmQgYmluICIvYmluIikpCi0gICAgICAgICAgICAgIDs7IFRo aXMgb25lIGlzIGFuIGltcGxlbWVudGF0aW9uIGRldGFpbCBvZiBnbGliLgotICAgICAgICAg ICAgICA7OyBJdCBpcyB3cm9uZyB0aGF0IHRoYXQncyBpbiAiL2JpbiIgaW4gdGhlIGZpcnN0 IHBsYWNlLAotICAgICAgICAgICAgICA7OyBidXQgdGhhdCdzIHdoYXQgdXBzdHJlYW0gaXMg ZG9pbmcgcmlnaHQgbm93LgotICAgICAgICAgICAgICA7OyBTZWUgPGh0dHBzOi8vZ2l0bGFi Lmdub21lLm9yZy9HTk9NRS9nbGliL2lzc3Vlcy8xNjMzPi4KLSAgICAgICAgICAgICAgKG1r ZGlyIChzdHJpbmctYXBwZW5kIG91dCAiL2xpYmV4ZWMiKSkKLSAgICAgICAgICAgICAgKHJl bmFtZS1maWxlIChzdHJpbmctYXBwZW5kIGJpbiAiL2Jpbi9naW8tbGF1bmNoLWRlc2t0b3Ai KQotICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgb3V0ICIvbGli ZXhlYy9naW8tbGF1bmNoLWRlc2t0b3AiKSkKLSAgICAgICAgICAgICAgOzsgRG8gbm90IHJl ZmVyIHRvICJiaW5kaXIiLCB3aGljaCBwb2ludHMgdG8gIiR7cHJlZml4fS9iaW4iLgotICAg ICAgICAgICAgICA7OyBXZSBkb24ndCBwYXRjaCAiYmluZGlyIiB0byBwb2ludCB0byAiJGJp bi9iaW4iLCBiZWNhdXNlIHRoYXQKLSAgICAgICAgICAgICAgOzsgd291bGQgY3JlYXRlIGEg cmVmZXJlbmNlIGN5Y2xlIGJldHdlZW4gdGhlICJvdXQiIGFuZCAiYmluIgotICAgICAgICAg ICAgICA7OyBvdXRwdXRzLgotICAgICAgICAgICAgICAoc3Vic3RpdHV0ZSogKGxpc3QgKHN0 cmluZy1hcHBlbmQgb3V0ICIvbGliL3BrZ2NvbmZpZy9naW8tMi4wLnBjIikKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kIG91dCAiL2xpYi9wa2dj b25maWcvZ2xpYi0yLjAucGMiKSkKLSAgICAgICAgICAgICAgICAoKCJiaW5kaXI9XFwkXFx7 cHJlZml4XFx9L2JpbiIpICIiKQotICAgICAgICAgICAgICAgICgoIj1cXCRcXHtiaW5kaXJc XH0vIikgIj0iKSkKLSAgICAgICAgICAgICAgI3QpKSkpKSkKLSAgICAgIDs7IFRPRE86IHNl ZSBhYm92ZSBmb3IgZXhwbGFuYXRpb24uCi0gICAgICA7OyAjOmNvbmZpZ3VyZS1mbGFncyAo bGlzdCAoc3RyaW5nLWFwcGVuZCAiLS1iaW5kaXI9IgotICAgICAgOzsgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgKGFzc29jLXJlZiAlb3V0cHV0cyAiYmluIikK LSAgICAgIDs7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIvYmlu IikpCi0KLSAgIChuYXRpdmUtc2VhcmNoLXBhdGhzCi0gICAgOzsgVGhpcyB2YXJpYWJsZSBp cyBub3QgcmVhbGx5ICJvd25lZCIgYnkgR0xpYiwgYnV0IHNldmVyYWwgcmVsYXRlZAotICAg IDs7IHBhY2thZ2VzIHJlZmVyIHRvIGl0OiBnb2JqZWN0LWludHJvc3BlY3Rpb24ncyB0b29s cyB1c2UgaXQgYXMgYSBzZWFyY2gKLSAgICA7OyBwYXRoIGZvciAuZ2lyIGZpbGVzLCBhbmQg aXQncyBhbHNvIGEgc2VhcmNoIHBhdGggZm9yIHNjaGVtYXMgcHJvZHVjZWQKLSAgICA7OyBi eSAnZ2xpYi1jb21waWxlLXNjaGVtYXMnLgotICAgIChsaXN0IChzZWFyY2gtcGF0aC1zcGVj aWZpY2F0aW9uCi0gICAgICAgICAgICh2YXJpYWJsZSAiWERHX0RBVEFfRElSUyIpCi0gICAg ICAgICAgIChmaWxlcyAnKCJzaGFyZSIpKSkKLSAgICAgICAgICA7OyBUbyBsb2FkIGV4dHJh IGdpbyBtb2R1bGVzIGZyb20gZ2xpYi1uZXR3b3JraW5nLCBldGMuCi0gICAgICAgICAgKHNl YXJjaC1wYXRoLXNwZWNpZmljYXRpb24KLSAgICAgICAgICAgKHZhcmlhYmxlICJHSU9fRVhU UkFfTU9EVUxFUyIpCi0gICAgICAgICAgIChmaWxlcyAnKCJsaWIvZ2lvL21vZHVsZXMiKSkp KSkKLSAgIChzZWFyY2gtcGF0aHMgbmF0aXZlLXNlYXJjaC1wYXRocykKLSAgIChwcm9wZXJ0 aWVzICcoKGhpZGRlbj8gLiAjdCkpKQotCi0gICAoc3lub3BzaXMgIlRocmVhZC1zYWZlIGdl bmVyYWwgdXRpbGl0eSBsaWJyYXJ5OyBiYXNpcyBvZiBHVEsrIGFuZCBHTk9NRSIpCi0gICAo ZGVzY3JpcHRpb24KLSAgICAiR0xpYiBwcm92aWRlcyBkYXRhIHN0cnVjdHVyZSBoYW5kbGlu ZyBmb3IgQywgcG9ydGFiaWxpdHkgd3JhcHBlcnMsCi1hbmQgaW50ZXJmYWNlcyBmb3Igc3Vj aCBydW50aW1lIGZ1bmN0aW9uYWxpdHkgYXMgYW4gZXZlbnQgbG9vcCwgdGhyZWFkcywKLWR5 bmFtaWMgbG9hZGluZywgYW5kIGFuIG9iamVjdCBzeXN0ZW0uIikKLSAgIChob21lLXBhZ2Ug Imh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9nbGliLyIpCi0gICAobGljZW5zZSBsaWNl bnNlOmxncGwyLjErKSkpCisgICAgKG5hbWUgImdsaWIiKQorICAgICh2ZXJzaW9uICIyLjYy LjYiKQorICAgIChwcm9wZXJ0aWVzICcoKGhpZGRlbj8gLiAjdCkpKQorICAgIChyZXBsYWNl bWVudCBnbGliLXdpdGgtZ2lvLXBhdGNoKQorICAgIChzb3VyY2UKKyAgICAgKG9yaWdpbgor ICAgICAgIChtZXRob2QgdXJsLWZldGNoKQorICAgICAgICh1cmkKKyAgICAgICAgKHN0cmlu Zy1hcHBlbmQgIm1pcnJvcjovL2dub21lL3NvdXJjZXMvIgorICAgICAgICAgICAgICAgICAg ICAgICBuYW1lICIvIiAoc3RyaW5nLXRha2UgdmVyc2lvbiA0KSAiLyIKKyAgICAgICAgICAg ICAgICAgICAgICAgbmFtZSAiLSIgdmVyc2lvbiAiLnRhci54eiIpKQorICAgICAgIChzaGEy NTYKKyAgICAgICAgKGJhc2UzMiAiMTc0YnNtYm1jdmF3NjlmZjlnNjBxNXN4MGZuMjNya2hx Y3dxejE3aDVzN3NwcnBzNGtxaCIpKQorICAgICAgIChwYXRjaGVzCisgICAgICAgIChzZWFy Y2gtcGF0Y2hlcyAiZ2xpYi10ZXN0cy10aW1lci5wYXRjaCIpKQorICAgICAgIChtb2R1bGVz ICcoKGd1aXggYnVpbGQgdXRpbHMpKSkKKyAgICAgICAoc25pcHBldAorICAgICAgICAnKGJl Z2luCisgICAgICAgICAgIChzdWJzdGl0dXRlKiAidGVzdHMvc3Bhd24tdGVzdC5jIgorICAg ICAgICAgICAgICgoIi9iaW4vc2giKSAic2giKSkKKyAgICAgICAgICAgI3QpKSkpCisgICAg KGJ1aWxkLXN5c3RlbSBtZXNvbi1idWlsZC1zeXN0ZW0pCisgICAgKG91dHB1dHMgJygib3V0 IiAgOyBldmVyeXRoaW5nCisgICAgICAgICAgICAgICAiYmluIikpIDsgZ2xpYi1ta2VudW1z LCBndGVzdGVyLCBldGMuOyBkZXBlbmRzIG9uIFB5dGhvbgorICAgIChhcmd1bWVudHMKKyAg ICAgYCgjOmRpc2FsbG93ZWQtcmVmZXJlbmNlcyAoLHR6ZGF0YS1mb3ItdGVzdHMpCisgICAg ICAgIzpwaGFzZXMKKyAgICAgICAobW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzCisg ICAgICAgICAoYWRkLWFmdGVyICd1bnBhY2sgJ3BhdGNoLWRidXMtbGF1bmNoLXBhdGgKKyAg ICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyAjOmFsbG93LW90aGVyLWtleXMpCisg ICAgICAgICAgICAgKGxldCAoKGRidXMgKGFzc29jLXJlZiBpbnB1dHMgImRidXMiKSkpCisg ICAgICAgICAgICAgICAoc3Vic3RpdHV0ZSogImdpby9nZGJ1c2FkZHJlc3MuYyIKKyAgICAg ICAgICAgICAgICAgKCgiY29tbWFuZF9saW5lID0gZ19zdHJkdXBfcHJpbnRmIFxcKFwiZGJ1 cy1sYXVuY2giKQorICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgImNvbW1hbmRf bGluZSA9IGdfc3RyZHVwX3ByaW50ZiAoXCIiCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBkYnVzICIvYmluL2RidXMtbGF1bmNoIikpKQorICAgICAgICAgICAgICAgI3Qp KSkKKyAgICAgICAgIChhZGQtYWZ0ZXIgJ3VucGFjayAncGF0Y2gtZ2lvLWxhdW5jaC1kZXNr dG9wCisgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBvdXRwdXRzICM6YWxsb3ctb3RoZXIt a2V5cykKKyAgICAgICAgICAgICAobGV0ICgob3V0IChhc3NvYy1yZWYgb3V0cHV0cyAib3V0 IikpKQorICAgICAgICAgICAgICAgOzsgU2VlIGFsc28gPGh0dHBzOi8vZ2l0bGFiLmdub21l Lm9yZy9HTk9NRS9nbGliL2lzc3Vlcy8xNjMzPgorICAgICAgICAgICAgICAgOzsgZm9yIGFu b3RoZXIgZnV0dXJlIGZpeC4KKyAgICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAiZ2lvL2dk ZXNrdG9wYXBwaW5mby5jIgorICAgICAgICAgICAgICAgICAoKCJnaW8tbGF1bmNoLWRlc2t0 b3AiKQorICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgb3V0ICIvbGliZXhlYy9n aW8tbGF1bmNoLWRlc2t0b3AiKSkpCisgICAgICAgICAgICAgICAjdCkpKQorICAgICAgICAg KGFkZC1iZWZvcmUgJ2J1aWxkICdwcmUtYnVpbGQKKyAgICAgICAgICAgKGxhbWJkYSogKCM6 a2V5IGlucHV0cyBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAgICA7 OyBGb3IgdGVzdHMvZ2RhdGV0aW1lLmMuCisgICAgICAgICAgICAgKHNldGVudiAiVFpESVIi CisgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAoYXNzb2MtcmVmIGlucHV0 cyAidHpkYXRhIikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIvc2hh cmUvem9uZWluZm8iKSkKKyAgICAgICAgICAgICA7OyBTb21lIHRlc3RzIHdhbnQgd3JpdGUg YWNjZXNzIHRoZXJlLgorICAgICAgICAgICAgIChzZXRlbnYgIkhPTUUiIChnZXRjd2QpKQor ICAgICAgICAgICAgIChzZXRlbnYgIlhER19DQUNIRV9IT01FIiAoZ2V0Y3dkKSkKKyAgICAg ICAgICAgICAjdCkpCisgICAgICAgICAoYWRkLWFmdGVyICd1bnBhY2sgJ2Rpc2FibGUtZmFp bGluZy10ZXN0cworICAgICAgICAgICAobGFtYmRhIF8KKyAgICAgICAgICAgICAobGV0ICgo ZGlzYWJsZQorICAgICAgICAgICAgICAgICAgICAobGFtYmRhICh0ZXN0LWZpbGUgdGVzdC1w YXRocykKKyAgICAgICAgICAgICAgICAgICAgICAoZGVmaW5lIHBhdHRlcm4rcHJvY3MKKyAg ICAgICAgICAgICAgICAgICAgICAgIChtYXAgKGxhbWJkYSAodGVzdC1wYXRoKQorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIChjb25zCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDs7IFhYWDogb25seSB3b3JrcyBmb3Igc2luZ2xlIGxpbmUgc3RhdGVtZW50 cy4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGZvcm1hdCAjZiAiZ190ZXN0 X2FkZF9mdW5jLipcIn5hXCIuKiIgdGVzdC1wYXRoKQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAoY29uc3QgIiIpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg dGVzdC1wYXRocykpCisgICAgICAgICAgICAgICAgICAgICAgKHN1YnN0aXR1dGUgdGVzdC1m aWxlIHBhdHRlcm4rcHJvY3MpKSkKKyAgICAgICAgICAgICAgICAgICAoZmFpbGluZy10ZXN0 cworICAgICAgICAgICAgICAgICAgICAnKCgiZ2xpYi90ZXN0cy90aHJlYWQuYyIKKyAgICAg ICAgICAgICAgICAgICAgICAgKCA7OyBwcmxpbWl0KDIpIHJldHVybnMgRU5PU1lTIG9uIExp bnV4IDIuNi4zMi01LXhlbi1hbWQ2NAorICAgICAgICAgICAgICAgICAgICAgICAgOzsgYXMg Zm91bmQgb24gaHlkcmEuZ251Lm9yZywgYW5kIHN0cmFjZSgxKSBkb2Vzbid0CisgICAgICAg ICAgICAgICAgICAgICAgICA7OyByZWNvZ25pemUgaXQuCisgICAgICAgICAgICAgICAgICAg ICAgICAiL3RocmVhZC90aHJlYWQ0IikpCisgICAgICAgICAgICAgICAgICAgICAgOzsgVGhp cyB0cmllcyB0byBmaW5kIHByb2dyYW1zIGluIEZIUyBkaXJlY3Rvcmllcy4KKyAgICAgICAg ICAgICAgICAgICAgICAoImdsaWIvdGVzdHMvdXRpbHMuYyIKKyAgICAgICAgICAgICAgICAg ICAgICAgKCIvdXRpbHMvZmluZC1wcm9ncmFtIikpCisgICAgICAgICAgICAgICAgICAgICAg OzsgVGhpcyBmYWlscyBiZWNhdXNlICJnbGliL3Rlc3RzL2VjaG8tc2NyaXB0IiBjYW5ub3Qg YmUKKyAgICAgICAgICAgICAgICAgICAgICA7OyBmb3VuZC4KKyAgICAgICAgICAgICAgICAg ICAgICAoImdsaWIvdGVzdHMvc3Bhd24tc2luZ2xldGhyZWFkLmMiCisgICAgICAgICAgICAg ICAgICAgICAgICgiL2d0aHJlYWQvc3Bhd24tc2NyaXB0IikpCisgICAgICAgICAgICAgICAg ICAgICAgKCJnbGliL3Rlc3RzL3RpbWVyLmMiCisgICAgICAgICAgICAgICAgICAgICAgICgg OzsgZmFpbHMgaWYgY29tcGlsZXIgb3B0aW1pemF0aW9ucyBhcmUgZW5hYmxlZCwgd2hpY2gg dGhleQorICAgICAgICAgICAgICAgICAgICAgICAgOzsgYXJlIGJ5IGRlZmF1bHQuCisgICAg ICAgICAgICAgICAgICAgICAgICAiL3RpbWVyL3N0b3AiKSkKKyAgICAgICAgICAgICAgICAg ICAgICAoImdpby90ZXN0cy9nYXBwbGljYXRpb24uYyIKKyAgICAgICAgICAgICAgICAgICAg ICAgKCA7OyBYWFg6IHByb3ZlbiB0byBiZSB1bnJlbGlhYmxlLiAgU2VlOgorICAgICAgICAg ICAgICAgICAgICAgICAgOzsgIDxodHRwczovL2J1Z3MuZGViaWFuLm9yZy83NTYyNzM+Cisg ICAgICAgICAgICAgICAgICAgICAgICA7OyAgPGh0dHA6Ly9idWdzLmdudS5vcmcvMTg0NDU+ CisgICAgICAgICAgICAgICAgICAgICAgICAiL2dhcHBsaWNhdGlvbi9xdWl0IgorICAgICAg ICAgICAgICAgICAgICAgICAgOzsgWFhYOiBmYWlscyByYW5kb21seSBmb3IgdW5rbm93biBy ZWFzb24uIFNlZToKKyAgICAgICAgICAgICAgICAgICAgICAgIDs7ICA8aHR0cHM6Ly9saXN0 cy5nbnUub3JnL2FyY2hpdmUvaHRtbC9ndWl4LWRldmVsLzIwMTYtMDQvbXNnMDAyMTUuaHRt bD4KKyAgICAgICAgICAgICAgICAgICAgICAgICIvZ2FwcGxpY2F0aW9uL2xvY2FsLWFjdGlv bnMiKSkKKyAgICAgICAgICAgICAgICAgICAgICAoImdpby90ZXN0cy9jb250ZW50dHlwZS5j IgorICAgICAgICAgICAgICAgICAgICAgICAoIDs7IFhYWDogcmVxdWlyZXMgc2hhcmVkLW1p bWUtaW5mby4KKyAgICAgICAgICAgICAgICAgICAgICAgICIvY29udGVudHR5cGUvZ3Vlc3Mi CisgICAgICAgICAgICAgICAgICAgICAgICAiL2NvbnRlbnR0eXBlL2d1ZXNzX3N2Z19mcm9t X2RhdGEiCisgICAgICAgICAgICAgICAgICAgICAgICAiL2NvbnRlbnR0eXBlL3N1YnR5cGUi CisgICAgICAgICAgICAgICAgICAgICAgICAiL2NvbnRlbnR0eXBlL2xpc3QiCisgICAgICAg ICAgICAgICAgICAgICAgICAiL2NvbnRlbnR0eXBlL2ljb24iCisgICAgICAgICAgICAgICAg ICAgICAgICAiL2NvbnRlbnR0eXBlL3N5bWJvbGljLWljb24iCisgICAgICAgICAgICAgICAg ICAgICAgICAiL2NvbnRlbnR0eXBlL3RyZWUiKSkKKyAgICAgICAgICAgICAgICAgICAgICAo Imdpby90ZXN0cy9hcHBpbmZvLmMiCisgICAgICAgICAgICAgICAgICAgICAgICggOzsgWFhY OiByZXF1aXJlcyB1cGRhdGUtZGVza3RvcC1kYXRhYmFzZS4KKyAgICAgICAgICAgICAgICAg ICAgICAgICIvYXBwaW5mby9hc3NvY2lhdGlvbnMiKSkKKyAgICAgICAgICAgICAgICAgICAg ICAoImdpby90ZXN0cy9kZXNrdG9wLWFwcC1pbmZvLmMiCisgICAgICAgICAgICAgICAgICAg ICAgICggOzsgWFhYOiByZXF1aXJlcyB1cGRhdGUtZGVza3RvcC1kYXRhYmFzZS4KKyAgICAg ICAgICAgICAgICAgICAgICAgICIvZGVza3RvcC1hcHAtaW5mby9kZWxldGUiCisgICAgICAg ICAgICAgICAgICAgICAgICAiL2Rlc2t0b3AtYXBwLWluZm8vZGVmYXVsdCIKKyAgICAgICAg ICAgICAgICAgICAgICAgICIvZGVza3RvcC1hcHAtaW5mby9mYWxsYmFjayIKKyAgICAgICAg ICAgICAgICAgICAgICAgICIvZGVza3RvcC1hcHAtaW5mby9sYXN0dXNlZCIKKyAgICAgICAg ICAgICAgICAgICAgICAgICIvZGVza3RvcC1hcHAtaW5mby9zZWFyY2giKSkKKyAgICAgICAg ICAgICAgICAgICAgICAoImdpby90ZXN0cy9nZGJ1cy1wZWVyLmMiCisgICAgICAgICAgICAg ICAgICAgICAgICggOzsgUmVxdWlyZXMgL2V0Yy9tYWNoaW5lLWlkLgorICAgICAgICAgICAg ICAgICAgICAgICAgIi9nZGJ1cy9jb2RlZ2VuLXBlZXItdG8tcGVlciIpKQorICAgICAgICAg ICAgICAgICAgICAgICgiZ2lvL3Rlc3RzL2dkYnVzLWFkZHJlc3MtZ2V0LXNlc3Npb24uYyIK KyAgICAgICAgICAgICAgICAgICAgICAgKCA7OyBSZXF1aXJlcyAvZXRjL21hY2hpbmUtaWQu CisgICAgICAgICAgICAgICAgICAgICAgICAiL2dkYnVzL3gxMS1hdXRvbGF1bmNoIikpCisg ICAgICAgICAgICAgICAgICAgICAgKCJnaW8vdGVzdHMvZ3NvY2tldGNsaWVudC1zbG93LmMi CisgICAgICAgICAgICAgICAgICAgICAgICggOzsgVGhlc2UgdGVzdHMgdHJpZXMgdG8gcmVz b2x2ZSAibG9jYWxob3N0IiwgYW5kIGZhaWxzLgorICAgICAgICAgICAgICAgICAgICAgICAg Ii9zb2NrZXQtY2xpZW50L2hhcHB5LWV5ZWJhbGxzL3Nsb3ciCisgICAgICAgICAgICAgICAg ICAgICAgICAiL3NvY2tldC1jbGllbnQvaGFwcHktZXllYmFsbHMvY2FuY2VsbGF0aW9uL2Rl bGF5ZWQiKSkpKSkKKyAgICAgICAgICAgICAgIChmb3ItZWFjaCAobGFtYmRhICh4KSAoYXBw bHkgZGlzYWJsZSB4KSkgZmFpbGluZy10ZXN0cykKKyAgICAgICAgICAgICAgICN0KSkpCisg ICAgICAgICAocmVwbGFjZSAnY2hlY2sKKyAgICAgICAgICAgKGxhbWJkYSBfCisgICAgICAg ICAgICAgKHNldGVudiAiTUVTT05fVEVTVFRIUkVBRFMiCisgICAgICAgICAgICAgICAgICAg ICAobnVtYmVyLT5zdHJpbmcgKHBhcmFsbGVsLWpvYi1jb3VudCkpKQorICAgICAgICAgICAg IDs7IERvIG5vdCBydW4gdGVzdHMgbWFya2VkIGFzICJmbGFreSIuCisgICAgICAgICAgICAg KGludm9rZSAibWVzb24iICJ0ZXN0IiAiLS1uby1zdWl0ZSIgImZsYWt5IikpKQorICAgICAg ICAgOzsgVE9ETzogbWVzb24gZG9lcyBub3QgcGVybWl0IHRoZSBiaW5kaXIgdG8gYmUgb3V0 c2lkZSBvZiBwcmVmaXguCisgICAgICAgICA7OyBTZWUgaHR0cHM6Ly9naXRodWIuY29tL21l c29uYnVpbGQvbWVzb24vaXNzdWVzLzI1NjEKKyAgICAgICAgIDs7IFdlIGNhbiByZW1vdmUg dGhpcyBvbmNlIG1lc29uIGlzIHBhdGNoZWQuCisgICAgICAgICAoYWRkLWFmdGVyICdpbnN0 YWxsICdtb3ZlLWV4ZWN1dGFibGVzCisgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBvdXRw dXRzICM6YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAgICAobGV0ICgob3V0IChhc3Nv Yy1yZWYgb3V0cHV0cyAib3V0IikpCisgICAgICAgICAgICAgICAgICAgKGJpbiAoYXNzb2Mt cmVmIG91dHB1dHMgImJpbiIpKSkKKyAgICAgICAgICAgICAgIChta2Rpci1wIGJpbikKKyAg ICAgICAgICAgICAgIChyZW5hbWUtZmlsZSAoc3RyaW5nLWFwcGVuZCBvdXQgIi9iaW4iKQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kIGJpbiAiL2JpbiIp KQorICAgICAgICAgICAgICAgOzsgVGhpcyBvbmUgaXMgYW4gaW1wbGVtZW50YXRpb24gZGV0 YWlsIG9mIGdsaWIuCisgICAgICAgICAgICAgICA7OyBJdCBpcyB3cm9uZyB0aGF0IHRoYXQn cyBpbiAiL2JpbiIgaW4gdGhlIGZpcnN0IHBsYWNlLAorICAgICAgICAgICAgICAgOzsgYnV0 IHRoYXQncyB3aGF0IHVwc3RyZWFtIGlzIGRvaW5nIHJpZ2h0IG5vdy4KKyAgICAgICAgICAg ICAgIDs7IFNlZSA8aHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dsaWIvaXNzdWVz LzE2MzM+LgorICAgICAgICAgICAgICAgKG1rZGlyIChzdHJpbmctYXBwZW5kIG91dCAiL2xp YmV4ZWMiKSkKKyAgICAgICAgICAgICAgIChyZW5hbWUtZmlsZSAoc3RyaW5nLWFwcGVuZCBi aW4gIi9iaW4vZ2lvLWxhdW5jaC1kZXNrdG9wIikKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAoc3RyaW5nLWFwcGVuZCBvdXQgIi9saWJleGVjL2dpby1sYXVuY2gtZGVza3RvcCIp KQorICAgICAgICAgICAgICAgOzsgRG8gbm90IHJlZmVyIHRvICJiaW5kaXIiLCB3aGljaCBw b2ludHMgdG8gIiR7cHJlZml4fS9iaW4iLgorICAgICAgICAgICAgICAgOzsgV2UgZG9uJ3Qg cGF0Y2ggImJpbmRpciIgdG8gcG9pbnQgdG8gIiRiaW4vYmluIiwgYmVjYXVzZSB0aGF0Cisg ICAgICAgICAgICAgICA7OyB3b3VsZCBjcmVhdGUgYSByZWZlcmVuY2UgY3ljbGUgYmV0d2Vl biB0aGUgIm91dCIgYW5kICJiaW4iCisgICAgICAgICAgICAgICA7OyBvdXRwdXRzLgorICAg ICAgICAgICAgICAgKHN1YnN0aXR1dGUqIChsaXN0IChzdHJpbmctYXBwZW5kIG91dCAiL2xp Yi9wa2djb25maWcvZ2lvLTIuMC5wYyIpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgKHN0cmluZy1hcHBlbmQgb3V0ICIvbGliL3BrZ2NvbmZpZy9nbGliLTIuMC5wYyIp KQorICAgICAgICAgICAgICAgICAoKCJiaW5kaXI9XFwkXFx7cHJlZml4XFx9L2JpbiIpICIi KQorICAgICAgICAgICAgICAgICAoKCI9XFwkXFx7YmluZGlyXFx9LyIpICI9IikpCisgICAg ICAgICAgICAgICAjdCkpKSkpKQorICAgIDs7IFRPRE86IHNlZSBhYm92ZSBmb3IgZXhwbGFu YXRpb24uCisgICAgOzsgIzpjb25maWd1cmUtZmxhZ3MgKGxpc3QgKHN0cmluZy1hcHBlbmQg Ii0tYmluZGlyPSIKKyAgICA7OyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAoYXNzb2MtcmVmICVvdXRwdXRzICJiaW4iKQorICAgIDs7ICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICIvYmluIikpCisgICAgKG5hdGl2ZS1pbnB1dHMK KyAgICAgYCgoImRidXMiICxkYnVzKSAgICAgICAgICAgICAgICAgICA7IGZvciBHREJ1cyB0 ZXN0cworICAgICAgICgiZ2V0dGV4dCIgLGdldHRleHQtbWluaW1hbCkKKyAgICAgICAoIm00 IiAsbTQpICAgICAgICAgICAgICAgICAgICAgICA7IGZvciBpbnN0YWxsaW5nIG00IG1hY3Jv cworICAgICAgICgicGVybCIgLHBlcmwpICAgICAgICAgICAgICAgICAgIDsgbmVlZGVkIGJ5 IEdJTyB0ZXN0cworICAgICAgICgicGtnLWNvbmZpZyIgLHBrZy1jb25maWcpCisgICAgICAg KCJweXRob24iICxweXRob24td3JhcHBlcikKKyAgICAgICAoInR6ZGF0YSIgLHR6ZGF0YS1m b3ItdGVzdHMpKSkgICA7IGZvciB0ZXN0cy9nZGF0ZXRpbWUuYworICAgIChwcm9wYWdhdGVk LWlucHV0cworICAgICBgKCgibGliZmZpIiAsbGliZmZpKSA7IGluIHRoZSBSZXF1aXJlcy5w cml2YXRlIGZpZWxkIG9mIGdvYmplY3QtMi4wLnBjCisgICAgICAgKCJsaWJzZWxpbnV4IiAs bGlic2VsaW51eCkgOyBpbiB0aGUgUmVxdWlyZXMucHJpdmF0ZSBmaWVsZCBvZiBnaW8tMi4w LnBjCisgICAgICAgKCJwY3JlIiAscGNyZSkgICA7IGluIHRoZSBSZXF1aXJlcy5wcml2YXRl IGZpZWxkIG9mIGdsaWItMi4wLnBjCisgICAgICAgKCJ1dGlsLWxpbnV4IiAsdXRpbC1saW51 eCAibGliIikgO2ZvciBsaWJtb3VudAorICAgICAgICgiemxpYiIgLHpsaWIpKSkgOyBpbiB0 aGUgUmVxdWlyZXMucHJpdmF0ZSBmaWVsZCBvZiBnbGliLTIuMC5wYworICAgIChuYXRpdmUt c2VhcmNoLXBhdGhzCisgICAgIDs7IFRoaXMgdmFyaWFibGUgaXMgbm90IHJlYWxseSAib3du ZWQiIGJ5IEdMaWIsIGJ1dCBzZXZlcmFsIHJlbGF0ZWQKKyAgICAgOzsgcGFja2FnZXMgcmVm ZXIgdG8gaXQ6IGdvYmplY3QtaW50cm9zcGVjdGlvbidzIHRvb2xzIHVzZSBpdCBhcyBhIHNl YXJjaAorICAgICA7OyBwYXRoIGZvciAuZ2lyIGZpbGVzLCBhbmQgaXQncyBhbHNvIGEgc2Vh cmNoIHBhdGggZm9yIHNjaGVtYXMgcHJvZHVjZWQKKyAgICAgOzsgYnkgJ2dsaWItY29tcGls ZS1zY2hlbWFzJy4KKyAgICAgKGxpc3QKKyAgICAgIChzZWFyY2gtcGF0aC1zcGVjaWZpY2F0 aW9uCisgICAgICAgKHZhcmlhYmxlICJYREdfREFUQV9ESVJTIikKKyAgICAgICAoZmlsZXMg Jygic2hhcmUiKSkpCisgICAgICA7OyBUbyBsb2FkIGV4dHJhIGdpbyBtb2R1bGVzIGZyb20g Z2xpYi1uZXR3b3JraW5nLCBldGMuCisgICAgICAoc2VhcmNoLXBhdGgtc3BlY2lmaWNhdGlv bgorICAgICAgICh2YXJpYWJsZSAiR0lPX0VYVFJBX01PRFVMRVMiKQorICAgICAgIChmaWxl cyAnKCJsaWIvZ2lvL21vZHVsZXMiKSkpKSkKKyAgICAoc2VhcmNoLXBhdGhzIG5hdGl2ZS1z ZWFyY2gtcGF0aHMpCisgICAgKHN5bm9wc2lzICJUaHJlYWQtc2FmZSBnZW5lcmFsIHV0aWxp dHkgbGlicmFyeTsgYmFzaXMgb2YgR1RLKyBhbmQgR05PTUUiKQorICAgIChkZXNjcmlwdGlv biAiR0xpYiBwcm92aWRlcyBkYXRhIHN0cnVjdHVyZSBoYW5kbGluZyBmb3IgQywgcG9ydGFi aWxpdHkKK3dyYXBwZXJzLCBhbmQgaW50ZXJmYWNlcyBmb3Igc3VjaCBydW50aW1lIGZ1bmN0 aW9uYWxpdHkgYXMgYW4gZXZlbnQgbG9vcCwKK3RocmVhZHMsIGR5bmFtaWMgbG9hZGluZywg YW5kIGFuIG9iamVjdCBzeXN0ZW0uIikKKyAgICAoaG9tZS1wYWdlICJodHRwczovL2RldmVs b3Blci5nbm9tZS5vcmcvZ2xpYi8iKQorICAgIChsaWNlbnNlIGxpY2Vuc2U6bGdwbDIuMSsp KSkKIAogKGRlZmluZSBnbGliLXdpdGgtZ2lvLXBhdGNoCiAgIDs7IEdMaWIgd2l0aCBhIGZp eCBmb3IgPGh0dHBzOi8vYnVncy5nbnUub3JnLzM1NTk0Pi4KLS0gCjIuMjkuMgoK ----=_RainLoop_185_971689866.1607062124 Content-Type: application/octet-stream; name="0002-gnu-glib-Update-to-2.64.3.patch" Content-Disposition: attachment; filename="0002-gnu-glib-Update-to-2.64.3.patch" Content-Transfer-Encoding: base64 RnJvbSBlZDY1MDBhOGJlZDFiMzY0ZTUzMDU5M2RhZTRlNDZiMTlkOWZhNmQwIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFq YW5AZGlzcm9vdC5vcmc+CkRhdGU6IFRodSwgMyBEZWMgMjAyMCAyMzo0MzozNiAtMDUwMApT dWJqZWN0OiBbUEFUQ0ggMDIvMTFdIGdudTogZ2xpYjogVXBkYXRlIHRvIDIuNjQuMy4KCiog Z251L3BhY2thZ2VzL2dsaWIuc2NtIChnbGliKSBbdmVyc2lvbl06IFVwZGF0ZSB0byAyLjY0 LjMuCltzb3VyY2VdPG9yaWdpbj5bc2hhMjU2XTogTW9kaWZ5IGJhc2UzMi4KW3BhdGNoZXNd OiBBZGQgZ2xpYi1kaXNhYmxlLWZhaWxpbmctdGVzdHMucGF0Y2guClJlbW92ZSBnbGliLXRl c3RzLXRpbWVyLnBhdGNoLgpbYXJndW1lbnRzXTwjOmRpc2FsbG93ZWQtcmVmZXJlbmNlcz46 IFJlbW92ZSBhcmd1bWVudC4KPCM6cGhhc2VzPlsncGF0Y2gtcHl0aG9uLXJlZmVyZW5jZXNd OiBOZXcgcGhhc2UuClsncHJlLWNoZWNrXTogTmV3IHBoYXNlLgpbJ21vdmUtYmluXTogTmV3 IHBoYXNlLgpbJ3BhdGNoLWRidXMtbGF1bmNoLXBhdGhdOiBSZW1vdmUgcGhhc2UuClsncGF0 Y2gtZ2lvLWxhdW5jaC1kZXNrdG9wXTogUmVtb3ZlIHBoYXNlLgpbJ3ByZS1idWlsZF06IFJl bW92ZSBwaGFzZS4KWydkaXNhYmxlLWZhaWxpbmctdGVzdHNdOiBSZW1vdmUgcGhhc2UuClsn Y2hlY2tdOiBSZW1vdmUgcGhhc2UuClsnbW92ZS1leGVjdXRhYmxlc106IFJlbW92ZSBwaGFz ZS4KW25hdGl2ZS1pbnB1dHNdOiBBZGQgaW50bHRvb2wsIHB5dGhvbiwgbGlieG1sMiBhbmQg bGlieHNsdC4KUmVtb3ZlIGRidXMuCltpbnB1dHNdOiBBZGQgZGJ1cyBhbmQgbGliZWxmLgoq IGdudS9wYWNrYWdlcy9wYXRjaGVzL2dsaWItZGlzYWJsZS1mYWlsaW5nLXRlc3RzLnBhdGNo OiBOZXcgZmlsZS4KKiBnbnUvcGFja2FnZXMvcGF0Y2hlcy9nbGliLXRlc3RzLXRpbWVyLnBh dGNoOiBEZWxldGUgZmlsZS4KKiBnbnUvbG9jYWwubWsgKGRpc3RfcGF0Y2hfREFUQSk6IEFk anVzdC4KLS0tCiBnbnUvbG9jYWwubWsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgfCAgIDIgKy0KIGdudS9wYWNrYWdlcy9nbGliLnNjbSAgICAgICAgICAgICAgICAgICAg ICAgICB8IDE3NCArKysrKy0tLS0tLS0tLS0tLS0KIC4uLi9wYXRjaGVzL2dsaWItZGlzYWJs ZS1mYWlsaW5nLXRlc3RzLnBhdGNoICB8ICA4NCArKysrKysrKysKIGdudS9wYWNrYWdlcy9w YXRjaGVzL2dsaWItdGVzdHMtdGltZXIucGF0Y2ggICB8ICAxNSAtLQogNCBmaWxlcyBjaGFu Z2VkLCAxMzIgaW5zZXJ0aW9ucygrKSwgMTQzIGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUg MTAwNjQ0IGdudS9wYWNrYWdlcy9wYXRjaGVzL2dsaWItZGlzYWJsZS1mYWlsaW5nLXRlc3Rz LnBhdGNoCiBkZWxldGUgbW9kZSAxMDA2NDQgZ251L3BhY2thZ2VzL3BhdGNoZXMvZ2xpYi10 ZXN0cy10aW1lci5wYXRjaAoKZGlmZiAtLWdpdCBhL2dudS9sb2NhbC5tayBiL2dudS9sb2Nh bC5tawppbmRleCA0NWEzOTYzNjhmLi4wNmRjNmJhOWFjIDEwMDY0NAotLS0gYS9nbnUvbG9j YWwubWsKKysrIGIvZ251L2xvY2FsLm1rCkBAIC0xMDU3LDcgKzEwNTcsNyBAQCBkaXN0X3Bh dGNoX0RBVEEgPQkJCQkJCVwKICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvZ2hvc3RzY3JpcHQt bm8taGVhZGVyLXV1aWQucGF0Y2gJCVwKICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvZ2hvc3Rz Y3JpcHQtbm8taGVhZGVyLWNyZWF0aW9uZGF0ZS5wYXRjaCBcCiAgICVEJS9wYWNrYWdlcy9w YXRjaGVzL2dsaWItYXBwaW5mby13YXRjaC5wYXRjaAkJCVwKLSAgJUQlL3BhY2thZ2VzL3Bh dGNoZXMvZ2xpYi10ZXN0cy10aW1lci5wYXRjaAkJCVwKKyAgJUQlL3BhY2thZ2VzL3BhdGNo ZXMvZ2xpYi1kaXNhYmxlLWZhaWxpbmctdGVzdHMucGF0Y2ggICAgICAgICAgICAgXAogICAl RCUvcGFja2FnZXMvcGF0Y2hlcy9nbGliYy1DVkUtMjAxOC0xMTIzNi5wYXRjaAkJXAogICAl RCUvcGFja2FnZXMvcGF0Y2hlcy9nbGliYy1DVkUtMjAxOC0xMTIzNy5wYXRjaAkJXAogICAl RCUvcGFja2FnZXMvcGF0Y2hlcy9nbGliYy1DVkUtMjAxOS03MzA5LnBhdGNoCQlcCmRpZmYg LS1naXQgYS9nbnUvcGFja2FnZXMvZ2xpYi5zY20gYi9nbnUvcGFja2FnZXMvZ2xpYi5zY20K aW5kZXggNWVmMGE0ZTUxNS4uZGYzNTVkNTBiNyAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2Vz L2dsaWIuc2NtCisrKyBiL2dudS9wYWNrYWdlcy9nbGliLnNjbQpAQCAtMzksNiArMzksNyBA QAogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBjb21wcmVzc2lvbikKICAgIzp1c2Ut bW9kdWxlIChnbnUgcGFja2FnZXMgZG9jYm9vaykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFj a2FnZXMgZG9jdW1lbnRhdGlvbikKKyAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZWxm KQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBlbmxpZ2h0ZW5tZW50KQogICAjOnVz ZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBmaWxlKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNr YWdlcyBmbGV4KQpAQCAtMTgwLDcgKzE4MSw3IEBAIHNoYXJlZCBORlMgaG9tZSBkaXJlY3Rv cmllcy4iKQogKGRlZmluZSBnbGliCiAgIChwYWNrYWdlCiAgICAgKG5hbWUgImdsaWIiKQot ICAgICh2ZXJzaW9uICIyLjYyLjYiKQorICAgICh2ZXJzaW9uICIyLjY0LjMiKQogICAgIChw cm9wZXJ0aWVzICcoKGhpZGRlbj8gLiAjdCkpKQogICAgIChyZXBsYWNlbWVudCBnbGliLXdp dGgtZ2lvLXBhdGNoKQogICAgIChzb3VyY2UKQEAgLTE5MSw5ICsxOTIsOSBAQCBzaGFyZWQg TkZTIGhvbWUgZGlyZWN0b3JpZXMuIikKICAgICAgICAgICAgICAgICAgICAgICAgbmFtZSAi LyIgKHN0cmluZy10YWtlIHZlcnNpb24gNCkgIi8iCiAgICAgICAgICAgICAgICAgICAgICAg IG5hbWUgIi0iIHZlcnNpb24gIi50YXIueHoiKSkKICAgICAgICAoc2hhMjU2Ci0gICAgICAg IChiYXNlMzIgIjE3NGJzbWJtY3ZhdzY5ZmY5ZzYwcTVzeDBmbjIzcmtocWN3cXoxN2g1czdz cHJwczRrcWgiKSkKKyAgICAgICAgKGJhc2UzMiAiMDhwYmdpdjVtM3JpY2E0eWR2d3ZwcTVt cnhieXN3eDdsMWp6amMyY2g1MnhqYWJ2cjc3eSIpKQogICAgICAgIChwYXRjaGVzCi0gICAg ICAgIChzZWFyY2gtcGF0Y2hlcyAiZ2xpYi10ZXN0cy10aW1lci5wYXRjaCIpKQorICAgICAg ICAoc2VhcmNoLXBhdGNoZXMgImdsaWItZGlzYWJsZS1mYWlsaW5nLXRlc3RzLnBhdGNoIikp CiAgICAgICAgKG1vZHVsZXMgJygoZ3VpeCBidWlsZCB1dGlscykpKQogICAgICAgIChzbmlw cGV0CiAgICAgICAgICcoYmVnaW4KQEAgLTIwMSwzMCArMjAyLDI3IEBAIHNoYXJlZCBORlMg aG9tZSBkaXJlY3Rvcmllcy4iKQogICAgICAgICAgICAgICgoIi9iaW4vc2giKSAic2giKSkK ICAgICAgICAgICAgI3QpKSkpCiAgICAgKGJ1aWxkLXN5c3RlbSBtZXNvbi1idWlsZC1zeXN0 ZW0pCi0gICAgKG91dHB1dHMgJygib3V0IiAgOyBldmVyeXRoaW5nCisgICAgKG91dHB1dHMg Jygib3V0IiAgIDsgZXZlcnl0aGluZwogICAgICAgICAgICAgICAgImJpbiIpKSA7IGdsaWIt bWtlbnVtcywgZ3Rlc3RlciwgZXRjLjsgZGVwZW5kcyBvbiBQeXRob24KICAgICAoYXJndW1l bnRzCiAgICAgIGAoIzpkaXNhbGxvd2VkLXJlZmVyZW5jZXMgKCx0emRhdGEtZm9yLXRlc3Rz KQogICAgICAgICM6cGhhc2VzCiAgICAgICAgKG1vZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBo YXNlcwotICAgICAgICAgKGFkZC1hZnRlciAndW5wYWNrICdwYXRjaC1kYnVzLWxhdW5jaC1w YXRoCisgICAgICAgICA7OyBQeXRob24gcmVmZXJlbmNlcyBhcmUgbm90IGJlaW5nIHBhdGNo ZWQgaW4gcGF0Y2gtcGhhc2Ugb2YgYnVpbGQsCisgICAgICAgICA7OyBkZXNwaXRlIHVzaW5n IHB5dGhvbi13cmFwcGVyIGFzIGlucHV0LiBTbyB3ZSBwYXRjaCB0aGVtIG1hbnVhbGx5Lgor ICAgICAgICAgKGFkZC1hZnRlciAndW5wYWNrICdwYXRjaC1weXRob24tcmVmZXJlbmNlcwog ICAgICAgICAgICAobGFtYmRhKiAoIzprZXkgaW5wdXRzICM6YWxsb3ctb3RoZXIta2V5cykK LSAgICAgICAgICAgICAobGV0ICgoZGJ1cyAoYXNzb2MtcmVmIGlucHV0cyAiZGJ1cyIpKSkK LSAgICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAiZ2lvL2dkYnVzYWRkcmVzcy5jIgotICAg ICAgICAgICAgICAgICAoKCJjb21tYW5kX2xpbmUgPSBnX3N0cmR1cF9wcmludGYgXFwoXCJk YnVzLWxhdW5jaCIpCi0gICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAiY29tbWFu ZF9saW5lID0gZ19zdHJkdXBfcHJpbnRmIChcIiIKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGRidXMgIi9iaW4vZGJ1cy1sYXVuY2giKSkpCi0gICAgICAgICAgICAgICAj dCkpKQotICAgICAgICAgKGFkZC1hZnRlciAndW5wYWNrICdwYXRjaC1naW8tbGF1bmNoLWRl c2t0b3AKLSAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IG91dHB1dHMgIzphbGxvdy1vdGhl ci1rZXlzKQotICAgICAgICAgICAgIChsZXQgKChvdXQgKGFzc29jLXJlZiBvdXRwdXRzICJv dXQiKSkpCi0gICAgICAgICAgICAgICA7OyBTZWUgYWxzbyA8aHR0cHM6Ly9naXRsYWIuZ25v bWUub3JnL0dOT01FL2dsaWIvaXNzdWVzLzE2MzM+Ci0gICAgICAgICAgICAgICA7OyBmb3Ig YW5vdGhlciBmdXR1cmUgZml4LgotICAgICAgICAgICAgICAgKHN1YnN0aXR1dGUqICJnaW8v Z2Rlc2t0b3BhcHBpbmZvLmMiCi0gICAgICAgICAgICAgICAgICgoImdpby1sYXVuY2gtZGVz a3RvcCIpCi0gICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCBvdXQgIi9saWJleGVj L2dpby1sYXVuY2gtZGVza3RvcCIpKSkKLSAgICAgICAgICAgICAgICN0KSkpCi0gICAgICAg ICAoYWRkLWJlZm9yZSAnYnVpbGQgJ3ByZS1idWlsZAorICAgICAgICAgICAgIChzdWJzdGl0 dXRlKiAnKCJnaW8vZ2RidXMtMi4wL2NvZGVnZW4vZ2RidXMtY29kZWdlbi5pbiIKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiZ2xpYi9ndGVzdGVyLXJlcG9ydC5pbiIKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiZ29iamVjdC9nbGliLWdlbm1hcnNoYWwuaW4iCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgImdvYmplY3QvZ2xpYi1ta2VudW1zLmluIikK KyAgICAgICAgICAgICAgICgoIkBQWVRIT05AIikKKyAgICAgICAgICAgICAgICAoc3RyaW5n LWFwcGVuZCAoYXNzb2MtcmVmIGlucHV0cyAicHl0aG9uIikKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAiL2Jpbi9weXRob24iCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgLCh2ZXJzaW9uLW1ham9yK21pbm9yCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAocGFja2FnZS12ZXJzaW9uIHB5dGhvbikpKSkpCisgICAgICAgICAgICAgI3Qp KQorICAgICAgICAgKGFkZC1iZWZvcmUgJ2NoZWNrICdwcmUtY2hlY2sKICAgICAgICAgICAg KGxhbWJkYSogKCM6a2V5IGlucHV0cyBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKICAg ICAgICAgICAgICA7OyBGb3IgdGVzdHMvZ2RhdGV0aW1lLmMuCiAgICAgICAgICAgICAgKHNl dGVudiAiVFpESVIiCkBAIC0yMzQsMTI0ICsyMzIsNDYgQEAgc2hhcmVkIE5GUyBob21lIGRp cmVjdG9yaWVzLiIpCiAgICAgICAgICAgICAgKHNldGVudiAiSE9NRSIgKGdldGN3ZCkpCiAg ICAgICAgICAgICAgKHNldGVudiAiWERHX0NBQ0hFX0hPTUUiIChnZXRjd2QpKQogICAgICAg ICAgICAgICN0KSkKLSAgICAgICAgIChhZGQtYWZ0ZXIgJ3VucGFjayAnZGlzYWJsZS1mYWls aW5nLXRlc3RzCi0gICAgICAgICAgIChsYW1iZGEgXwotICAgICAgICAgICAgIChsZXQgKChk aXNhYmxlCi0gICAgICAgICAgICAgICAgICAgIChsYW1iZGEgKHRlc3QtZmlsZSB0ZXN0LXBh dGhzKQotICAgICAgICAgICAgICAgICAgICAgIChkZWZpbmUgcGF0dGVybitwcm9jcwotICAg ICAgICAgICAgICAgICAgICAgICAgKG1hcCAobGFtYmRhICh0ZXN0LXBhdGgpCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKGNvbnMKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgOzsgWFhYOiBvbmx5IHdvcmtzIGZvciBzaW5nbGUgbGluZSBzdGF0ZW1lbnRz LgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoZm9ybWF0ICNmICJnX3Rlc3Rf YWRkX2Z1bmMuKlwifmFcIi4qIiB0ZXN0LXBhdGgpCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIChjb25zdCAiIikpKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0 ZXN0LXBhdGhzKSkKLSAgICAgICAgICAgICAgICAgICAgICAoc3Vic3RpdHV0ZSB0ZXN0LWZp bGUgcGF0dGVybitwcm9jcykpKQotICAgICAgICAgICAgICAgICAgIChmYWlsaW5nLXRlc3Rz Ci0gICAgICAgICAgICAgICAgICAgICcoKCJnbGliL3Rlc3RzL3RocmVhZC5jIgotICAgICAg ICAgICAgICAgICAgICAgICAoIDs7IHBybGltaXQoMikgcmV0dXJucyBFTk9TWVMgb24gTGlu dXggMi42LjMyLTUteGVuLWFtZDY0Ci0gICAgICAgICAgICAgICAgICAgICAgICA7OyBhcyBm b3VuZCBvbiBoeWRyYS5nbnUub3JnLCBhbmQgc3RyYWNlKDEpIGRvZXNuJ3QKLSAgICAgICAg ICAgICAgICAgICAgICAgIDs7IHJlY29nbml6ZSBpdC4KLSAgICAgICAgICAgICAgICAgICAg ICAgICIvdGhyZWFkL3RocmVhZDQiKSkKLSAgICAgICAgICAgICAgICAgICAgICA7OyBUaGlz IHRyaWVzIHRvIGZpbmQgcHJvZ3JhbXMgaW4gRkhTIGRpcmVjdG9yaWVzLgotICAgICAgICAg ICAgICAgICAgICAgICgiZ2xpYi90ZXN0cy91dGlscy5jIgotICAgICAgICAgICAgICAgICAg ICAgICAoIi91dGlscy9maW5kLXByb2dyYW0iKSkKLSAgICAgICAgICAgICAgICAgICAgICA7 OyBUaGlzIGZhaWxzIGJlY2F1c2UgImdsaWIvdGVzdHMvZWNoby1zY3JpcHQiIGNhbm5vdCBi ZQotICAgICAgICAgICAgICAgICAgICAgIDs7IGZvdW5kLgotICAgICAgICAgICAgICAgICAg ICAgICgiZ2xpYi90ZXN0cy9zcGF3bi1zaW5nbGV0aHJlYWQuYyIKLSAgICAgICAgICAgICAg ICAgICAgICAgKCIvZ3RocmVhZC9zcGF3bi1zY3JpcHQiKSkKLSAgICAgICAgICAgICAgICAg ICAgICAoImdsaWIvdGVzdHMvdGltZXIuYyIKLSAgICAgICAgICAgICAgICAgICAgICAgKCA7 OyBmYWlscyBpZiBjb21waWxlciBvcHRpbWl6YXRpb25zIGFyZSBlbmFibGVkLCB3aGljaCB0 aGV5Ci0gICAgICAgICAgICAgICAgICAgICAgICA7OyBhcmUgYnkgZGVmYXVsdC4KLSAgICAg ICAgICAgICAgICAgICAgICAgICIvdGltZXIvc3RvcCIpKQotICAgICAgICAgICAgICAgICAg ICAgICgiZ2lvL3Rlc3RzL2dhcHBsaWNhdGlvbi5jIgotICAgICAgICAgICAgICAgICAgICAg ICAoIDs7IFhYWDogcHJvdmVuIHRvIGJlIHVucmVsaWFibGUuICBTZWU6Ci0gICAgICAgICAg ICAgICAgICAgICAgICA7OyAgPGh0dHBzOi8vYnVncy5kZWJpYW4ub3JnLzc1NjI3Mz4KLSAg ICAgICAgICAgICAgICAgICAgICAgIDs7ICA8aHR0cDovL2J1Z3MuZ251Lm9yZy8xODQ0NT4K LSAgICAgICAgICAgICAgICAgICAgICAgICIvZ2FwcGxpY2F0aW9uL3F1aXQiCi0gICAgICAg ICAgICAgICAgICAgICAgICA7OyBYWFg6IGZhaWxzIHJhbmRvbWx5IGZvciB1bmtub3duIHJl YXNvbi4gU2VlOgotICAgICAgICAgICAgICAgICAgICAgICAgOzsgIDxodHRwczovL2xpc3Rz LmdudS5vcmcvYXJjaGl2ZS9odG1sL2d1aXgtZGV2ZWwvMjAxNi0wNC9tc2cwMDIxNS5odG1s PgotICAgICAgICAgICAgICAgICAgICAgICAgIi9nYXBwbGljYXRpb24vbG9jYWwtYWN0aW9u cyIpKQotICAgICAgICAgICAgICAgICAgICAgICgiZ2lvL3Rlc3RzL2NvbnRlbnR0eXBlLmMi Ci0gICAgICAgICAgICAgICAgICAgICAgICggOzsgWFhYOiByZXF1aXJlcyBzaGFyZWQtbWlt ZS1pbmZvLgotICAgICAgICAgICAgICAgICAgICAgICAgIi9jb250ZW50dHlwZS9ndWVzcyIK LSAgICAgICAgICAgICAgICAgICAgICAgICIvY29udGVudHR5cGUvZ3Vlc3Nfc3ZnX2Zyb21f ZGF0YSIKLSAgICAgICAgICAgICAgICAgICAgICAgICIvY29udGVudHR5cGUvc3VidHlwZSIK LSAgICAgICAgICAgICAgICAgICAgICAgICIvY29udGVudHR5cGUvbGlzdCIKLSAgICAgICAg ICAgICAgICAgICAgICAgICIvY29udGVudHR5cGUvaWNvbiIKLSAgICAgICAgICAgICAgICAg ICAgICAgICIvY29udGVudHR5cGUvc3ltYm9saWMtaWNvbiIKLSAgICAgICAgICAgICAgICAg ICAgICAgICIvY29udGVudHR5cGUvdHJlZSIpKQotICAgICAgICAgICAgICAgICAgICAgICgi Z2lvL3Rlc3RzL2FwcGluZm8uYyIKLSAgICAgICAgICAgICAgICAgICAgICAgKCA7OyBYWFg6 IHJlcXVpcmVzIHVwZGF0ZS1kZXNrdG9wLWRhdGFiYXNlLgotICAgICAgICAgICAgICAgICAg ICAgICAgIi9hcHBpbmZvL2Fzc29jaWF0aW9ucyIpKQotICAgICAgICAgICAgICAgICAgICAg ICgiZ2lvL3Rlc3RzL2Rlc2t0b3AtYXBwLWluZm8uYyIKLSAgICAgICAgICAgICAgICAgICAg ICAgKCA7OyBYWFg6IHJlcXVpcmVzIHVwZGF0ZS1kZXNrdG9wLWRhdGFiYXNlLgotICAgICAg ICAgICAgICAgICAgICAgICAgIi9kZXNrdG9wLWFwcC1pbmZvL2RlbGV0ZSIKLSAgICAgICAg ICAgICAgICAgICAgICAgICIvZGVza3RvcC1hcHAtaW5mby9kZWZhdWx0IgotICAgICAgICAg ICAgICAgICAgICAgICAgIi9kZXNrdG9wLWFwcC1pbmZvL2ZhbGxiYWNrIgotICAgICAgICAg ICAgICAgICAgICAgICAgIi9kZXNrdG9wLWFwcC1pbmZvL2xhc3R1c2VkIgotICAgICAgICAg ICAgICAgICAgICAgICAgIi9kZXNrdG9wLWFwcC1pbmZvL3NlYXJjaCIpKQotICAgICAgICAg ICAgICAgICAgICAgICgiZ2lvL3Rlc3RzL2dkYnVzLXBlZXIuYyIKLSAgICAgICAgICAgICAg ICAgICAgICAgKCA7OyBSZXF1aXJlcyAvZXRjL21hY2hpbmUtaWQuCi0gICAgICAgICAgICAg ICAgICAgICAgICAiL2dkYnVzL2NvZGVnZW4tcGVlci10by1wZWVyIikpCi0gICAgICAgICAg ICAgICAgICAgICAgKCJnaW8vdGVzdHMvZ2RidXMtYWRkcmVzcy1nZXQtc2Vzc2lvbi5jIgot ICAgICAgICAgICAgICAgICAgICAgICAoIDs7IFJlcXVpcmVzIC9ldGMvbWFjaGluZS1pZC4K LSAgICAgICAgICAgICAgICAgICAgICAgICIvZ2RidXMveDExLWF1dG9sYXVuY2giKSkKLSAg ICAgICAgICAgICAgICAgICAgICAoImdpby90ZXN0cy9nc29ja2V0Y2xpZW50LXNsb3cuYyIK LSAgICAgICAgICAgICAgICAgICAgICAgKCA7OyBUaGVzZSB0ZXN0cyB0cmllcyB0byByZXNv bHZlICJsb2NhbGhvc3QiLCBhbmQgZmFpbHMuCi0gICAgICAgICAgICAgICAgICAgICAgICAi L3NvY2tldC1jbGllbnQvaGFwcHktZXllYmFsbHMvc2xvdyIKLSAgICAgICAgICAgICAgICAg ICAgICAgICIvc29ja2V0LWNsaWVudC9oYXBweS1leWViYWxscy9jYW5jZWxsYXRpb24vZGVs YXllZCIpKSkpKQotICAgICAgICAgICAgICAgKGZvci1lYWNoIChsYW1iZGEgKHgpIChhcHBs eSBkaXNhYmxlIHgpKSBmYWlsaW5nLXRlc3RzKQotICAgICAgICAgICAgICAgI3QpKSkKLSAg ICAgICAgIChyZXBsYWNlICdjaGVjawotICAgICAgICAgICAobGFtYmRhIF8KLSAgICAgICAg ICAgICAoc2V0ZW52ICJNRVNPTl9URVNUVEhSRUFEUyIKLSAgICAgICAgICAgICAgICAgICAg IChudW1iZXItPnN0cmluZyAocGFyYWxsZWwtam9iLWNvdW50KSkpCi0gICAgICAgICAgICAg OzsgRG8gbm90IHJ1biB0ZXN0cyBtYXJrZWQgYXMgImZsYWt5Ii4KLSAgICAgICAgICAgICAo aW52b2tlICJtZXNvbiIgInRlc3QiICItLW5vLXN1aXRlIiAiZmxha3kiKSkpCi0gICAgICAg ICA7OyBUT0RPOiBtZXNvbiBkb2VzIG5vdCBwZXJtaXQgdGhlIGJpbmRpciB0byBiZSBvdXRz aWRlIG9mIHByZWZpeC4KLSAgICAgICAgIDs7IFNlZSBodHRwczovL2dpdGh1Yi5jb20vbWVz b25idWlsZC9tZXNvbi9pc3N1ZXMvMjU2MQotICAgICAgICAgOzsgV2UgY2FuIHJlbW92ZSB0 aGlzIG9uY2UgbWVzb24gaXMgcGF0Y2hlZC4KLSAgICAgICAgIChhZGQtYWZ0ZXIgJ2luc3Rh bGwgJ21vdmUtZXhlY3V0YWJsZXMKKyAgICAgICAgIDs7IE1lc29uIGRvZXMgbm90IHBlcm1p dCB0aGUgYmluZGlyIHRvIGJlIG91dHNpZGUgb2YgcHJlZml4LgorICAgICAgICAgKGFkZC1h ZnRlciAnaW5zdGFsbCAnbW92ZS1iaW4KICAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IG91 dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQotICAgICAgICAgICAgIChsZXQgKChvdXQgKGFz c29jLXJlZiBvdXRwdXRzICJvdXQiKSkKLSAgICAgICAgICAgICAgICAgICAoYmluIChhc3Nv Yy1yZWYgb3V0cHV0cyAiYmluIikpKQorICAgICAgICAgICAgIChsZXQqICgob3V0IChhc3Nv Yy1yZWYgb3V0cHV0cyAib3V0IikpCisgICAgICAgICAgICAgICAgICAgIChiaW4gKGFzc29j LXJlZiBvdXRwdXRzICJiaW4iKSkpCiAgICAgICAgICAgICAgICAobWtkaXItcCBiaW4pCi0g ICAgICAgICAgICAgICAocmVuYW1lLWZpbGUgKHN0cmluZy1hcHBlbmQgb3V0ICIvYmluIikK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCBiaW4gIi9iaW4i KSkKLSAgICAgICAgICAgICAgIDs7IFRoaXMgb25lIGlzIGFuIGltcGxlbWVudGF0aW9uIGRl dGFpbCBvZiBnbGliLgotICAgICAgICAgICAgICAgOzsgSXQgaXMgd3JvbmcgdGhhdCB0aGF0 J3MgaW4gIi9iaW4iIGluIHRoZSBmaXJzdCBwbGFjZSwKLSAgICAgICAgICAgICAgIDs7IGJ1 dCB0aGF0J3Mgd2hhdCB1cHN0cmVhbSBpcyBkb2luZyByaWdodCBub3cuCi0gICAgICAgICAg ICAgICA7OyBTZWUgPGh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbGliL2lzc3Vl cy8xNjMzPi4KLSAgICAgICAgICAgICAgIChta2RpciAoc3RyaW5nLWFwcGVuZCBvdXQgIi9s aWJleGVjIikpCi0gICAgICAgICAgICAgICAocmVuYW1lLWZpbGUgKHN0cmluZy1hcHBlbmQg YmluICIvYmluL2dpby1sYXVuY2gtZGVza3RvcCIpCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgKHN0cmluZy1hcHBlbmQgb3V0ICIvbGliZXhlYy9naW8tbGF1bmNoLWRlc2t0b3Ai KSkKKyAgICAgICAgICAgICAgIChyZW5hbWUtZmlsZQorICAgICAgICAgICAgICAgIChzdHJp bmctYXBwZW5kIG91dCAiL2JpbiIpCisgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQg YmluICIvYmluIikpCiAgICAgICAgICAgICAgICA7OyBEbyBub3QgcmVmZXIgdG8gImJpbmRp ciIsIHdoaWNoIHBvaW50cyB0byAiJHtwcmVmaXh9L2JpbiIuCiAgICAgICAgICAgICAgICA7 OyBXZSBkb24ndCBwYXRjaCAiYmluZGlyIiB0byBwb2ludCB0byAiJGJpbi9iaW4iLCBiZWNh dXNlIHRoYXQKICAgICAgICAgICAgICAgIDs7IHdvdWxkIGNyZWF0ZSBhIHJlZmVyZW5jZSBj eWNsZSBiZXR3ZWVuIHRoZSAib3V0IiBhbmQgImJpbiIKICAgICAgICAgICAgICAgIDs7IG91 dHB1dHMuCi0gICAgICAgICAgICAgICAoc3Vic3RpdHV0ZSogKGxpc3QgKHN0cmluZy1hcHBl bmQgb3V0ICIvbGliL3BrZ2NvbmZpZy9naW8tMi4wLnBjIikKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCBvdXQgIi9saWIvcGtnY29uZmlnL2ds aWItMi4wLnBjIikpCisgICAgICAgICAgICAgICAoc3Vic3RpdHV0ZSoKKyAgICAgICAgICAg ICAgICAgICAobGlzdAorICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCBvdXQg Ii9saWIvcGtnY29uZmlnL2dpby0yLjAucGMiKQorICAgICAgICAgICAgICAgICAgICAoc3Ry aW5nLWFwcGVuZCBvdXQgIi9saWIvcGtnY29uZmlnL2dsaWItMi4wLnBjIikpCiAgICAgICAg ICAgICAgICAgICgoImJpbmRpcj1cXCRcXHtwcmVmaXhcXH0vYmluIikgIiIpCiAgICAgICAg ICAgICAgICAgICgoIj1cXCRcXHtiaW5kaXJcXH0vIikgIj0iKSkKICAgICAgICAgICAgICAg ICN0KSkpKSkpCi0gICAgOzsgVE9ETzogc2VlIGFib3ZlIGZvciBleHBsYW5hdGlvbi4KLSAg ICA7OyAjOmNvbmZpZ3VyZS1mbGFncyAobGlzdCAoc3RyaW5nLWFwcGVuZCAiLS1iaW5kaXI9 IgotICAgIDs7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChhc3Nv Yy1yZWYgJW91dHB1dHMgImJpbiIpCi0gICAgOzsgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIi9iaW4iKSkKICAgICAobmF0aXZlLWlucHV0cwotICAgICBgKCgi ZGJ1cyIgLGRidXMpICAgICAgICAgICAgICAgICAgIDsgZm9yIEdEQnVzIHRlc3RzCi0gICAg ICAgKCJnZXR0ZXh0IiAsZ2V0dGV4dC1taW5pbWFsKQotICAgICAgICgibTQiICxtNCkgICAg ICAgICAgICAgICAgICAgICAgIDsgZm9yIGluc3RhbGxpbmcgbTQgbWFjcm9zCi0gICAgICAg KCJwZXJsIiAscGVybCkgICAgICAgICAgICAgICAgICAgOyBuZWVkZWQgYnkgR0lPIHRlc3Rz CisgICAgIGAoKCJnZXR0ZXh0IiAsZ2V0dGV4dC1taW5pbWFsKQorICAgICAgICgibGliaW50 bCIgLGludGx0b29sKQorICAgICAgICgibTQiICxtNCkKKyAgICAgICAoInBlcmwiICxwZXJs KQogICAgICAgICgicGtnLWNvbmZpZyIgLHBrZy1jb25maWcpCi0gICAgICAgKCJweXRob24i ICxweXRob24td3JhcHBlcikKLSAgICAgICAoInR6ZGF0YSIgLHR6ZGF0YS1mb3ItdGVzdHMp KSkgICA7IGZvciB0ZXN0cy9nZGF0ZXRpbWUuYworICAgICAgICgicHl0aG9uLXdyYXBwZXIi ICxweXRob24td3JhcHBlcikKKyAgICAgICAoInB5dGhvbiIgLHB5dGhvbikgICAgICAgICAg ICAgICA7IEZvciAncGF0Y2gtcHl0aG9uLXJlZmVyZW5jZXMKKyAgICAgICAoInR6ZGF0YSIg LHR6ZGF0YS1mb3ItdGVzdHMpCisgICAgICAgKCJ4bWxsaW50IiAsbGlieG1sMikKKyAgICAg ICAoInhzbHRwcm9jIiAsbGlieHNsdCkpKQorICAgIChpbnB1dHMKKyAgICAgYCgoImRidXMi ICxkYnVzKQorICAgICAgICgibGliZWxmIiAsbGliZWxmKSkpCiAgICAgKHByb3BhZ2F0ZWQt aW5wdXRzCi0gICAgIGAoKCJsaWJmZmkiICxsaWJmZmkpIDsgaW4gdGhlIFJlcXVpcmVzLnBy aXZhdGUgZmllbGQgb2YgZ29iamVjdC0yLjAucGMKLSAgICAgICAoImxpYnNlbGludXgiICxs aWJzZWxpbnV4KSA7IGluIHRoZSBSZXF1aXJlcy5wcml2YXRlIGZpZWxkIG9mIGdpby0yLjAu cGMKLSAgICAgICAoInBjcmUiICxwY3JlKSAgIDsgaW4gdGhlIFJlcXVpcmVzLnByaXZhdGUg ZmllbGQgb2YgZ2xpYi0yLjAucGMKLSAgICAgICAoInV0aWwtbGludXgiICx1dGlsLWxpbnV4 ICJsaWIiKSA7Zm9yIGxpYm1vdW50Ci0gICAgICAgKCJ6bGliIiAsemxpYikpKSA7IGluIHRo ZSBSZXF1aXJlcy5wcml2YXRlIGZpZWxkIG9mIGdsaWItMi4wLnBjCisgICAgIGAoKCJsaWJm ZmkiICxsaWJmZmkpCisgICAgICAgKCJsaWJzZWxpbnV4IiAsbGlic2VsaW51eCkKKyAgICAg ICAoInBjcmUiICxwY3JlKQorICAgICAgICgidXRpbC1saW51eCIgLHV0aWwtbGludXggImxp YiIpCisgICAgICAgKCJ6bGliIiAsemxpYikpKQogICAgIChuYXRpdmUtc2VhcmNoLXBhdGhz CiAgICAgIDs7IFRoaXMgdmFyaWFibGUgaXMgbm90IHJlYWxseSAib3duZWQiIGJ5IEdMaWIs IGJ1dCBzZXZlcmFsIHJlbGF0ZWQKICAgICAgOzsgcGFja2FnZXMgcmVmZXIgdG8gaXQ6IGdv YmplY3QtaW50cm9zcGVjdGlvbidzIHRvb2xzIHVzZSBpdCBhcyBhIHNlYXJjaApkaWZmIC0t Z2l0IGEvZ251L3BhY2thZ2VzL3BhdGNoZXMvZ2xpYi1kaXNhYmxlLWZhaWxpbmctdGVzdHMu cGF0Y2ggYi9nbnUvcGFja2FnZXMvcGF0Y2hlcy9nbGliLWRpc2FibGUtZmFpbGluZy10ZXN0 cy5wYXRjaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwLi4zNjAxYzQy MDMwCi0tLSAvZGV2L251bGwKKysrIGIvZ251L3BhY2thZ2VzL3BhdGNoZXMvZ2xpYi1kaXNh YmxlLWZhaWxpbmctdGVzdHMucGF0Y2gKQEAgLTAsMCArMSw4NCBAQAorRnJvbSBhMmU2Nzgz ZjIyNzhlZDMyYjFlNTUyNjkxZWM1ZDY3ZDY5NDA3NTdlIE1vbiBTZXAgMTcgMDA6MDA6MDAg MjAwMQorRnJvbTogUmFnaGF2IEd1cnVyYWphbiA8cmFnaGF2Z3VydXJhamFuQGRpc3Jvb3Qu b3JnPgorRGF0ZTogVHVlLCA5IEp1biAyMDIwIDA1OjE3OjUzIC0wNDAwCitTdWJqZWN0OiBb UEFUQ0hdIFBBVENIOiBEaXNhYmxlIGZhaWxpbmcgdGVzdHMuCisKKy0tLQorIGdpby90ZXN0 cy9tZXNvbi5idWlsZCAgfCAxOSAtLS0tLS0tLS0tLS0tLS0tLS0tCisgZ2xpYi90ZXN0cy9t ZXNvbi5idWlsZCB8ICAyIC0tCisgMiBmaWxlcyBjaGFuZ2VkLCAyMSBkZWxldGlvbnMoLSkK KworZGlmZiAtLWdpdCBhL2dpby90ZXN0cy9tZXNvbi5idWlsZCBiL2dpby90ZXN0cy9tZXNv bi5idWlsZAoraW5kZXggYzdjM2UzMDM1Li42ZTM4ZWIzOWUgMTAwNjQ0CistLS0gYS9naW8v dGVzdHMvbWVzb24uYnVpbGQKKysrKyBiL2dpby90ZXN0cy9tZXNvbi5idWlsZAorQEAgLTM0 LDcgKzM0LDYgQEAgZ2lvX3Rlc3RzID0geworICAgJ2J1ZmZlcmVkLW91dHB1dC1zdHJlYW0n IDoge30sCisgICAnY2FuY2VsbGFibGUnIDoge30sCisgICAnY29udGV4dHMnIDoge30sCist ICAnY29udGVudHR5cGUnIDoge30sCisgICAnY29udmVydGVyLXN0cmVhbScgOiB7fSwKKyAg ICdjcmVkZW50aWFscycgOiB7fSwKKyAgICdkYXRhLWlucHV0LXN0cmVhbScgOiB7fSwKK0BA IC03OCw3ICs3Nyw2IEBAIGdpb190ZXN0cyA9IHsKKyAgICd0bHMtY2VydGlmaWNhdGUnIDog eydleHRyYV9zb3VyY2VzJyA6IFsnZ3Rlc3R0bHNiYWNrZW5kLmMnXX0sCisgICAndGxzLWlu dGVyYWN0aW9uJyA6IHsnZXh0cmFfc291cmNlcycgOiBbJ2d0ZXN0dGxzYmFja2VuZC5jJ119 LAorICAgJ3Rscy1kYXRhYmFzZScgOiB7J2V4dHJhX3NvdXJjZXMnIDogWydndGVzdHRsc2Jh Y2tlbmQuYyddfSwKKy0gICdnZGJ1cy1hZGRyZXNzLWdldC1zZXNzaW9uJyA6IHt9LAorICAg J3dpbjMyLWFwcGluZm8nIDoge30sCisgfQorIAorQEAgLTEzNSwxMCArMTMzLDYgQEAgZW5k aWYKKyBpZiBob3N0X21hY2hpbmUuc3lzdGVtKCkgIT0gJ3dpbmRvd3MnCisgICBnaW9fdGVz dHMgKz0geworICAgICAnZmlsZScgOiB7fSwKKy0gICAgJ2dkYnVzLXBlZXInIDogeworLSAg ICAgICdkZXBlbmRlbmNpZXMnIDogW2xpYmdkYnVzX2V4YW1wbGVfb2JqZWN0bWFuYWdlcl9k ZXBdLAorLSAgICAgICdpbnN0YWxsX3JwYXRoJyA6IGluc3RhbGxlZF90ZXN0c19leGVjZGly CistICAgIH0sCisgICAgICdnZGJ1cy1wZWVyLW9iamVjdC1tYW5hZ2VyJyA6IHt9LAorICAg ICAnbGl2ZS1nLWZpbGUnIDoge30sCisgICAgICdzb2NrZXQtYWRkcmVzcycgOiB7fSwKK0BA IC0xNzMsMTkgKzE2Nyw2IEBAIGlmIGhvc3RfbWFjaGluZS5zeXN0ZW0oKSAhPSAnd2luZG93 cycKKyAgICAgfQorICAgZW5kaWYKKyAKKy0gICMgVW5pbnN0YWxsZWQgYmVjYXVzZSBvZiB0 aGUgY2hlY2stZm9yLWV4ZWN1dGFibGUgbG9naWMgaW4gRGVza3RvcEFwcEluZm8KKy0gICMg dW5hYmxlIHRvIGZpbmQgdGhlIGluc3RhbGxlZCBleGVjdXRhYmxlCistICBpZiBub3QgZ2xp Yl9oYXZlX2NvY29hCistICAgIGdpb190ZXN0cyArPSB7CistICAgICAgJ2FwcGluZm8nIDog eworLSAgICAgICAgJ2luc3RhbGwnIDogZmFsc2UsCistICAgICAgfSwKKy0gICAgICAnZGVz a3RvcC1hcHAtaW5mbycgOiB7CistICAgICAgICAnaW5zdGFsbCcgOiBmYWxzZSwKKy0gICAg ICB9LAorLSAgICB9CistICBlbmRpZgorLQorICAgdGVzdF9leHRyYV9wcm9ncmFtcyArPSB7 CisgICAgICdiYXNpYy1hcHBsaWNhdGlvbicgOiB7fSwKKyAgICAgJ2RidXMtbGF1bmNoJyA6 IHt9LAorZGlmZiAtLWdpdCBhL2dsaWIvdGVzdHMvbWVzb24uYnVpbGQgYi9nbGliL3Rlc3Rz L21lc29uLmJ1aWxkCitpbmRleCA4ZGE0NzdkMTkuLjlmYTI0ZGQ0OSAxMDA2NDQKKy0tLSBh L2dsaWIvdGVzdHMvbWVzb24uYnVpbGQKKysrKyBiL2dsaWIvdGVzdHMvbWVzb24uYnVpbGQK K0BAIC0xMDMsNyArMTAzLDYgQEAgZ2xpYl90ZXN0cyA9IHsKKyAgICd1dGY4LXBvaW50ZXIn IDoge30sCisgICAndXRmOC12YWxpZGF0ZScgOiB7fSwKKyAgICd1dGY4LW1pc2MnIDoge30s CistICAndXRpbHMnIDoge30sCisgICAndW5pY29kZScgOiB7fSwKKyAgICd1cmknIDoge30s CisgICAnMWJpdC1tdXRleCcgOiB7fSwKK0BAIC0xNTEsNyArMTUwLDYgQEAgaWYgaG9zdF9t YWNoaW5lLnN5c3RlbSgpID09ICd3aW5kb3dzJworIGVsc2UKKyAgIGdsaWJfdGVzdHMgKz0g eworICAgICAnaW5jbHVkZScgOiB7fSwKKy0gICAgJ3VuaXgnIDoge30sCisgICB9CisgICBp ZiBoYXZlX3J0bGRfbmV4dAorICAgICBnbGliX3Rlc3RzICs9IHsKKy0tIAorMi4yNi4yCisK ZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9wYXRjaGVzL2dsaWItdGVzdHMtdGltZXIucGF0 Y2ggYi9nbnUvcGFja2FnZXMvcGF0Y2hlcy9nbGliLXRlc3RzLXRpbWVyLnBhdGNoCmRlbGV0 ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBlMzc0MjVjMGM4Li4wMDAwMDAwMDAwCi0tLSBh L2dudS9wYWNrYWdlcy9wYXRjaGVzL2dsaWItdGVzdHMtdGltZXIucGF0Y2gKKysrIC9kZXYv bnVsbApAQCAtMSwxNSArMCwwIEBACi0qIE9uIGk2ODYgZmxvYXRpbmctcG9pbnQgcm91bmRv ZmYgZXJyb3JzIGNvdWxkIHNvbWV0aW1lcyBjYXVzZSB0aGlzIGNoZWNrIHRvCi0gIGZhaWwg ZGVwZW5kaW5nIG9uIHRoZSBlbGFwc2VkIG1pY3Jvc2Vjb25kcy4gIEltcHJvdmUgcm91bmRp bmcgYnkgYWRkaW5nIGEKLSAgZnJhY3Rpb25hbCBiaXQuCi0KLS0tLSBnbGliLTIuNDAuMC9n bGliL3Rlc3RzL3RpbWVyLmMJMjAxNC0wMy0wNSAwODowNTo0Mi4wMDAwMDAwMDAgLTA2MDAK LSsrKyBnbGliLTIuNDAuMC9nbGliL3Rlc3RzL3RpbWVyLmMJMjAxNC0wNy0xMCAxNjozMzox Mi43NDY4NjI4MjIgLTA1MDAKLUBAIC0zNSw3ICszNSw3IEBACi0gICBlbGFwc2VkID0gZ190 aW1lcl9lbGFwc2VkICh0aW1lciwgJm1pY3Jvcyk7Ci0gCi0gICBnX2Fzc2VydF9jbXBmbG9h dCAoZWxhcHNlZCwgPCwgMS4wKTsKLS0gIGdfYXNzZXJ0X2NtcHVpbnQgKG1pY3JvcywgPT0s ICgoZ3VpbnQ2NCkoZWxhcHNlZCAqIDFlNikpICUgMTAwMDAwMCk7Ci0rICBnX2Fzc2VydF9j bXB1aW50IChtaWNyb3MsID09LCAoKGd1aW50NjQpKGVsYXBzZWQgKiAxZTYgKyAwLjUpKSAl IDEwMDAwMDApOwotIAotICAgZ190aW1lcl9kZXN0cm95ICh0aW1lcik7Ci0gfQotLSAKMi4y OS4yCgo= ----=_RainLoop_185_971689866.1607062124 Content-Type: application/octet-stream; name="0003-gnu-glib-Update-synopsis-description-and-home-page.patch" Content-Disposition: attachment; filename="0003-gnu-glib-Update-synopsis-description-and-home-page.patch" Content-Transfer-Encoding: base64 RnJvbSAwYjc2YTQ2ZWU2OGMwY2Q4MTY0NzBhZjQzNzBhZGM3MzRkMWEyMTg4IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFq YW5AZGlzcm9vdC5vcmc+CkRhdGU6IFRodSwgMyBEZWMgMjAyMCAyMzo0ODoyNSAtMDUwMApT dWJqZWN0OiBbUEFUQ0ggMDMvMTFdIGdudTogZ2xpYjogVXBkYXRlIHN5bm9wc2lzLCBkZXNj cmlwdGlvbiBhbmQgaG9tZS1wYWdlLgoKKiBnbnUvcGFja2FnZXMvZ2xpYi5zY20gKGdsaWIp IFtzeW5vcHNpc106IE1vZGlmeS4KW2Rlc2NyaXB0aW9uXTogTW9kaWZ5LgpbaG9tZS1wYWdl XTogTW9kaWZ5LgotLS0KIGdudS9wYWNrYWdlcy9nbGliLnNjbSB8IDQgKystLQogMSBmaWxl IGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9nbnUvcGFja2FnZXMvZ2xpYi5zY20gYi9nbnUvcGFja2FnZXMvZ2xpYi5zY20KaW5kZXgg ZGYzNTVkNTBiNy4uOWVjZjkxZWM4MSAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL2dsaWIu c2NtCisrKyBiL2dudS9wYWNrYWdlcy9nbGliLnNjbQpAQCAtMjg2LDExICsyODYsMTEgQEAg c2hhcmVkIE5GUyBob21lIGRpcmVjdG9yaWVzLiIpCiAgICAgICAgKHZhcmlhYmxlICJHSU9f RVhUUkFfTU9EVUxFUyIpCiAgICAgICAgKGZpbGVzICcoImxpYi9naW8vbW9kdWxlcyIpKSkp KQogICAgIChzZWFyY2gtcGF0aHMgbmF0aXZlLXNlYXJjaC1wYXRocykKLSAgICAoc3lub3Bz aXMgIlRocmVhZC1zYWZlIGdlbmVyYWwgdXRpbGl0eSBsaWJyYXJ5OyBiYXNpcyBvZiBHVEsr IGFuZCBHTk9NRSIpCisgICAgKHN5bm9wc2lzICJMb3ctbGV2ZWwgY29yZSBsaWJyYXJ5IGZv ciBHTk9NRSBwcm9qZWN0cyIpCiAgICAgKGRlc2NyaXB0aW9uICJHTGliIHByb3ZpZGVzIGRh dGEgc3RydWN0dXJlIGhhbmRsaW5nIGZvciBDLCBwb3J0YWJpbGl0eQogd3JhcHBlcnMsIGFu ZCBpbnRlcmZhY2VzIGZvciBzdWNoIHJ1bnRpbWUgZnVuY3Rpb25hbGl0eSBhcyBhbiBldmVu dCBsb29wLAogdGhyZWFkcywgZHluYW1pYyBsb2FkaW5nLCBhbmQgYW4gb2JqZWN0IHN5c3Rl bS4iKQotICAgIChob21lLXBhZ2UgImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9nbGli LyIpCisgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly93aWtpLmdub21lLm9yZy9Qcm9qZWN0cy9H TGliIikKICAgICAobGljZW5zZSBsaWNlbnNlOmxncGwyLjErKSkpCiAKIChkZWZpbmUgZ2xp Yi13aXRoLWdpby1wYXRjaAotLSAKMi4yOS4yCgo= ----=_RainLoop_185_971689866.1607062124 Content-Type: application/octet-stream; name="0004-gnu-glib-with-gio-patch-Make-some-cosmetic-changes.patch" Content-Disposition: attachment; filename="0004-gnu-glib-with-gio-patch-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: base64 RnJvbSBiMTEyOGRiN2I1ZjhiMGMxY2UxMzljOTg0MTY5ZmEyZWVjNzBhNzFlIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFq YW5AZGlzcm9vdC5vcmc+CkRhdGU6IFRodSwgMyBEZWMgMjAyMCAyMzo1Mjo1NCAtMDUwMApT dWJqZWN0OiBbUEFUQ0ggMDQvMTFdIGdudTogZ2xpYi13aXRoLWdpby1wYXRjaDogTWFrZSBz b21lIGNvc21ldGljIGNoYW5nZXMuCgoqIGdudS9wYWNrYWdlcy9nbGliLnNjbSAoZ2xpYi13 aXRoLWdpby1wYXRjaCk6IE1ha2Ugc29tZSBjb3NtZXRpYyBjaGFuZ2VzLgotLS0KIGdudS9w YWNrYWdlcy9nbGliLnNjbSB8IDEzICsrKysrKysrKy0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA5 IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2th Z2VzL2dsaWIuc2NtIGIvZ251L3BhY2thZ2VzL2dsaWIuc2NtCmluZGV4IDllY2Y5MWVjODEu LmI5ZThmZTk2ZjUgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9nbGliLnNjbQorKysgYi9n bnUvcGFja2FnZXMvZ2xpYi5zY20KQEAgLTI5OCwxMCArMjk4LDE1IEBAIHRocmVhZHMsIGR5 bmFtaWMgbG9hZGluZywgYW5kIGFuIG9iamVjdCBzeXN0ZW0uIikKICAgOzsgVE9ETzogRm9s ZCBpbnRvICdnbGliJyBhYm92ZSBpbiB0aGUgbmV4dCByZWJ1aWxkIGN5Y2xlLgogICAocGFj a2FnZQogICAgIChpbmhlcml0IGdsaWIpCi0gICAgKHNvdXJjZSAob3JpZ2luCi0gICAgICAg ICAgICAgIChpbmhlcml0IChwYWNrYWdlLXNvdXJjZSBnbGliKSkKLSAgICAgICAgICAgICAg KHBhdGNoZXMgKGNvbnMgKHNlYXJjaC1wYXRjaCAiZ2xpYi1hcHBpbmZvLXdhdGNoLnBhdGNo IikKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG9yaWdpbi1wYXRjaGVzIChwYWNr YWdlLXNvdXJjZSBnbGliKSkpKSkpKSkKKyAgICAoc291cmNlCisgICAgIChvcmlnaW4KKyAg ICAgICAoaW5oZXJpdAorICAgICAgICAocGFja2FnZS1zb3VyY2UgZ2xpYikpCisgICAgICAg KHBhdGNoZXMKKyAgICAgICAgKGNvbnMKKyAgICAgICAgIChzZWFyY2gtcGF0Y2ggImdsaWIt YXBwaW5mby13YXRjaC5wYXRjaCIpCisgICAgICAgICAob3JpZ2luLXBhdGNoZXMKKyAgICAg ICAgICAocGFja2FnZS1zb3VyY2UgZ2xpYikpKSkpKSkpCiAKIChkZWZpbmUtcHVibGljIGds aWItd2l0aC1kb2N1bWVudGF0aW9uCiAgIDs7IGdsaWIncyBkb2MgbXVzdCBiZSBidWlsdCBp biBhIHNlcGFyYXRlIHBhY2thZ2Ugc2luY2UgaXQgcmVxdWlyZXMgZ3RrLWRvYywKLS0gCjIu MjkuMgoK ----=_RainLoop_185_971689866.1607062124 Content-Type: application/octet-stream; name="0005-gnu-glib-with-documentation-Make-some-cosmetic-chang.patch" Content-Disposition: attachment; filename="0005-gnu-glib-with-documentation-Make-some-cosmetic-chang.patch" Content-Transfer-Encoding: base64 RnJvbSBjYmY5ODA2NzBjODU1MWZkMTRiYzNiNThhNDg5MzM1M2YyZWJmZjRiIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFq YW5AZGlzcm9vdC5vcmc+CkRhdGU6IEZyaSwgNCBEZWMgMjAyMCAwMDowNzo0NSAtMDUwMApT dWJqZWN0OiBbUEFUQ0ggMDUvMTFdIGdudTogZ2xpYi13aXRoLWRvY3VtZW50YXRpb246IE1h a2Ugc29tZSBjb3NtZXRpYwogY2hhbmdlcy4KCiogZ251L3BhY2thZ2VzL2dsaWIuc2NtIChn bGliLXdpdGgtZG9jdW1lbnRhdGlvbik6IE1ha2Ugc29tZSBjb3NtZXRpYyBjaGFuZ2VzLgot LS0KIGdudS9wYWNrYWdlcy9nbGliLnNjbSB8IDMxICsrKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvZ2xpYi5zY20gYi9nbnUvcGFja2Fn ZXMvZ2xpYi5zY20KaW5kZXggYjllOGZlOTZmNS4uYzA2ZTFjNzhlMCAxMDA2NDQKLS0tIGEv Z251L3BhY2thZ2VzL2dsaWIuc2NtCisrKyBiL2dudS9wYWNrYWdlcy9nbGliLnNjbQpAQCAt MzExLDI4ICszMTEsMzUgQEAgdGhyZWFkcywgZHluYW1pYyBsb2FkaW5nLCBhbmQgYW4gb2Jq ZWN0IHN5c3RlbS4iKQogKGRlZmluZS1wdWJsaWMgZ2xpYi13aXRoLWRvY3VtZW50YXRpb24K ICAgOzsgZ2xpYidzIGRvYyBtdXN0IGJlIGJ1aWx0IGluIGEgc2VwYXJhdGUgcGFja2FnZSBz aW5jZSBpdCByZXF1aXJlcyBndGstZG9jLAogICA7OyB3aGljaCBpbiB0dXJuIGRlcGVuZHMg b24gZ2xpYi4KLSAgKHBhY2thZ2UvaW5oZXJpdCBnbGliCi0gICAgKHByb3BlcnRpZXMgKGFs aXN0LWRlbGV0ZSAnaGlkZGVuPyAocGFja2FnZS1wcm9wZXJ0aWVzIGdsaWIpKSkKLSAgICAo b3V0cHV0cyAoY29ucyAiZG9jIiAocGFja2FnZS1vdXRwdXRzIGdsaWIpKSkgOyAyMCBNaUIg b2YgR1RLLURvYyByZWZlcmVuY2UKKyAgKHBhY2thZ2UKKyAgICAoaW5oZXJpdCBnbGliKQor ICAgIChwcm9wZXJ0aWVzCisgICAgIChhbGlzdC1kZWxldGUgJ2hpZGRlbj8KKyAgICAgICAg ICAgICAgICAgICAocGFja2FnZS1wcm9wZXJ0aWVzIGdsaWIpKSkKICAgICAobmF0aXZlLWlu cHV0cwotICAgICBgKCgiZ3RrLWRvYyIgLGd0ay1kb2MpICAgICAgICAgICAgIDsgZm9yIHRo ZSBkb2MKLSAgICAgICAoImRvY2Jvb2steG1sIiAsZG9jYm9vay14bWwpCisgICAgIGAoKCJk b2Nib29rLXhtbCIgLGRvY2Jvb2steG1sKQorICAgICAgICgiZ3RrLWRvYyIgLGd0ay1kb2Mp CiAgICAgICAgKCJsaWJ4bWwyIiAsbGlieG1sMikKICAgICAgICAsQChwYWNrYWdlLW5hdGl2 ZS1pbnB1dHMgZ2xpYikpKQorICAgIChvdXRwdXRzCisgICAgIChjb25zICJkb2MiCisgICAg ICAgICAgIChwYWNrYWdlLW91dHB1dHMgZ2xpYikpKQogICAgIChhcmd1bWVudHMKLSAgICAg KHN1YnN0aXR1dGUta2V5d29yZC1hcmd1bWVudHMgKHBhY2thZ2UtYXJndW1lbnRzIGdsaWIp CisgICAgIChzdWJzdGl0dXRlLWtleXdvcmQtYXJndW1lbnRzCisgICAgICAgICAocGFja2Fn ZS1hcmd1bWVudHMgZ2xpYikKICAgICAgICAoKCM6Y29uZmlndXJlLWZsYWdzIGZsYWdzICcn KCkpCiAgICAgICAgIGAoY29ucyAiLURndGtfZG9jPXRydWUiICxmbGFncykpCiAgICAgICAg KCgjOnBoYXNlcyBwaGFzZXMpCiAgICAgICAgIGAobW9kaWZ5LXBoYXNlcyAscGhhc2VzCiAg ICAgICAgICAgIChhZGQtYWZ0ZXIgJ2luc3RhbGwgJ21vdmUtZG9jCiAgICAgICAgICAgICAg KGxhbWJkYSogKCM6a2V5IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQotICAgICAgICAg ICAgICAgKGxldCAoKG91dCAoYXNzb2MtcmVmIG91dHB1dHMgIm91dCIpKQotICAgICAgICAg ICAgICAgICAgICAgKGRvYyAoYXNzb2MtcmVmIG91dHB1dHMgImRvYyIpKQotICAgICAgICAg ICAgICAgICAgICAgKGh0bWwgKHN0cmluZy1hcHBlbmQgIi9zaGFyZS9ndGstZG9jIikpKQot ICAgICAgICAgICAgICAgICAoY29weS1yZWN1cnNpdmVseSAoc3RyaW5nLWFwcGVuZCBvdXQg aHRtbCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBl bmQgZG9jIGh0bWwpKQotICAgICAgICAgICAgICAgICAoZGVsZXRlLWZpbGUtcmVjdXJzaXZl bHkgKHN0cmluZy1hcHBlbmQgb3V0IGh0bWwpKQorICAgICAgICAgICAgICAgKGxldCogKChv dXQgKGFzc29jLXJlZiBvdXRwdXRzICJvdXQiKSkKKyAgICAgICAgICAgICAgICAgICAgICAo ZG9jIChhc3NvYy1yZWYgb3V0cHV0cyAiZG9jIikpCisgICAgICAgICAgICAgICAgICAgICAg KGh0bWwgKHN0cmluZy1hcHBlbmQgIi9zaGFyZS9ndGstZG9jIikpKQorICAgICAgICAgICAg ICAgICAobWtkaXItcCAoc3RyaW5nLWFwcGVuZCBkb2MgIi9zaGFyZSIpKQorICAgICAgICAg ICAgICAgICAocmVuYW1lLWZpbGUKKyAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5k IG91dCBodG1sKQorICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgZG9jIGh0bWwp KQogICAgICAgICAgICAgICAgICAjdCkpKSkpKSkpKQogCiAoZGVmaW5lIGdvYmplY3QtaW50 cm9zcGVjdGlvbgotLSAKMi4yOS4yCgo= ----=_RainLoop_185_971689866.1607062124 Content-Type: application/octet-stream; name="0006-gnu-glib-with-documentation-Fix-documentation-build.patch" Content-Disposition: attachment; filename="0006-gnu-glib-with-documentation-Fix-documentation-build.patch" Content-Transfer-Encoding: base64 RnJvbSBhN2Q1ZDZjNzIwYzEwZTEyZmZiMmRmOTViZTNhZTdiOTExNWRkY2RjIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFq YW5AZGlzcm9vdC5vcmc+CkRhdGU6IEZyaSwgNCBEZWMgMjAyMCAwMDoxMDoyMiAtMDUwMApT dWJqZWN0OiBbUEFUQ0ggMDYvMTFdIGdudTogZ2xpYi13aXRoLWRvY3VtZW50YXRpb246IEZp eCBkb2N1bWVudGF0aW9uIGJ1aWxkLgoKKiBnbnUvcGFja2FnZXMvZ2xpYi5zY20gKGdsaWIt d2l0aC1kb2N1bWVudGF0aW9uKSBbbmF0aXZlLWlucHV0c106CkFkZCBkb2Nib29rLTQuMi4g UmVtb3ZlIGxpYnhtbDIuClthcmd1bWVudHNdPCM6cGhhc2VzPlsncGF0Y2gtZG9jYm9vay14 bWxdOiBOZXcgcGhhc2UuCi0tLQogZ251L3BhY2thZ2VzL2dsaWIuc2NtIHwgMTcgKysrKysr KysrKysrKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCAyIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9nbGliLnNjbSBiL2dudS9wYWNr YWdlcy9nbGliLnNjbQppbmRleCBjMDZlMWM3OGUwLi43NTliZTcxOTRlIDEwMDY0NAotLS0g YS9nbnUvcGFja2FnZXMvZ2xpYi5zY20KKysrIGIvZ251L3BhY2thZ2VzL2dsaWIuc2NtCkBA IC0zMTcsOSArMzE3LDkgQEAgdGhyZWFkcywgZHluYW1pYyBsb2FkaW5nLCBhbmQgYW4gb2Jq ZWN0IHN5c3RlbS4iKQogICAgICAoYWxpc3QtZGVsZXRlICdoaWRkZW4/CiAgICAgICAgICAg ICAgICAgICAgKHBhY2thZ2UtcHJvcGVydGllcyBnbGliKSkpCiAgICAgKG5hdGl2ZS1pbnB1 dHMKLSAgICAgYCgoImRvY2Jvb2steG1sIiAsZG9jYm9vay14bWwpCisgICAgIGAoKCJkb2Ni b29rLXhtbC00LjIiICxkb2Nib29rLXhtbC00LjIpCisgICAgICAgKCJkb2Nib29rLXhtbC00 LjUiICxkb2Nib29rLXhtbCkKICAgICAgICAoImd0ay1kb2MiICxndGstZG9jKQotICAgICAg ICgibGlieG1sMiIgLGxpYnhtbDIpCiAgICAgICAgLEAocGFja2FnZS1uYXRpdmUtaW5wdXRz IGdsaWIpKSkKICAgICAob3V0cHV0cwogICAgICAoY29ucyAiZG9jIgpAQCAtMzMxLDYgKzMz MSwxOSBAQCB0aHJlYWRzLCBkeW5hbWljIGxvYWRpbmcsIGFuZCBhbiBvYmplY3Qgc3lzdGVt LiIpCiAgICAgICAgIGAoY29ucyAiLURndGtfZG9jPXRydWUiICxmbGFncykpCiAgICAgICAg KCgjOnBoYXNlcyBwaGFzZXMpCiAgICAgICAgIGAobW9kaWZ5LXBoYXNlcyAscGhhc2VzCisg ICAgICAgICAgIChhZGQtYWZ0ZXIgJ3VucGFjayAncGF0Y2gtZG9jYm9vay14bWwKKyAgICAg ICAgICAgICAobGFtYmRhKiAoIzprZXkgaW5wdXRzICM6YWxsb3ctb3RoZXIta2V5cykKKyAg ICAgICAgICAgICAgICh3aXRoLWRpcmVjdG9yeS1leGN1cnNpb24gImRvY3MvcmVmZXJlbmNl IgorICAgICAgICAgICAgICAgICAoc3Vic3RpdHV0ZSogJygiZ2lvL2dkYnVzLW9iamVjdC1t YW5hZ2VyLWV4YW1wbGUvLipcXC54bWwiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICJnaW8vLipcXC54bWwiICJnbGliLy4qXFwueG1sIiAiZ29iamVjdC8uKlxcLnhtbCIp CisgICAgICAgICAgICAgICAgICAgKCgiaHR0cDovL3d3dy5vYXNpcy1vcGVuLm9yZy9kb2Ni b29rL3htbC80LjUvIikKKyAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgKGFz c29jLXJlZiBpbnB1dHMgImRvY2Jvb2steG1sLTQuNSIpCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICIveG1sL2R0ZC9kb2Nib29rLyIpKSkKKyAgICAgICAgICAgICAg ICAgKHN1YnN0aXR1dGUqICJnaW8vZ2lvLnhtbCIKKyAgICAgICAgICAgICAgICAgICAoKCJo dHRwOi8vd3d3Lm9hc2lzLW9wZW4ub3JnL2RvY2Jvb2sveG1sLzQuMi8iKQorICAgICAgICAg ICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAoYXNzb2MtcmVmIGlucHV0cyAiZG9jYm9vay14 bWwtNC4yIikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi94bWwvZHRk L2RvY2Jvb2svIikpKSkKKyAgICAgICAgICAgICAgICN0KSkKICAgICAgICAgICAgKGFkZC1h ZnRlciAnaW5zdGFsbCAnbW92ZS1kb2MKICAgICAgICAgICAgICAobGFtYmRhKiAoIzprZXkg b3V0cHV0cyAjOmFsbG93LW90aGVyLWtleXMpCiAgICAgICAgICAgICAgICAobGV0KiAoKG91 dCAoYXNzb2MtcmVmIG91dHB1dHMgIm91dCIpKQotLSAKMi4yOS4yCgo= ----=_RainLoop_185_971689866.1607062124 Content-Type: application/octet-stream; name="0007-gnu-cairo-Make-some-cosmetic-changes.patch" Content-Disposition: attachment; filename="0007-gnu-cairo-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: base64 RnJvbSBiNTZkMDAwNDE3NzQ2NWExOGQ4MmIwMTMxYzU0YTUzODg1YmM2YWU3IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFq YW5AZGlzcm9vdC5vcmc+CkRhdGU6IEZyaSwgNCBEZWMgMjAyMCAwMDo0OToxMCAtMDUwMApT dWJqZWN0OiBbUEFUQ0ggMDcvMTFdIGdudTogY2Fpcm86IE1ha2Ugc29tZSBjb3NtZXRpYyBj aGFuZ2VzLgoKKiBnbnUvcGFja2FnZXMvZ3RrLnNjbSAoY2Fpcm8pOiBNYWtlIHNvbWUgY29z bWV0aWMgY2hhbmdlcy4KLS0tCiBnbnUvcGFja2FnZXMvZ3RrLnNjbSB8IDgyICsrKysrKysr KysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg NDEgaW5zZXJ0aW9ucygrKSwgNDEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3Bh Y2thZ2VzL2d0ay5zY20gYi9nbnUvcGFja2FnZXMvZ3RrLnNjbQppbmRleCA0ZTU4YzY1ZWFk Li45NGZjNTJiN2QwIDEwMDY0NAotLS0gYS9nbnUvcGFja2FnZXMvZ3RrLnNjbQorKysgYi9n bnUvcGFja2FnZXMvZ3RrLnNjbQpAQCAtMTIxLDU3ICsxMjEsNTcgQEAgdG9vbHMgaGF2ZSBm dWxsIGFjY2VzcyB0byB2aWV3IGFuZCBjb250cm9sIHJ1bm5pbmcgYXBwbGljYXRpb25zLiIp CiAKIChkZWZpbmUtcHVibGljIGNhaXJvCiAgIChwYWNrYWdlCi0gICAobmFtZSAiY2Fpcm8i KQotICAgKHZlcnNpb24gIjEuMTYuMCIpCi0gICAoc291cmNlIChvcmlnaW4KLSAgICAgICAg ICAgIChtZXRob2QgdXJsLWZldGNoKQotICAgICAgICAgICAgKHVyaSAoc3RyaW5nLWFwcGVu ZCAiaHR0cHM6Ly9jYWlyb2dyYXBoaWNzLm9yZy9yZWxlYXNlcy9jYWlyby0iCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHZlcnNpb24gIi50YXIueHoiKSkKLSAgICAgICAg ICAgIChzaGEyNTYKLSAgICAgICAgICAgICAoYmFzZTMyCi0gICAgICAgICAgICAgICIwYzkz MG1rNXhyMmJzaGJkbGp2MDA1ajNqOHpyNDdncW1rcnkzcTZxZ3Zxa3k2cmpqeXN5IikpKSkK LSAgIChidWlsZC1zeXN0ZW0gZ251LWJ1aWxkLXN5c3RlbSkKLSAgIChwcm9wYWdhdGVkLWlu cHV0cwotICAgIGAoKCJmb250Y29uZmlnIiAsZm9udGNvbmZpZykKLSAgICAgICgiZnJlZXR5 cGUiICxmcmVldHlwZSkKLSAgICAgICgiZ2xpYiIgLGdsaWIpCi0gICAgICAoImxpYnBuZyIg LGxpYnBuZykKLSAgICAgICgibGlieDExIiAsbGlieDExKQotICAgICAgKCJsaWJ4ZXh0IiAs bGlieGV4dCkKLSAgICAgICgibGlieHJlbmRlciIgLGxpYnhyZW5kZXIpCi0gICAgICAoInBp eG1hbiIgLHBpeG1hbikpKQotICAgKGlucHV0cwotICAgIGAoKCJnaG9zdHNjcmlwdCIgLGdo b3N0c2NyaXB0KQotICAgICAgKCJsaWJzcGVjdHJlIiAsbGlic3BlY3RyZSkKLSAgICAgICgi cG9wcGxlciIgLHBvcHBsZXIpCi0gICAgICAoInhvcmdwcm90byIgLHhvcmdwcm90bykKLSAg ICAgICgiemxpYiIgLHpsaWIpKSkKLSAgIChuYXRpdmUtaW5wdXRzCi0gICAgIGAoKCJwa2ct Y29uZmlnIiAscGtnLWNvbmZpZykKLSAgICAgICgicHl0aG9uIiAscHl0aG9uLXdyYXBwZXIp KSkKKyAgICAobmFtZSAiY2Fpcm8iKQorICAgICh2ZXJzaW9uICIxLjE2LjAiKQorICAgIChz b3VyY2UKKyAgICAgKG9yaWdpbgorICAgICAgIChtZXRob2QgdXJsLWZldGNoKQorICAgICAg ICh1cmkKKyAgICAgICAgKHN0cmluZy1hcHBlbmQgImh0dHBzOi8vY2Fpcm9ncmFwaGljcy5v cmcvcmVsZWFzZXMvY2Fpcm8tIgorICAgICAgICAgICAgICAgICAgICAgICB2ZXJzaW9uICIu dGFyLnh6IikpCisgICAgICAgKHNoYTI1NgorICAgICAgICAoYmFzZTMyICIwYzkzMG1rNXhy MmJzaGJkbGp2MDA1ajNqOHpyNDdncW1rcnkzcTZxZ3Zxa3k2cmpqeXN5IikpKSkKKyAgICAo YnVpbGQtc3lzdGVtIGdudS1idWlsZC1zeXN0ZW0pCiAgICAgKGFyZ3VtZW50cwotICAgICBg KCM6dGVzdHM/ICNmICA7IHNlZSBodHRwOi8vbGlzdHMuZ251Lm9yZy9hcmNoaXZlL2h0bWwv YnVnLWd1aXgvMjAxMy0wNi9tc2cwMDA4NS5odG1sCi0gICAgICAgIzpjb25maWd1cmUtZmxh Z3MgJygiLS1lbmFibGUtdGVlIiAgICAgIDtuZWVkZWQgZm9yIEdOVSBJY2VjYXQKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICItLWVuYWJsZS14bWwiICAgICAgO2ZvciBjYWlyby14 bWwgc3VwcG9ydAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIi0tZGlzYWJsZS1zdGF0 aWMiKSkpCi0gICAoc3lub3BzaXMgIjJEIGdyYXBoaWNzIGxpYnJhcnkiKQotICAgKGRlc2Ny aXB0aW9uCi0gICAgIkNhaXJvIGlzIGEgMkQgZ3JhcGhpY3MgbGlicmFyeSB3aXRoIHN1cHBv cnQgZm9yIG11bHRpcGxlIG91dHB1dCBkZXZpY2VzLgotQ3VycmVudGx5IHN1cHBvcnRlZCBv dXRwdXQgdGFyZ2V0cyBpbmNsdWRlIHRoZSBYIFdpbmRvdyBTeXN0ZW0gKHZpYSBib3RoCi1Y bGliIGFuZCBYQ0IpLCBRdWFydHosIFdpbjMyLCBpbWFnZSBidWZmZXJzLCBQb3N0U2NyaXB0 LCBQREYsIGFuZCBTVkcgZmlsZQorICAgICBgKCM6dGVzdHM/ICNmIDsgc2VlIGh0dHA6Ly9s aXN0cy5nbnUub3JnL2FyY2hpdmUvaHRtbC9idWctZ3VpeC8yMDEzLTA2L21zZzAwMDg1Lmh0 bWwKKyAgICAgICAjOmNvbmZpZ3VyZS1mbGFncworICAgICAgIChsaXN0CisgICAgICAgICIt LWVuYWJsZS10ZWUiICAgICAgICAgICAgICAgICAgICA7bmVlZGVkIGZvciBHTlUgSWNlY2F0 CisgICAgICAgICItLWVuYWJsZS14bWwiICAgICAgICAgICAgICAgICAgICA7Zm9yIGNhaXJv LXhtbCBzdXBwb3J0CisgICAgICAgICItLWRpc2FibGUtc3RhdGljIikpKQorICAgIChuYXRp dmUtaW5wdXRzCisgICAgIGAoKCJwa2ctY29uZmlnIiAscGtnLWNvbmZpZykKKyAgICAgICAo InB5dGhvbiIgLHB5dGhvbi13cmFwcGVyKSkpCisgICAgKGlucHV0cworICAgICBgKCgiZ2hv c3RzY3JpcHQiICxnaG9zdHNjcmlwdCkKKyAgICAgICAoImxpYnNwZWN0cmUiICxsaWJzcGVj dHJlKQorICAgICAgICgicG9wcGxlciIgLHBvcHBsZXIpCisgICAgICAgKCJ4b3JncHJvdG8i ICx4b3JncHJvdG8pCisgICAgICAgKCJ6bGliIiAsemxpYikpKQorICAgIChwcm9wYWdhdGVk LWlucHV0cworICAgICBgKCgiZm9udGNvbmZpZyIgLGZvbnRjb25maWcpCisgICAgICAgKCJm cmVldHlwZSIgLGZyZWV0eXBlKQorICAgICAgICgiZ2xpYiIgLGdsaWIpCisgICAgICAgKCJs aWJwbmciICxsaWJwbmcpCisgICAgICAgKCJsaWJ4MTEiICxsaWJ4MTEpCisgICAgICAgKCJs aWJ4ZXh0IiAsbGlieGV4dCkKKyAgICAgICAoImxpYnhyZW5kZXIiICxsaWJ4cmVuZGVyKQor ICAgICAgICgicGl4bWFuIiAscGl4bWFuKSkpCisgICAgKHN5bm9wc2lzICIyRCBncmFwaGlj cyBsaWJyYXJ5IikKKyAgICAoZGVzY3JpcHRpb24gIkNhaXJvIGlzIGEgMkQgZ3JhcGhpY3Mg bGlicmFyeSB3aXRoIHN1cHBvcnQgZm9yIG11bHRpcGxlIG91dHB1dAorZGV2aWNlcy4gIEN1 cnJlbnRseSBzdXBwb3J0ZWQgb3V0cHV0IHRhcmdldHMgaW5jbHVkZSB0aGUgWCBXaW5kb3cg U3lzdGVtICh2aWEKK2JvdGggWGxpYiBhbmQgWENCKSwgUXVhcnR6LCBXaW4zMiwgaW1hZ2Ug YnVmZmVycywgUG9zdFNjcmlwdCwgUERGLCBhbmQgU1ZHIGZpbGUKIG91dHB1dC4gIEV4cGVy aW1lbnRhbCBiYWNrZW5kcyBpbmNsdWRlIE9wZW5HTCwgQmVPUywgT1MvMiwgYW5kIERpcmVj dEZCLgotCiBDYWlybyBpcyBkZXNpZ25lZCB0byBwcm9kdWNlIGNvbnNpc3RlbnQgb3V0cHV0 IG9uIGFsbCBvdXRwdXQgbWVkaWEgd2hpbGUKIHRha2luZyBhZHZhbnRhZ2Ugb2YgZGlzcGxh eSBoYXJkd2FyZSBhY2NlbGVyYXRpb24gd2hlbiBhdmFpbGFibGUKIGVnLiB0aHJvdWdoIHRo ZSBYIFJlbmRlciBFeHRlbnNpb24pLgotCiBUaGUgY2Fpcm8gQVBJIHByb3ZpZGVzIG9wZXJh dGlvbnMgc2ltaWxhciB0byB0aGUgZHJhd2luZyBvcGVyYXRvcnMgb2YKIFBvc3RTY3JpcHQg YW5kIFBERi4gIE9wZXJhdGlvbnMgaW4gY2Fpcm8gaW5jbHVkaW5nIHN0cm9raW5nIGFuZCBm aWxsaW5nIGN1YmljCiBCw6l6aWVyIHNwbGluZXMsIHRyYW5zZm9ybWluZyBhbmQgY29tcG9z aXRpbmcgdHJhbnNsdWNlbnQgaW1hZ2VzLCBhbmQKIGFudGlhbGlhc2VkIHRleHQgcmVuZGVy aW5nLiAgQWxsIGRyYXdpbmcgb3BlcmF0aW9ucyBjYW4gYmUgdHJhbnNmb3JtZWQgYnkgYW55 CiBhZmZpbmUgdHJhbnNmb3JtYXRpb24gKHNjYWxlLCByb3RhdGlvbiwgc2hlYXIsIGV0Yy4p LiIpCi0gICAobGljZW5zZSBsaWNlbnNlOmxncGwyLjEpIDsgb3IgTW96aWxsYSBQdWJsaWMg TGljZW5zZSAxLjEKLSAgIChob21lLXBhZ2UgImh0dHBzOi8vY2Fpcm9ncmFwaGljcy5vcmcv IikpKQorICAgIChob21lLXBhZ2UgImh0dHBzOi8vY2Fpcm9ncmFwaGljcy5vcmcvIikKKyAg ICAobGljZW5zZSBsaWNlbnNlOmxncGwyLjEpKSkgOyBvciBNb3ppbGxhIFB1YmxpYyBMaWNl bnNlIDEuMQogCiAoZGVmaW5lLXB1YmxpYyBjYWlyby1zYW5zLXBvcHBsZXIKICAgOzsgVmFy aWFudCB1c2VkIHRvIGJyZWFrIHRoZSBkZXBlbmRlbmN5IGN5Y2xlIGJldHdlZW4gUG9wcGxl ciBhbmQgQ2Fpcm8uCi0tIAoyLjI5LjIKCg== ----=_RainLoop_185_971689866.1607062124 Content-Type: application/octet-stream; name="0008-gnu-cairo-Change-build-system.patch" Content-Disposition: attachment; filename="0008-gnu-cairo-Change-build-system.patch" Content-Transfer-Encoding: base64 RnJvbSA0YWQ5MjAzMjUzZjgyMGVlOGUyNTExMjZjMjA1MmVjNGU3Njk2Zjg2IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFq YW5AZGlzcm9vdC5vcmc+CkRhdGU6IEZyaSwgNCBEZWMgMjAyMCAwMDo1MToxMCAtMDUwMApT dWJqZWN0OiBbUEFUQ0ggMDgvMTFdIGdudTogY2Fpcm86IENoYW5nZSBidWlsZC1zeXN0ZW0u CgoqIGdudS9wYWNrYWdlcy9ndGsuc2NtIChjYWlybykgW2J1aWxkLXN5c3RlbV06IENoYW5n ZSBmcm9tIGdudSB0byBnbGliLW9yLWd0ay4KLS0tCiBnbnUvcGFja2FnZXMvZ3RrLnNjbSB8 IDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigtKQoK ZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9ndGsuc2NtIGIvZ251L3BhY2thZ2VzL2d0ay5z Y20KaW5kZXggOTRmYzUyYjdkMC4uYTA5YTgxMTg0YyAxMDA2NDQKLS0tIGEvZ251L3BhY2th Z2VzL2d0ay5zY20KKysrIGIvZ251L3BhY2thZ2VzL2d0ay5zY20KQEAgLTEzMSw3ICsxMzEs NyBAQCB0b29scyBoYXZlIGZ1bGwgYWNjZXNzIHRvIHZpZXcgYW5kIGNvbnRyb2wgcnVubmlu ZyBhcHBsaWNhdGlvbnMuIikKICAgICAgICAgICAgICAgICAgICAgICAgdmVyc2lvbiAiLnRh ci54eiIpKQogICAgICAgIChzaGEyNTYKICAgICAgICAgKGJhc2UzMiAiMGM5MzBtazV4cjJi c2hiZGxqdjAwNWozajh6cjQ3Z3Fta3J5M3E2cWd2cWt5NnJqanlzeSIpKSkpCi0gICAgKGJ1 aWxkLXN5c3RlbSBnbnUtYnVpbGQtc3lzdGVtKQorICAgIChidWlsZC1zeXN0ZW0gZ2xpYi1v ci1ndGstYnVpbGQtc3lzdGVtKQogICAgIChhcmd1bWVudHMKICAgICAgYCgjOnRlc3RzPyAj ZiA7IHNlZSBodHRwOi8vbGlzdHMuZ251Lm9yZy9hcmNoaXZlL2h0bWwvYnVnLWd1aXgvMjAx My0wNi9tc2cwMDA4NS5odG1sCiAgICAgICAgIzpjb25maWd1cmUtZmxhZ3MKLS0gCjIuMjku MgoK ----=_RainLoop_185_971689866.1607062124 Content-Type: application/octet-stream; name="0009-gnu-cairo-Move-documentation-to-separate-output.patch" Content-Disposition: attachment; filename="0009-gnu-cairo-Move-documentation-to-separate-output.patch" Content-Transfer-Encoding: base64 RnJvbSBhYmY0MTYwZjRjNjhiZDhjNDJkMzcyYjJmZjEwMzg2OGVhODg2OTNjIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFq YW5AZGlzcm9vdC5vcmc+CkRhdGU6IEZyaSwgNCBEZWMgMjAyMCAwMDo1MzoxNiAtMDUwMApT dWJqZWN0OiBbUEFUQ0ggMDkvMTFdIGdudTogY2Fpcm86IE1vdmUgZG9jdW1lbnRhdGlvbiB0 byBzZXBhcmF0ZSBvdXRwdXQuCgoqIGdudS9wYWNrYWdlcy9ndGsuc2NtIChjYWlybykgW291 dHB1dHNdOiBOZXcgb3V0cHV0ICJkb2MiLgpbYXJndW1lbnRzXTwjOmNvbmZpZ3VyZS1mbGFn cz5bLS13aXRoLWh0bWwtZGlyXTogTmV3IGZsYWcuCi0tLQogZ251L3BhY2thZ2VzL2d0ay5z Y20gfCAxMCArKysrKysrLS0tCiAxIGZpbGUgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCAz IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9ndGsuc2NtIGIvZ251 L3BhY2thZ2VzL2d0ay5zY20KaW5kZXggYTA5YTgxMTg0Yy4uNjM3MWQ3MTQ3MSAxMDA2NDQK LS0tIGEvZ251L3BhY2thZ2VzL2d0ay5zY20KKysrIGIvZ251L3BhY2thZ2VzL2d0ay5zY20K QEAgLTEzMiwxMyArMTMyLDE3IEBAIHRvb2xzIGhhdmUgZnVsbCBhY2Nlc3MgdG8gdmlldyBh bmQgY29udHJvbCBydW5uaW5nIGFwcGxpY2F0aW9ucy4iKQogICAgICAgIChzaGEyNTYKICAg ICAgICAgKGJhc2UzMiAiMGM5MzBtazV4cjJic2hiZGxqdjAwNWozajh6cjQ3Z3Fta3J5M3E2 cWd2cWt5NnJqanlzeSIpKSkpCiAgICAgKGJ1aWxkLXN5c3RlbSBnbGliLW9yLWd0ay1idWls ZC1zeXN0ZW0pCisgICAgKG91dHB1dHMgJygib3V0IiAiZG9jIikpCiAgICAgKGFyZ3VtZW50 cwogICAgICBgKCM6dGVzdHM/ICNmIDsgc2VlIGh0dHA6Ly9saXN0cy5nbnUub3JnL2FyY2hp dmUvaHRtbC9idWctZ3VpeC8yMDEzLTA2L21zZzAwMDg1Lmh0bWwKICAgICAgICAjOmNvbmZp Z3VyZS1mbGFncwogICAgICAgIChsaXN0Ci0gICAgICAgICItLWVuYWJsZS10ZWUiICAgICAg ICAgICAgICAgICAgICA7bmVlZGVkIGZvciBHTlUgSWNlY2F0Ci0gICAgICAgICItLWVuYWJs ZS14bWwiICAgICAgICAgICAgICAgICAgICA7Zm9yIGNhaXJvLXhtbCBzdXBwb3J0Ci0gICAg ICAgICItLWRpc2FibGUtc3RhdGljIikpKQorICAgICAgICAiLS1lbmFibGUtdGVlIiAgICAg ICAgICAgICAgICAgIDtuZWVkZWQgZm9yIEdOVSBJY2VjYXQKKyAgICAgICAgIi0tZW5hYmxl LXhtbCIgICAgICAgICAgICAgICAgICA7Zm9yIGNhaXJvLXhtbCBzdXBwb3J0CisgICAgICAg ICItLWRpc2FibGUtc3RhdGljIgorICAgICAgICAoc3RyaW5nLWFwcGVuZCAiLS13aXRoLWh0 bWwtZGlyPSIKKyAgICAgICAgICAgICAgICAgICAgICAgKGFzc29jLXJlZiAlb3V0cHV0cyAi ZG9jIikKKyAgICAgICAgICAgICAgICAgICAgICAgIi9zaGFyZS9ndGstZG9jL2h0bWwiKSkp KQogICAgIChuYXRpdmUtaW5wdXRzCiAgICAgIGAoKCJwa2ctY29uZmlnIiAscGtnLWNvbmZp ZykKICAgICAgICAoInB5dGhvbiIgLHB5dGhvbi13cmFwcGVyKSkpCi0tIAoyLjI5LjIKCg== ----=_RainLoop_185_971689866.1607062124 Content-Type: application/octet-stream; name="0010-gnu-cairo-Enable-some-features.patch" Content-Disposition: attachment; filename="0010-gnu-cairo-Enable-some-features.patch" Content-Transfer-Encoding: base64 RnJvbSA5OGI0YzZiOTM2ZDMyM2RkZmJjZTQyNmIwNDI2N2Q2NWZkOWU1NzIyIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFq YW5AZGlzcm9vdC5vcmc+CkRhdGU6IEZyaSwgNCBEZWMgMjAyMCAwMTowMjowMCAtMDUwMApT dWJqZWN0OiBbUEFUQ0ggMTAvMTFdIGdudTogY2Fpcm86IEVuYWJsZSBzb21lIGZlYXR1cmVz LgoKKiBnbnUvcGFja2FnZXMvZ3RrLnNjbSAoY2Fpcm8pIFtuYXRpdmUtaW5wdXRzXTogQWRk IGdvYmplY3QtaW50cm9zcGVjdGlvbi4KW2lucHV0c106IEFkZCBsaWJkcm0uIFJlbW92ZSB4 b3JncHJvdG8gYW5kIHpsaWIuCltwcm9wYWdhdGVkLWlucHV0c106IEFkZCBsaWJ4Y2IuCi0t LQogZ251L3BhY2thZ2VzL2d0ay5zY20gfCAzOSArKysrKysrKysrKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNyBpbnNlcnRpb25zKCspLCAxMiBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvZ3RrLnNjbSBiL2dudS9w YWNrYWdlcy9ndGsuc2NtCmluZGV4IDYzNzFkNzE0NzEuLjRmNDA2NzIxMjcgMTAwNjQ0Ci0t LSBhL2dudS9wYWNrYWdlcy9ndGsuc2NtCisrKyBiL2dudS9wYWNrYWdlcy9ndGsuc2NtCkBA IC0xMzcsMzAgKzEzNyw0NSBAQCB0b29scyBoYXZlIGZ1bGwgYWNjZXNzIHRvIHZpZXcgYW5k IGNvbnRyb2wgcnVubmluZyBhcHBsaWNhdGlvbnMuIikKICAgICAgYCgjOnRlc3RzPyAjZiA7 IHNlZSBodHRwOi8vbGlzdHMuZ251Lm9yZy9hcmNoaXZlL2h0bWwvYnVnLWd1aXgvMjAxMy0w Ni9tc2cwMDA4NS5odG1sCiAgICAgICAgIzpjb25maWd1cmUtZmxhZ3MKICAgICAgICAobGlz dAotICAgICAgICAiLS1lbmFibGUtdGVlIiAgICAgICAgICAgICAgICAgIDtuZWVkZWQgZm9y IEdOVSBJY2VjYXQKLSAgICAgICAgIi0tZW5hYmxlLXhtbCIgICAgICAgICAgICAgICAgICA7 Zm9yIGNhaXJvLXhtbCBzdXBwb3J0CiAgICAgICAgICItLWRpc2FibGUtc3RhdGljIgorICAg ICAgICA7OyBYWFg6IFRvIGJlIGVuYWJsZWQuCisgICAgICAgIDs7ICItLWVuYWJsZS1nYWxs aXVtPXllcyIKKyAgICAgICAgOzsgIi0tZW5hYmxlLWdsPXllcyIKKyAgICAgICAgOzsgIiAt LWVuYWJsZS1nbGVzdjI9eWVzIgorICAgICAgICA7OyAiLS1lbmFibGUtZ2xlc3YzPXllcyIK KyAgICAgICAgOzsgIi0tZW5hYmxlLWNvZ2w9eWVzIgorICAgICAgICA7OyAiLS1lbmFibGUt ZGlyZWN0ZmI9eWVzIgorICAgICAgICA7OyAiLS1lbmFibGUtdmc9eWVzIgorICAgICAgICAi LS1lbmFibGUtdGVlPXllcyIKKyAgICAgICAgIi0tZW5hYmxlLXhtbD15ZXMiCiAgICAgICAg IChzdHJpbmctYXBwZW5kICItLXdpdGgtaHRtbC1kaXI9IgogICAgICAgICAgICAgICAgICAg ICAgICAoYXNzb2MtcmVmICVvdXRwdXRzICJkb2MiKQogICAgICAgICAgICAgICAgICAgICAg ICAiL3NoYXJlL2d0ay1kb2MvaHRtbCIpKSkpCiAgICAgKG5hdGl2ZS1pbnB1dHMKLSAgICAg YCgoInBrZy1jb25maWciICxwa2ctY29uZmlnKQorICAgICBgKCgiZ29iamVjdC1pbnRyb3Nw ZWN0aW9uIiAsZ29iamVjdC1pbnRyb3NwZWN0aW9uKQorICAgICAgICgicGtnLWNvbmZpZyIg LHBrZy1jb25maWcpCiAgICAgICAgKCJweXRob24iICxweXRob24td3JhcHBlcikpKQogICAg IChpbnB1dHMKLSAgICAgYCgoImdob3N0c2NyaXB0IiAsZ2hvc3RzY3JpcHQpCisgICAgIGAo KCJkcm0iICxsaWJkcm0pCisgICAgICAgKCJnaG9zdHNjcmlwdCIgLGdob3N0c2NyaXB0KQog ICAgICAgICgibGlic3BlY3RyZSIgLGxpYnNwZWN0cmUpCi0gICAgICAgKCJwb3BwbGVyIiAs cG9wcGxlcikKLSAgICAgICAoInhvcmdwcm90byIgLHhvcmdwcm90bykKLSAgICAgICAoInps aWIiICx6bGliKSkpCisgICAgICAgKCJwb3BwbGVyIiAscG9wcGxlcikpKQogICAgIChwcm9w YWdhdGVkLWlucHV0cwotICAgICBgKCgiZm9udGNvbmZpZyIgLGZvbnRjb25maWcpCisgICAg IGAoIDs7ICgiY29nbCIgLGNvZ2wpCisgICAgICAgOzsgKCJkaXJlY3RmYiIgLGRpcmVjdGZi KQorICAgICAgICgiZm9udGNvbmZpZyIgLGZvbnRjb25maWcpCisgICAgICAgKCJmb250Y29u ZmlnIiAsZm9udGNvbmZpZykKICAgICAgICAoImZyZWV0eXBlIiAsZnJlZXR5cGUpCiAgICAg ICAgKCJnbGliIiAsZ2xpYikKKyAgICAgICA7OyAoImd0aysiICxndGsrKQogICAgICAgICgi bGlicG5nIiAsbGlicG5nKQotICAgICAgICgibGlieDExIiAsbGlieDExKQotICAgICAgICgi bGlieGV4dCIgLGxpYnhleHQpCi0gICAgICAgKCJsaWJ4cmVuZGVyIiAsbGlieHJlbmRlcikK LSAgICAgICAoInBpeG1hbiIgLHBpeG1hbikpKQorICAgICAgIDs7ICgibGlicnN2ZyIgLGxp YnJzdmcpCisgICAgICAgOzsgKCJvcGVuZ2wiICxtZXNhKQorICAgICAgICgicGl4bWFuIiAs cGl4bWFuKQorICAgICAgICgieDExIiAsbGlieDExKQorICAgICAgICgieGNiIiAsbGlieGNi KQorICAgICAgICgieGV4dCIgLGxpYnhleHQpCisgICAgICAgKCJ4cmVuZGVyIiAsbGlieHJl bmRlcikpKQogICAgIChzeW5vcHNpcyAiMkQgZ3JhcGhpY3MgbGlicmFyeSIpCiAgICAgKGRl c2NyaXB0aW9uICJDYWlybyBpcyBhIDJEIGdyYXBoaWNzIGxpYnJhcnkgd2l0aCBzdXBwb3J0 IGZvciBtdWx0aXBsZSBvdXRwdXQKIGRldmljZXMuICBDdXJyZW50bHkgc3VwcG9ydGVkIG91 dHB1dCB0YXJnZXRzIGluY2x1ZGUgdGhlIFggV2luZG93IFN5c3RlbSAodmlhCi0tIAoyLjI5 LjIKCg== ----=_RainLoop_185_971689866.1607062124 Content-Type: application/octet-stream; name="0011-gnu-cairo-Update-synopsis-description-and-license.patch" Content-Disposition: attachment; filename="0011-gnu-cairo-Update-synopsis-description-and-license.patch" Content-Transfer-Encoding: base64 RnJvbSBkZjg1M2JkN2M3NGVlM2Q3M2ZmZjE5ZGVjYjFhOGNkMmU4ZTQyYzQ3IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFq YW5AZGlzcm9vdC5vcmc+CkRhdGU6IEZyaSwgNCBEZWMgMjAyMCAwMTowNDozNyAtMDUwMApT dWJqZWN0OiBbUEFUQ0ggMTEvMTFdIGdudTogY2Fpcm86IFVwZGF0ZSBzeW5vcHNpcywgZGVz Y3JpcHRpb24gYW5kIGxpY2Vuc2UuCgoqIGdudS9wYWNrYWdlcy9ndGsuc2NtIChjYWlybykg W3N5bm9wc2lzXTogTW9kaWZ5LgpbZGVzY3JpcHRpb25dOiBNb2RpZnkuCltsaWNlbnNlXTog TW9kaWZ5LgotLS0KIGdudS9wYWNrYWdlcy9ndGsuc2NtIHwgMTggKysrKysrKy0tLS0tLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvZ3RrLnNjbSBiL2dudS9wYWNrYWdlcy9ndGsu c2NtCmluZGV4IDRmNDA2NzIxMjcuLjZkMDQwZmYyZTEgMTAwNjQ0Ci0tLSBhL2dudS9wYWNr YWdlcy9ndGsuc2NtCisrKyBiL2dudS9wYWNrYWdlcy9ndGsuc2NtCkBAIC0xNzYsMjEgKzE3 NiwxNyBAQCB0b29scyBoYXZlIGZ1bGwgYWNjZXNzIHRvIHZpZXcgYW5kIGNvbnRyb2wgcnVu bmluZyBhcHBsaWNhdGlvbnMuIikKICAgICAgICAoInhjYiIgLGxpYnhjYikKICAgICAgICAo InhleHQiICxsaWJ4ZXh0KQogICAgICAgICgieHJlbmRlciIgLGxpYnhyZW5kZXIpKSkKLSAg ICAoc3lub3BzaXMgIjJEIGdyYXBoaWNzIGxpYnJhcnkiKQorICAgIChzeW5vcHNpcyAiTXVs dGktcGxhdGZvcm0gMkQgZ3JhcGhpY3MgbGlicmFyeSIpCiAgICAgKGRlc2NyaXB0aW9uICJD YWlybyBpcyBhIDJEIGdyYXBoaWNzIGxpYnJhcnkgd2l0aCBzdXBwb3J0IGZvciBtdWx0aXBs ZSBvdXRwdXQKIGRldmljZXMuICBDdXJyZW50bHkgc3VwcG9ydGVkIG91dHB1dCB0YXJnZXRz IGluY2x1ZGUgdGhlIFggV2luZG93IFN5c3RlbSAodmlhCiBib3RoIFhsaWIgYW5kIFhDQiks IFF1YXJ0eiwgV2luMzIsIGltYWdlIGJ1ZmZlcnMsIFBvc3RTY3JpcHQsIFBERiwgYW5kIFNW RyBmaWxlCi1vdXRwdXQuICBFeHBlcmltZW50YWwgYmFja2VuZHMgaW5jbHVkZSBPcGVuR0ws IEJlT1MsIE9TLzIsIGFuZCBEaXJlY3RGQi4KLUNhaXJvIGlzIGRlc2lnbmVkIHRvIHByb2R1 Y2UgY29uc2lzdGVudCBvdXRwdXQgb24gYWxsIG91dHB1dCBtZWRpYSB3aGlsZQotdGFraW5n IGFkdmFudGFnZSBvZiBkaXNwbGF5IGhhcmR3YXJlIGFjY2VsZXJhdGlvbiB3aGVuIGF2YWls YWJsZQotZWcuIHRocm91Z2ggdGhlIFggUmVuZGVyIEV4dGVuc2lvbikuCi1UaGUgY2Fpcm8g QVBJIHByb3ZpZGVzIG9wZXJhdGlvbnMgc2ltaWxhciB0byB0aGUgZHJhd2luZyBvcGVyYXRv cnMgb2YKLVBvc3RTY3JpcHQgYW5kIFBERi4gIE9wZXJhdGlvbnMgaW4gY2Fpcm8gaW5jbHVk aW5nIHN0cm9raW5nIGFuZCBmaWxsaW5nIGN1YmljCi1Cw6l6aWVyIHNwbGluZXMsIHRyYW5z Zm9ybWluZyBhbmQgY29tcG9zaXRpbmcgdHJhbnNsdWNlbnQgaW1hZ2VzLCBhbmQKLWFudGlh bGlhc2VkIHRleHQgcmVuZGVyaW5nLiAgQWxsIGRyYXdpbmcgb3BlcmF0aW9ucyBjYW4gYmUg dHJhbnNmb3JtZWQgYnkgYW55Ci1hZmZpbmUgdHJhbnNmb3JtYXRpb24gKHNjYWxlLCByb3Rh dGlvbiwgc2hlYXIsIGV0Yy4pLiIpCitvdXRwdXQuICBFeHBlcmltZW50YWwgYmFja2VuZHMg aW5jbHVkZSBPcGVuR0wsIEJlT1MsIE9TLzIsIGFuZCBEaXJlY3RGQi4iKQogICAgIChob21l LXBhZ2UgImh0dHBzOi8vY2Fpcm9ncmFwaGljcy5vcmcvIikKLSAgICAobGljZW5zZSBsaWNl bnNlOmxncGwyLjEpKSkgOyBvciBNb3ppbGxhIFB1YmxpYyBMaWNlbnNlIDEuMQorICAgIChs aWNlbnNlCisgICAgIDs7IFRoaXMgcHJvamVjdCBpcyBkdWFsLWxpY2Vuc2VkLgorICAgICAo bGlzdAorICAgICAgbGljZW5zZTpsZ3BsMi4xKworICAgICAgbGljZW5zZTptcGwxLjEpKSkp CiAKIChkZWZpbmUtcHVibGljIGNhaXJvLXNhbnMtcG9wcGxlcgogICA7OyBWYXJpYW50IHVz ZWQgdG8gYnJlYWsgdGhlIGRlcGVuZGVuY3kgY3ljbGUgYmV0d2VlbiBQb3BwbGVyIGFuZCBD YWlyby4KLS0gCjIuMjkuMgoK ----=_RainLoop_185_971689866.1607062124-- From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 11 09:46:13 2021 Received: (at 42958) by debbugs.gnu.org; 11 Mar 2021 14:46:13 +0000 Received: from localhost ([127.0.0.1]:52940 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKMZf-0000sm-2q for submit@debbugs.gnu.org; Thu, 11 Mar 2021 09:46:13 -0500 Received: from out2.migadu.com ([188.165.223.204]:30255) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKMZZ-0000sB-NC for 42958@debbugs.gnu.org; Thu, 11 Mar 2021 09:46:02 -0500 To: 42958@debbugs.gnu.org, Danny Milosavljevic DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1615473954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=HpWrAzcS456Khlp48czdCIQL31k8eS7qICli27gkWpc=; b=ppZWYtlJk2PjWR7wxC98AdIhjTkLtZLfyfGKLTzTdB6sck4uS5Hz/Pe15+5Xtp8w1u1Smb Rwi7bE5XdgpMsdfz2O3FFE43/7cYmJzm/M8jKX3yoS+sxf3GlCkLnsHGx4kwF7uZAz+qYo TtOCIbRFOzBmJ7wlyHYFrDM6V4l0DP/kwuHgAFQ6o5J1anAvqR9xLh/Fmurhp9lWXmVe/l 2n0oT5SCEWfrvSzvV8dtzVY0z4SMInGkkay6YhVLESsGtNQnQcnaIIeSF1k6NoTvwq9jRC jf/dhbaQZCa24xsi4XNN9Nwv7GIvRXeaXE5Ka81qaAjeapnSrsY2IEORJm6WYQ== X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Subject: Re: [bug#42958] Message-ID: <31f41cbe-6522-c518-5159-4f02433a710e@raghavgururajan.name> Date: Thu, 11 Mar 2021 09:45:52 -0500 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="y1IJJmkDmXveLon2R18Lmnl1TpwsY6jc9" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42958 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --y1IJJmkDmXveLon2R18Lmnl1TpwsY6jc9 Content-Type: multipart/mixed; boundary="xljpr0SMS9qJe5XRK1QHf60vI9ztq42c6"; protected-headers="v1" From: Raghav Gururajan To: 42958@debbugs.gnu.org, Danny Milosavljevic Message-ID: <31f41cbe-6522-c518-5159-4f02433a710e@raghavgururajan.name> Subject: Re: [bug#42958] --xljpr0SMS9qJe5XRK1QHf60vI9ztq42c6 Content-Type: multipart/mixed; boundary="------------2B51BB6BCF7FD238BE97D642" Content-Language: en-US This is a multi-part message in MIME format. --------------2B51BB6BCF7FD238BE97D642 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Danny! Please find the attached patches for glib and cairo, which I re-prepared = to be applied on current core-updates. Regards, RG. --------------2B51BB6BCF7FD238BE97D642 Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-yelp-xsl-Update-to-3.36.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-yelp-xsl-Update-to-3.36.0.patch" =46rom 55c6e5d2a152645a8bc2de3bbfdd0ff16cb4f63f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 05:50:46 -0500 Subject: [PATCH 01/11] gnu: yelp-xsl: Update to 3.36.0. * gnu/packages/gnome.scm (yelp-xsl) [version]: Update to 3.36.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 36e3346499..eaea4c6cb6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6701,7 +6701,7 @@ of running programs and invoke methods on those int= erfaces.") (define-public yelp-xsl (package (name "yelp-xsl") - (version "3.34.2") + (version "3.36.0") (source (origin (method url-fetch) @@ -6710,7 +6710,7 @@ of running programs and invoke methods on those int= erfaces.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc"))= )) + (base32 "1hsfj3q3a3kca0cf9i02xlq2qd4vy12qsjb89hh4r6mp6c11rrag"))= )) (build-system gnu-build-system) (native-inputs `(("gettext-minimal" ,gettext-minimal) --=20 2.30.1 --------------2B51BB6BCF7FD238BE97D642 Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-glib-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-glib-Make-some-cosmetic-changes.patch" =46rom 4c405fac02e07558461c7dff67df5403ba21a74d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 06:39:29 -0500 Subject: [PATCH 02/11] gnu: glib: Make some cosmetic changes. * gnu/packages/glib.scm (glib): Make some cosmetic changes. --- gnu/packages/glib.scm | 424 ++++++++++++++++++++---------------------- 1 file changed, 201 insertions(+), 223 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index fdbe6d0cdf..e5372c6f28 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -170,229 +170,207 @@ shared NFS home directories.") =20 (define glib (package - (name "glib") - (version "2.62.6") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" - name "/" (string-take version 4) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh")) - (patches (search-patches "glib-appinfo-watch.patch" - "glib-tests-timer.patch")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "tests/spawn-test.c" - (("/bin/sh") "sh")) - #t)))) - (build-system meson-build-system) - (outputs '("out" ; everything - "bin" ; glib-mkenums, gtester, etc.; depends on = Python - "debug")) - (propagated-inputs - `(("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc - ("libffi" ,libffi) ; in the Requires.private field of gobject-2.0.= pc - ;; These are in the Requires.private field of gio-2.0.pc - ("util-linux" ,util-linux "lib") ;for libmount - ("zlib" ,zlib))) - (native-inputs - `(("gettext" ,gettext-minimal) - ("m4" ,m4) ; for installing m4 macros - ("dbus" ,dbus) ; for GDBus tests - ("pkg-config" ,pkg-config) - ("python" ,python-minimal-wrapper) - ("perl" ,perl) ; needed by GIO tests - ("tzdata" ,tzdata-for-tests))) ; for tests/gdatet= ime.c - (arguments - `(#:disallowed-references (,tzdata-for-tests) - #:configure-flags '("-Dselinux=3Ddisabled") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-dbus-launch-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((dbus (assoc-ref inputs "dbus"))) - (substitute* "gio/gdbusaddress.c" - (("command_line =3D g_strdup_printf \\(\"dbus-launch") - (string-append "command_line =3D g_strdup_printf (\"" - dbus "/bin/dbus-launch"))) - #t))) - (add-after 'unpack 'patch-gio-launch-desktop - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; See also - ;; for another future fix. - (substitute* "gio/gdesktopappinfo.c" - (("gio-launch-desktop") - (string-append out "/libexec/gio-launch-desktop"))) - #t))) - ;; TODO: Remove the conditional in the next core-updates cycle. - ;; Needed to build glib on slower ARM nodes. - ,@(if (string-prefix? "arm" (%current-system)) - `((add-after 'unpack 'increase-test-timeout - (lambda _ - (substitute* "meson.build" - (("test_timeout =3D 60") - "test_timeout =3D 90") - (("test_timeout_slow =3D 120") - "test_timeout_slow =3D 180"))))) - '()) - (add-before 'build 'pre-build - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; For tests/gdatetime.c. - (setenv "TZDIR" - (string-append (assoc-ref inputs "tzdata") - "/share/zoneinfo")) - - ;; Some tests want write access there. - (setenv "HOME" (getcwd)) - (setenv "XDG_CACHE_HOME" (getcwd)) - #t)) - (add-after 'unpack 'disable-failing-tests - (lambda _ - (let ((disable - (lambda (test-file test-paths) - (define pattern+procs - (map (lambda (test-path) - (cons - ;; XXX: only works for single line statem= ents. - (format #f "g_test_add_func.*\"~a\".*" te= st-path) - (const ""))) - test-paths)) - (substitute test-file pattern+procs))) - (failing-tests - '(("glib/tests/thread.c" - (;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-xe= n-amd64 - ;; as found on hydra.gnu.org, and strace(1) doesn= 't - ;; recognize it. - "/thread/thread4")) - - ;; This tries to find programs in FHS directories. - ("glib/tests/utils.c" - ("/utils/find-program")) - - ;; This fails because "glib/tests/echo-script" cann= ot be - ;; found. - ("glib/tests/spawn-singlethread.c" - ("/gthread/spawn-script")) - - ("glib/tests/timer.c" - (;; fails if compiler optimizations are enabled, w= hich they - ;; are by default. - "/timer/stop")) - - ("gio/tests/gapplication.c" - (;; XXX: proven to be unreliable. See: - ;; - ;; - "/gapplication/quit" - - ;; XXX: fails randomly for unknown reason. See: - ;; - "/gapplication/local-actions")) - - ("gio/tests/contenttype.c" - (;; XXX: requires shared-mime-info. - "/contenttype/guess" - "/contenttype/guess_svg_from_data" - "/contenttype/subtype" - "/contenttype/list" - "/contenttype/icon" - "/contenttype/symbolic-icon" - "/contenttype/tree")) - - ("gio/tests/appinfo.c" - (;; XXX: requires update-desktop-database. - "/appinfo/associations")) - - ("gio/tests/desktop-app-info.c" - (;; XXX: requires update-desktop-database. - "/desktop-app-info/delete" - "/desktop-app-info/default" - "/desktop-app-info/fallback" - "/desktop-app-info/lastused" - "/desktop-app-info/search")) - - ("gio/tests/gdbus-peer.c" - (;; Requires /etc/machine-id. - "/gdbus/codegen-peer-to-peer")) - - ("gio/tests/gdbus-address-get-session.c" - (;; Requires /etc/machine-id. - "/gdbus/x11-autolaunch")) - - ("gio/tests/gsocketclient-slow.c" - (;; These tests tries to resolve "localhost", and = fails. - "/socket-client/happy-eyeballs/slow" - "/socket-client/happy-eyeballs/cancellation/delay= ed")) - - ))) - (for-each (lambda (x) (apply disable x)) failing-tests) - #t))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (if tests? - (begin - (setenv "MESON_TESTTHREADS" - (number->string (parallel-job-count))) - ;; Do not run tests marked as "flaky". - (invoke "meson" "test" "--no-suite" "flaky")) - #t))) - ;; TODO: meson does not permit the bindir to be outside of prefi= x. - ;; See https://github.com/mesonbuild/meson/issues/2561 - ;; We can remove this once meson is patched. - (add-after 'install 'move-executables - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (assoc-ref outputs "bin"))) - (mkdir-p bin) - (rename-file (string-append out "/bin") - (string-append bin "/bin")) - ;; This one is an implementation detail of glib. - ;; It is wrong that that's in "/bin" in the first place, - ;; but that's what upstream is doing right now. - ;; See . - (mkdir (string-append out "/libexec")) - (rename-file (string-append bin "/bin/gio-launch-desktop")= - (string-append out "/libexec/gio-launch-deskt= op")) - ;; Do not refer to "bindir", which points to "${prefix}/bi= n". - ;; We don't patch "bindir" to point to "$bin/bin", because= that - ;; would create a reference cycle between the "out" and "b= in" - ;; outputs. - (substitute* (list (string-append out "/lib/pkgconfig/gio-= 2.0.pc") - (string-append out "/lib/pkgconfig/glib= -2.0.pc")) - (("bindir=3D\\$\\{prefix\\}/bin") "") - (("=3D\\$\\{bindir\\}/") "=3D")) - #t)))))) - ;; TODO: see above for explanation. - ;; #:configure-flags (list (string-append "--bindir=3D" - ;; (assoc-ref %outputs "bin= ") - ;; "/bin")) - - (native-search-paths - ;; This variable is not really "owned" by GLib, but several related - ;; packages refer to it: gobject-introspection's tools use it as a s= earch - ;; path for .gir files, and it's also a search path for schemas prod= uced - ;; by 'glib-compile-schemas'. - (list (search-path-specification - (variable "XDG_DATA_DIRS") - (files '("share"))) - ;; To load extra gio modules from glib-networking, etc. - (search-path-specification - (variable "GIO_EXTRA_MODULES") - (files '("lib/gio/modules"))))) - (search-paths native-search-paths) - (properties '((hidden? . #t))) - - (synopsis "Thread-safe general utility library; basis of GTK+ and GNO= ME") - (description - "GLib provides data structure handling for C, portability wrappers, -and interfaces for such runtime functionality as an event loop, threads,= -dynamic loading, and an object system.") - (home-page "https://developer.gnome.org/glib/") - (license license:lgpl2.1+))) + (name "glib") + (version "2.62.6") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" + name "/" (string-take version 4) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh"))= + (patches + (search-patches "glib-tests-timer.patch" "glib-appinfo-watch.pat= ch")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "tests/spawn-test.c" + (("/bin/sh") "sh")) + #t)))) + (build-system meson-build-system) + (outputs '("out" ; everything + "bin")) ; glib-mkenums, gtester, etc.; depends on Python + (arguments + `(#:disallowed-references (,tzdata-for-tests) + #:phases + (modify-phases %standard-phases + ;; TODO: Remove the conditional in the next core-updates cycle.= + ;; Needed to build glib on slower ARM nodes. + ,@(if (string-prefix? "arm" (%current-system)) + `((add-after 'unpack 'increase-test-timeout + (lambda _ + (substitute* "meson.build" + (("test_timeout =3D 60") + "test_timeout =3D 90") + (("test_timeout_slow =3D 120") + "test_timeout_slow =3D 180"))))) + '()) + (add-after 'unpack 'patch-dbus-launch-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((dbus (assoc-ref inputs "dbus"))) + (substitute* "gio/gdbusaddress.c" + (("command_line =3D g_strdup_printf \\(\"dbus-launch") + (string-append "command_line =3D g_strdup_printf (\"" + dbus "/bin/dbus-launch"))) + #t))) + (add-after 'unpack 'patch-gio-launch-desktop + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; See also + ;; for another future fix. + (substitute* "gio/gdesktopappinfo.c" + (("gio-launch-desktop") + (string-append out "/libexec/gio-launch-desktop"))) + #t))) + (add-before 'build 'pre-build + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; For tests/gdatetime.c. + (setenv "TZDIR" + (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo")) + ;; Some tests want write access there. + (setenv "HOME" (getcwd)) + (setenv "XDG_CACHE_HOME" (getcwd)) + #t)) + (add-after 'unpack 'disable-failing-tests + (lambda _ + (let ((disable + (lambda (test-file test-paths) + (define pattern+procs + (map (lambda (test-path) + (cons + ;; XXX: only works for single line state= ments. + (format #f "g_test_add_func.*\"~a\".*" t= est-path) + (const ""))) + test-paths)) + (substitute test-file pattern+procs))) + (failing-tests + '(("glib/tests/thread.c" + ( ;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-= xen-amd64 + ;; as found on hydra.gnu.org, and strace(1) does= n't + ;; recognize it. + "/thread/thread4")) + ;; This tries to find programs in FHS directories.= + ("glib/tests/utils.c" + ("/utils/find-program")) + ;; This fails because "glib/tests/echo-script" can= not be + ;; found. + ("glib/tests/spawn-singlethread.c" + ("/gthread/spawn-script")) + ("glib/tests/timer.c" + ( ;; fails if compiler optimizations are enabled,= which they + ;; are by default. + "/timer/stop")) + ("gio/tests/gapplication.c" + ( ;; XXX: proven to be unreliable. See: + ;; + ;; + "/gapplication/quit" + ;; XXX: fails randomly for unknown reason. See: + ;; + "/gapplication/local-actions")) + ("gio/tests/contenttype.c" + ( ;; XXX: requires shared-mime-info. + "/contenttype/guess" + "/contenttype/guess_svg_from_data" + "/contenttype/subtype" + "/contenttype/list" + "/contenttype/icon" + "/contenttype/symbolic-icon" + "/contenttype/tree")) + ("gio/tests/appinfo.c" + ( ;; XXX: requires update-desktop-database. + "/appinfo/associations")) + ("gio/tests/desktop-app-info.c" + ( ;; XXX: requires update-desktop-database. + "/desktop-app-info/delete" + "/desktop-app-info/default" + "/desktop-app-info/fallback" + "/desktop-app-info/lastused" + "/desktop-app-info/search")) + ("gio/tests/gdbus-peer.c" + ( ;; Requires /etc/machine-id. + "/gdbus/codegen-peer-to-peer")) + ("gio/tests/gdbus-address-get-session.c" + ( ;; Requires /etc/machine-id. + "/gdbus/x11-autolaunch")) + ("gio/tests/gsocketclient-slow.c" + ( ;; These tests tries to resolve "localhost", an= d fails. + "/socket-client/happy-eyeballs/slow" + "/socket-client/happy-eyeballs/cancellation/dela= yed"))))) + (for-each (lambda (x) (apply disable x)) failing-tests) + #t))) + (replace 'check + (lambda _ + (setenv "MESON_TESTTHREADS" + (number->string (parallel-job-count))) + ;; Do not run tests marked as "flaky". + (invoke "meson" "test" "--no-suite" "flaky"))) + ;; TODO: meson does not permit the bindir to be outside of pref= ix. + ;; See https://github.com/mesonbuild/meson/issues/2561 + ;; We can remove this once meson is patched. + (add-after 'install 'move-executables + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) + (mkdir-p bin) + (rename-file (string-append out "/bin") + (string-append bin "/bin")) + ;; This one is an implementation detail of glib. + ;; It is wrong that that's in "/bin" in the first place, + ;; but that's what upstream is doing right now. + ;; See .= + (mkdir (string-append out "/libexec")) + (rename-file (string-append bin "/bin/gio-launch-desktop"= ) + (string-append out "/libexec/gio-launch-desk= top")) + ;; Do not refer to "bindir", which points to "${prefix}/b= in". + ;; We don't patch "bindir" to point to "$bin/bin", becaus= e that + ;; would create a reference cycle between the "out" and "= bin" + ;; outputs. + (substitute* (list (string-append out "/lib/pkgconfig/gio= -2.0.pc") + (string-append out "/lib/pkgconfig/gli= b-2.0.pc")) + (("bindir=3D\\$\\{prefix\\}/bin") "") + (("=3D\\$\\{bindir\\}/") "=3D")) + #t)))))) + ;; TODO: see above for explanation. + ;; #:configure-flags (list (string-append "--bindir=3D" + ;; (assoc-ref %outputs "bin")= + ;; "/bin")) + (native-inputs + `(("dbus" ,dbus) ; for GDBus tests + ("gettext" ,gettext-minimal) + ("m4" ,m4) ; for installing m4 macros + ("perl" ,perl) ; needed by GIO tests + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("tzdata" ,tzdata-for-tests))) ; for tests/gdatetime.c + (propagated-inputs + `(("libffi" ,libffi) ; in the Requires.private field of gobject-2.0= =2Epc + ("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc + ("util-linux" ,util-linux "lib") ;for libmount + ("zlib" ,zlib))) ; in the Requires.private field of glib-2.0.pc + (native-search-paths + ;; This variable is not really "owned" by GLib, but several related= + ;; packages refer to it: gobject-introspection's tools use it as a = search + ;; path for .gir files, and it's also a search path for schemas pro= duced + ;; by 'glib-compile-schemas'. + (list + (search-path-specification + (variable "XDG_DATA_DIRS") + (files '("share"))) + ;; To load extra gio modules from glib-networking, etc. + (search-path-specification + (variable "GIO_EXTRA_MODULES") + (files '("lib/gio/modules"))))) + (search-paths native-search-paths) + (synopsis "Thread-safe general utility library; basis of GTK+ and GN= OME") + (description "GLib provides data structure handling for C, portabili= ty +wrappers, and interfaces for such runtime functionality as an event loop= , +threads, dynamic loading, and an object system.") + (home-page "https://developer.gnome.org/glib/") + (license license:lgpl2.1+))) =20 (define-public glib-with-documentation ;; glib's doc must be built in a separate package since it requires gt= k-doc, --=20 2.30.1 --------------2B51BB6BCF7FD238BE97D642 Content-Type: text/x-patch; charset=UTF-8; name="0003-gnu-glib-Update-to-2.64.3.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0003-gnu-glib-Update-to-2.64.3.patch" =46rom a36581713c963b0e96401ad160b042cfd4e86b9c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 07:22:07 -0500 Subject: [PATCH 03/11] gnu: glib: Update to 2.64.3. * gnu/packages/glib.scm (glib) [version]: Update to 2.64.3. [patches]: Add glib-disable-failing-tests.patch. Remove glib-tests-timer.patch. [arguments]<#:phases>['patch-python-references]: New phase. ['pre-check]: New phase. ['move-bin]: New phase. ['patch-dbus-launch-path]: Remove phase. ['patch-gio-launch-desktop]: Remove phase. ['pre-build]: Remove phase. ['disable-failing-tests]: Remove phase. ['check]: Remove phase. ['move-executables]: Remove phase. [native-inputs]: Add intltool, python, libxml2 and libxslt. Remove dbus. [inputs]: Add dbus and libelf. [propagated-inputs]: Add libselinux. * gnu/packages/patches/glib-disable-failing-tests.patch: New file. * gnu/packages/patches/glib-tests-timer.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust. --- gnu/local.mk | 2 +- gnu/packages/glib.scm | 157 +++++------------- .../patches/glib-disable-failing-tests.patch | 84 ++++++++++ gnu/packages/patches/glib-tests-timer.patch | 15 -- 4 files changed, 127 insertions(+), 131 deletions(-) create mode 100644 gnu/packages/patches/glib-disable-failing-tests.patch= delete mode 100644 gnu/packages/patches/glib-tests-timer.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6c6d1ba47b..da6af367a2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1068,7 +1068,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ - %D%/packages/patches/glib-tests-timer.patch \ + %D%/packages/patches/glib-disable-failing-tests.patch \ %D%/packages/patches/glibc-CVE-2018-11236.patch \ %D%/packages/patches/glibc-CVE-2018-11237.patch \ %D%/packages/patches/glibc-CVE-2019-7309.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index e5372c6f28..f0548ff71c 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -41,6 +41,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) + #:use-module (gnu packages elf) #:use-module (gnu packages enlightenment) #:use-module (gnu packages file) #:use-module (gnu packages flex) @@ -60,6 +61,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages selinux) #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -171,7 +173,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.62.6") + (version "2.64.3") (source (origin (method url-fetch) @@ -180,9 +182,10 @@ shared NFS home directories.") name "/" (string-take version 4) "/" name "-" version ".tar.xz")) (sha256 - (base32 "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh"))= + (base32 "08pbgiv5m3rica4ydvwvpq5mrxbyswx7l1jzjc2ch52xjabvr77y"))= (patches - (search-patches "glib-tests-timer.patch" "glib-appinfo-watch.pat= ch")) + (search-patches "glib-disable-failing-tests.patch" + "glib-appinfo-watch.patch")) (modules '((guix build utils))) (snippet '(begin @@ -207,24 +210,21 @@ shared NFS home directories.") (("test_timeout_slow =3D 120") "test_timeout_slow =3D 180"))))) '()) - (add-after 'unpack 'patch-dbus-launch-path + ;; Python references are not being patched in patch-phase of bu= ild, + ;; despite using python-wrapper as input. So we patch them manu= ally. + (add-after 'unpack 'patch-python-references (lambda* (#:key inputs #:allow-other-keys) - (let ((dbus (assoc-ref inputs "dbus"))) - (substitute* "gio/gdbusaddress.c" - (("command_line =3D g_strdup_printf \\(\"dbus-launch") - (string-append "command_line =3D g_strdup_printf (\"" - dbus "/bin/dbus-launch"))) - #t))) - (add-after 'unpack 'patch-gio-launch-desktop - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; See also - ;; for another future fix. - (substitute* "gio/gdesktopappinfo.c" - (("gio-launch-desktop") - (string-append out "/libexec/gio-launch-desktop"))) - #t))) - (add-before 'build 'pre-build + (substitute* '("gio/gdbus-2.0/codegen/gdbus-codegen.in" + "glib/gtester-report.in" + "gobject/glib-genmarshal.in" + "gobject/glib-mkenums.in") + (("@PYTHON@") + (string-append (assoc-ref inputs "python") + "/bin/python" + ,(version-major+minor + (package-version python))))) + #t)) + (add-before 'check 'pre-check (lambda* (#:key inputs outputs #:allow-other-keys) ;; For tests/gdatetime.c. (setenv "TZDIR" @@ -234,103 +234,23 @@ shared NFS home directories.") (setenv "HOME" (getcwd)) (setenv "XDG_CACHE_HOME" (getcwd)) #t)) - (add-after 'unpack 'disable-failing-tests - (lambda _ - (let ((disable - (lambda (test-file test-paths) - (define pattern+procs - (map (lambda (test-path) - (cons - ;; XXX: only works for single line state= ments. - (format #f "g_test_add_func.*\"~a\".*" t= est-path) - (const ""))) - test-paths)) - (substitute test-file pattern+procs))) - (failing-tests - '(("glib/tests/thread.c" - ( ;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-= xen-amd64 - ;; as found on hydra.gnu.org, and strace(1) does= n't - ;; recognize it. - "/thread/thread4")) - ;; This tries to find programs in FHS directories.= - ("glib/tests/utils.c" - ("/utils/find-program")) - ;; This fails because "glib/tests/echo-script" can= not be - ;; found. - ("glib/tests/spawn-singlethread.c" - ("/gthread/spawn-script")) - ("glib/tests/timer.c" - ( ;; fails if compiler optimizations are enabled,= which they - ;; are by default. - "/timer/stop")) - ("gio/tests/gapplication.c" - ( ;; XXX: proven to be unreliable. See: - ;; - ;; - "/gapplication/quit" - ;; XXX: fails randomly for unknown reason. See: - ;; - "/gapplication/local-actions")) - ("gio/tests/contenttype.c" - ( ;; XXX: requires shared-mime-info. - "/contenttype/guess" - "/contenttype/guess_svg_from_data" - "/contenttype/subtype" - "/contenttype/list" - "/contenttype/icon" - "/contenttype/symbolic-icon" - "/contenttype/tree")) - ("gio/tests/appinfo.c" - ( ;; XXX: requires update-desktop-database. - "/appinfo/associations")) - ("gio/tests/desktop-app-info.c" - ( ;; XXX: requires update-desktop-database. - "/desktop-app-info/delete" - "/desktop-app-info/default" - "/desktop-app-info/fallback" - "/desktop-app-info/lastused" - "/desktop-app-info/search")) - ("gio/tests/gdbus-peer.c" - ( ;; Requires /etc/machine-id. - "/gdbus/codegen-peer-to-peer")) - ("gio/tests/gdbus-address-get-session.c" - ( ;; Requires /etc/machine-id. - "/gdbus/x11-autolaunch")) - ("gio/tests/gsocketclient-slow.c" - ( ;; These tests tries to resolve "localhost", an= d fails. - "/socket-client/happy-eyeballs/slow" - "/socket-client/happy-eyeballs/cancellation/dela= yed"))))) - (for-each (lambda (x) (apply disable x)) failing-tests) - #t))) - (replace 'check - (lambda _ - (setenv "MESON_TESTTHREADS" - (number->string (parallel-job-count))) - ;; Do not run tests marked as "flaky". - (invoke "meson" "test" "--no-suite" "flaky"))) - ;; TODO: meson does not permit the bindir to be outside of pref= ix. - ;; See https://github.com/mesonbuild/meson/issues/2561 - ;; We can remove this once meson is patched. - (add-after 'install 'move-executables + ;; Meson does not permit the bindir to be outside of prefix. + (add-after 'install 'move-bin (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (assoc-ref outputs "bin"))) + (let* ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) (mkdir-p bin) - (rename-file (string-append out "/bin") - (string-append bin "/bin")) - ;; This one is an implementation detail of glib. - ;; It is wrong that that's in "/bin" in the first place, - ;; but that's what upstream is doing right now. - ;; See .= - (mkdir (string-append out "/libexec")) - (rename-file (string-append bin "/bin/gio-launch-desktop"= ) - (string-append out "/libexec/gio-launch-desk= top")) + (rename-file + (string-append out "/bin") + (string-append bin "/bin")) ;; Do not refer to "bindir", which points to "${prefix}/b= in". ;; We don't patch "bindir" to point to "$bin/bin", becaus= e that ;; would create a reference cycle between the "out" and "= bin" ;; outputs. - (substitute* (list (string-append out "/lib/pkgconfig/gio= -2.0.pc") - (string-append out "/lib/pkgconfig/gli= b-2.0.pc")) + (substitute* + (list + (string-append out "/lib/pkgconfig/gio-2.0.pc") + (string-append out "/lib/pkgconfig/glib-2.0.pc")) (("bindir=3D\\$\\{prefix\\}/bin") "") (("=3D\\$\\{bindir\\}/") "=3D")) #t)))))) @@ -339,15 +259,22 @@ shared NFS home directories.") ;; (assoc-ref %outputs "bin")= ;; "/bin")) (native-inputs - `(("dbus" ,dbus) ; for GDBus tests - ("gettext" ,gettext-minimal) + `(("gettext" ,gettext-minimal) + ("libintl" ,intltool) ("m4" ,m4) ; for installing m4 macros ("perl" ,perl) ; needed by GIO tests ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("tzdata" ,tzdata-for-tests))) ; for tests/gdatetime.c + ("python" ,python) ; For 'patch-python-references + ("python-wrapper" ,python-wrapper) + ("tzdata" ,tzdata-for-tests) ; for tests/gdatetime.c + ("xmllint" ,libxml2) + ("xsltproc" ,libxslt))) + (inputs + `(("dbus" ,dbus) + ("libelf" ,libelf))) (propagated-inputs `(("libffi" ,libffi) ; in the Requires.private field of gobject-2.0= =2Epc + ("libselinux" ,libselinux) ; in the Requires.private field of gio= -2.0.pc ("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc ("util-linux" ,util-linux "lib") ;for libmount ("zlib" ,zlib))) ; in the Requires.private field of glib-2.0.pc diff --git a/gnu/packages/patches/glib-disable-failing-tests.patch b/gnu/= packages/patches/glib-disable-failing-tests.patch new file mode 100644 index 0000000000..3601c42030 --- /dev/null +++ b/gnu/packages/patches/glib-disable-failing-tests.patch @@ -0,0 +1,84 @@ +From a2e6783f2278ed32b1e552691ec5d67d6940757e Mon Sep 17 00:00:00 2001 +From: Raghav Gururajan +Date: Tue, 9 Jun 2020 05:17:53 -0400 +Subject: [PATCH] PATCH: Disable failing tests. + +--- + gio/tests/meson.build | 19 ------------------- + glib/tests/meson.build | 2 -- + 2 files changed, 21 deletions(-) + +diff --git a/gio/tests/meson.build b/gio/tests/meson.build +index c7c3e3035..6e38eb39e 100644 +--- a/gio/tests/meson.build ++++ b/gio/tests/meson.build +@@ -34,7 +34,6 @@ gio_tests =3D { + 'buffered-output-stream' : {}, + 'cancellable' : {}, + 'contexts' : {}, +- 'contenttype' : {}, + 'converter-stream' : {}, + 'credentials' : {}, + 'data-input-stream' : {}, +@@ -78,7 +77,6 @@ gio_tests =3D { + 'tls-certificate' : {'extra_sources' : ['gtesttlsbackend.c']}, + 'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']}, + 'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']}, +- 'gdbus-address-get-session' : {}, + 'win32-appinfo' : {}, + } +=20 +@@ -135,10 +133,6 @@ endif + if host_machine.system() !=3D 'windows' + gio_tests +=3D { + 'file' : {}, +- 'gdbus-peer' : { +- 'dependencies' : [libgdbus_example_objectmanager_dep], +- 'install_rpath' : installed_tests_execdir +- }, + 'gdbus-peer-object-manager' : {}, + 'live-g-file' : {}, + 'socket-address' : {}, +@@ -173,19 +167,6 @@ if host_machine.system() !=3D 'windows' + } + endif +=20 +- # Uninstalled because of the check-for-executable logic in DesktopApp= Info +- # unable to find the installed executable +- if not glib_have_cocoa +- gio_tests +=3D { +- 'appinfo' : { +- 'install' : false, +- }, +- 'desktop-app-info' : { +- 'install' : false, +- }, +- } +- endif +- + test_extra_programs +=3D { + 'basic-application' : {}, + 'dbus-launch' : {}, +diff --git a/glib/tests/meson.build b/glib/tests/meson.build +index 8da477d19..9fa24dd49 100644 +--- a/glib/tests/meson.build ++++ b/glib/tests/meson.build +@@ -103,7 +103,6 @@ glib_tests =3D { + 'utf8-pointer' : {}, + 'utf8-validate' : {}, + 'utf8-misc' : {}, +- 'utils' : {}, + 'unicode' : {}, + 'uri' : {}, + '1bit-mutex' : {}, +@@ -151,7 +150,6 @@ if host_machine.system() =3D=3D 'windows' + else + glib_tests +=3D { + 'include' : {}, +- 'unix' : {}, + } + if have_rtld_next + glib_tests +=3D { +--=20 +2.26.2 + diff --git a/gnu/packages/patches/glib-tests-timer.patch b/gnu/packages/p= atches/glib-tests-timer.patch deleted file mode 100644 index e37425c0c8..0000000000 --- a/gnu/packages/patches/glib-tests-timer.patch +++ /dev/null @@ -1,15 +0,0 @@ -* On i686 floating-point roundoff errors could sometimes cause this chec= k to - fail depending on the elapsed microseconds. Improve rounding by addin= g a - fractional bit. - ---- glib-2.40.0/glib/tests/timer.c 2014-03-05 08:05:42.000000000 -0600 -+++ glib-2.40.0/glib/tests/timer.c 2014-07-10 16:33:12.746862822 -0500 -@@ -35,7 +35,7 @@ - elapsed =3D g_timer_elapsed (timer, µs); -=20 - g_assert_cmpfloat (elapsed, <, 1.0); -- g_assert_cmpuint (micros, =3D=3D, ((guint64)(elapsed * 1e6)) % 100000= 0); -+ g_assert_cmpuint (micros, =3D=3D, ((guint64)(elapsed * 1e6 + 0.5)) % = 1000000); -=20 - g_timer_destroy (timer); - } --=20 2.30.1 --------------2B51BB6BCF7FD238BE97D642 Content-Type: text/x-patch; charset=UTF-8; name="0004-gnu-glib-Update-synopsis-description-and-home-page.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0004-gnu-glib-Update-synopsis-description-and-home-page.patc"; filename*1="h" =46rom 8a337d499afb066d7323e207ae31b828359894fe Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 07:45:50 -0500 Subject: [PATCH 04/11] gnu: glib: Update synopsis, description and home-p= age. * gnu/packages/glib.scm (glib) [synopsis]: Modify. [description]: Modify. [home-page]: Modify. --- gnu/packages/glib.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index f0548ff71c..5f4c5b4f73 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -292,11 +292,12 @@ shared NFS home directories.") (variable "GIO_EXTRA_MODULES") (files '("lib/gio/modules"))))) (search-paths native-search-paths) - (synopsis "Thread-safe general utility library; basis of GTK+ and GN= OME") - (description "GLib provides data structure handling for C, portabili= ty -wrappers, and interfaces for such runtime functionality as an event loop= , -threads, dynamic loading, and an object system.") - (home-page "https://developer.gnome.org/glib/") + (synopsis "Low-level core library for GNOME projects") + (description "GLib provides the core application building blocks for= +libraries and applications written in C. It provides the core object sy= stem +used in GNOME, the main loop implementation, and a large set of utility +functions for strings and common data structures.") + (home-page "https://wiki.gnome.org/Projects/GLib") (license license:lgpl2.1+))) =20 (define-public glib-with-documentation --=20 2.30.1 --------------2B51BB6BCF7FD238BE97D642 Content-Type: text/x-patch; charset=UTF-8; name="0005-gnu-glib-with-documentation-Make-some-cosmetic-chang.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0005-gnu-glib-with-documentation-Make-some-cosmetic-chang.pa"; filename*1="tch" =46rom 438b5d21587a10bd48d4430bc6860c9d21f44b49 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 09:37:00 -0500 Subject: [PATCH 05/11] gnu: glib-with-documentation: Make some cosmetic changes. * gnu/packages/glib.scm (glib-with-documentation): Make some cosmetic cha= nges. --- gnu/packages/glib.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 5f4c5b4f73..f8d23e5802 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -307,8 +307,8 @@ functions for strings and common data structures.") (properties (alist-delete 'hidden? (package-properties glib))) (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc re= ference (native-inputs - `(("gtk-doc" ,gtk-doc) ; for the doc - ("docbook-xml" ,docbook-xml) + `(("docbook-xml" ,docbook-xml) + ("gtk-doc" ,gtk-doc) ; for the doc ("libxml2" ,libxml2) ,@(package-native-inputs glib))) (arguments @@ -319,12 +319,13 @@ functions for strings and common data structures.")= `(modify-phases ,phases (add-after 'install 'move-doc (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (html (string-append "/share/gtk-doc"))) - (copy-recursively (string-append out html) - (string-append doc html)) - (delete-file-recursively (string-append out html)) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (html (string-append "/share/gtk-doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out html) + (string-append doc html)) #t))))))))) =20 (define gobject-introspection --=20 2.30.1 --------------2B51BB6BCF7FD238BE97D642 Content-Type: text/x-patch; charset=UTF-8; name="0006-gnu-glib-with-documentation-Fix-documentation-build.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0006-gnu-glib-with-documentation-Fix-documentation-build.pat"; filename*1="ch" =46rom a4ee35143ba9e8a9c84d4649a18503a473779f22 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 09:39:52 -0500 Subject: [PATCH 06/11] gnu: glib-with-documentation: Fix documentation bu= ild. * gnu/packages/glib.scm (glib-with-documentation) [native-inputs]: Add docbook-4.2. Remove libxml2. [arguments]<#:phases>['patch-docbook-xml]: New phase. --- gnu/packages/glib.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index f8d23e5802..07e65e49f5 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -307,7 +307,8 @@ functions for strings and common data structures.") (properties (alist-delete 'hidden? (package-properties glib))) (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc re= ference (native-inputs - `(("docbook-xml" ,docbook-xml) + `(("docbook-xml-4.2" ,docbook-xml-4.2) + ("docbook-xml-4.5" ,docbook-xml) ("gtk-doc" ,gtk-doc) ; for the doc ("libxml2" ,libxml2) ,@(package-native-inputs glib))) @@ -317,6 +318,19 @@ functions for strings and common data structures.") `(cons "-Dgtk_doc=3Dtrue" ,flags)) ((#:phases phases) `(modify-phases ,phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs/reference" + (substitute* '("gio/gdbus-object-manager-example/.*\\.x= ml" + "gio/.*\\.xml" "glib/.*\\.xml" "gobject/= =2E*\\.xml") + (("http://www.oasis-open.org/docbook/xml/4.5/") + (string-append (assoc-ref inputs "docbook-xml-4.5") + "/xml/dtd/docbook/"))) + (substitute* "gio/gio.xml" + (("http://www.oasis-open.org/docbook/xml/4.2/") + (string-append (assoc-ref inputs "docbook-xml-4.2") + "/xml/dtd/docbook/")))) + #t)) (add-after 'install 'move-doc (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) --=20 2.30.1 --------------2B51BB6BCF7FD238BE97D642 Content-Type: text/x-patch; charset=UTF-8; name="0007-gnu-cairo-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0007-gnu-cairo-Make-some-cosmetic-changes.patch" =46rom 4ea541c4ca694e602dc79ee8b0ef5cccaf987d4f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 4 Dec 2020 00:49:10 -0500 Subject: [PATCH 07/11] gnu: cairo: Make some cosmetic changes. * gnu/packages/gtk.scm (cairo): Make some cosmetic changes. --- gnu/packages/gtk.scm | 82 ++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index fbaacc11e4..b82a0aed8f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -123,57 +123,57 @@ tools have full access to view and control running = applications.") =20 (define-public cairo (package - (name "cairo") - (version "1.16.0") - (source (origin - (method url-fetch) - (uri (string-append "https://cairographics.org/releases/cair= o-" - version ".tar.xz")) - (sha256 - (base32 - "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))))= - (build-system gnu-build-system) - (propagated-inputs - `(("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glib" ,glib) - ("libpng" ,libpng) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libxrender" ,libxrender) - ("pixman" ,pixman))) - (inputs - `(("ghostscript" ,ghostscript) - ("libspectre" ,libspectre) - ("poppler" ,poppler) - ("xorgproto" ,xorgproto) - ("zlib" ,zlib))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("python" ,python-wrapper))) + (name "cairo") + (version "1.16.0") + (source + (origin + (method url-fetch) + (uri + (string-append "https://cairographics.org/releases/cairo-" + version ".tar.xz")) + (sha256 + (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))= )) + (build-system gnu-build-system) (arguments - `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/201= 3-06/msg00085.html - #:configure-flags '("--enable-tee" ;needed for GNU Icecat - "--enable-xml" ;for cairo-xml support - "--disable-static"))) - (synopsis "2D graphics library") - (description - "Cairo is a 2D graphics library with support for multiple output dev= ices. -Currently supported output targets include the X Window System (via both= -Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG fi= le + `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013= -06/msg00085.html + #:configure-flags + (list + "--enable-tee" ;needed for GNU Icecat + "--enable-xml" ;for cairo-xml support + "--disable-static"))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (inputs + `(("ghostscript" ,ghostscript) + ("libspectre" ,libspectre) + ("poppler" ,poppler) + ("xorgproto" ,xorgproto) + ("zlib" ,zlib))) + (propagated-inputs + `(("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("glib" ,glib) + ("libpng" ,libpng) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxrender" ,libxrender) + ("pixman" ,pixman))) + (synopsis "2D graphics library") + (description "Cairo is a 2D graphics library with support for multip= le output +devices. Currently supported output targets include the X Window System= (via +both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and S= VG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.= - Cairo is designed to produce consistent output on all output media while= taking advantage of display hardware acceleration when available eg. through the X Render Extension). - The cairo API provides operations similar to the drawing operators of PostScript and PDF. Operations in cairo including stroking and filling = cubic B=C3=A9zier splines, transforming and compositing translucent images, an= d antialiased text rendering. All drawing operations can be transformed b= y any affine transformation (scale, rotation, shear, etc.).") - (license license:lgpl2.1) ; or Mozilla Public License 1.1 - (home-page "https://cairographics.org/"))) + (home-page "https://cairographics.org/") + (license license:lgpl2.1))) ; or Mozilla Public License 1.1 =20 (define-public cairo-sans-poppler ;; Variant used to break the dependency cycle between Poppler and Cair= o. --=20 2.30.1 --------------2B51BB6BCF7FD238BE97D642 Content-Type: text/x-patch; charset=UTF-8; name="0008-gnu-cairo-Change-build-system.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0008-gnu-cairo-Change-build-system.patch" =46rom 2637f9545716cf3165fba1366993b73eb7230fd6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 4 Dec 2020 00:51:10 -0500 Subject: [PATCH 08/11] gnu: cairo: Change build-system. * gnu/packages/gtk.scm (cairo) [build-system]: Change from gnu to glib-or= -gtk. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b82a0aed8f..a94eca6a12 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -133,7 +133,7 @@ tools have full access to view and control running ap= plications.") version ".tar.xz")) (sha256 (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))= )) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013= -06/msg00085.html #:configure-flags --=20 2.30.1 --------------2B51BB6BCF7FD238BE97D642 Content-Type: text/x-patch; charset=UTF-8; name="0009-gnu-cairo-Move-documentation-to-separate-output.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0009-gnu-cairo-Move-documentation-to-separate-output.patch" =46rom 338a129c19230480833dbdaa5b195062c99aa4a1 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 4 Dec 2020 00:53:16 -0500 Subject: [PATCH 09/11] gnu: cairo: Move documentation to separate output.= * gnu/packages/gtk.scm (cairo) [outputs]: New output "doc". [arguments]<#:configure-flags>[--with-html-dir]: New flag. --- gnu/packages/gtk.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a94eca6a12..36d39104f8 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -134,13 +134,17 @@ tools have full access to view and control running = applications.") (sha256 (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))= )) (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) (arguments `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013= -06/msg00085.html #:configure-flags (list - "--enable-tee" ;needed for GNU Icecat - "--enable-xml" ;for cairo-xml support - "--disable-static"))) + "--enable-tee" ;needed for GNU Icecat + "--enable-xml" ;for cairo-xml support + "--disable-static" + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html")))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python-wrapper))) --=20 2.30.1 --------------2B51BB6BCF7FD238BE97D642 Content-Type: text/x-patch; charset=UTF-8; name="0010-gnu-cairo-Enable-some-features.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0010-gnu-cairo-Enable-some-features.patch" =46rom a674da82de3f404cbae263d76b83bcc96e0cf8a9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 4 Dec 2020 01:02:00 -0500 Subject: [PATCH 10/11] gnu: cairo: Enable some features. * gnu/packages/gtk.scm (cairo) [native-inputs]: Add gobject-introspection= =2E [inputs]: Add libdrm. Remove xorgproto and zlib. [propagated-inputs]: Add libxcb. --- gnu/packages/gtk.scm | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 36d39104f8..2032568a91 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -139,30 +139,45 @@ tools have full access to view and control running = applications.") `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013= -06/msg00085.html #:configure-flags (list - "--enable-tee" ;needed for GNU Icecat - "--enable-xml" ;for cairo-xml support "--disable-static" + ;; XXX: To be enabled. + ;; "--enable-gallium=3Dyes" + ;; "--enable-gl=3Dyes" + ;; " --enable-glesv2=3Dyes" + ;; "--enable-glesv3=3Dyes" + ;; "--enable-cogl=3Dyes" + ;; "--enable-directfb=3Dyes" + ;; "--enable-vg=3Dyes" + "--enable-tee=3Dyes" + "--enable-xml=3Dyes" (string-append "--with-html-dir=3D" (assoc-ref %outputs "doc") "/share/gtk-doc/html")))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (inputs - `(("ghostscript" ,ghostscript) + `(("drm" ,libdrm) + ("ghostscript" ,ghostscript) ("libspectre" ,libspectre) - ("poppler" ,poppler) - ("xorgproto" ,xorgproto) - ("zlib" ,zlib))) + ("poppler" ,poppler))) (propagated-inputs - `(("fontconfig" ,fontconfig) + `( ;; ("cogl" ,cogl) + ;; ("directfb" ,directfb) + ("fontconfig" ,fontconfig) + ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("glib" ,glib) + ;; ("gtk+" ,gtk+) ("libpng" ,libpng) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libxrender" ,libxrender) - ("pixman" ,pixman))) + ;; ("librsvg" ,librsvg) + ;; ("opengl" ,mesa) + ("pixman" ,pixman) + ("x11" ,libx11) + ("xcb" ,libxcb) + ("xext" ,libxext) + ("xrender" ,libxrender))) (synopsis "2D graphics library") (description "Cairo is a 2D graphics library with support for multip= le output devices. Currently supported output targets include the X Window System= (via --=20 2.30.1 --------------2B51BB6BCF7FD238BE97D642 Content-Type: text/x-patch; charset=UTF-8; name="0011-gnu-cairo-Update-synopsis-description-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0011-gnu-cairo-Update-synopsis-description-and-license.patch" =46rom b7d65f96c1937258daeac97049d4601c213bc12c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 4 Dec 2020 01:04:37 -0500 Subject: [PATCH 11/11] gnu: cairo: Update synopsis, description and licen= se. * gnu/packages/gtk.scm (cairo) [synopsis]: Modify. [description]: Modify. [license]: Modify. --- gnu/packages/gtk.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 2032568a91..111171f65a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -178,21 +178,17 @@ tools have full access to view and control running = applications.") ("xcb" ,libxcb) ("xext" ,libxext) ("xrender" ,libxrender))) - (synopsis "2D graphics library") + (synopsis "Multi-platform 2D graphics library") (description "Cairo is a 2D graphics library with support for multip= le output devices. Currently supported output targets include the X Window System= (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and S= VG file -output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.= -Cairo is designed to produce consistent output on all output media while= -taking advantage of display hardware acceleration when available -eg. through the X Render Extension). -The cairo API provides operations similar to the drawing operators of -PostScript and PDF. Operations in cairo including stroking and filling = cubic -B=C3=A9zier splines, transforming and compositing translucent images, an= d -antialiased text rendering. All drawing operations can be transformed b= y any -affine transformation (scale, rotation, shear, etc.).") +output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.= ") (home-page "https://cairographics.org/") - (license license:lgpl2.1))) ; or Mozilla Public License 1.1 + (license + ;; This project is dual-licensed. + (list + license:lgpl2.1+ + license:mpl1.1)))) =20 (define-public cairo-sans-poppler ;; Variant used to break the dependency cycle between Poppler and Cair= o. --=20 2.30.1 --------------2B51BB6BCF7FD238BE97D642-- --xljpr0SMS9qJe5XRK1QHf60vI9ztq42c6-- --y1IJJmkDmXveLon2R18Lmnl1TpwsY6jc9 Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYEotIAUDAAAAAAAKCRBfWBZkf4vlUcCn AP0Yt+eyySaJjm+dQxx6ubL+T3DZXJYWib/HmkZ0ungXzAD/aUtxWNWR7afSLJc86InrGlrci410 YcUoZXzVI2H9IAE= =ztam -----END PGP SIGNATURE----- --y1IJJmkDmXveLon2R18Lmnl1TpwsY6jc9-- From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 12 11:37:27 2021 Received: (at 42958) by debbugs.gnu.org; 12 Mar 2021 16:37:27 +0000 Received: from localhost ([127.0.0.1]:58217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKkn1-0008S2-KJ for submit@debbugs.gnu.org; Fri, 12 Mar 2021 11:37:27 -0500 Received: from out1.migadu.com ([91.121.223.63]:30910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKkmz-0008Rt-8r for 42958@debbugs.gnu.org; Fri, 12 Mar 2021 11:37:26 -0500 To: 42958@debbugs.gnu.org, Danny Milosavljevic DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1615567042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=PNQACq5TE9S4Z4wmmiS0mXNNzwpeyksxX86V/pjbm18=; b=AgTs1qH9Mve2L60NSezffXmsRSMY5n44m0xeKzAwdOOafTO4hjz3csctll795gn3ZVxqSg P3pmW5AOn2IjaJppDFKbEj69kGi4aiykDKT2KAFh9ERZ679/U3zjbzWj9gOdM3kCg58ddT qxhVVaO+BK8a0OoTrU4jWGm0sL2i12Kd9MvAhJ6mFit1fuU4eyaknyIaiu3liHqRF2Oft/ /L0pc0ZkpzTVbyC7Xv8X8QlX0SNUloS67tzxwl7f6IxlYw/CAvoXgRYSxcpbvPYZ7K+cmu CvbFFlzTLlPo1gkMbHQWd9So7y0HpdYjFvds+JDFV3mKS/3A0TYY5uE00RXlbQ== X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Subject: Re: Big changes from wip-desktop. Message-ID: Date: Fri, 12 Mar 2021 11:37:19 -0500 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="YrlEz8SxQ9FIPvC4PENRydshB1ABS1U4e" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Debbugs-Envelope-To: 42958 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --YrlEz8SxQ9FIPvC4PENRydshB1ABS1U4e Content-Type: multipart/mixed; boundary="npWP0sW2c5np1dLba6wsn48lT1BgSy1NT"; protected-headers="v1" From: Raghav Gururajan To: 42958@debbugs.gnu.org, Danny Milosavljevic Message-ID: Subject: Re: Big changes from wip-desktop. --npWP0sW2c5np1dLba6wsn48lT1BgSy1NT Content-Type: multipart/mixed; boundary="------------E9340A1FBD4A02B2BDE528B9" Content-Language: en-US This is a multi-part message in MIME format. --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Danny! I have split and re-worked remaining patches for current core-updates.=20 Please find them attached. Regards, RG. --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-gobject-introspection-Modify-arguments-and-input.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0001-gnu-gobject-introspection-Modify-arguments-and-input.pa"; filename*1="tch" =46rom 47a7641d83784fcf60f5b07aa1385791cab06474 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 09:59:44 -0500 Subject: [PATCH 01/68] gnu: gobject-introspection: Modify arguments and inputs. * gnu/packages/glib.scm (gobject-introspection) [arguments] <#:glib-or-gtk?>: New argument. [inputs]: Move glib to ... [propagated-inputs]: ... here. --- gnu/packages/glib.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 07e65e49f5..974315f642 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -359,7 +359,8 @@ functions for strings and common data structures.") "gobject-introspection-absolute-shlib-path.patch"= )))) (build-system meson-build-system) (arguments - `(#:phases + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases (modify-phases %standard-phases (add-after 'unpack 'do-not-use-/usr/bin/env (lambda _ @@ -373,11 +374,11 @@ functions for strings and common data structures.")= (inputs `(("bison" ,bison) ("flex" ,flex) - ("glib" ,glib) ("python" ,python-wrapper) ("zlib" ,zlib))) (propagated-inputs - `(;; In practice, GIR users will need libffi when using + `(("glib" ,glib) + ;; In practice, GIR users will need libffi when using ;; gobject-introspection. ("libffi" ,libffi))) (native-search-paths --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-pango-Add-missing-arguments.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-pango-Add-missing-arguments.patch" =46rom 989da48d12be90ca3af152141cd5091fd8d76cd7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:11:10 -0500 Subject: [PATCH 02/68] gnu: pango: Add missing arguments. * gnu/packages/gtk.scm (pango) [arguments]<#:glib-or-gtk?>: New argument.= --- gnu/packages/gtk.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 111171f65a..ce5a0b7520 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -325,7 +325,8 @@ applications.") "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6"))))= (build-system meson-build-system) (arguments - '(#:phases (modify-phases %standard-phases + '(#:glib-or-gtk? ; To wrap binaries and/or compile schemas + #:phases (modify-phases %standard-phases (add-after 'unpack 'disable-cantarell-tests (lambda _ (substitute* "tests/meson.build" --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0003-gnu-pango-Re-arrange-inputs-in-alphabetical-order.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0003-gnu-pango-Re-arrange-inputs-in-alphabetical-order.patch" =46rom 25008dfaf167760cd2c7c795833fc18251c8d58b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:17:09 -0500 Subject: [PATCH 03/68] gnu: pango: Re-arrange inputs in alphabetical orde= r. * gnu/packages/gtk.scm (pango) [propagated-inputs]: Modify. [native-inputs]: Modify. --- gnu/packages/gtk.scm | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index ce5a0b7520..5a07d133b4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -336,24 +336,23 @@ applications.") (("\\[ 'test-itemize'.*") "") (("\\[ 'test-layout'.*") "")) #t))))) - (propagated-inputs - ;; These are all in Requires or Requires.private of the '.pc' files.= - `(("cairo" ,cairo) - ("fribidi" ,fribidi) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glib" ,glib) - ("harfbuzz" ,harfbuzz) - - ;; Some packages, such as Openbox, expect Pango to be built with t= he - ;; optional libxft support. - ("libxft" ,libxft))) - (inputs - `(("zlib" ,zlib))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ; glib-mkenums,= etc. - ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler= , etc. + (propagated-inputs + ;; These are all in Requires or Requires.private of the '.pc' files= =2E + `(("cairo" ,cairo) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("fribidi" ,fribidi) + ("glib" ,glib) + ("harfbuzz" ,harfbuzz) + ;; Some packages, such as Openbox, expect Pango to be built with = the + ;; optional libxft support. + ("libxft" ,libxft))) + (inputs + `(("zlib" ,zlib))) + (native-inputs + `(("glib" ,glib "bin") ; glib-mkenums, etc. + ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. + ("pkg-config" ,pkg-config))) (synopsis "GNOME text and font handling library") (description "Pango is the core text and font handling library used in GNOME --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0004-gnu-pango-Fix-indentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0004-gnu-pango-Fix-indentation.patch" =46rom 1b82fe58c040735560fca0d461abcfcac2f64719 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:18:37 -0500 Subject: [PATCH 04/68] gnu: pango: Fix indentation. * gnu/packages/gtk.scm (pango): Fix indentation. --- gnu/packages/gtk.scm | 58 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5a07d133b4..97d9ef6fd3 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -312,30 +312,30 @@ applications.") =20 (define-public pango (package - (name "pango") - (version "1.44.7") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/pango/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (patches (search-patches "pango-skip-libthai-test.patch")) - (sha256 - (base32 - "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6"))))= - (build-system meson-build-system) - (arguments - '(#:glib-or-gtk? ; To wrap binaries and/or compile schemas - #:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-cantarell-tests - (lambda _ - (substitute* "tests/meson.build" - ;; XXX FIXME: These tests require "font-cantarell= ", but - ;; adding it here would introduce a circular depe= ndency. - (("\\[ 'test-harfbuzz'.*") "") - (("\\[ 'test-itemize'.*") "") - (("\\[ 'test-layout'.*") "")) - #t))))) + (name "pango") + (version "1.44.7") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/pango/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (patches (search-patches "pango-skip-libthai-test.patch"))= + (sha256 + (base32 + "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6"))= )) + (build-system meson-build-system) + (arguments + '(#:glib-or-gtk? ; To wrap binaries and/or compile schemas + #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-cantarell-tests + (lambda _ + (substitute* "tests/meson.build" + ;; XXX FIXME: These tests require "font-cantarel= l", but + ;; adding it here would introduce a circular dep= endency. + (("\\[ 'test-harfbuzz'.*") "") + (("\\[ 'test-itemize'.*") "") + (("\\[ 'test-layout'.*") "")) + #t))))) (propagated-inputs ;; These are all in Requires or Requires.private of the '.pc' files= =2E `(("cairo" ,cairo) @@ -353,13 +353,13 @@ applications.") `(("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. ("pkg-config" ,pkg-config))) - (synopsis "GNOME text and font handling library") - (description - "Pango is the core text and font handling library used in GNOME + (synopsis "GNOME text and font handling library") + (description + "Pango is the core text and font handling library used in GNOME applications. It has extensive support for the different writing system= s used throughout the world.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/pango/"))) + (license license:lgpl2.0+) + (home-page "https://developer.gnome.org/pango/"))) =20 (define-public pango-1.42 (package --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0005-gnu-pango-Add-missing-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0005-gnu-pango-Add-missing-inputs.patch" =46rom 8f1d1541b946dba83413cad33c719d8f2163b464 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:21:03 -0500 Subject: [PATCH 05/68] gnu: pango: Add missing inputs. * gnu/packages/gtk.scm (pango) [propagated-inputs]: Add libthai and libxrender. [native-inputs]: Add help2man, perl and python-wrapper. --- gnu/packages/gtk.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 97d9ef6fd3..f5e1634e87 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -344,15 +344,20 @@ applications.") ("fribidi" ,fribidi) ("glib" ,glib) ("harfbuzz" ,harfbuzz) + ("libthai" ,libthai) ;; Some packages, such as Openbox, expect Pango to be built with = the ;; optional libxft support. - ("libxft" ,libxft))) + ("libxft" ,libxft) + ("libxrender" ,libxrender))) (inputs `(("zlib" ,zlib))) (native-inputs `(("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. - ("pkg-config" ,pkg-config))) + ("help2man" ,help2man) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) (synopsis "GNOME text and font handling library") (description "Pango is the core text and font handling library used in GNOME --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0006-gnu-pango-Update-synopsis-description-and-home-page.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0006-gnu-pango-Update-synopsis-description-and-home-page.pat"; filename*1="ch" =46rom 71428da03a71d2a3f531f772b423b892f654d286 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:24:42 -0500 Subject: [PATCH 06/68] gnu: pango: Update synopsis, description and home-= page. * gnu/packages/gtk.scm (pango) [synopsis]: Modify. [description]: Modify. [home-page]: Modify. --- gnu/packages/gtk.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f5e1634e87..548e46f191 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -358,13 +358,14 @@ applications.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) - (synopsis "GNOME text and font handling library") - (description - "Pango is the core text and font handling library used in GNOME -applications. It has extensive support for the different writing system= s -used throughout the world.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/pango/"))) + (synopsis "Text and font handling library") + (description "Pango is a library for laying out and rendering of tex= t, with +an emphasis on internationalization. Pango can be used anywhere that te= xt +layout is needed, though most of the work on Pango so far has been done = in the +context of the GTK+ widget toolkit. Pango forms the core of text and fo= nt +handling for GTK+-2.x.") + (home-page "https://pango.gnome.org/") + (license license:lgpl2.0+))) =20 (define-public pango-1.42 (package --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0007-gnu-gdk-pixbuf-Fix-indentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0007-gnu-gdk-pixbuf-Fix-indentation.patch" =46rom 444a2be133a2e52e54645ba03aa88df1c87ca835 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:29:02 -0500 Subject: [PATCH 07/68] gnu: gdk-pixbuf: Fix indentation. * gnu/packages/gtk.scm (gdk-pixbuf): Fix indentation. --- gnu/packages/gtk.scm | 80 ++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 548e46f191..b744837cbe 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -577,50 +577,50 @@ highlighting and other features typical of a source= code editor.") =20 (define-public gdk-pixbuf (package - (name "gdk-pixbuf") - (version "2.42.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3"))))= - (build-system meson-build-system) - (arguments - `(#:meson ,meson-0.55 - #:configure-flags '("-Dinstalled_tests=3Dfalse") - #:phases - (modify-phases %standard-phases - ;; 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 + (name "gdk-pixbuf") + (version "2.42.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3"))= )) + (build-system meson-build-system) + (arguments + `(#:meson ,meson-0.55 + #:configure-flags '("-Dinstalled_tests=3Dfalse") + #:phases + (modify-phases %standard-phases + ;; 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) ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ; glib-mkenums= , etc. + ("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= + (synopsis "GNOME image loading and manipulation library") + (description + "GdkPixbuf is a library for image loading and manipulation develope= d in the GNOME project.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/gdk-pixbuf/"))) + (license license:lgpl2.0+) + (home-page "https://developer.gnome.org/gdk-pixbuf/"))) =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.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0008-gnu-gdk-pixbuf-Add-missing-arguments.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0008-gnu-gdk-pixbuf-Add-missing-arguments.patch" =46rom d39e7470248a026c2aee9e6c1b52ec4f40c204b5 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:31:32 -0500 Subject: [PATCH 08/68] gnu: gdk-pixbuf: Add missing arguments. * gnu/packages/gtk.scm (gdk-pixbuf) [arguments]<#:glib-or-gtk?>: New argu= ment. --- gnu/packages/gtk.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b744837cbe..11f05cf6fa 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -590,6 +590,7 @@ highlighting and other features typical of a source c= ode editor.") (build-system meson-build-system) (arguments `(#:meson ,meson-0.55 + #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:configure-flags '("-Dinstalled_tests=3Dfalse") #:phases (modify-phases %standard-phases --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0009-gnu-gdk-pixbuf-Correct-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0009-gnu-gdk-pixbuf-Correct-inputs.patch" =46rom 6ae5ea1284a241076a6e9fa60c3189527405beec Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:35:56 -0500 Subject: [PATCH 09/68] gnu: gdk-pixbuf: Correct inputs. * gnu/packages/gtk.scm (gdk-pixbuf) [propagated-inputs]: Add libx11. Remove libpng. [inputs]: Add libpng. Remove libx11. --- gnu/packages/gtk.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 11f05cf6fa..63ee17d7b4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -604,13 +604,14 @@ highlighting and other features typical of a source= code editor.") (propagated-inputs `( ;; Required by gdk-pixbuf-2.0.pc ("glib" ,glib) - ("libpng" ,libpng) + ;; Required by gdk-pixbuf-xlib-2.0.pc + ("libx11" ,libx11) ;; Used for testing and required at runtime. ("shared-mime-info" ,shared-mime-info))) (inputs `(("libjpeg" ,libjpeg-turbo) - ("libtiff" ,libtiff) - ("libx11" ,libx11))) + ("libpng" ,libpng) + ("libtiff" ,libtiff))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0010-gnu-gdk-pixbuf-Enable-jasper-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0010-gnu-gdk-pixbuf-Enable-jasper-support.patch" =46rom 274ea76c5a3e36380037b26a7a6975189f0391f2 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:41:10 -0500 Subject: [PATCH 10/68] gnu: gdk-pixbuf: Enable jasper support. * gnu/packages/gtk.scm (gdk-pixbuf) [arguments]<#:configure-flags>[-Djasp= er]: New flag. [inputs]: Add jasper. --- gnu/packages/gtk.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 63ee17d7b4..192a5b60f5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -591,7 +591,7 @@ highlighting and other features typical of a source c= ode editor.") (arguments `(#:meson ,meson-0.55 #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas - #:configure-flags '("-Dinstalled_tests=3Dfalse") + #:configure-flags '("-Dinstalled_tests=3Dfalse" "-Djasper=3Dtrue"= ) #:phases (modify-phases %standard-phases ;; The slow tests take longer than the specified timeout. @@ -609,7 +609,8 @@ highlighting and other features typical of a source c= ode editor.") ;; Used for testing and required at runtime. ("shared-mime-info" ,shared-mime-info))) (inputs - `(("libjpeg" ,libjpeg-turbo) + `(("jasper" ,jasper) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff))) (native-inputs --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0011-gnu-gdk-pixbuf-Fix-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0011-gnu-gdk-pixbuf-Fix-documentation.patch" =46rom ebfd8acd539a73871a63c4bc54f97dc35f2d242d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:50:46 -0500 Subject: [PATCH 11/68] gnu: gdk-pixbuf: Fix documentation. * gnu/packages/gtk.scm (gdk-pixbuf) [arguments]<#:phases>['patch-docbook]= : New phase. [native-inputs]: Add docbook-xml and docbook-xsl. --- gnu/packages/gtk.scm | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 192a5b60f5..5bc160be5e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -590,10 +590,25 @@ highlighting and other features typical of a source= code editor.") (build-system meson-build-system) (arguments `(#:meson ,meson-0.55 - #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:configure-flags '("-Dinstalled_tests=3Dfalse" "-Djasper=3Dtrue"= ) #: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.2/"))) + (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)) ;; The slow tests take longer than the specified timeout. ,@(if (any (cute string=3D? <> (%current-system)) '("armhf-linux" "aarch64-linux")) @@ -614,10 +629,12 @@ highlighting and other features typical of a source= code editor.") ("libpng" ,libpng) ("libtiff" ,libtiff))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("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. + ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. + ("pkg-config" ,pkg-config))) (synopsis "GNOME image loading and manipulation library") (description "GdkPixbuf is a library for image loading and manipulation develope= d --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0012-gnu-gdk-pixbuf-Add-missing-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0012-gnu-gdk-pixbuf-Add-missing-inputs.patch" =46rom 9f50f7baaf0f69b9d017321a936c33c3c84cabfd Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:53:43 -0500 Subject: [PATCH 12/68] gnu: gdk-pixbuf: Add missing inputs. * gnu/packages/gtk.scm (gdk-pixbuf) [native-inputs]: Add perl and libxslt= =2E --- gnu/packages/gtk.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5bc160be5e..d9509763d2 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -634,7 +634,9 @@ highlighting and other features typical of a source c= ode editor.") ("gettext" ,gettext-minimal) ("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. - ("pkg-config" ,pkg-config))) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (synopsis "GNOME image loading and manipulation library") (description "GdkPixbuf is a library for image loading and manipulation develope= d --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0013-gnu-gdk-pixbuf-Update-synopsis-description-home-page.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0013-gnu-gdk-pixbuf-Update-synopsis-description-home-page.pa"; filename*1="tch" =46rom 1d90af0cb85b5c048956ef67f9f6ed34444a8c5b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:56:29 -0500 Subject: [PATCH 13/68] gnu: gdk-pixbuf: Update synopsis, description, home-page and license. * gnu/packages/gtk.scm (gdk-pixbuf) [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Update to lgpl2.1+. --- gnu/packages/gtk.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d9509763d2..ff7289e78d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -637,12 +637,12 @@ highlighting and other features typical of a source= code editor.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt))) - (synopsis "GNOME image loading and manipulation library") - (description - "GdkPixbuf is a library for image loading and manipulation develope= d -in the GNOME project.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/gdk-pixbuf/"))) + (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.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0014-gnu-gdk-pixbuf-Disable-failing-tests.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0014-gnu-gdk-pixbuf-Disable-failing-tests.patch" =46rom a1e1ab7564d947e6d3aac72f403382f383c8211e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:00:10 -0500 Subject: [PATCH 14/68] gnu: gdk-pixbuf: Disable failing tests. * gnu/packages/gtk.scm (gdk-pixbuf) [arguments]<#:phases>['disable-failin= g-tests]: New phase. --- gnu/packages/gtk.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index ff7289e78d..c3a007ab23 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -609,6 +609,12 @@ highlighting and other features typical of a source = code editor.") (string-append (assoc-ref inputs "docbook-xml") "/xml/dtd/docbook/")))) #t)) + (add-before 'configure 'disable-failing-tests + (lambda _ + (substitute* "tests/meson.build" + (("\\[ 'pixbuf-fail', \\['conform', 'slow'\\], \\],") + "")) + #t)) ;; The slow tests take longer than the specified timeout. ,@(if (any (cute string=3D? <> (%current-system)) '("armhf-linux" "aarch64-linux")) --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0015-gnu-gdk-pixbuf-svg-Correct-package-definition-to-inc.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0015-gnu-gdk-pixbuf-svg-Correct-package-definition-to-inc.pa"; filename*1="tch" =46rom 8066818b81d68ba749abcb0a3d122c70d9d6a984 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:08:24 -0500 Subject: [PATCH 15/68] gnu: gdk-pixbuf+svg: Correct package definition to= include changes from gdk-pixbuf. * gnu/packages/gtk.scm (gdk-pixbuf+svg) [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 c3a007ab23..b34d758f4a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -660,10 +660,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")) @@ -677,9 +676,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.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0016-gnu-vala-Fix-indentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0016-gnu-vala-Fix-indentation.patch" =46rom 6e06abc97a300d46d73698f348b5a68ca4c45fc1 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:20:37 -0500 Subject: [PATCH 16/68] gnu: vala: Fix indentation. * gnu/packages/gnome.scm (vala): Fix indentation. --- gnu/packages/gnome.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaea4c6cb6..01a86a193a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4267,23 +4267,23 @@ passwords in the GNOME keyring.") '(#:phases (modify-phases %standard-phases (add-before 'check 'pre-check - (lambda _ - (setenv "CC" "gcc") - (substitute* "valadoc/tests/libvaladoc\ + (lambda _ + (setenv "CC" "gcc") + (substitute* "valadoc/tests/libvaladoc\ /tests-extra-environment.sh" - (("export PKG_CONFIG_PATH=3D" m) - (string-append m "$PKG_CONFIG_PATH:")))))))) + (("export PKG_CONFIG_PATH=3D" m) + (string-append m "$PKG_CONFIG_PATH:")))))))) (native-inputs `(("pkg-config" ,pkg-config) ("flex" ,flex) ("bison" ,bison) ("xsltproc" ,libxslt) - ("dbus" ,dbus) ; for dbus tes= ts + ("dbus" ,dbus) ; for dbus tests ("gobject-introspection" ,gobject-introspection))) ; for gir test= s (inputs `(("graphviz" ,graphviz))) (propagated-inputs - `(("glib" ,glib))) ; required by libvala-0.40.pc + `(("glib" ,glib))) ; required by libvala-0.40.pc (home-page "https://wiki.gnome.org/Projects/Vala/") (synopsis "Compiler for the GObject type system") (description --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0017-gnu-vala-Change-build-system.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0017-gnu-vala-Change-build-system.patch" =46rom f9dcc88185226a83b6d63f610962121a83ce80cf Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:21:35 -0500 Subject: [PATCH 17/68] gnu: vala: Change build-system. * gnu/packages/gnome.scm (vala) [build-system]: Change from gnu to glib-o= r-gtk. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 01a86a193a..6e2d9165e9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4262,7 +4262,7 @@ passwords in the GNOME keyring.") (sha256 (base32 "1nx5xjarpkl9hgy0qbqfczx7d7clh5g1r8xr5xp8b97c5fsc2rb1"))= )) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments '(#:phases (modify-phases %standard-phases --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0018-gnu-vala-Enable-coverage-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0018-gnu-vala-Enable-coverage-support.patch" =46rom 8a42fb2902f92602e8c4a452e2cf620806e0fa96 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:23:56 -0500 Subject: [PATCH 18/68] gnu: vala: Enable coverage support. * gnu/packages/gnome.scm (vala) [arguments]<#:configure-flags> [--enable-coverage]: New flag. --- gnu/packages/gnome.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6e2d9165e9..d8b8fdb3e8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4264,7 +4264,8 @@ passwords in the GNOME keyring.") "1nx5xjarpkl9hgy0qbqfczx7d7clh5g1r8xr5xp8b97c5fsc2rb1"))= )) (build-system glib-or-gtk-build-system) (arguments - '(#:phases + '(#:configure-flags '("--enable-coverage") + #:phases (modify-phases %standard-phases (add-before 'check 'pre-check (lambda _ --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0019-gnu-vala-Fix-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0019-gnu-vala-Fix-documentation.patch" =46rom 49aa1c38fd457c01fb82a13bf13a8c9afed24ac6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:30:26 -0500 Subject: [PATCH 19/68] gnu: vala: Fix documentation. * gnu/packages/gnome.scm (vala) [arguments]<#:phases>['patch-docbook-xml]= : New phase. [native-inputs]: Add docbook-xml and docbook-xsl. --- gnu/packages/gnome.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d8b8fdb3e8..733d2ac1e3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4267,6 +4267,14 @@ passwords in the GNOME keyring.") '(#:configure-flags '("--enable-coverage") #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc/manual" + (substitute* '("manual.xml" "version.xml.in") + (("http://www.oasis-open.org/docbook/xml/4.4/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) (add-before 'check 'pre-check (lambda _ (setenv "CC" "gcc") @@ -4276,6 +4284,8 @@ passwords in the GNOME keyring.") (string-append m "$PKG_CONFIG_PATH:")))))))) (native-inputs `(("pkg-config" ,pkg-config) + ("docbook-xml" ,docbook-xml-4.4) + ("docbook-xsl" ,docbook-xsl) ("flex" ,flex) ("bison" ,bison) ("xsltproc" ,libxslt) --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0020-gnu-vala-Add-missing-inputs-and-propagate-libgvc.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0020-gnu-vala-Add-missing-inputs-and-propagate-libgvc.patch" =46rom 9b657b9ae9db9262d88c28910b88f18f59bc2ffa Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:34:48 -0500 Subject: [PATCH 20/68] gnu: vala: Add missing inputs and propagate libgvc= =2E * gnu/packages/gnome.scm (vala) [native-inputs]: Add help2man and perl. [inputs]: Move graphviz to ... [propagated-inputs]: ... here. --- gnu/packages/gnome.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 733d2ac1e3..db014f9b34 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4283,18 +4283,19 @@ passwords in the GNOME keyring.") (("export PKG_CONFIG_PATH=3D" m) (string-append m "$PKG_CONFIG_PATH:")))))))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("bison" ,bison) + ("dbus" ,dbus) ; for dbus tests ("docbook-xml" ,docbook-xml-4.4) ("docbook-xsl" ,docbook-xsl) ("flex" ,flex) - ("bison" ,bison) - ("xsltproc" ,libxslt) - ("dbus" ,dbus) ; for dbus tests - ("gobject-introspection" ,gobject-introspection))) ; for gir test= s - (inputs - `(("graphviz" ,graphviz))) + ("gobject-introspection" ,gobject-introspection) ; for gir tests + ("help2man" ,help2man) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs - `(("glib" ,glib))) ; required by libvala-0.40.pc + `(("glib" ,glib) ; required by libvala-0.40.pc + ("libgvc" ,graphviz))) (home-page "https://wiki.gnome.org/Projects/Vala/") (synopsis "Compiler for the GObject type system") (description --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0021-gnu-vala-Update-synopsis-and-description.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0021-gnu-vala-Update-synopsis-and-description.patch" =46rom 4680aceb9d240b1e261d98d4a3735562dad5dc4d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:38:26 -0500 Subject: [PATCH 21/68] gnu: vala: Update synopsis and description. * gnu/packages/gnome.scm (vala) [synopsis]: Modify. [description]: Modify. --- gnu/packages/gnome.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index db014f9b34..d02a7c5591 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4297,12 +4297,12 @@ passwords in the GNOME keyring.") `(("glib" ,glib) ; required by libvala-0.40.pc ("libgvc" ,graphviz))) (home-page "https://wiki.gnome.org/Projects/Vala/") - (synopsis "Compiler for the GObject type system") - (description - "Vala is a programming language that aims to bring modern programmi= ng -language features to GNOME developers without imposing any additional ru= ntime -requirements and without using a different ABI compared to applications = and -libraries written in C.") + (synopsis "Compiler using the GObject type system") + (description "Vala is a programming language using modern high level= +abstractions without imposing additional runtime requirements and withou= t using +a different ABI compared to applications and libraries written in C. Va= la uses +the GObject type system and has additional code generation routines that= make +targeting the GNOME stack simple.") (license license:lgpl2.1+))) =20 (define-public vte --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0022-gnu-libgsf-Change-build-system.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0022-gnu-libgsf-Change-build-system.patch" =46rom f32446d337046c1b9534d8971ac5b38302178cba Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:53:42 -0500 Subject: [PATCH 22/68] gnu: libgsf: Change build-system. * gnu/packages/gnome.scm (libgsf) [build-system]: Change from gnu to glib= -or-gtk. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d02a7c5591..3d9e98d0c9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3257,7 +3257,7 @@ XML/CSS rendering engine.") (sha256 (base32 "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"))= )) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags '("--disable-static"))) (native-inputs --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0023-gnu-libgsf-Make-separate-output-for-binaries.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0023-gnu-libgsf-Make-separate-output-for-binaries.patch" =46rom f18792280f1f267f3639ec893144f040ee66d96d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:56:04 -0500 Subject: [PATCH 23/68] gnu: libgsf: Make separate output for binaries. * gnu/packages/gnome.scm (libgsf) [outputs]: New output "bin". --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3d9e98d0c9..384535412f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3258,6 +3258,7 @@ XML/CSS rendering engine.") (base32 "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"))= )) (build-system glib-or-gtk-build-system) + (outputs '("out" "bin")) (arguments '(#:configure-flags '("--disable-static"))) (native-inputs --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0024-gnu-libgsf-Re-arrange-inputs-in-alphabetical-order.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0024-gnu-libgsf-Re-arrange-inputs-in-alphabetical-order.patc"; filename*1="h" =46rom 10b20548acc1978077761acf5ec2a7f9e989ef51 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:02:14 -0500 Subject: [PATCH 24/68] gnu: libgsf: Re-arrange inputs in alphabetical ord= er. * gnu/packages/gnome.scm (libgsf) [native-inputs]: Modify. [inputs]: Modify. --- gnu/packages/gnome.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 384535412f..ea37d4a7ca 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3262,15 +3262,13 @@ XML/CSS rendering engine.") (arguments '(#:configure-flags '("--disable-static"))) (native-inputs - `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - - ;; For tests. + `(("gettext" ,gettext-minimal) ("perl" ,perl) - ("perl-xml-parser" ,perl-xml-parser))) + ("perl-xml-parser" ,perl-xml-parser) + ("pkg-config" ,pkg-config))) (inputs - `(("zlib" ,zlib) - ("bzip2" ,bzip2))) + `(("bzip2" ,bzip2) + ("zlib" ,zlib))) (propagated-inputs `(("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0025-gnu-libgsf-Enable-missing-features.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0025-gnu-libgsf-Enable-missing-features.patch" =46rom 7df7e488def2c6b70ada87fd2c1fdeb66888f020 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:08:10 -0500 Subject: [PATCH 25/68] gnu: libgsf: Enable missing features. * gnu/packages/gnome.scm (libgsf) [arguments]<#:configure-flag>[--enable-= introspection]: New flag. [--with-gir-dir=3D]: New flag. [--with-typelib-dir=3D]: New flag. [--with-zlib]: New flag. [--with-bz2]: New flag. [native-inputs]: Add gobject-introspection. --- gnu/packages/gnome.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ea37d4a7ca..d4c20de8b0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3260,9 +3260,27 @@ XML/CSS rendering engine.") (build-system glib-or-gtk-build-system) (outputs '("out" "bin")) (arguments - '(#:configure-flags '("--disable-static"))) + `(#:configure-flags + (list + "--disable-static" + "--enable-introspection" + (string-append "--with-gir-dir=3D" + (assoc-ref %outputs "out") + "/share/gir-" + ,(version-major + (package-version gobject-introspection)) + ".0") + (string-append "--with-typelib-dir=3D" + (assoc-ref %outputs "out") + "/lib/girepository-" + ,(version-major + (package-version gobject-introspection)) + ".0") + "--with-zlib" + "--with-bz2"))) (native-inputs `(("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) ("perl" ,perl) ("perl-xml-parser" ,perl-xml-parser) ("pkg-config" ,pkg-config))) --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0026-gnu-libgsf-Correct-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0026-gnu-libgsf-Correct-inputs.patch" =46rom 34317800dd1d0016ea787b7cfcb58680935064c7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:11:02 -0500 Subject: [PATCH 26/68] gnu: libgsf: Correct inputs. * gnu/packages/gnome.scm (libgsf) [native-inputs]: Add python-wrapper. [propagated-inputs]: Move gdk-pixbuf to ... [inputs]: ... here. --- gnu/packages/gnome.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d4c20de8b0..5cd1396d6c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3283,13 +3283,14 @@ XML/CSS rendering engine.") ("gobject-introspection" ,gobject-introspection) ("perl" ,perl) ("perl-xml-parser" ,perl-xml-parser) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) (inputs `(("bzip2" ,bzip2) + ("gdk-pixbuf" ,gdk-pixbuf) ("zlib" ,zlib))) (propagated-inputs - `(("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) + `(("glib" ,glib) ("libxml2" ,libxml2))) (home-page "https://www.gnome.org/projects/libgsf") (synopsis "GNOME's Structured File Library") --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0027-gnu-libgsf-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0027-gnu-libgsf-Enable-documentation.patch" =46rom c0eda744064e6ed69f75803b87ca66100bd58fa9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:20:52 -0500 Subject: [PATCH 27/68] gnu: libgsf: Enable documentation. * gnu/packages/gnome.scm (libgsf) [outputs]: New output "doc". [arguments]<#:configure-flags>[--with-html-dir]: New flag. [native-inputs]: Add docbook-xml. --- gnu/packages/gnome.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5cd1396d6c..8965365855 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3258,7 +3258,7 @@ XML/CSS rendering engine.") (base32 "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"))= )) (build-system glib-or-gtk-build-system) - (outputs '("out" "bin")) + (outputs '("out" "bin" "doc")) (arguments `(#:configure-flags (list @@ -3276,10 +3276,24 @@ XML/CSS rendering engine.") ,(version-major (package-version gobject-introspection)) ".0") + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html") "--with-zlib" - "--with-bz2"))) + "--with-bz2") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* "gsf-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.5/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t))))) (native-inputs - `(("gettext" ,gettext-minimal) + `(("docbook-xml" ,docbook-xml) + ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) ("perl" ,perl) ("perl-xml-parser" ,perl-xml-parser) --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0028-gnu-libgsf-Update-synopsis-description-home-page-and.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0028-gnu-libgsf-Update-synopsis-description-home-page-and.pa"; filename*1="tch" =46rom d7472bbaa3b07fce0e2dbb11948b21b03c3cea4a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:22:54 -0500 Subject: [PATCH 28/68] gnu: libgsf: Update synopsis, description, home-pa= ge and license. * gnu/packages/gnome.scm (libgsf) [synopsis]: Modify. [home-page]: Modify. [description]: Modify. [license]: Modify. --- gnu/packages/gnome.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8965365855..cbda2a93a7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3306,14 +3306,16 @@ XML/CSS rendering engine.") (propagated-inputs `(("glib" ,glib) ("libxml2" ,libxml2))) - (home-page "https://www.gnome.org/projects/libgsf") - (synopsis "GNOME's Structured File Library") - (description - "Libgsf aims to provide an efficient extensible I/O abstraction for= -dealing with different structured file formats.") - - ;; LGPLv2.1-only. - (license license:lgpl2.1))) + (synopsis "G Structured File Library") + (description "Libgsf aims to provide an efficient extensible I/O abs= traction +for dealing with different structured file formats.") + (home-page "https://gitlab.gnome.org/GNOME/libgsf") + (license + (list + ;; Library + license:lgpl2.1+ + ;; Others + license:lgpl2.0+)))) =20 (define-public librsvg (package --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0029-gnu-atk-Fix-indentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0029-gnu-atk-Fix-indentation.patch" =46rom 7175184691380f747db8517988e1e859c022303b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:39:47 -0500 Subject: [PATCH 29/68] gnu: atk: Fix indentation. * gnu/packages/gtk.scm (atk): Fix indentation. --- gnu/packages/gtk.scm | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b34d758f4a..9e2759bd06 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -96,30 +96,30 @@ =20 (define-public atk (package - (name "atk") - (version "2.34.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l"))))= - (build-system meson-build-system) - (propagated-inputs `(("glib" ,glib))) ; required by atk.pc - (native-inputs - `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ; glib-mkenums,= etc. - ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler= , etc. - (synopsis "GNOME accessibility toolkit") - (description - "ATK provides the set of accessibility interfaces that are implement= ed + (name "atk") + (version "2.34.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l"))= )) + (build-system meson-build-system) + (propagated-inputs `(("glib" ,glib))) ; required by atk.pc + (native-inputs + `(("pkg-config" ,pkg-config) + ("gettext" ,gettext-minimal) + ("glib" ,glib "bin") ; glib-mkenums, etc. + ("gobject-introspection" ,gobject-introspection))) ; g-ir-compile= r, etc. + (synopsis "GNOME accessibility toolkit") + (description + "ATK provides the set of accessibility interfaces that are implemen= ted by other toolkits and applications. Using the ATK interfaces, accessibi= lity tools have full access to view and control running applications.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/atk/"))) + (license license:lgpl2.0+) + (home-page "https://developer.gnome.org/atk/"))) =20 (define-public cairo (package --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0030-gnu-atk-Re-arrange-inputs-in-alphabetical-order.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0030-gnu-atk-Re-arrange-inputs-in-alphabetical-order.patch" =46rom c427a68ec7a2a596c7991f1bfac7ddb313b41ec2 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:41:46 -0500 Subject: [PATCH 30/68] gnu: atk: Re-arrange inputs in alphabetical order.= * gnu/packages/gtk.scm (atk) [native-inputs]: Modify. --- gnu/packages/gtk.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 9e2759bd06..3d1c32b952 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -109,10 +109,10 @@ (build-system meson-build-system) (propagated-inputs `(("glib" ,glib))) ; required by atk.pc (native-inputs - `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) + `(("gettext" ,gettext-minimal) ("glib" ,glib "bin") ; glib-mkenums, etc. - ("gobject-introspection" ,gobject-introspection))) ; g-ir-compile= r, etc. + ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. + ("pkg-config" ,pkg-config))) (synopsis "GNOME accessibility toolkit") (description "ATK provides the set of accessibility interfaces that are implemen= ted --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0031-gnu-atk-Update-to-2.36.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0031-gnu-atk-Update-to-2.36.0.patch" =46rom 1e4cfea7d94f75a6e346af0929305985a815f98a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:44:36 -0500 Subject: [PATCH 31/68] gnu: atk: Update to 2.36.0. * gnu/packages/gtk.scm (atk) [version]: Update to 2.36.0. [arguments]<#:glib-or-gtk?>: New argument. --- gnu/packages/gtk.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3d1c32b952..5cfe5bf8a4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -97,7 +97,7 @@ (define-public atk (package (name "atk") - (version "2.34.1") + (version "2.36.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -105,8 +105,10 @@ name "-" version ".tar.xz")) (sha256 (base32 - "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l"))= )) + "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv"))= )) (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas (propagated-inputs `(("glib" ,glib))) ; required by atk.pc (native-inputs `(("gettext" ,gettext-minimal) --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0032-gnu-atk-Update-home-page-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0032-gnu-atk-Update-home-page-and-license.patch" =46rom 7dea981e3d214181618aba96bc95cfe31fe7e4c5 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:46:00 -0500 Subject: [PATCH 32/68] gnu: atk: Update home-page and license. * gnu/packages/gtk.scm (atk) [home-page]: Modify. [license]: Update to lgpl2.1+. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5cfe5bf8a4..e12049a109 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -120,8 +120,8 @@ "ATK provides the set of accessibility interfaces that are implemen= ted by other toolkits and applications. Using the ATK interfaces, accessibi= lity tools have full access to view and control running applications.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/atk/"))) + (license license:lgpl2.1+) + (home-page "https://wiki.gnome.org/Accessibility"))) =20 (define-public cairo (package --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0033-gnu-atkmm-Fix-indentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0033-gnu-atkmm-Fix-indentation.patch" =46rom 9e2ed951e36cfcf26f9593602cb6de7071941756 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:50:53 -0500 Subject: [PATCH 33/68] gnu: atkmm: Fix indentation. * gnu/packages/gtk.scm (atkmm): Fix indentation. --- gnu/packages/gtk.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e12049a109..9cfeb69889 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1381,13 +1381,13 @@ library.") (name "atkmm") (version "2.28.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c")))= ) + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c"))= )) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0034-gnu-atkmm-Change-build-system.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0034-gnu-atkmm-Change-build-system.patch" =46rom 0f229b440be5837ec30f996891593969518f9248 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:52:35 -0500 Subject: [PATCH 34/68] gnu: atkmm: Change build-system. * gnu/packages/gtk.scm (atkmm) [build-system]: Change from gnu to glib-or= -gtk. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 9cfeb69889..1d3e7542ed 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1388,7 +1388,7 @@ library.") (sha256 (base32 "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c"))= )) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs `(("glibmm" ,glibmm) ("atk" ,atk))) --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0035-gnu-atkmm-Add-missing-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0035-gnu-atkmm-Add-missing-inputs.patch" =46rom 79430041366d67e81b614bfa531aa949ff146db8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:55:27 -0500 Subject: [PATCH 35/68] gnu: atkmm: Add missing inputs. * gnu/packages/gtk.scm (atkmm) [native-inputs]: Add m4, mm-common, perl and libxslt. --- gnu/packages/gtk.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 1d3e7542ed..894757f2df 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -77,6 +77,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) + #:use-module (gnu packages m4) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -1389,7 +1390,12 @@ library.") (base32 "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c"))= )) (build-system glib-or-gtk-build-system) - (native-inputs `(("pkg-config" ,pkg-config))) + (native-inputs + `(("m4" ,m4) + ("mm-common" ,mm-common) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs `(("glibmm" ,glibmm) ("atk" ,atk))) (home-page "https://www.gtkmm.org") --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0036-gnu-atkmm-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0036-gnu-atkmm-Enable-documentation.patch" =46rom 6ee34e17aba042ba4d51ae818065e97f945811ca Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:59:21 -0500 Subject: [PATCH 36/68] gnu: atkmm: Enable documentation. * gnu/packages/gtk.scm (atkmm) [outputs]: Add new output "doc". [arguments]<#:phases>['move-doc]: New phase. [native-inputs]: Add graphviz, doxygen. --- gnu/packages/gtk.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 894757f2df..611b0736aa 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1390,8 +1390,23 @@ library.") (base32 "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c"))= )) (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) + (arguments + `(#: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/doc") + (string-append doc "/share/doc")) + #t)))))) (native-inputs - `(("m4" ,m4) + `(("dot" ,graphviz) + ("doxygen" ,doxygen) + ("m4" ,m4) ("mm-common" ,mm-common) ("perl" ,perl) ("pkg-config" ,pkg-config) --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0037-gnu-atkmm-Update-synopsis-description-home-page-and-.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0037-gnu-atkmm-Update-synopsis-description-home-page-and-.pa"; filename*1="tch" =46rom 093687871537d1be22ccc741b5513339211a565b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 13:01:19 -0500 Subject: [PATCH 37/68] gnu: atkmm: Update synopsis, description, home-pag= e and license. * gnu/packages/gtk.scm (atkmm) [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Add gpl2+. --- gnu/packages/gtk.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 611b0736aa..c8eab2c0aa 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1413,12 +1413,15 @@ library.") ("xsltproc" ,libxslt))) (propagated-inputs `(("glibmm" ,glibmm) ("atk" ,atk))) - (home-page "https://www.gtkmm.org") - (synopsis "C++ interface to the ATK accessibility library") - (description - "ATKmm provides a C++ programming interface to the ATK accessibilit= y -toolkit.") - (license license:lgpl2.1+))) + (synopsis "C++ bindings for ATK") + (description "ATKmm is the C++ binding for the ATK library.") + (home-page "https://wiki.gnome.org/Accessibility") + (license + (list + ;; Library + license:lgpl2.1+ + ;; Tools + license:gpl2+)))) =20 (define-public gtkmm (package --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0038-gnu-at-spi2-core-Update-to-2.36.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0038-gnu-at-spi2-core-Update-to-2.36.0.patch" =46rom b9c89edebe1c3db923fe6cc8354a79d1d1c37ab3 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 13:17:35 -0500 Subject: [PATCH 38/68] gnu: at-spi2-core: Update to 2.36.0. * gnu/packages/gtk.scm (at-spi2-core) [version]: Update to 2.36.0. [arguments]<#:glib-or-gtk?>: New argument. --- gnu/packages/gtk.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index c8eab2c0aa..f3038ea02c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -685,7 +685,7 @@ scaled, composited, modified, saved, or rendered.") (define-public at-spi2-core (package (name "at-spi2-core") - (version "2.34.0") + (version "2.36.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -693,11 +693,12 @@ scaled, composited, modified, saved, or rendered.")= name "-" version ".tar.xz")) (sha256 (base32 - "1ihixwhh3c16q6253qj9gf69741rb2pi51822a4rylsfcyywsafn"))))= + "0nn0lnf07ayysq8c8irmvc91c2dszn04m5qs6jy60g3y1bg5gnl8"))))= (build-system meson-build-system) (outputs '("out" "doc")) (arguments - '(#:configure-flags + '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags (list "-Ddocs=3Dtrue") #:phases (modify-phases %standard-phases --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0039-gnu-at-spi2-core-Add-missing-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0039-gnu-at-spi2-core-Add-missing-inputs.patch" =46rom 19f6684abd8128ef5668b5dde50ed74fe88c0ddb Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 13:20:37 -0500 Subject: [PATCH 39/68] gnu: at-spi2-core: Add missing inputs. * gnu/packages/gtk.scm (at-spi2-core) [native-inputs]: Add python-wrapper= =2E [propagated-inputs]: Add libx11. --- gnu/packages/gtk.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f3038ea02c..ad0d1144fc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -737,14 +737,16 @@ scaled, composited, modified, saved, or rendered.")= ;; atspi-2.pc refers to all these. `(("dbus" ,dbus) ("glib" ,glib) + ("libx11" ,libx11) ("libxi" ,libxi) ("libxtst" ,libxtst))) (native-inputs `(("gettext" ,gettext-minimal) + ("glib" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("gtk-doc" ,gtk-doc) - ("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) (synopsis "Assistive Technology Service Provider Interface, core comp= onents") (description "The Assistive Technology Service Provider Interface, core component= s, --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0040-gnu-at-spi2-core-Fix-intendation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0040-gnu-at-spi2-core-Fix-intendation.patch" =46rom d080196e9354cc96162c023678c817aaa03ba740 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 13:22:41 -0500 Subject: [PATCH 40/68] gnu: at-spi2-core: Fix intendation. * gnu/packages/gtk.scm (at-spi2-core): Fix indentation. --- gnu/packages/gtk.scm | 134 +++++++++++++++++++++---------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index ad0d1144fc..02cdc30911 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -684,75 +684,75 @@ scaled, composited, modified, saved, or rendered.")= =20 (define-public at-spi2-core (package - (name "at-spi2-core") - (version "2.36.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0nn0lnf07ayysq8c8irmvc91c2dszn04m5qs6jy60g3y1bg5gnl8"))))= - (build-system meson-build-system) - (outputs '("out" "doc")) - (arguments - '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas - #:configure-flags - (list "-Ddocs=3Dtrue") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-documentation-path - (lambda* (#:key outputs #:allow-other-keys) - ;; Ensure that the cross-references point to the "doc" outpu= t. - (substitute* "doc/libatspi/meson.build" - (("docpath =3D.*") - (string-append "docpath =3D '" (assoc-ref outputs "doc") = "/share/gtk-doc/html'\n"))) - #t)) - (add-before 'install 'prepare-doc-directory - (lambda* (#:key outputs #:allow-other-keys) - (mkdir-p (string-append (assoc-ref outputs "doc") "/share"))= - #t)) - (add-after 'install 'move-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (copy-recursively - (string-append out "/share/gtk-doc") - (string-append doc "/share/gtk-doc")) - (delete-file-recursively - (string-append out "/share/gtk-doc"))) - #t)) - (add-after 'install 'check - (lambda _ - (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writa= ble HOME - ;; Run test-suite under a dbus session. - (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.se= rvice - (string-append %output "/share")) - ;; Don't fail on missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0") ; - (invoke "dbus-launch" "ninja" "test"))) + (name "at-spi2-core") + (version "2.36.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0nn0lnf07ayysq8c8irmvc91c2dszn04m5qs6jy60g3y1bg5gnl8"))= )) + (build-system meson-build-system) + (outputs '("out" "doc")) + (arguments + '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list "-Ddocs=3Dtrue") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-documentation-path + (lambda* (#:key outputs #:allow-other-keys) + ;; Ensure that the cross-references point to the "doc" outp= ut. + (substitute* "doc/libatspi/meson.build" + (("docpath =3D.*") + (string-append "docpath =3D '" (assoc-ref outputs "doc")= "/share/gtk-doc/html'\n"))) + #t)) + (add-before 'install 'prepare-doc-directory + (lambda* (#:key outputs #:allow-other-keys) + (mkdir-p (string-append (assoc-ref outputs "doc") "/share")= ) + #t)) + (add-after 'install 'move-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (copy-recursively + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")) + (delete-file-recursively + (string-append out "/share/gtk-doc"))) + #t)) + (add-after 'install 'check + (lambda _ + (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writ= able HOME + ;; Run test-suite under a dbus session. + (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.servi= ce + (string-append %output "/share")) + ;; Don't fail on missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") ; + (invoke "dbus-launch" "ninja" "test"))) (delete 'check)))) - (propagated-inputs - ;; atspi-2.pc refers to all these. - `(("dbus" ,dbus) - ("glib" ,glib) - ("libx11" ,libx11) - ("libxi" ,libxi) - ("libxtst" ,libxtst))) - (native-inputs - `(("gettext" ,gettext-minimal) - ("glib" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper))) - (synopsis "Assistive Technology Service Provider Interface, core comp= onents") - (description - "The Assistive Technology Service Provider Interface, core component= s, + (propagated-inputs + ;; atspi-2.pc refers to all these. + `(("dbus" ,dbus) + ("glib" ,glib) + ("libx11" ,libx11) + ("libxi" ,libxi) + ("libxtst" ,libxtst))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (synopsis "Assistive Technology Service Provider Interface, core com= ponents") + (description + "The Assistive Technology Service Provider Interface, core componen= ts, is part of the GNOME accessibility project.") - (license license:lgpl2.0+) - (home-page "https://projects.gnome.org/accessibility/"))) + (license license:lgpl2.0+) + (home-page "https://projects.gnome.org/accessibility/"))) =20 ;;; A minimal variant used to prevent a cycle with Inkscape. (define at-spi2-core-minimal --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0041-gnu-at-spi2-core-Fix-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0041-gnu-at-spi2-core-Fix-documentation.patch" =46rom 02dafcff4d4e7ecbd486cdd4dde153f14387427c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 13:24:57 -0500 Subject: [PATCH 41/68] gnu: at-spi2-core: Fix documentation. * gnu/packages/gtk.scm (at-spi2-core) [arguments]<#:phases>['patch-docboo= k-sgml]: New phase. [native-inputs]: Add docbook-xml. --- gnu/packages/gtk.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 02cdc30911..1d1bd6ca42 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -713,6 +713,14 @@ scaled, composited, modified, saved, or rendered.") (lambda* (#:key outputs #:allow-other-keys) (mkdir-p (string-append (assoc-ref outputs "doc") "/share")= ) #t)) + (add-after 'unpack 'patch-docbook-sgml + (lambda* (#:key inputs #:allow-other-keys) + (let* ((xmldoc (string-append (assoc-ref inputs "docbook-xm= l") + "/xml/dtd/docbook"))) + (substitute* "doc/libatspi/libatspi-docs.sgml" + (("http://.*/docbookx\\.dtd") + (string-append xmldoc "/docbookx.dtd"))) + #t))) (add-after 'install 'move-documentation (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) @@ -741,7 +749,8 @@ scaled, composited, modified, saved, or rendered.") ("libxi" ,libxi) ("libxtst" ,libxtst))) (native-inputs - `(("gettext" ,gettext-minimal) + `(("docbook-xml" ,docbook-xml-4.3) + ("gettext" ,gettext-minimal) ("glib" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("gtk-doc" ,gtk-doc) --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0042-gnu-at-spi2-core-Update-home-page-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0042-gnu-at-spi2-core-Update-home-page-and-license.patch" =46rom 9c268d642ad78b48bd332d6511ddac296cdf086f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 13:26:26 -0500 Subject: [PATCH 42/68] gnu: at-spi2-core: Update home-page and license. * gnu/packages/gtk.scm (at-spi2-core) [home-page]: Modify. [license]: Update to lgpl2.1+. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 1d1bd6ca42..1d404e0ae7 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -760,8 +760,8 @@ scaled, composited, modified, saved, or rendered.") (description "The Assistive Technology Service Provider Interface, core componen= ts, is part of the GNOME accessibility project.") - (license license:lgpl2.0+) - (home-page "https://projects.gnome.org/accessibility/"))) + (license license:lgpl2.1+) + (home-page "https://wiki.gnome.org/Accessibility/"))) =20 ;;; A minimal variant used to prevent a cycle with Inkscape. (define at-spi2-core-minimal --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0043-gnu-at-spi2-atk-Fix-indentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0043-gnu-at-spi2-atk-Fix-indentation.patch" =46rom f3b1ce08d80cfa81120b788502e77a05b19a7b14 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 13:29:52 -0500 Subject: [PATCH 43/68] gnu: at-spi2-atk: Fix indentation. * gnu/packages/gtk.scm (at-spi2-atk): Fix indentation. --- gnu/packages/gtk.scm | 70 ++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 1d404e0ae7..5cd22bdd0c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -783,42 +783,42 @@ is part of the GNOME accessibility project.") =20 (define-public at-spi2-atk (package - (name "at-spi2-atk") - (version "2.34.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "05ncp7s5nddjinffs26mcvpbd63vk1m3cv5y530p3plgfhqgjvbp"))))= - (build-system meson-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - ;; Run test-suite under a dbus session. - (lambda _ - (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "meson" "test")))))) - (propagated-inputs - ;; TODO: Replace by at-spi2-core-minimal in the next staging window,= or - ;; when Inkscape 0.92 is upgraded to 1.0 to avoid a cycle. - `(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc - (inputs - `(("atk" ,atk))) - (native-inputs - `(("pkg-config" ,pkg-config) - ;; For tests. - ("dbus" ,dbus) - ("libxml2" ,libxml2))) - (synopsis "Assistive Technology Service Provider Interface, ATK bindi= ngs") - (description - "The Assistive Technology Service Provider Interface + (name "at-spi2-atk") + (version "2.34.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "05ncp7s5nddjinffs26mcvpbd63vk1m3cv5y530p3plgfhqgjvbp"))= )) + (build-system meson-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + ;; Run test-suite under a dbus session. + (lambda _ + (setenv "DBUS_FATAL_WARNINGS" "0") + (invoke "dbus-launch" "meson" "test")))))) + (propagated-inputs + ;; TODO: Replace by at-spi2-core-minimal in the next staging window= , or + ;; when Inkscape 0.92 is upgraded to 1.0 to avoid a cycle. + `(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc + (inputs + `(("atk" ,atk))) + (native-inputs + `(("pkg-config" ,pkg-config) + ;; For tests. + ("dbus" ,dbus) + ("libxml2" ,libxml2))) + (synopsis "Assistive Technology Service Provider Interface, ATK bind= ings") + (description + "The Assistive Technology Service Provider Interface is part of the GNOME accessibility project.") - (license license:lgpl2.0+) - (home-page "https://projects.gnome.org/accessibility/"))) + (license license:lgpl2.0+) + (home-page "https://projects.gnome.org/accessibility/"))) =20 (define-public gtk+-2 (package --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0044-gnu-at-spi2-atk-Update-to-2.34.2.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0044-gnu-at-spi2-atk-Update-to-2.34.2.patch" =46rom e5bc0f107216fedac6ce6eb3e2769ecf9955885a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 13:33:47 -0500 Subject: [PATCH 44/68] gnu: at-spi2-atk: Update to 2.34.2. * gnu/packages/gtk.scm (at-spi2-atk) [version]: Update to 2.34.2. [arguments]<#:glib-or-gtk?>: New argument. [native-inputs]: Add gobject-introspection. [inputs]: Add glib. --- gnu/packages/gtk.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5cd22bdd0c..98c30cf4e5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -784,7 +784,7 @@ is part of the GNOME accessibility project.") (define-public at-spi2-atk (package (name "at-spi2-atk") - (version "2.34.1") + (version "2.34.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -792,10 +792,11 @@ is part of the GNOME accessibility project.") name "-" version ".tar.xz")) (sha256 (base32 - "05ncp7s5nddjinffs26mcvpbd63vk1m3cv5y530p3plgfhqgjvbp"))= )) + "1w7l4xg00qx3dwhn0zaa64daiv5f073hdvjdxh0mrw7fw37264wh"))= )) (build-system meson-build-system) (arguments - '(#:phases + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases (modify-phases %standard-phases (replace 'check ;; Run test-suite under a dbus session. @@ -807,12 +808,13 @@ is part of the GNOME accessibility project.") ;; when Inkscape 0.92 is upgraded to 1.0 to avoid a cycle. `(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc (inputs - `(("atk" ,atk))) + `(("atk" ,atk) + ("glib" ,glib))) (native-inputs - `(("pkg-config" ,pkg-config) - ;; For tests. - ("dbus" ,dbus) - ("libxml2" ,libxml2))) + `(("dbus" ,dbus) ; For tests + ("gobject-introspection" ,gobject-introspection) + ("libxml2" ,libxml2) + ("pkg-config" ,pkg-config))) (synopsis "Assistive Technology Service Provider Interface, ATK bind= ings") (description "The Assistive Technology Service Provider Interface --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0045-gnu-at-spi2-atk-Update-home-page-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0045-gnu-at-spi2-atk-Update-home-page-and-license.patch" =46rom aca1f7f18725383d25166ec8e3d3a37450c81063 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 13:35:04 -0500 Subject: [PATCH 45/68] gnu: at-spi2-atk: Update home-page and license. * gnu/packages/gtk.scm (at-spi2-atk) [home-page]: Modify. [license]: Update to lgpl2.1+. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 98c30cf4e5..c45bbb6d2f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -819,8 +819,8 @@ is part of the GNOME accessibility project.") (description "The Assistive Technology Service Provider Interface is part of the GNOME accessibility project.") - (license license:lgpl2.0+) - (home-page "https://projects.gnome.org/accessibility/"))) + (license license:lgpl2.1+) + (home-page "https://wiki.gnome.org/Accessibility/"))) =20 (define-public gtk+-2 (package --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0046-gnu-gtk-2-Fix-indentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0046-gnu-gtk-2-Fix-indentation.patch" =46rom 010b14081e7d1292ffc8affd105a74644cd9c43f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 07:54:08 -0500 Subject: [PATCH 46/68] gnu: gtk+-2: Fix indentation. * gnu/packages/gtk.scm (gtk+-2): Fix indentation. --- gnu/packages/gtk.scm | 132 +++++++++++++++++++++---------------------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index c45bbb6d2f..84d20ecafb 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -824,77 +824,77 @@ is part of the GNOME accessibility project.") =20 (define-public gtk+-2 (package - (name "gtk+") - (version "2.24.32") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0bjq7ja9gwcv6n5q4qkvdjjx40wsdiikksz1zqxvxsm5vlyskj5n")) - (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch"= - "gtk2-respect-GUIX_GTK2_IM_MODULE_F= ILE.patch" - "gtk2-theme-paths.patch")))) - (build-system gnu-build-system) - (outputs '("out" "bin" "doc")) - (propagated-inputs - `(("atk" ,atk) - ;; SVG support is optional and requires librsvg, which pulls in ru= st. - ;; Rust is not supported well on every architecture yet. - ("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-s= ystem) - (%current-system))= ) - gdk-pixbuf+svg - gdk-pixbuf)) - ("pango" ,pango))) - (inputs - `(("cups" ,cups) - ("libxcomposite" ,libxcomposite) - ("libxcursor" ,libxcursor) - ("libxdamage" ,libxdamage) - ("libxi" ,libxi) - ("libxinerama" ,libxinerama) - ("libxrandr" ,libxrandr))) - (native-inputs - `(("perl" ,perl) - ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config) - ("python-wrapper" ,python-wrapper))) - (arguments - `(#:configure-flags - (list "--with-xinput=3Dyes" - (string-append "--with-html-dir=3D" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'disable-tests - (lambda _ - ;; FIXME: re-enable tests requiring an X server - (substitute* "gtk/Makefile.in" - (("SUBDIRS =3D theme-bits . tests") "SUBDIRS =3D theme-bit= s .")) - #t)) - (add-after 'install 'remove-cache - (lambda* (#:key outputs #:allow-other-keys) - (for-each + (name "gtk+") + (version "2.24.32") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0bjq7ja9gwcv6n5q4qkvdjjx40wsdiikksz1zqxvxsm5vlyskj5n"))= + (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patc= h" + "gtk2-respect-GUIX_GTK2_IM_MODULE= _FILE.patch" + "gtk2-theme-paths.patch")))) + (build-system gnu-build-system) + (outputs '("out" "bin" "doc")) + (propagated-inputs + `(("atk" ,atk) + ;; SVG support is optional and requires librsvg, which pulls in r= ust. + ;; Rust is not supported well on every architecture yet. + ("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-= system) + (%current-system)= )) + gdk-pixbuf+svg + gdk-pixbuf)) + ("pango" ,pango))) + (inputs + `(("cups" ,cups) + ("libxcomposite" ,libxcomposite) + ("libxcursor" ,libxcursor) + ("libxdamage" ,libxdamage) + ("libxi" ,libxi) + ("libxinerama" ,libxinerama) + ("libxrandr" ,libxrandr))) + (native-inputs + `(("perl" ,perl) + ("gettext" ,gettext-minimal) + ("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper))) + (arguments + `(#:configure-flags + (list "--with-xinput=3Dyes" + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'disable-tests + (lambda _ + ;; FIXME: re-enable tests requiring an X server + (substitute* "gtk/Makefile.in" + (("SUBDIRS =3D theme-bits . tests") "SUBDIRS =3D theme-bi= ts .")) + #t)) + (add-after 'install 'remove-cache + (lambda* (#:key outputs #:allow-other-keys) + (for-each delete-file (find-files (assoc-ref outputs "out") "immodules.cache")) - #t))))) - (native-search-paths - (list (search-path-specification - (variable "GUIX_GTK2_PATH") - (files '("lib/gtk-2.0"))))) - (synopsis "Cross-platform toolkit for creating graphical user interfa= ces") - (description - "GTK+, or the GIMP Toolkit, is a multi-platform toolkit for creating= + #t))))) + (native-search-paths + (list (search-path-specification + (variable "GUIX_GTK2_PATH") + (files '("lib/gtk-2.0"))))) + (synopsis "Cross-platform toolkit for creating graphical user interf= aces") + (description + "GTK+, or the GIMP Toolkit, is a multi-platform toolkit for creatin= g graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off tools to complete application suites.") - (license license:lgpl2.0+) - (home-page "https://www.gtk.org/"))) + (license license:lgpl2.0+) + (home-page "https://www.gtk.org/"))) =20 (define-public gtk+ (package (inherit gtk+-2) --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0047-gnu-gtk-2-Enable-tests.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0047-gnu-gtk-2-Enable-tests.patch" =46rom 7ee4f778ed433feab8a07225b6c40d5ac77bfe66 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 07:58:04 -0500 Subject: [PATCH 47/68] gnu: gtk+-2: Enable tests. * gnu/packages/gtk.scm (gtk+-2) [arguments]<#:phases>['disable-tests]: Re= move phase. ['disable-failing-tests]: New phase. ['pre-check]: New phase. [native-inputs]: Add xorg-server-for-tests. --- gnu/packages/gtk.scm | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 84d20ecafb..227cdff7f4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -862,7 +862,8 @@ is part of the GNOME accessibility project.") ("glib" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) - ("python-wrapper" ,python-wrapper))) + ("python-wrapper" ,python-wrapper) + ("xorg-server" ,xorg-server-for-tests))) (arguments `(#:configure-flags (list "--with-xinput=3Dyes" @@ -871,11 +872,26 @@ is part of the GNOME accessibility project.") "/share/gtk-doc/html")) #:phases (modify-phases %standard-phases - (add-before 'configure 'disable-tests + (add-after 'unpack 'disable-failing-tests (lambda _ - ;; FIXME: re-enable tests requiring an X server - (substitute* "gtk/Makefile.in" - (("SUBDIRS =3D theme-bits . tests") "SUBDIRS =3D theme-bi= ts .")) + (substitute* "gtk/tests/recentmanager.c" + (("g_test_add_func \\(\"/recent-manager/add-many\", recen= t_manager_add_many\\);") + "")) + (substitute* "gtk/tests/defaultvalue.c" + (("return g_test_run\\(\\);") + "")) + #t)) + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 +extension GLX &") + (setenv "DISPLAY" ":1") + ;; Tests write to $HOME. + (setenv "HOME" (getcwd)) + ;; Tests look for $XDG_RUNTIME_DIR. + (setenv "XDG_RUNTIME_DIR" (getcwd)) + ;; For missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") #t)) (add-after 'install 'remove-cache (lambda* (#:key outputs #:allow-other-keys) --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0048-gnu-gtk-2-Add-missing-inputs-and-search-path.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0048-gnu-gtk-2-Add-missing-inputs-and-search-path.patch" =46rom f6171cef8d4f758be1c8d307bf54ea7f4e208c83 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 08:05:28 -0500 Subject: [PATCH 48/68] gnu: gtk+-2: Add missing inputs and search-path. * gnu/packages/gtk.scm (gtk+-2) [native-inputs]: Add intltool. [inputs]: Add libx11, libxext, libxkbcommon, libxrender and libxshmfence.= [propagated-inputs]: Add cairo and glib. [search-paths]: New field. --- gnu/packages/gtk.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 227cdff7f4..77bb0d4656 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -841,26 +841,34 @@ is part of the GNOME accessibility project.") (outputs '("out" "bin" "doc")) (propagated-inputs `(("atk" ,atk) + ("cairo" ,cairo) ;; SVG support is optional and requires librsvg, which pulls in r= ust. ;; Rust is not supported well on every architecture yet. ("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-= system) (%current-system)= )) gdk-pixbuf+svg gdk-pixbuf)) + ("glib" ,glib) ("pango" ,pango))) (inputs `(("cups" ,cups) + ("libx11" ,libx11) ("libxcomposite" ,libxcomposite) ("libxcursor" ,libxcursor) + ("libxext" ,libxext) ("libxdamage" ,libxdamage) ("libxi" ,libxi) ("libxinerama" ,libxinerama) - ("libxrandr" ,libxrandr))) + ("libxkbcommon" ,libxkbcommon) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxshmfence" ,libxshmfence))) (native-inputs - `(("perl" ,perl) - ("gettext" ,gettext-minimal) + `(("gettext" ,gettext-minimal) ("glib" ,glib "bin") ("gobject-introspection" ,gobject-introspection) + ("intltool" ,intltool) + ("perl" ,perl) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper) ("xorg-server" ,xorg-server-for-tests))) @@ -903,6 +911,7 @@ is part of the GNOME accessibility project.") (list (search-path-specification (variable "GUIX_GTK2_PATH") (files '("lib/gtk-2.0"))))) + (search-paths native-search-paths) (synopsis "Cross-platform toolkit for creating graphical user interf= aces") (description "GTK+, or the GIMP Toolkit, is a multi-platform toolkit for creatin= g --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0049-gnu-gtk-Fix-indentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0049-gnu-gtk-Fix-indentation.patch" =46rom eafeffe88843bed56671a108fa1e3e7d890d9533 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 08:15:52 -0500 Subject: [PATCH 49/68] gnu: gtk+: Fix indentation. * gnu/packages/gtk.scm (gtk+): Fix indentation. --- gnu/packages/gtk.scm | 185 ++++++++++++++++++++++--------------------- 1 file changed, 94 insertions(+), 91 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 77bb0d4656..c288a0f1ce 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -922,97 +922,100 @@ application suites.") (home-page "https://www.gtk.org/"))) =20 (define-public gtk+ - (package (inherit gtk+-2) - (name "gtk+") - (version "3.24.24") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "12ipk1d376bai9v820qzhxba93kkh5abi6mhyqr4hwjvqmkl77fc")) - (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"= - "gtk3-respect-GUIX_GTK3_IM_MODULE_F= ILE.patch")))) - (propagated-inputs - `(("at-spi2-atk" ,at-spi2-atk) - ("atk" ,atk) - ;; SVG support is optional and requires librsvg, which pulls in ru= st. - ;; Rust is not supported well on every architecture yet. - ("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-s= ystem) - (%current-system))= ) - gdk-pixbuf+svg - gdk-pixbuf)) - ("libepoxy" ,libepoxy) - ("libxcursor" ,libxcursor) - ("libxi" ,libxi) - ("libxinerama" ,libxinerama) - ("libxkbcommon" ,libxkbcommon) - ("libxdamage" ,libxdamage) - ("libxrandr" ,libxrandr) - ("mesa" ,mesa) - ("pango" ,pango) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols))) - (inputs - `(("libxml2" ,libxml2) - ;; XXX: colord depends on mozjs (through polkit), which fails on - ;; on non-intel systems now. - ;;("colord" ,colord) - ("cups" ,cups) ;for printing support - ;; XXX: rest depends on p11-kit, which fails on mips64el now. - ;;("rest" ,rest) - ("json-glib" ,json-glib))) - (native-inputs - `(("perl" ,perl) - ("glib" ,glib "bin") - ("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config) - ("gobject-introspection" ,gobject-introspection) - ("python-wrapper" ,python-wrapper) - ;; By using a special xorg-server for GTK+'s tests, we reduce the = impact - ;; of updating xorg-server directly on the master branch. - ("xorg-server" ,xorg-server-for-tests))) - (arguments - `(#:disallowed-references (,xorg-server-for-tests) - ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB = goes - ;; to "doc". - #:configure-flags (list (string-append "--with-html-dir=3D" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html") - ;; The header file is r= equired - ;; by gnome-control-center - "--enable-wayland-backend" - ;; This is necessary to build both backend= s. - "--enable-x11-backend" - ;; This enables the HTML5 websocket backen= d. - "--enable-broadway-backend") - #:phases (modify-phases %standard-phases - (add-before 'configure 'pre-configure - (lambda _ - ;; Disable most tests, failing in the chroot with the messag= e: - ;; D-Bus library appears to be incorrectly set up; failed to= read - ;; machine uuid: Failed to open "/etc/machine-id": No such f= ile or - ;; directory. - ;; See the manual page for dbus-uuidgen to correct this issu= e. - (substitute* "testsuite/Makefile.in" - (("SUBDIRS =3D gdk gtk a11y css reftests") - "SUBDIRS =3D gdk")) - #t)) - (add-after 'install 'move-desktop-files - ;; Move desktop files into 'bin' to avoid cycle references. - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (assoc-ref outputs "bin"))) - (mkdir-p (string-append bin "/share")) - (rename-file (string-append out "/share/applications") - (string-append bin "/share/applications")) - #t)))))) - (native-search-paths - (list (search-path-specification - (variable "GUIX_GTK3_PATH") - (files '("lib/gtk-3.0"))))))) + (package + (inherit gtk+-2) + (name "gtk+") + (version "3.24.24") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "12ipk1d376bai9v820qzhxba93kkh5abi6mhyqr4hwjvqmkl77fc")) + (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" + "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.p= atch")))) + (propagated-inputs + `(("at-spi2-atk" ,at-spi2-atk) + ("atk" ,atk) + ;; SVG support is optional and requires librsvg, which pulls in r= ust. + ;; Rust is not supported well on every architecture yet. + ("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-= system) + (%current-system)= )) + gdk-pixbuf+svg + gdk-pixbuf)) + ("libepoxy" ,libepoxy) + ("libxcursor" ,libxcursor) + ("libxi" ,libxi) + ("libxinerama" ,libxinerama) + ("libxkbcommon" ,libxkbcommon) + ("libxdamage" ,libxdamage) + ("libxrandr" ,libxrandr) + ("mesa" ,mesa) + ("pango" ,pango) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols))) + (inputs + `(("libxml2" ,libxml2) + ;; XXX: colord depends on mozjs (through polkit), which fails on + ;; on non-intel systems now. + ;;("colord" ,colord) + ("cups" ,cups) ;for printing support + ;; XXX: rest depends on p11-kit, which fails on mips64el now. + ;;("rest" ,rest) + ("json-glib" ,json-glib))) + (native-inputs + `(("perl" ,perl) + ("glib" ,glib "bin") + ("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config) + ("gobject-introspection" ,gobject-introspection) + ("python-wrapper" ,python-wrapper) + ;; By using a special xorg-server for GTK+'s tests, we reduce the= impact + ;; of updating xorg-server directly on the master branch. + ("xorg-server" ,xorg-server-for-tests))) + (arguments + `(#:disallowed-references (,xorg-server-for-tests) + ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB= goes + ;; to "doc". + #:configure-flags (list (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc")= + "/share/gtk-doc/html") + ;; The header file is = required + ;; by gnome-control-center + "--enable-wayland-backend" + ;; This is necessary to build both backen= ds. + "--enable-x11-backend" + ;; This enables the HTML5 websocket backe= nd. + "--enable-broadway-backend") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'pre-configure + (lambda _ + ;; Disable most tests, failing in the chroot with the messa= ge: + ;; D-Bus library appears to be incorrectly set up; failed t= o read + ;; machine uuid: Failed to open "/etc/machine-id": No such = file or + ;; directory. + ;; See the manual page for dbus-uuidgen to correct this iss= ue. + (substitute* "testsuite/Makefile.in" + (("SUBDIRS =3D gdk gtk a11y css reftests") + "SUBDIRS =3D gdk")) + #t)) + (add-after 'install 'move-desktop-files + ;; Move desktop files into 'bin' to avoid cycle references. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) + (mkdir-p (string-append bin "/share")) + (rename-file (string-append out "/share/applications") + (string-append bin "/share/applications")) + #t)))))) + (native-search-paths + (list (search-path-specification + (variable "GUIX_GTK3_PATH") + (files '("lib/gtk-3.0"))))))) =20 ;;; ;;; Guile bindings. --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0050-gnu-gtk-Enable-tests.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0050-gnu-gtk-Enable-tests.patch" =46rom 9a14228eec61f1bbc14b537044d3de4229bcaaa3 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 08:24:01 -0500 Subject: [PATCH 50/68] gnu: gtk+: Enable tests. * gnu/packages/gtk.scm (gtk+) [arguments]<#:phases>['pre-configure]: Remo= ve phase. ['disable-failing-tests]: New phase. ['pre-check]: New phase. --- gnu/packages/gtk.scm | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index c288a0f1ce..6ee702de2a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -992,16 +992,33 @@ application suites.") "--enable-broadway-backend") #:phases (modify-phases %standard-phases - (add-before 'configure 'pre-configure + (add-after 'unpack 'disable-failing-tests + (lambda _ + (substitute* "testsuite/gtk/Makefile.in" + (("builderparser cellarea check-icon-names check-cursor-n= ames") + "builderparser cellarea check-cursor-names") + (("notify no-gtk-init object objects-finalize papersize r= btree") + "no-gtk-init papersize rbtree") + (("stylecontext templates textbuffer textiter treemodel t= reepath") + "stylecontext textbuffer textiter treemodel treepath")) + (substitute* "testsuite/a11y/Makefile.in" + (("accessibility-dump tree-performance text children deri= ve") + "tree-performance text children derive")) + (substitute* "testsuite/reftests/Makefile.in" + (("TEST_PROGS =3D gtk-reftest") + "TEST_PROGS =3D ")) + #t)) + (add-before 'check 'pre-check (lambda _ - ;; Disable most tests, failing in the chroot with the messa= ge: - ;; D-Bus library appears to be incorrectly set up; failed t= o read - ;; machine uuid: Failed to open "/etc/machine-id": No such = file or - ;; directory. - ;; See the manual page for dbus-uuidgen to correct this iss= ue. - (substitute* "testsuite/Makefile.in" - (("SUBDIRS =3D gdk gtk a11y css reftests") - "SUBDIRS =3D gdk")) + ;; Tests require a running X server. + (system "Xvfb :1 +extension GLX &") + (setenv "DISPLAY" ":1") + ;; Tests write to $HOME. + (setenv "HOME" (getcwd)) + ;; Tests look for $XDG_RUNTIME_DIR. + (setenv "XDG_RUNTIME_DIR" (getcwd)) + ;; For missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") #t)) (add-after 'install 'move-desktop-files ;; Move desktop files into 'bin' to avoid cycle references. --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0051-gnu-gtk-Add-missing-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0051-gnu-gtk-Add-missing-inputs.patch" =46rom fc595684db2197067f9c9c7912770f5c0d11e2b6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 08:32:10 -0500 Subject: [PATCH 51/68] gnu: gtk+: Add missing inputs. * gnu/packages/gtk.scm (gtk+) [native-inputs]: Add docbook-xml, hicolor-icon-theme, intltool, sassc and libxslt. [inputs]: Add graphene, harfbuzz, iso-codes and papi. [propagated-inputs]: Add cairo, fribidi, fontconfig, freetype, glib, libx11, libxcomposite, libxext, libxfixes and libxrender. --- gnu/packages/gtk.scm | 45 +++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 6ee702de2a..aa11271756 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -938,44 +938,63 @@ application suites.") (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.p= atch")))) (propagated-inputs - `(("at-spi2-atk" ,at-spi2-atk) - ("atk" ,atk) + `(("atk" ,atk) + ("at-spi2-atk" ,at-spi2-atk) + ("cairo" ,cairo) + ("fribidi" ,fribidi) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) ;; SVG support is optional and requires librsvg, which pulls in r= ust. ;; Rust is not supported well on every architecture yet. ("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-= system) (%current-system)= )) gdk-pixbuf+svg gdk-pixbuf)) + ("glib" ,glib) ("libepoxy" ,libepoxy) + ("libx11" ,libx11) + ("libxcomposite" ,libxcomposite) ("libxcursor" ,libxcursor) + ("libxdamage" ,libxdamage) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) ("libxi" ,libxi) ("libxinerama" ,libxinerama) ("libxkbcommon" ,libxkbcommon) - ("libxdamage" ,libxdamage) ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) ("mesa" ,mesa) ("pango" ,pango) ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols))) (inputs - `(("libxml2" ,libxml2) - ;; XXX: colord depends on mozjs (through polkit), which fails on + `(;; XXX: colord depends on mozjs (through polkit), which fails on ;; on non-intel systems now. - ;;("colord" ,colord) - ("cups" ,cups) ;for printing support + ("colord" ,colord) + ("cups" ,cups) + ("graphene" ,graphene) + ("harfbuzz" ,harfbuzz) + ("iso-codes" ,iso-codes) + ("json-glib" ,json-glib) + ("libxml2" ,libxml2) + ("papi" ,papi) ;; XXX: rest depends on p11-kit, which fails on mips64el now. - ;;("rest" ,rest) - ("json-glib" ,json-glib))) + ("rest" ,rest))) (native-inputs - `(("perl" ,perl) - ("glib" ,glib "bin") + `(("docbook-xml" ,docbook-xml-4.1.2) ("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config) + ("glib" ,glib "bin") ("gobject-introspection" ,gobject-introspection) + ("hicolor-icon-theme" ,hicolor-icon-theme) + ("intltool" ,intltool) + ("perl" ,perl) + ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper) + ("sassc" ,sassc) ;; By using a special xorg-server for GTK+'s tests, we reduce the= impact ;; of updating xorg-server directly on the master branch. - ("xorg-server" ,xorg-server-for-tests))) + ("xorg-server" ,xorg-server-for-tests) + ("xsltproc" ,libxslt))) (arguments `(#:disallowed-references (,xorg-server-for-tests) ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB= goes --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0052-gnu-gtk-Enable-cloud-providers-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0052-gnu-gtk-Enable-cloud-providers-support.patch" =46rom 6c26205dd5b13471c5e4b2e9bd1ba55c2928ad38 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 08:36:52 -0500 Subject: [PATCH 52/68] gnu: gtk+: Enable cloud-providers support. * gnu/packages/gtk.scm (gtk+) [arguments]<#:configure-flags> [--enable-cloudproviders]: New flag. [propagated-inputs]: Add libcloudproviders. --- gnu/packages/gtk.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index aa11271756..8aaf6dcf00 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -951,6 +951,7 @@ application suites.") gdk-pixbuf+svg gdk-pixbuf)) ("glib" ,glib) + ("libcloudproviders" ,libcloudproviders) ("libepoxy" ,libepoxy) ("libx11" ,libx11) ("libxcomposite" ,libxcomposite) @@ -1002,6 +1003,7 @@ application suites.") #:configure-flags (list (string-append "--with-html-dir=3D" (assoc-ref %outputs "doc")= "/share/gtk-doc/html") + "--enable-cloudproviders" ;; The header file is = required ;; by gnome-control-center "--enable-wayland-backend" --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0053-gnu-gtk-doc-Fix-identation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0053-gnu-gtk-doc-Fix-identation.patch" =46rom 397d96d32dbb621826c745a06ddb07b932cb7b7e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 08:51:02 -0500 Subject: [PATCH 53/68] gnu: gtk-doc: Fix identation. * gnu/packages/gtk.scm (gtk-doc): Fix identation. --- gnu/packages/gtk.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 8aaf6dcf00..bed9765fa5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1884,16 +1884,16 @@ information.") (add-after 'unpack 'patch-gtk-doc-scan (lambda* (#:key inputs #:allow-other-keys) (substitute* "gtk-doc.xsl" - (("http://docbook.sourceforge.net/release/xsl/current/html= /chunk.xsl") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/html/chunk.xsl")) - (("http://docbook.sourceforge.net/release/xsl/current/comm= on/en.xml") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/common/en.xml"))) + (("http://docbook.sourceforge.net/release/xsl/current/htm= l/chunk.xsl") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/html/chunk.xsl")) + (("http://docbook.sourceforge.net/release/xsl/current/com= mon/en.xml") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/common/en.xml"))) #t)) (add-after 'patch-gtk-doc-scan 'patch-test-out (lambda _ @@ -1902,7 +1902,7 @@ information.") ;; generator metafont outputs a lot of extra lines, this ;; test would always fail. Disable it for now. (substitute* "tests/Makefile.in" - (("empty.sh sanity.sh") "empty.sh")) + (("empty.sh sanity.sh") "empty.sh")) #t)) (add-before 'configure 'fix-docbook (lambda* (#:key inputs #:allow-other-keys) --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0054-gnu-gtk-doc-Change-build-system.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0054-gnu-gtk-doc-Change-build-system.patch" =46rom 21210baba744cea8bc5ca53c538d4de3531e1af6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 08:52:07 -0500 Subject: [PATCH 54/68] gnu: gtk-doc: Change build-system. * gnu/packages/gtk.scm (gtk-doc) [build-system]: Change from gnu to glib-= or-gtk. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index bed9765fa5..f041c8d6c9 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1876,7 +1876,7 @@ information.") (sha256 (base32 "05apmwibkmn1icx05l8aw241lhymcx01zvk5i499cb150bijj7li"))= )) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments `(#:parallel-tests? #f #:phases --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0055-gnu-gtk-doc-Correct-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0055-gnu-gtk-doc-Correct-inputs.patch" =46rom f37a2e57d4c64cbe64d7b0338b7d2c2fe9867351 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 08:58:34 -0500 Subject: [PATCH 55/68] gnu: gtk-doc: Correct inputs. * gnu/packages/gtk.scm (gtk-doc) [native-inputs]: Add glib:bin, perl and python-wrapper. [inputs]: Add python-anytree, python-lxml, python-parameterized, python-pygments, python-unittest2 and yelp-tools. Remove perl. --- gnu/packages/gtk.scm | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f041c8d6c9..62537d9578 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1932,21 +1932,29 @@ information.") (assoc-ref %build-inputs "docbook-xml") "/xml/dtd/docbook/catalog.xml")))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) ("itstool" ,itstool) - ("libxml" ,libxml2) - ("gettext" ,gettext-minimal) - ("bc" ,bc))) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper))) (inputs - `(("perl" ,perl) - ("python" ,python) - ("xsltproc" ,libxslt) + `(("bc" ,bc) ("dblatex" ,dblatex) ("docbook-xml" ,docbook-xml-4.3) ("docbook-xsl" ,docbook-xsl) - ("source-highlight" ,source-highlight) ("glib" ,glib) - ("python-six" ,python-six))) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("python" ,python) + ("python-anytree" ,python-anytree) + ("python-lxml" ,python-lxml) + ("python-parameterized" ,python-parameterized) + ("python-pygments" ,python-pygments) + ("python-unittest2" ,python-unittest2) + ("source-highlight" ,source-highlight) + ("yelp-tools" ,yelp-tools))) (home-page "https://www.gtk.org/gtk-doc/") (synopsis "Documentation generator from C source code") (description --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0056-gnu-gtk-doc-Update-to-1.32.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0056-gnu-gtk-doc-Update-to-1.32.patch" =46rom 90060d9701e0a47b58e066ef05059be3a85839f7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 09:08:32 -0500 Subject: [PATCH 56/68] gnu: gtk-doc: Update to 1.32. * gnu/packages/gtk.scm (gtk-doc) [version]: Update to 1.32. [arguments]<#:phases>['patch-test-out]: Remove phase. ['disable-failing-tests]: New phase. ['set-HOME]: New phase. --- gnu/packages/gtk.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 62537d9578..389d54b29a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1867,7 +1867,7 @@ information.") (define-public gtk-doc (package (name "gtk-doc") - (version "1.28") + (version "1.32") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1875,7 +1875,7 @@ information.") name "-" version ".tar.xz")) (sha256 (base32 - "05apmwibkmn1icx05l8aw241lhymcx01zvk5i499cb150bijj7li"))= )) + "0z4h1dggpimygdp719l457jvqilps4qcfpk31jmj3jqpzcsg03ny"))= )) (build-system glib-or-gtk-build-system) (arguments `(#:parallel-tests? #f @@ -1895,14 +1895,11 @@ information.") ,(package-version docbook-xsl) "/common/en.xml"))) #t)) - (add-after 'patch-gtk-doc-scan 'patch-test-out + (add-after 'unpack 'disable-failing-tests (lambda _ - ;; sanity.sh counts the number of status lines. Since our - ;; texlive regenerates the fonts every time and the font - ;; generator metafont outputs a lot of extra lines, this - ;; test would always fail. Disable it for now. (substitute* "tests/Makefile.in" - (("empty.sh sanity.sh") "empty.sh")) + (("annotations.sh bugs.sh empty.sh fail.sh gobject.sh pro= gram.sh") + "")) #t)) (add-before 'configure 'fix-docbook (lambda* (#:key inputs #:allow-other-keys) @@ -1919,6 +1916,12 @@ information.") "^catalog.xml$")) " \"http://docbook.sourceforge.net/releas= e/xsl/"))) #t)) + (add-before 'build 'set-HOME + (lambda _ + ;; FIXME: dblatex with texlive-union does not find the buil= t + ;; metafonts, so it tries to generate them in HOME. + (setenv "HOME" "/tmp") + #t)) (add-after 'install 'wrap-executables (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0057-gnu-gtk-doc-Enable-help.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0057-gnu-gtk-doc-Enable-help.patch" =46rom 19ec597cbc98364370c4989fc4c1ea23667df93b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 09:13:14 -0500 Subject: [PATCH 57/68] gnu: gtk-doc: Enable help. * gnu/packages/gtk.scm (gtk-doc) [outputs]: New output 'help'. [arguments]<#:configure-flags>[--with-help-dir]: New flag. --- gnu/packages/gtk.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 389d54b29a..0ec65ff6cf 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1877,6 +1877,7 @@ information.") (base32 "0z4h1dggpimygdp719l457jvqilps4qcfpk31jmj3jqpzcsg03ny"))= )) (build-system glib-or-gtk-build-system) + (outputs '("out" "help")) (arguments `(#:parallel-tests? #f #:phases @@ -1933,7 +1934,10 @@ information.") #:configure-flags (list (string-append "--with-xml-catalog=3D" (assoc-ref %build-inputs "docbook-xml") - "/xml/dtd/docbook/catalog.xml")))) + "/xml/dtd/docbook/catalog.xml") + (string-append "--with-help-dir=3D" + (assoc-ref %outputs "help") + "/share/help")))) (native-inputs `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0058-gnu-gtk-doc-Update-synopsis-description-home-page-an.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0058-gnu-gtk-doc-Update-synopsis-description-home-page-an.pa"; filename*1="tch" =46rom 2f7ab0dd2d89f3332ee2951ed92bab93a4137d7d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 09:20:40 -0500 Subject: [PATCH 58/68] gnu: gtk-doc: Update synopsis, description, home-p= age and license. * gnu/packages/gtk.scm (gtk-doc) [home-page]: Modify. [synopsis]: Modify. [description]: Modify. [license]: Add fdl1.1+. --- gnu/packages/gtk.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 0ec65ff6cf..2dbf8de452 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1962,13 +1962,19 @@ information.") ("python-unittest2" ,python-unittest2) ("source-highlight" ,source-highlight) ("yelp-tools" ,yelp-tools))) - (home-page "https://www.gtk.org/gtk-doc/") - (synopsis "Documentation generator from C source code") - (description - "GTK-Doc generates API documentation from comments added to C code.= It is -typically used to document the public API of GTK+ and GNOME libraries, b= ut it -can also be used to document application code.") - (license license:gpl2+))) + (home-page "https://wiki.gnome.org/DocumentationProject/GtkDoc") + (synopsis "GTK+ DocBook Documentation Generator") + (description "GtkDoc is a tool used to extract API documentation fro= m C-code +like Doxygen, but handles documentation of GObject (including signals an= d +properties) that makes it very suitable for GTK+ apps and libraries. It= uses +docbook for intermediate files and can produce html by default and pdf/m= an-pages +with some extra work.") + (license + (list + ;; Docs. + license:fdl1.1+ + ;; Others. + license:gpl2+)))) =20 (define-public gtk-engines (package --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0059-gnu-json-glib-Add-missing-argument.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0059-gnu-json-glib-Add-missing-argument.patch" =46rom 197ca1623229118223ad76f82c46f7f358174a3a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 10:46:18 -0500 Subject: [PATCH 59/68] gnu: json-glib: Add missing argument. * gnu/packages/gnome.scm (json-glib) [arguments]<#:glib-or-gtk?>: New arg= ument. --- gnu/packages/gnome.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cbda2a93a7..d4b3f4aa14 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4544,13 +4544,15 @@ configuration storage systems.") (base32 "0ixwyis47v5bkx6h8a1iqlw3638cxcv57ivxv4gw2gaig51my33j"))= )) (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas= (native-inputs `(("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ;for glib-mkenums and glib-genm= arshal + ("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config))) (propagated-inputs - `(("glib" ,glib))) ;according to json-glib-= 1.0.pc + `(("glib" ,glib))) ;according to json-glib-1.0.pc (home-page "https://wiki.gnome.org/Projects/JsonGlib") (synopsis "Compiler for the GObject type system") (description --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0060-gnu-json-glib-Enable-documentation-and-man-pages.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0060-gnu-json-glib-Enable-documentation-and-man-pages.patch" =46rom dc7f28eac50cdf6c06d36dcdb51732e5aa5dfdf1 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 10:51:35 -0500 Subject: [PATCH 60/68] gnu: json-glib: Enable documentation and man-pages= =2E * gnu/packages/gnome.scm (json-glib) [outputs]: New output "doc". [arguments]<#:configure-flags>[-Ddocs]: New flag. [-Dman]: New flag. <#:phases>['patch-docbook]: New phase. ['move-doc]: New phase. [native-inputs]: Add docbook-xml, docbook-xsl, gtk-doc and libxslt. --- gnu/packages/gnome.scm | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d4b3f4aa14..887f40f950 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4544,13 +4544,44 @@ configuration storage systems.") (base32 "0ixwyis47v5bkx6h8a1iqlw3638cxcv57ivxv4gw2gaig51my33j"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas= + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Ddocs=3Dtrue" + "-Dman=3Dtrue") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* "json-glib-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/"))) + (substitute* "meson.build" + (("http://docbook.sourceforge.net/release/xsl/current/"= ) + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-1.79.1/")))) + #t)) + (add-after 'install 'move-docs + (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 - `(("gettext" ,gettext-minimal) + `(("docbook-xml" ,docbook-xml-4.3) + ("docbook-xsl" ,docbook-xsl) + ("gettext" ,gettext-minimal) ("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs `(("glib" ,glib))) ;according to json-glib-1.0.pc (home-page "https://wiki.gnome.org/Projects/JsonGlib") --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0061-gnu-json-glib-Update-synopsis-and-description.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0061-gnu-json-glib-Update-synopsis-and-description.patch" =46rom 6096b42e525b553b18421525cc68f3866a837b9c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 10:55:57 -0500 Subject: [PATCH 61/68] gnu: json-glib: Update synopsis and description. * gnu/packages/gnome.scm (json-glib) [synopsis]: Modify. [description]: Modify. --- gnu/packages/gnome.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 887f40f950..9ce07c21c3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4585,13 +4585,10 @@ configuration storage systems.") (propagated-inputs `(("glib" ,glib))) ;according to json-glib-1.0.pc (home-page "https://wiki.gnome.org/Projects/JsonGlib") - (synopsis "Compiler for the GObject type system") - (description - "JSON-GLib is a C library based on GLib providing serialization and= -deserialization support for the JavaScript Object Notation (JSON) format= -described by RFC 4627. It provides parser and generator GObject classes= and -various wrappers for the complex data types employed by JSON, such as ar= rays -and objects.") + (synopsis "Glib and GObject implementation of JSON") + (description "JSON-GLib is a library providing serialization and +described by RFC 4627. It implements a full JSON parser and generator u= sing +GLib and GObject, and integrates JSON with GLib data types.") (license license:lgpl2.1+))) =20 (define-public libxklavier --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0062-gnu-wayland-Fix-indentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0062-gnu-wayland-Fix-indentation.patch" =46rom f5fca8b4ec97f683461d7339b5605bee0e72fc25 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 11:05:02 -0500 Subject: [PATCH 62/68] gnu: wayland: Fix indentation. * gnu/packages/freedesktop.scm (wayland): Fix identation. --- gnu/packages/freedesktop.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index e00454f7b3..4fcf663602 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -840,7 +840,7 @@ Python.") ("docbook-xsl" ,docbook-xsl) ("expat" ,expat) ("libffi" ,libffi) - ("libxml2" ,libxml2))) ; for XML_CATALOG_FILES + ("libxml2" ,libxml2))) ; for XML_CATALOG_FILES (home-page "https://wayland.freedesktop.org/") (synopsis "Display server protocol") (description --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0063-gnu-wayland-Change-build-system.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0063-gnu-wayland-Change-build-system.patch" =46rom fbca49a82bbae3a2608879f79993a8ad1ee53ea9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 11:06:18 -0500 Subject: [PATCH 63/68] gnu: wayland: Change build-system. * gnu/packages/freedesktop.scm (wayland) [build-system]: Change from gnu = to meson. --- gnu/packages/freedesktop.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 4fcf663602..ea1324b9f6 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -826,7 +826,7 @@ Python.") (sha256 (base32 "0k995rn96xkplrapz5k648j651wc43kq817xk1x8280h16gsfxa6"))= )) - (build-system gnu-build-system) + (build-system meson-build-system) (arguments `(#:parallel-tests? #f)) (native-inputs --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0064-gnu-wayland-Correct-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0064-gnu-wayland-Correct-inputs.patch" =46rom 24eace287aa5fefe796a2fe30924ad42cb5d8a47 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 11:09:46 -0500 Subject: [PATCH 64/68] gnu: wayland: Correct inputs. * gnu/packages/freedesktop.scm (wayland) [native-inputs]: Move here docbook-xml and docbook-xsl from ... [inputs]: ... here. Move libffi to ... [propagated-inputs]: ... here. --- gnu/packages/freedesktop.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index ea1324b9f6..d12fdd46f5 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -830,17 +830,19 @@ Python.") (arguments `(#:parallel-tests? #f)) (native-inputs - `(("doxygen" ,doxygen) - ("graphviz" ,graphviz) + `(("docbook-xml-4.2" ,docbook-xml-4.2) + ("docbook-xml" ,docbook-xml) + ("docbook-xsl" ,docbook-xsl) + ("dot" ,graphviz) + ("doxygen" ,doxygen) ("pkg-config" ,pkg-config) ("xmlto" ,xmlto) ("xsltproc" ,libxslt))) (inputs - `(("docbook-xml" ,docbook-xml) - ("docbook-xsl" ,docbook-xsl) - ("expat" ,expat) - ("libffi" ,libffi) + `(("expat" ,expat) ("libxml2" ,libxml2))) ; for XML_CATALOG_FILES + (propagated-inputs + `(("libffi" ,libffi))) (home-page "https://wayland.freedesktop.org/") (synopsis "Display server protocol") (description --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0065-gnu-wayland-Fix-and-move-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0065-gnu-wayland-Fix-and-move-documentation.patch" =46rom 108320c35f843874257021d6722ef82f938a23e7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 11:14:33 -0500 Subject: [PATCH 65/68] gnu: wayland: Fix and move documentation. * gnu/packages/freedesktop.scm (wayland) [outputs]: New output "doc". [arguments]<#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. --- gnu/packages/freedesktop.scm | 37 +++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index d12fdd46f5..9c293bd2fc 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -827,8 +827,43 @@ Python.") (base32 "0k995rn96xkplrapz5k648j651wc43kq817xk1x8280h16gsfxa6"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - `(#:parallel-tests? #f)) + `(#:parallel-tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* '("man/wl_display_connect.xml" + "publican/sources/Architecture.xml" + "publican/sources/Author_Group.xml" + "publican/sources/Book_Info.xml" + "publican/sources/Client.xml" + "publican/sources/Compositors.xml" + "publican/sources/Foreword.xml" + "publican/sources/Introduction.xml" + "publican/sources/Preface.xml" + "publican/sources/Protocol.xml" + "publican/sources/Server.xml" + "publican/sources/Wayland.xml" + "publican/sources/Xwayland.xml") + (("http://www.oasis-open.org/docbook/xml/4.5/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")) + (("http://www.oasis-open.org/docbook/xml/4.2/") + (string-append (assoc-ref inputs "docbook-xml-4.2") + "/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/doc") + (string-append doc "/share/doc")) + #t)))))) (native-inputs `(("docbook-xml-4.2" ,docbook-xml-4.2) ("docbook-xml" ,docbook-xml) --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0066-gnu-wayland-Update-synopsis-description-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0066-gnu-wayland-Update-synopsis-description-and-license.pat"; filename*1="ch" =46rom 27cbf051513bc7d2c1d624f1e040d8720014343d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 11:18:19 -0500 Subject: [PATCH 66/68] gnu: wayland: Update synopsis, description and lic= ense. * gnu/packages/freedesktop.scm (wayland) [synopsis]: Modify. [description]: Modify. [license]: Change from x11 to expat. --- gnu/packages/freedesktop.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 9c293bd2fc..4e105ac384 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -879,14 +879,14 @@ Python.") (propagated-inputs `(("libffi" ,libffi))) (home-page "https://wayland.freedesktop.org/") - (synopsis "Display server protocol") - (description - "Wayland is a protocol for a compositor to talk to its clients as w= ell as -a C library implementation of that protocol. The compositor can be a st= andalone -display server running on Linux kernel modesetting and evdev input devic= es, an X -application, or a wayland client itself. The clients can be traditional= -applications, X servers (rootless or fullscreen) or other display server= s.") - (license license:x11))) + (synopsis "Core Wayland window system code and protocol") + (description "Wayland is a project to define a protocol for a compos= itor to +talk to its clients as well as a library implementation of the protocol.= The +compositor can be a standalone display server running on Linux kernel +modesetting and evdev input devices, an X application, or a wayland clie= nt +itself. The clients can be traditional applications, X servers (rootles= s or +fullscreen) or other display servers.") + (license license:expat))) =20 (define-public wayland-protocols (package --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0067-gnu-wayland-protocols-Update-description.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0067-gnu-wayland-protocols-Update-description.patch" =46rom 2143dbcbf5be6be9e60babf0f6a1ce5ff3c4854e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 11:22:54 -0500 Subject: [PATCH 67/68] gnu: wayland-protocols: Update description. * gnu/packages/freedesktop.scm (wayland-protocols) [description]: Modify.= --- gnu/packages/freedesktop.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 4e105ac384..7b06d21769 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -906,7 +906,10 @@ fullscreen) or other display servers.") (native-inputs `(("pkg-config" ,pkg-config))) (synopsis "Wayland protocols") - (description "This package contains XML definitions of the Wayland p= rotocols.") + (description "Wayland-Protocols contains Wayland protocols that add +functionality not available in the Wayland core protocol. Such protocol= s either +add completely new functionality, or extend the functionality of some ot= her +protocol either in Wayland core, or some other protocol in wayland-proto= cols.") (home-page "https://wayland.freedesktop.org") (license license:expat))) =20 --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9 Content-Type: text/x-patch; charset=UTF-8; name="0068-gnu-yelp-xsl-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0068-gnu-yelp-xsl-Enable-documentation.patch" =46rom 2d54e42cdced31ae84f4162753df3452a45cd535 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 11:30:38 -0500 Subject: [PATCH 68/68] gnu: yelp-xsl: Enable documentation. * gnu/packages/gnome.scm (yelp-xsl) [arguments]<#:configure-flag> [--enable-doc]: New flag. [native-inputs]: Add mallard-ducktype, intltool and libxslt. --- gnu/packages/gnome.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9ce07c21c3..d9332d0add 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6788,10 +6788,17 @@ of running programs and invoke methods on those i= nterfaces.") (sha256 (base32 "1hsfj3q3a3kca0cf9i02xlq2qd4vy12qsjb89hh4r6mp6c11rrag"))= )) (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + "--enable-doc"))) (native-inputs - `(("gettext-minimal" ,gettext-minimal) + `(("ducktype" ,mallard-ducktype) + ("gettext" ,gettext-minimal) + ("intltool" ,intltool) ("itstool" ,itstool) - ("xmllint" ,libxml2))) + ("xmllint" ,libxml2) + ("xsltproc" ,libxslt))) (synopsis "XSL stylesheets for Yelp") (description "Yelp-XSL is a collection of programs and data files to= help you build, maintain, and distribute documentation. It provides XSLT sty= lesheets --=20 2.30.1 --------------E9340A1FBD4A02B2BDE528B9-- --npWP0sW2c5np1dLba6wsn48lT1BgSy1NT-- --YrlEz8SxQ9FIPvC4PENRydshB1ABS1U4e Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYEuYvwUDAAAAAAAKCRBfWBZkf4vlUeja AQCFnPonDYJlaWN4GZP9gYYxyrIVAuJO5fMZCgINv4EpygD/SxbrDjarH09DJvdhZudjf4tKUkCd wZLUC5RLhOdzKwM= =hdXZ -----END PGP SIGNATURE----- --YrlEz8SxQ9FIPvC4PENRydshB1ABS1U4e-- From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 12 12:19:26 2021 Received: (at 42958) by debbugs.gnu.org; 12 Mar 2021 17:19:26 +0000 Received: from localhost ([127.0.0.1]:58258 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKlRd-00017E-Lz for submit@debbugs.gnu.org; Fri, 12 Mar 2021 12:19:25 -0500 Received: from out2.migadu.com ([188.165.223.204]:16237) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKlRY-00016z-EU for 42958@debbugs.gnu.org; Fri, 12 Mar 2021 12:19:23 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1615569557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=BctB2ycHVykATmmY6JU2+sF85QMwescEziz1/nd5SqA=; b=Jp8I27omcr+/UItXzXC8hqHoLUEKxlENcV9ovXQJWrfOfrSvSuGkCI0C93MFl6sjoRQGjR Mot8g12qbjo/1p5M9DZgnYCp9J1o7HhzZc6vaXTo65KpPV6eTAEA9tB04R02AfnV7oOxeK AA2z8HZnapzCf0AisKMFYfgJ9/CtU+LUjUaff7ay/hR/nu/iDfKv7nU7MQY2ilvA4M20zq AHHGkyPrkbu+Y9i2OHCyH/6Furr2Dp3bhORiHBeJCH/IAfhQte3ZRFMBQOY8wTny2XRq73 CayRZhtd3Y1hcN0KTcEz0TJ+3+u/tqTnMDZVddKJQomY0JSmUcIoS6EFD33iTA== From: Raghav Gururajan To: 42958@debbugs.gnu.org, Danny Milosavljevic References: Subject: Re: Big changes from wip-desktop. Message-ID: <7bef0b9f-b8a6-bd56-52e7-e283d8342470@raghavgururajan.name> Date: Fri, 12 Mar 2021 12:19:15 -0500 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="U9HVKOHPUQxicwVd1Z50yUr4MZVaXUyEn" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42958 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --U9HVKOHPUQxicwVd1Z50yUr4MZVaXUyEn Content-Type: multipart/mixed; boundary="BcaayM6QPHFrZqyJGwQbV2OaAxdKIEoHM"; protected-headers="v1" From: Raghav Gururajan To: 42958@debbugs.gnu.org, Danny Milosavljevic Message-ID: <7bef0b9f-b8a6-bd56-52e7-e283d8342470@raghavgururajan.name> Subject: Re: Big changes from wip-desktop. References: In-Reply-To: --BcaayM6QPHFrZqyJGwQbV2OaAxdKIEoHM Content-Type: multipart/mixed; boundary="------------55A8151FB1C627BEE4181966" Content-Language: en-US This is a multi-part message in MIME format. --------------55A8151FB1C627BEE4181966 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi Danny! > I have split and re-worked remaining patches for current core-updates. = > Please find them attached. Since we are touching glib and gtk here, I think we can use this=20 opportunity to update them further on minor versions. I have attached=20 the patches. Regards, RG. --------------55A8151FB1C627BEE4181966 Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-glib-Update-to-2.64.6.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-glib-Update-to-2.64.6.patch" =46rom 6a5c5f57acfa9d8a630e9e53ebf9e934f890cbce Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 11:48:26 -0500 Subject: [PATCH 1/3] gnu: glib: Update to 2.64.6. * gnu/packages/glib.scm (glib) [version]: Update to 2.64.6. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 974315f642..d0d0ddb371 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -173,7 +173,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.64.3") + (version "2.64.6") (source (origin (method url-fetch) @@ -182,7 +182,7 @@ shared NFS home directories.") name "/" (string-take version 4) "/" name "-" version ".tar.xz")) (sha256 - (base32 "08pbgiv5m3rica4ydvwvpq5mrxbyswx7l1jzjc2ch52xjabvr77y"))= + (base32 "1wakp3zl9hs7p86br415qhrq6dnnmjmfcvq18vq72k0nf1xf0vn3"))= (patches (search-patches "glib-disable-failing-tests.patch" "glib-appinfo-watch.patch")) --=20 2.30.1 --------------55A8151FB1C627BEE4181966 Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-gtk-Update-to-3.24.27.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-gtk-Update-to-3.24.27.patch" =46rom 6f223b44a73ec144f0708bcc38ce35ad92e0d0d1 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 12:01:02 -0500 Subject: [PATCH 2/3] gnu: gtk+: Update to 3.24.27. * gnu/packages/gtk.scm (gtk+) [version]: Update to 3.24.27. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 2dbf8de452..cb49e682a2 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -925,7 +925,7 @@ application suites.") (package (inherit gtk+-2) (name "gtk+") - (version "3.24.24") + (version "3.24.27") (source (origin (method url-fetch) @@ -934,7 +934,7 @@ application suites.") name "-" version ".tar.xz")) (sha256 (base32 - "12ipk1d376bai9v820qzhxba93kkh5abi6mhyqr4hwjvqmkl77fc")) + "09ksflq5j257bf5zn8q2nnf2flicg9qqgfy7za79z7rkf1shc77p")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.p= atch")))) (propagated-inputs --=20 2.30.1 --------------55A8151FB1C627BEE4181966 Content-Type: text/x-patch; charset=UTF-8; name="0003-gnu-gtk-2-Update-to-2.24.33.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0003-gnu-gtk-2-Update-to-2.24.33.patch" =46rom cd01788cc03864717513c7a8fbbdd5f8ba9e071e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 12:04:56 -0500 Subject: [PATCH 3/3] gnu: gtk+-2: Update to 2.24.33. * gnu/packages/gtk.scm (gtk+-2) [version]: Update to 2.24.33. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index cb49e682a2..05768c564b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -825,7 +825,7 @@ is part of the GNOME accessibility project.") (define-public gtk+-2 (package (name "gtk+") - (version "2.24.32") + (version "2.24.33") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -833,7 +833,7 @@ is part of the GNOME accessibility project.") name "-" version ".tar.xz")) (sha256 (base32 - "0bjq7ja9gwcv6n5q4qkvdjjx40wsdiikksz1zqxvxsm5vlyskj5n"))= + "1nn6kks1zyvb5xikr9y2k7r9bwjy1g4b0m0s66532bclymbwfamc"))= (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patc= h" "gtk2-respect-GUIX_GTK2_IM_MODULE= _FILE.patch" "gtk2-theme-paths.patch")))) --=20 2.30.1 --------------55A8151FB1C627BEE4181966-- --BcaayM6QPHFrZqyJGwQbV2OaAxdKIEoHM-- --U9HVKOHPUQxicwVd1Z50yUr4MZVaXUyEn Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYEuikwUDAAAAAAAKCRBfWBZkf4vlUXCL AP48WHfrzFkqTzNv6wZcj4jNCI41JId3JDTVKYwrsRFVugD/fqHz2pmttPMkE17pvZsiVXf2SX2x QP3G4Sive07sTQI= =JZE5 -----END PGP SIGNATURE----- --U9HVKOHPUQxicwVd1Z50yUr4MZVaXUyEn-- From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 25 08:08:43 2021 Received: (at 42958) by debbugs.gnu.org; 25 Mar 2021 12:08:44 +0000 Received: from localhost ([127.0.0.1]:37376 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPOn5-0005D2-Tn for submit@debbugs.gnu.org; Thu, 25 Mar 2021 08:08:43 -0400 Received: from out1.migadu.com ([91.121.223.63]:17664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPOn3-0005Ct-Rq for 42958@debbugs.gnu.org; Thu, 25 Mar 2021 08:08:43 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1616674119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Ad5X60g9d9HmGZj0Jy+79z2kXCCJtxKkw70lE8PVSmM=; b=FiGIX8ZN3NUbh1Gpp+cjeMKjrSaYR736fn27CbIOrIaFtXmxixaFar8fD7o9EMPNxllJbD fb/6dWR4ZOMdsJjwyg9Y4RtKz9MYzseL2GDB9hWb7cGViJvQJNH9aTyTEcoRgjq2kjgXha fPXv5ShXako1AyfJAzc9E9+iJxC2YeTosfpnitjbu9jTKIJLr0Kf8rqJ8tLfmYBY5mZHcz CeRlMXJ3VijhwsP60ceJXIvyh9Bm+30dtVmGnEj2VhHYzNxBLZFqCI7Ja2XQ9ceUWyXJn0 Q4OF0oPuf7eIntjsKbbtL959GzA+l7iEjMSnSTRzoxroLL6YuEh/rXmhpKa/Vw== From: Raghav Gururajan To: 42958@debbugs.gnu.org, Danny Milosavljevic , Ricardo Wurmus , =?UTF-8?Q?L=c3=a9o_Le_Bouter?= References: <7bef0b9f-b8a6-bd56-52e7-e283d8342470@raghavgururajan.name> Subject: Re: Big changes from wip-desktop. Message-ID: <2b0dc6df-d533-8793-697c-82d664e93ddb@raghavgururajan.name> Date: Thu, 25 Mar 2021 08:08:36 -0400 MIME-Version: 1.0 In-Reply-To: <7bef0b9f-b8a6-bd56-52e7-e283d8342470@raghavgururajan.name> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="VtjJH3IgXV8VZB3lKXI2ilZPxQzLOOVDB" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Debbugs-Envelope-To: 42958 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --VtjJH3IgXV8VZB3lKXI2ilZPxQzLOOVDB Content-Type: multipart/mixed; boundary="eADj2hk9hu2mUgoABcyrjlrgntpzQ8YJ1"; protected-headers="v1" From: Raghav Gururajan To: 42958@debbugs.gnu.org, Danny Milosavljevic , Ricardo Wurmus , =?UTF-8?Q?L=c3=a9o_Le_Bouter?= Message-ID: <2b0dc6df-d533-8793-697c-82d664e93ddb@raghavgururajan.name> Subject: Re: Big changes from wip-desktop. References: <7bef0b9f-b8a6-bd56-52e7-e283d8342470@raghavgururajan.name> In-Reply-To: <7bef0b9f-b8a6-bd56-52e7-e283d8342470@raghavgururajan.name> --eADj2hk9hu2mUgoABcyrjlrgntpzQ8YJ1 Content-Type: multipart/mixed; boundary="------------0F79ABA1FFD960FD0A3963A3" Content-Language: en-US This is a multi-part message in MIME format. --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable @(rekado|lle-bout|danny), Could any of you please review and merge the attached patches to=20 core-updates? These patches has been successfully built on bayfront, from which you=20 can obtain substitutes, if needed. I will send some more patches for this #42958 by tomorrow. It would be great if we could together finish-off this #42958 ASAP, so=20 that I can bring remaining patches from wip-deskop. P.S Please pardon two cosmetic changes patches, which were done very long=20 ago and had to use it to cleanly apply succeeding patches. Also, I must=20 have used #t with lambda out of habit. Regards, RG. --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-glib-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-glib-Make-some-cosmetic-changes.patch" =46rom 2df41c9b1d7012f2eb3490280630f5324584eb9f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 06:39:29 -0500 Subject: [PATCH 01/56] gnu: glib: Make some cosmetic changes. * gnu/packages/glib.scm (glib): Make some cosmetic changes. --- gnu/packages/glib.scm | 425 ++++++++++++++++++++---------------------- 1 file changed, 202 insertions(+), 223 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index fdbe6d0cdf..8e14aa8c5a 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -170,229 +170,208 @@ shared NFS home directories.") =20 (define glib (package - (name "glib") - (version "2.62.6") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" - name "/" (string-take version 4) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh")) - (patches (search-patches "glib-appinfo-watch.patch" - "glib-tests-timer.patch")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "tests/spawn-test.c" - (("/bin/sh") "sh")) - #t)))) - (build-system meson-build-system) - (outputs '("out" ; everything - "bin" ; glib-mkenums, gtester, etc.; depends on = Python - "debug")) - (propagated-inputs - `(("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc - ("libffi" ,libffi) ; in the Requires.private field of gobject-2.0.= pc - ;; These are in the Requires.private field of gio-2.0.pc - ("util-linux" ,util-linux "lib") ;for libmount - ("zlib" ,zlib))) - (native-inputs - `(("gettext" ,gettext-minimal) - ("m4" ,m4) ; for installing m4 macros - ("dbus" ,dbus) ; for GDBus tests - ("pkg-config" ,pkg-config) - ("python" ,python-minimal-wrapper) - ("perl" ,perl) ; needed by GIO tests - ("tzdata" ,tzdata-for-tests))) ; for tests/gdatet= ime.c - (arguments - `(#:disallowed-references (,tzdata-for-tests) - #:configure-flags '("-Dselinux=3Ddisabled") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-dbus-launch-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((dbus (assoc-ref inputs "dbus"))) - (substitute* "gio/gdbusaddress.c" - (("command_line =3D g_strdup_printf \\(\"dbus-launch") - (string-append "command_line =3D g_strdup_printf (\"" - dbus "/bin/dbus-launch"))) - #t))) - (add-after 'unpack 'patch-gio-launch-desktop - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; See also - ;; for another future fix. - (substitute* "gio/gdesktopappinfo.c" - (("gio-launch-desktop") - (string-append out "/libexec/gio-launch-desktop"))) - #t))) - ;; TODO: Remove the conditional in the next core-updates cycle. - ;; Needed to build glib on slower ARM nodes. - ,@(if (string-prefix? "arm" (%current-system)) - `((add-after 'unpack 'increase-test-timeout - (lambda _ - (substitute* "meson.build" - (("test_timeout =3D 60") - "test_timeout =3D 90") - (("test_timeout_slow =3D 120") - "test_timeout_slow =3D 180"))))) - '()) - (add-before 'build 'pre-build - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; For tests/gdatetime.c. - (setenv "TZDIR" - (string-append (assoc-ref inputs "tzdata") - "/share/zoneinfo")) - - ;; Some tests want write access there. - (setenv "HOME" (getcwd)) - (setenv "XDG_CACHE_HOME" (getcwd)) - #t)) - (add-after 'unpack 'disable-failing-tests - (lambda _ - (let ((disable - (lambda (test-file test-paths) - (define pattern+procs - (map (lambda (test-path) - (cons - ;; XXX: only works for single line statem= ents. - (format #f "g_test_add_func.*\"~a\".*" te= st-path) - (const ""))) - test-paths)) - (substitute test-file pattern+procs))) - (failing-tests - '(("glib/tests/thread.c" - (;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-xe= n-amd64 - ;; as found on hydra.gnu.org, and strace(1) doesn= 't - ;; recognize it. - "/thread/thread4")) - - ;; This tries to find programs in FHS directories. - ("glib/tests/utils.c" - ("/utils/find-program")) - - ;; This fails because "glib/tests/echo-script" cann= ot be - ;; found. - ("glib/tests/spawn-singlethread.c" - ("/gthread/spawn-script")) - - ("glib/tests/timer.c" - (;; fails if compiler optimizations are enabled, w= hich they - ;; are by default. - "/timer/stop")) - - ("gio/tests/gapplication.c" - (;; XXX: proven to be unreliable. See: - ;; - ;; - "/gapplication/quit" - - ;; XXX: fails randomly for unknown reason. See: - ;; - "/gapplication/local-actions")) - - ("gio/tests/contenttype.c" - (;; XXX: requires shared-mime-info. - "/contenttype/guess" - "/contenttype/guess_svg_from_data" - "/contenttype/subtype" - "/contenttype/list" - "/contenttype/icon" - "/contenttype/symbolic-icon" - "/contenttype/tree")) - - ("gio/tests/appinfo.c" - (;; XXX: requires update-desktop-database. - "/appinfo/associations")) - - ("gio/tests/desktop-app-info.c" - (;; XXX: requires update-desktop-database. - "/desktop-app-info/delete" - "/desktop-app-info/default" - "/desktop-app-info/fallback" - "/desktop-app-info/lastused" - "/desktop-app-info/search")) - - ("gio/tests/gdbus-peer.c" - (;; Requires /etc/machine-id. - "/gdbus/codegen-peer-to-peer")) - - ("gio/tests/gdbus-address-get-session.c" - (;; Requires /etc/machine-id. - "/gdbus/x11-autolaunch")) - - ("gio/tests/gsocketclient-slow.c" - (;; These tests tries to resolve "localhost", and = fails. - "/socket-client/happy-eyeballs/slow" - "/socket-client/happy-eyeballs/cancellation/delay= ed")) - - ))) - (for-each (lambda (x) (apply disable x)) failing-tests) - #t))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (if tests? - (begin - (setenv "MESON_TESTTHREADS" - (number->string (parallel-job-count))) - ;; Do not run tests marked as "flaky". - (invoke "meson" "test" "--no-suite" "flaky")) - #t))) - ;; TODO: meson does not permit the bindir to be outside of prefi= x. - ;; See https://github.com/mesonbuild/meson/issues/2561 - ;; We can remove this once meson is patched. - (add-after 'install 'move-executables - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (assoc-ref outputs "bin"))) - (mkdir-p bin) - (rename-file (string-append out "/bin") - (string-append bin "/bin")) - ;; This one is an implementation detail of glib. - ;; It is wrong that that's in "/bin" in the first place, - ;; but that's what upstream is doing right now. - ;; See . - (mkdir (string-append out "/libexec")) - (rename-file (string-append bin "/bin/gio-launch-desktop")= - (string-append out "/libexec/gio-launch-deskt= op")) - ;; Do not refer to "bindir", which points to "${prefix}/bi= n". - ;; We don't patch "bindir" to point to "$bin/bin", because= that - ;; would create a reference cycle between the "out" and "b= in" - ;; outputs. - (substitute* (list (string-append out "/lib/pkgconfig/gio-= 2.0.pc") - (string-append out "/lib/pkgconfig/glib= -2.0.pc")) - (("bindir=3D\\$\\{prefix\\}/bin") "") - (("=3D\\$\\{bindir\\}/") "=3D")) - #t)))))) - ;; TODO: see above for explanation. - ;; #:configure-flags (list (string-append "--bindir=3D" - ;; (assoc-ref %outputs "bin= ") - ;; "/bin")) - - (native-search-paths - ;; This variable is not really "owned" by GLib, but several related - ;; packages refer to it: gobject-introspection's tools use it as a s= earch - ;; path for .gir files, and it's also a search path for schemas prod= uced - ;; by 'glib-compile-schemas'. - (list (search-path-specification - (variable "XDG_DATA_DIRS") - (files '("share"))) - ;; To load extra gio modules from glib-networking, etc. - (search-path-specification - (variable "GIO_EXTRA_MODULES") - (files '("lib/gio/modules"))))) - (search-paths native-search-paths) - (properties '((hidden? . #t))) - - (synopsis "Thread-safe general utility library; basis of GTK+ and GNO= ME") - (description - "GLib provides data structure handling for C, portability wrappers, -and interfaces for such runtime functionality as an event loop, threads,= -dynamic loading, and an object system.") - (home-page "https://developer.gnome.org/glib/") - (license license:lgpl2.1+))) + (name "glib") + (version "2.62.6") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" + name "/" (string-take version 4) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh"))= + (patches + (search-patches "glib-tests-timer.patch" "glib-appinfo-watch.pat= ch")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "tests/spawn-test.c" + (("/bin/sh") "sh")) + #t)))) + (properties '((hidden? . #t))) + (build-system meson-build-system) + (outputs '("out" ; everything + "bin")) ; glib-mkenums, gtester, etc.; depends on Python + (arguments + `(#:disallowed-references (,tzdata-for-tests) + #:phases + (modify-phases %standard-phases + ;; TODO: Remove the conditional in the next core-updates cycle.= + ;; Needed to build glib on slower ARM nodes. + ,@(if (string-prefix? "arm" (%current-system)) + `((add-after 'unpack 'increase-test-timeout + (lambda _ + (substitute* "meson.build" + (("test_timeout =3D 60") + "test_timeout =3D 90") + (("test_timeout_slow =3D 120") + "test_timeout_slow =3D 180"))))) + '()) + (add-after 'unpack 'patch-dbus-launch-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((dbus (assoc-ref inputs "dbus"))) + (substitute* "gio/gdbusaddress.c" + (("command_line =3D g_strdup_printf \\(\"dbus-launch") + (string-append "command_line =3D g_strdup_printf (\"" + dbus "/bin/dbus-launch"))) + #t))) + (add-after 'unpack 'patch-gio-launch-desktop + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; See also + ;; for another future fix. + (substitute* "gio/gdesktopappinfo.c" + (("gio-launch-desktop") + (string-append out "/libexec/gio-launch-desktop"))) + #t))) + (add-before 'build 'pre-build + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; For tests/gdatetime.c. + (setenv "TZDIR" + (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo")) + ;; Some tests want write access there. + (setenv "HOME" (getcwd)) + (setenv "XDG_CACHE_HOME" (getcwd)) + #t)) + (add-after 'unpack 'disable-failing-tests + (lambda _ + (let ((disable + (lambda (test-file test-paths) + (define pattern+procs + (map (lambda (test-path) + (cons + ;; XXX: only works for single line state= ments. + (format #f "g_test_add_func.*\"~a\".*" t= est-path) + (const ""))) + test-paths)) + (substitute test-file pattern+procs))) + (failing-tests + '(("glib/tests/thread.c" + ( ;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-= xen-amd64 + ;; as found on hydra.gnu.org, and strace(1) does= n't + ;; recognize it. + "/thread/thread4")) + ;; This tries to find programs in FHS directories.= + ("glib/tests/utils.c" + ("/utils/find-program")) + ;; This fails because "glib/tests/echo-script" can= not be + ;; found. + ("glib/tests/spawn-singlethread.c" + ("/gthread/spawn-script")) + ("glib/tests/timer.c" + ( ;; fails if compiler optimizations are enabled,= which they + ;; are by default. + "/timer/stop")) + ("gio/tests/gapplication.c" + ( ;; XXX: proven to be unreliable. See: + ;; + ;; + "/gapplication/quit" + ;; XXX: fails randomly for unknown reason. See: + ;; + "/gapplication/local-actions")) + ("gio/tests/contenttype.c" + ( ;; XXX: requires shared-mime-info. + "/contenttype/guess" + "/contenttype/guess_svg_from_data" + "/contenttype/subtype" + "/contenttype/list" + "/contenttype/icon" + "/contenttype/symbolic-icon" + "/contenttype/tree")) + ("gio/tests/appinfo.c" + ( ;; XXX: requires update-desktop-database. + "/appinfo/associations")) + ("gio/tests/desktop-app-info.c" + ( ;; XXX: requires update-desktop-database. + "/desktop-app-info/delete" + "/desktop-app-info/default" + "/desktop-app-info/fallback" + "/desktop-app-info/lastused" + "/desktop-app-info/search")) + ("gio/tests/gdbus-peer.c" + ( ;; Requires /etc/machine-id. + "/gdbus/codegen-peer-to-peer")) + ("gio/tests/gdbus-address-get-session.c" + ( ;; Requires /etc/machine-id. + "/gdbus/x11-autolaunch")) + ("gio/tests/gsocketclient-slow.c" + ( ;; These tests tries to resolve "localhost", an= d fails. + "/socket-client/happy-eyeballs/slow" + "/socket-client/happy-eyeballs/cancellation/dela= yed"))))) + (for-each (lambda (x) (apply disable x)) failing-tests) + #t))) + (replace 'check + (lambda _ + (setenv "MESON_TESTTHREADS" + (number->string (parallel-job-count))) + ;; Do not run tests marked as "flaky". + (invoke "meson" "test" "--no-suite" "flaky"))) + ;; TODO: meson does not permit the bindir to be outside of pref= ix. + ;; See https://github.com/mesonbuild/meson/issues/2561 + ;; We can remove this once meson is patched. + (add-after 'install 'move-executables + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) + (mkdir-p bin) + (rename-file (string-append out "/bin") + (string-append bin "/bin")) + ;; This one is an implementation detail of glib. + ;; It is wrong that that's in "/bin" in the first place, + ;; but that's what upstream is doing right now. + ;; See .= + (mkdir (string-append out "/libexec")) + (rename-file (string-append bin "/bin/gio-launch-desktop"= ) + (string-append out "/libexec/gio-launch-desk= top")) + ;; Do not refer to "bindir", which points to "${prefix}/b= in". + ;; We don't patch "bindir" to point to "$bin/bin", becaus= e that + ;; would create a reference cycle between the "out" and "= bin" + ;; outputs. + (substitute* (list (string-append out "/lib/pkgconfig/gio= -2.0.pc") + (string-append out "/lib/pkgconfig/gli= b-2.0.pc")) + (("bindir=3D\\$\\{prefix\\}/bin") "") + (("=3D\\$\\{bindir\\}/") "=3D")) + #t)))))) + ;; TODO: see above for explanation. + ;; #:configure-flags (list (string-append "--bindir=3D" + ;; (assoc-ref %outputs "bin")= + ;; "/bin")) + (native-inputs + `(("dbus" ,dbus) ; for GDBus tests + ("gettext" ,gettext-minimal) + ("m4" ,m4) ; for installing m4 macros + ("perl" ,perl) ; needed by GIO tests + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("tzdata" ,tzdata-for-tests))) ; for tests/gdatetime.c + (propagated-inputs + `(("libffi" ,libffi) ; in the Requires.private field of gobject-2.0= =2Epc + ("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc + ("util-linux" ,util-linux "lib") ;for libmount + ("zlib" ,zlib))) ; in the Requires.private field of glib-2.0.pc + (native-search-paths + ;; This variable is not really "owned" by GLib, but several related= + ;; packages refer to it: gobject-introspection's tools use it as a = search + ;; path for .gir files, and it's also a search path for schemas pro= duced + ;; by 'glib-compile-schemas'. + (list + (search-path-specification + (variable "XDG_DATA_DIRS") + (files '("share"))) + ;; To load extra gio modules from glib-networking, etc. + (search-path-specification + (variable "GIO_EXTRA_MODULES") + (files '("lib/gio/modules"))))) + (search-paths native-search-paths) + (synopsis "Thread-safe general utility library; basis of GTK+ and GN= OME") + (description "GLib provides data structure handling for C, portabili= ty +wrappers, and interfaces for such runtime functionality as an event loop= , +threads, dynamic loading, and an object system.") + (home-page "https://developer.gnome.org/glib/") + (license license:lgpl2.1+))) =20 (define-public glib-with-documentation ;; glib's doc must be built in a separate package since it requires gt= k-doc, --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-glib-Update-to-2.68.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-glib-Update-to-2.68.0.patch" =46rom 76fa7c146a5395cbc4ed36712eb7cc1ae71d378f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 07:22:07 -0500 Subject: [PATCH 02/56] gnu: glib: Update to 2.68.0. * gnu/packages/glib.scm (glib) [version]: Update to 2.68.0. [patches]: Remove glib-tests-timer.patch. [arguments]<#:phases>['patch-python-references]: New phase. ['pre-check]: New phase. ['move-bin]: New phase. ['patch-dbus-launch-path]: Remove phase. ['patch-gio-launch-desktop]: Remove phase. ['pre-build]: Remove phase. ['disable-failing-tests]: Modify phase. ['check]: Remove phase. ['move-executables]: Remove phase. [native-inputs]: Add intltool, python, libxml2 and libxslt. Remove dbus. [inputs]: Add bash-completion, dbus and libelf. [propagated-inputs]: Add libselinux. * gnu/packages/patches/glib-tests-timer.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust. --- gnu/local.mk | 1 - gnu/packages/glib.scm | 168 ++++++-------------- gnu/packages/patches/glib-tests-timer.patch | 15 -- 3 files changed, 53 insertions(+), 131 deletions(-) delete mode 100644 gnu/packages/patches/glib-tests-timer.patch diff --git a/gnu/local.mk b/gnu/local.mk index 572f439cae..d070ab08a9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1068,7 +1068,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ - %D%/packages/patches/glib-tests-timer.patch \ %D%/packages/patches/glibc-CVE-2018-11236.patch \ %D%/packages/patches/glibc-CVE-2018-11237.patch \ %D%/packages/patches/glibc-CVE-2019-7309.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 8e14aa8c5a..6d9df5375a 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -36,11 +36,13 @@ #:use-module (gnu packages) #:use-module (gnu packages backup) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) + #:use-module (gnu packages elf) #:use-module (gnu packages enlightenment) #:use-module (gnu packages file) #:use-module (gnu packages flex) @@ -60,6 +62,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages selinux) #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -171,7 +174,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.62.6") + (version "2.68.0") (source (origin (method url-fetch) @@ -180,9 +183,9 @@ shared NFS home directories.") name "/" (string-take version 4) "/" name "-" version ".tar.xz")) (sha256 - (base32 "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh"))= + (base32 "1sh3h6b734cxhdd1qlzvhxq6rc7k73dsisap5y3s419s9xc4ywv7"))= (patches - (search-patches "glib-tests-timer.patch" "glib-appinfo-watch.pat= ch")) + (search-patches "glib-appinfo-watch.patch")) (modules '((guix build utils))) (snippet '(begin @@ -208,24 +211,31 @@ shared NFS home directories.") (("test_timeout_slow =3D 120") "test_timeout_slow =3D 180"))))) '()) - (add-after 'unpack 'patch-dbus-launch-path + (add-after 'unpack 'disable-failing-tests + (lambda _ + (with-directory-excursion "glib/tests" + (substitute* '("unix.c" "utils.c") + (("[ \t]*g_test_add_func.*;") ""))) + (with-directory-excursion "gio/tests" + (substitute* '("contenttype.c" "gdbus-address-get-session= =2Ec" + "gdbus-peer.c" "appinfo.c" "desktop-app-in= fo.c") + (("[ \t]*g_test_add_func.*;") ""))) + #t)) + ;; Python references are not being patched in patch-phase of bu= ild, + ;; despite using python-wrapper as input. So we patch them manu= ally. + (add-after 'unpack 'patch-python-references (lambda* (#:key inputs #:allow-other-keys) - (let ((dbus (assoc-ref inputs "dbus"))) - (substitute* "gio/gdbusaddress.c" - (("command_line =3D g_strdup_printf \\(\"dbus-launch") - (string-append "command_line =3D g_strdup_printf (\"" - dbus "/bin/dbus-launch"))) - #t))) - (add-after 'unpack 'patch-gio-launch-desktop - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; See also - ;; for another future fix. - (substitute* "gio/gdesktopappinfo.c" - (("gio-launch-desktop") - (string-append out "/libexec/gio-launch-desktop"))) - #t))) - (add-before 'build 'pre-build + (substitute* '("gio/gdbus-2.0/codegen/gdbus-codegen.in" + "glib/gtester-report.in" + "gobject/glib-genmarshal.in" + "gobject/glib-mkenums.in") + (("@PYTHON@") + (string-append (assoc-ref inputs "python") + "/bin/python" + ,(version-major+minor + (package-version python))))) + #t)) + (add-before 'check 'pre-check (lambda* (#:key inputs outputs #:allow-other-keys) ;; For tests/gdatetime.c. (setenv "TZDIR" @@ -235,103 +245,23 @@ shared NFS home directories.") (setenv "HOME" (getcwd)) (setenv "XDG_CACHE_HOME" (getcwd)) #t)) - (add-after 'unpack 'disable-failing-tests - (lambda _ - (let ((disable - (lambda (test-file test-paths) - (define pattern+procs - (map (lambda (test-path) - (cons - ;; XXX: only works for single line state= ments. - (format #f "g_test_add_func.*\"~a\".*" t= est-path) - (const ""))) - test-paths)) - (substitute test-file pattern+procs))) - (failing-tests - '(("glib/tests/thread.c" - ( ;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-= xen-amd64 - ;; as found on hydra.gnu.org, and strace(1) does= n't - ;; recognize it. - "/thread/thread4")) - ;; This tries to find programs in FHS directories.= - ("glib/tests/utils.c" - ("/utils/find-program")) - ;; This fails because "glib/tests/echo-script" can= not be - ;; found. - ("glib/tests/spawn-singlethread.c" - ("/gthread/spawn-script")) - ("glib/tests/timer.c" - ( ;; fails if compiler optimizations are enabled,= which they - ;; are by default. - "/timer/stop")) - ("gio/tests/gapplication.c" - ( ;; XXX: proven to be unreliable. See: - ;; - ;; - "/gapplication/quit" - ;; XXX: fails randomly for unknown reason. See: - ;; - "/gapplication/local-actions")) - ("gio/tests/contenttype.c" - ( ;; XXX: requires shared-mime-info. - "/contenttype/guess" - "/contenttype/guess_svg_from_data" - "/contenttype/subtype" - "/contenttype/list" - "/contenttype/icon" - "/contenttype/symbolic-icon" - "/contenttype/tree")) - ("gio/tests/appinfo.c" - ( ;; XXX: requires update-desktop-database. - "/appinfo/associations")) - ("gio/tests/desktop-app-info.c" - ( ;; XXX: requires update-desktop-database. - "/desktop-app-info/delete" - "/desktop-app-info/default" - "/desktop-app-info/fallback" - "/desktop-app-info/lastused" - "/desktop-app-info/search")) - ("gio/tests/gdbus-peer.c" - ( ;; Requires /etc/machine-id. - "/gdbus/codegen-peer-to-peer")) - ("gio/tests/gdbus-address-get-session.c" - ( ;; Requires /etc/machine-id. - "/gdbus/x11-autolaunch")) - ("gio/tests/gsocketclient-slow.c" - ( ;; These tests tries to resolve "localhost", an= d fails. - "/socket-client/happy-eyeballs/slow" - "/socket-client/happy-eyeballs/cancellation/dela= yed"))))) - (for-each (lambda (x) (apply disable x)) failing-tests) - #t))) - (replace 'check - (lambda _ - (setenv "MESON_TESTTHREADS" - (number->string (parallel-job-count))) - ;; Do not run tests marked as "flaky". - (invoke "meson" "test" "--no-suite" "flaky"))) - ;; TODO: meson does not permit the bindir to be outside of pref= ix. - ;; See https://github.com/mesonbuild/meson/issues/2561 - ;; We can remove this once meson is patched. - (add-after 'install 'move-executables + ;; Meson does not permit the bindir to be outside of prefix. + (add-after 'install 'move-bin (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (assoc-ref outputs "bin"))) + (let* ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) (mkdir-p bin) - (rename-file (string-append out "/bin") - (string-append bin "/bin")) - ;; This one is an implementation detail of glib. - ;; It is wrong that that's in "/bin" in the first place, - ;; but that's what upstream is doing right now. - ;; See .= - (mkdir (string-append out "/libexec")) - (rename-file (string-append bin "/bin/gio-launch-desktop"= ) - (string-append out "/libexec/gio-launch-desk= top")) + (rename-file + (string-append out "/bin") + (string-append bin "/bin")) ;; Do not refer to "bindir", which points to "${prefix}/b= in". ;; We don't patch "bindir" to point to "$bin/bin", becaus= e that ;; would create a reference cycle between the "out" and "= bin" ;; outputs. - (substitute* (list (string-append out "/lib/pkgconfig/gio= -2.0.pc") - (string-append out "/lib/pkgconfig/gli= b-2.0.pc")) + (substitute* + (list + (string-append out "/lib/pkgconfig/gio-2.0.pc") + (string-append out "/lib/pkgconfig/glib-2.0.pc")) (("bindir=3D\\$\\{prefix\\}/bin") "") (("=3D\\$\\{bindir\\}/") "=3D")) #t)))))) @@ -340,15 +270,23 @@ shared NFS home directories.") ;; (assoc-ref %outputs "bin")= ;; "/bin")) (native-inputs - `(("dbus" ,dbus) ; for GDBus tests - ("gettext" ,gettext-minimal) + `(("gettext" ,gettext-minimal) + ("libintl" ,intltool) ("m4" ,m4) ; for installing m4 macros ("perl" ,perl) ; needed by GIO tests ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("tzdata" ,tzdata-for-tests))) ; for tests/gdatetime.c + ("python" ,python) ; For 'patch-python-references + ("python-wrapper" ,python-wrapper) + ("tzdata" ,tzdata-for-tests) ; for tests/gdatetime.c + ("xmllint" ,libxml2) + ("xsltproc" ,libxslt))) + (inputs + `(("bash-completion" ,bash-completion) + ("dbus" ,dbus) + ("libelf" ,libelf))) (propagated-inputs `(("libffi" ,libffi) ; in the Requires.private field of gobject-2.0= =2Epc + ("libselinux" ,libselinux) ; in the Requires.private field of gio= -2.0.pc ("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc ("util-linux" ,util-linux "lib") ;for libmount ("zlib" ,zlib))) ; in the Requires.private field of glib-2.0.pc diff --git a/gnu/packages/patches/glib-tests-timer.patch b/gnu/packages/p= atches/glib-tests-timer.patch deleted file mode 100644 index e37425c0c8..0000000000 --- a/gnu/packages/patches/glib-tests-timer.patch +++ /dev/null @@ -1,15 +0,0 @@ -* On i686 floating-point roundoff errors could sometimes cause this chec= k to - fail depending on the elapsed microseconds. Improve rounding by addin= g a - fractional bit. - ---- glib-2.40.0/glib/tests/timer.c 2014-03-05 08:05:42.000000000 -0600 -+++ glib-2.40.0/glib/tests/timer.c 2014-07-10 16:33:12.746862822 -0500 -@@ -35,7 +35,7 @@ - elapsed =3D g_timer_elapsed (timer, µs); -=20 - g_assert_cmpfloat (elapsed, <, 1.0); -- g_assert_cmpuint (micros, =3D=3D, ((guint64)(elapsed * 1e6)) % 100000= 0); -+ g_assert_cmpuint (micros, =3D=3D, ((guint64)(elapsed * 1e6 + 0.5)) % = 1000000); -=20 - g_timer_destroy (timer); - } --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0003-gnu-glib-Enable-man-pages.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0003-gnu-glib-Enable-man-pages.patch" =46rom 3b89c3da9ff7f444d4a9df5d01816e3bf35fb110 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 02:14:27 -0400 Subject: [PATCH 03/56] gnu: glib: Enable man pages. * gnu/packages/glib.scm (glib)[arguments]<#:configure-flags>[-Dman]: New = flag. [native-inputs]: Add docbook-xsl. --- gnu/packages/glib.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 6d9df5375a..27c36d40bb 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -198,6 +198,7 @@ shared NFS home directories.") "bin")) ; glib-mkenums, gtester, etc.; depends on Python (arguments `(#:disallowed-references (,tzdata-for-tests) + #:configure-flags '("-Dman=3Dtrue") #:phases (modify-phases %standard-phases ;; TODO: Remove the conditional in the next core-updates cycle.= @@ -270,7 +271,8 @@ shared NFS home directories.") ;; (assoc-ref %outputs "bin")= ;; "/bin")) (native-inputs - `(("gettext" ,gettext-minimal) + `(("docbook-xsl" ,docbook-xsl) + ("gettext" ,gettext-minimal) ("libintl" ,intltool) ("m4" ,m4) ; for installing m4 macros ("perl" ,perl) ; needed by GIO tests --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0004-gnu-glib-Update-synopsis-description-and-home-page.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0004-gnu-glib-Update-synopsis-description-and-home-page.patc"; filename*1="h" =46rom 9491a8b00f8e7a859fcc49e28ec45f39901ea10f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 07:45:50 -0500 Subject: [PATCH 04/56] gnu: glib: Update synopsis, description and home-p= age. * gnu/packages/glib.scm (glib) [synopsis]: Modify. [description]: Modify. [home-page]: Modify. --- gnu/packages/glib.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 27c36d40bb..72e9b7a91f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -306,11 +306,12 @@ shared NFS home directories.") (variable "GIO_EXTRA_MODULES") (files '("lib/gio/modules"))))) (search-paths native-search-paths) - (synopsis "Thread-safe general utility library; basis of GTK+ and GN= OME") - (description "GLib provides data structure handling for C, portabili= ty -wrappers, and interfaces for such runtime functionality as an event loop= , -threads, dynamic loading, and an object system.") - (home-page "https://developer.gnome.org/glib/") + (synopsis "Low-level core library for GNOME projects") + (description "GLib provides the core application building blocks for= +libraries and applications written in C. It provides the core object sy= stem +used in GNOME, the main loop implementation, and a large set of utility +functions for strings and common data structures.") + (home-page "https://wiki.gnome.org/Projects/GLib") (license license:lgpl2.1+))) =20 (define-public glib-with-documentation --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0005-gnu-glib-with-documentation-Make-some-cosmetic-chang.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0005-gnu-glib-with-documentation-Make-some-cosmetic-chang.pa"; filename*1="tch" =46rom f2723dc42ac7c5aafd2cc7ddab1d5e606e3a50c6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 09:37:00 -0500 Subject: [PATCH 05/56] gnu: glib-with-documentation: Make some cosmetic changes. * gnu/packages/glib.scm (glib-with-documentation): Make some cosmetic cha= nges. --- gnu/packages/glib.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 72e9b7a91f..9ec1c3904d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -321,8 +321,8 @@ functions for strings and common data structures.") (properties (alist-delete 'hidden? (package-properties glib))) (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc re= ference (native-inputs - `(("gtk-doc" ,gtk-doc) ; for the doc - ("docbook-xml" ,docbook-xml) + `(("docbook-xml" ,docbook-xml) + ("gtk-doc" ,gtk-doc) ; for the doc ("libxml2" ,libxml2) ,@(package-native-inputs glib))) (arguments @@ -333,12 +333,13 @@ functions for strings and common data structures.")= `(modify-phases ,phases (add-after 'install 'move-doc (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (html (string-append "/share/gtk-doc"))) - (copy-recursively (string-append out html) - (string-append doc html)) - (delete-file-recursively (string-append out html)) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (html (string-append "/share/gtk-doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out html) + (string-append doc html)) #t))))))))) =20 (define gobject-introspection --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0006-gnu-glib-with-documentation-Fix-documentation-build.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0006-gnu-glib-with-documentation-Fix-documentation-build.pat"; filename*1="ch" =46rom 1d9e2ffcae508465323edc4826a681d336a5aa87 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 09:39:52 -0500 Subject: [PATCH 06/56] gnu: glib-with-documentation: Fix documentation bu= ild. * gnu/packages/glib.scm (glib-with-documentation) [native-inputs]: Add docbook-4.2. Remove libxml2. [arguments]<#:phases>['patch-docbook-xml]: New phase. --- gnu/packages/glib.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9ec1c3904d..9d9bad19bd 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -321,7 +321,8 @@ functions for strings and common data structures.") (properties (alist-delete 'hidden? (package-properties glib))) (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc re= ference (native-inputs - `(("docbook-xml" ,docbook-xml) + `(("docbook-xml-4.2" ,docbook-xml-4.2) + ("docbook-xml-4.5" ,docbook-xml) ("gtk-doc" ,gtk-doc) ; for the doc ("libxml2" ,libxml2) ,@(package-native-inputs glib))) @@ -331,6 +332,17 @@ functions for strings and common data structures.") `(cons "-Dgtk_doc=3Dtrue" ,flags)) ((#:phases phases) `(modify-phases ,phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs" + (substitute* (find-files "." "\\.xml$") + (("http://www.oasis-open.org/docbook/xml/4\\.5/") + (string-append (assoc-ref inputs "docbook-xml-4.5") + "/xml/dtd/docbook/")) + (("http://www.oasis-open.org/docbook/xml/4\\.2/") + (string-append (assoc-ref inputs "docbook-xml-4.2") + "/xml/dtd/docbook/")))) + #t)) (add-after 'install 'move-doc (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0007-gnu-Temporarily-use-glib-without-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0007-gnu-Temporarily-use-glib-without-documentation.patch" =46rom 3f0aabff2c71bd3448614cf234bc2f449866dc38 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 24 Mar 2021 02:47:29 -0400 Subject: [PATCH 07/56] gnu: Temporarily use glib without documentation. GLib v2.68.0 refers to gtk-doc v1.32.1 which is not released yet. Therefore, hide glib-with-documentation and unhide glib. * gnu/packages/glib.scm (glib) [properties]: Remove hidden. (glib-with-documentation) [properties]: Add hidden. --- gnu/packages/glib.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9d9bad19bd..fd64f702f8 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -192,7 +192,7 @@ shared NFS home directories.") (substitute* "tests/spawn-test.c" (("/bin/sh") "sh")) #t)))) - (properties '((hidden? . #t))) + ;; (properties '((hidden? . #t))) (build-system meson-build-system) (outputs '("out" ; everything "bin")) ; glib-mkenums, gtester, etc.; depends on Python @@ -318,7 +318,8 @@ functions for strings and common data structures.") ;; glib's doc must be built in a separate package since it requires gt= k-doc, ;; which in turn depends on glib. (package/inherit glib - (properties (alist-delete 'hidden? (package-properties glib))) + ;; (properties (alist-delete 'hidden? (package-properties glib))) + (properties '((hidden? . #t))) (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc re= ference (native-inputs `(("docbook-xml-4.2" ,docbook-xml-4.2) --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0008-gnu-libsigc-Update-to-3.0.6.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0008-gnu-libsigc-Update-to-3.0.6.patch" =46rom 1ad03a9e8601df8a9403c75e759fb4b31e1d1f69 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 24 Mar 2021 23:28:10 -0400 Subject: [PATCH 08/56] gnu: libsigc++: Update to 3.0.6. * gnu/packages/glib.scm (libsigc++)[version]: Update to 3.0.6. [build-system]: Change from gnu to meson. [native-inputs]: Add mm-common, perl, libxml2 and libxslt. [inputs]: Add boost. [license]: Update to lgpl3+. --- gnu/packages/glib.scm | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index fd64f702f8..9a273aa7d3 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) + #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages docbook) @@ -542,18 +543,25 @@ by GDBus included in Glib.") (define libsigc++ (package (name "libsigc++") - (version "2.10.3") + (version "3.0.6") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/libsigc++/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "11j7j1jv4z58d9s7jvl42fnqa1dzl4idgil9r45cjv1w673dys0b")))= ) - (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config) - ("m4" ,m4))) + (method url-fetch) + (uri (string-append "mirror://gnome/sources/libsigc++/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1kn57b039lg20182lnchl1ys27vf34brn43f895cal8nc7sdq3mp"))= )) + (build-system meson-build-system) + (native-inputs + `(("m4" ,m4) + ("mm-common" ,mm-common) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xmllint" ,libxml2) + ("xsltproc" ,libxslt))) + (inputs + `(("boost" ,boost))) (home-page "https://libsigcplusplus.github.io/libsigcplusplus/") (synopsis "Type-safe callback system for standard C++") (description @@ -564,7 +572,7 @@ static or virtual. =20 It also contains adaptor classes for connection of dissimilar callbacks = and has an ease of use unmatched by other C++ callback libraries.") - (license license:lgpl2.1+))) + (license license:lgpl3+))) =20 (define glibmm (package --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0009-gnu-libsigc-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0009-gnu-libsigc-Enable-documentation.patch" =46rom 57453211659f1cfeefa78c3c284e12b761fcd30d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 00:07:52 -0400 Subject: [PATCH 09/56] gnu: libsigc++: Enable documentation. * gnu/packages/glib.scm (libsigc++)[outputs]: New output "doc". [arguments]<#:configure-flags>[-Dbuild-documentation]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. [native-inputs]: Add dblatex, doxygen and graphviz. --- gnu/packages/glib.scm | 45 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9a273aa7d3..0505910b41 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -49,6 +49,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) + #:use-module (gnu packages graphviz) #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages libffi) @@ -553,8 +554,36 @@ by GDBus included in Glib.") (base32 "1kn57b039lg20182lnchl1ys27vf34brn43f895cal8nc7sdq3mp"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) + (arguments + `(#:configure-flags + (list + "-Dbuild-documentation=3Dtrue") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs" + (substitute* (find-files "." "\\.xml$") + (("http://www.oasis-open.org/docbook/xml/4\\.1\\.2/") + (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/doc") + (string-append doc "/share/doc")) + #t)))))) (native-inputs - `(("m4" ,m4) + `(("docbook-xml" ,docbook-xml-4.1.2) + ("docbook-xsl" ,docbook-xsl) + ("dot" ,graphviz) + ("doxygen" ,doxygen) + ("m4" ,m4) ("mm-common" ,mm-common) ("perl" ,perl) ("pkg-config" ,pkg-config) @@ -566,12 +595,12 @@ by GDBus included in Glib.") (synopsis "Type-safe callback system for standard C++") (description "Libsigc++ implements a type-safe callback system for standard C++.= It -allows you to define signals and to connect those signals to any callbac= k -function, either global or a member function, regardless of whether it i= s -static or virtual. + allows you to define signals and to connect those signals to any ca= llback + function, either global or a member function, regardless of whether= it is + static or virtual. =20 -It also contains adaptor classes for connection of dissimilar callbacks = and -has an ease of use unmatched by other C++ callback libraries.") + It also contains adaptor classes for connection of dissimilar callb= acks and + has an ease of use unmatched by other C++ callback libraries.") (license license:lgpl3+))) =20 (define glibmm @@ -603,8 +632,8 @@ has an ease of use unmatched by other C++ callback li= braries.") ;; to open a TLS session; just skip it. (substitute* "tests/giomm_tls_client/main.cc" (("Gio::init.*$") - "return 77;\n")) - #t))))) + "return 77 ;\n")) + #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin"))) (propagated-inputs --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0010-gnu-glibmm-Update-to-2.68.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0010-gnu-glibmm-Update-to-2.68.0.patch" =46rom 16be17b1a1e8897a527dab679bc0be13549a06b2 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 01:56:45 -0400 Subject: [PATCH 10/56] gnu: glibmm: Update to 2.68.0. * gnu/packages/glib.scm (glibmm)[version]: Update to 2.68.0. [arguments]<#:phases>['pre-build]: Remove phase. ['disable-failing-tests]: New phase. [native-inputs]: Add m4, mm-common, perl and libxslt. --- gnu/packages/glib.scm | 50 +++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 0505910b41..c2f49f32cd 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -606,36 +606,36 @@ by GDBus included in Glib.") (define glibmm (package (name "glibmm") - (version "2.62.0") + (version "2.68.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/glibmm/" - (version-major+minor version) - "/glibmm-" version ".tar.xz")) - (sha256 - (base32 - "1ziwx6r7k7wbvg4qq1rgrv8zninapgrmhn1hs6926a3krh9ryr9n")))= ) - (build-system gnu-build-system) + (method url-fetch) + (uri (string-append "mirror://gnome/sources/glibmm/" + (version-major+minor version) + "/glibmm-" version ".tar.xz")) + (sha256 + (base32 + "0xgkyhb2876mcyyib5rk3ya9aingyj68h02nl22yvkhx35rqbwy1"))= )) + (build-system meson-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'build 'pre-build + (add-after 'unpack 'disable-failing-tests (lambda _ - ;; This test uses /etc/fstab as an example file to read - ;; from; choose a better example. - (substitute* "tests/giomm_simple/main.cc" - (("/etc/fstab") - (string-append (getcwd) - "/tests/giomm_simple/main.cc"))) - - ;; This test does a DNS lookup, and then expects to be able= - ;; to open a TLS session; just skip it. - (substitute* "tests/giomm_tls_client/main.cc" - (("Gio::init.*$") - "return 77 ;\n")) - #t))))) - (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin"))) + (substitute* "tests/meson.build" + ;; This test uses /etc/fstab as an example file to read + ;; from; disable it. + (("[ \t]*.*giomm_simple.*$") "") + ;; This test does a DNS lookup, and then expects to be ab= le + ;; to open a TLS session; just skip it. + (("[ \t]*.*giomm_tls_client.*$") "")) + #t))))) + (native-inputs + `(("glib:bin" ,glib "bin") + ("m4" ,m4) + ("mm-common" ,mm-common) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs `(("libsigc++" ,libsigc++) ("glib" ,glib))) --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0011-gnu-glibmm-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0011-gnu-glibmm-Enable-documentation.patch" =46rom c00a73a68a2f4784c148f5e632df5cb22ff3bde8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 03:04:01 -0400 Subject: [PATCH 11/56] gnu: glibmm: Enable documentation. * gnu/packages/glib.scm (glibmm)[outputs]: New output "doc". [arguments]<#:configure-flags>[-Dbuild-documentation]: New flag. <#:phases>['move-doc]: New phase. [native-inputs]: Add doxygen and graphviz. --- gnu/packages/glib.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index c2f49f32cd..fa0e2e3c9a 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -616,8 +616,12 @@ by GDBus included in Glib.") (base32 "0xgkyhb2876mcyyib5rk3ya9aingyj68h02nl22yvkhx35rqbwy1"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - `(#:phases + `(#:configure-flags + (list + "-Dbuild-documentation=3Dtrue") + #:phases (modify-phases %standard-phases (add-after 'unpack 'disable-failing-tests (lambda _ @@ -628,9 +632,20 @@ by GDBus included in Glib.") ;; This test does a DNS lookup, and then expects to be ab= le ;; to open a TLS session; just skip it. (("[ \t]*.*giomm_tls_client.*$") "")) - #t))))) + #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/doc") + (string-append doc "/share/doc")) + #t)))))) (native-inputs - `(("glib:bin" ,glib "bin") + `(("dot" ,graphviz) + ("doxygen" ,doxygen) + ("glib:bin" ,glib "bin") ("m4" ,m4) ("mm-common" ,mm-common) ("perl" ,perl) --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0012-gnu-gtk-doc-Change-build-system.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0012-gnu-gtk-doc-Change-build-system.patch" =46rom 8cbefcb3ed11119604bde9835898f361156dea5e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 08:51:02 -0500 Subject: [PATCH 12/56] gnu: gtk-doc: Change build-system. * gnu/packages/gtk.scm (gtk-doc) [build-system]: Change from gnu to glib-= or-gtk. --- gnu/packages/gtk.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index fbaacc11e4..41a300be8c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1723,7 +1723,7 @@ information.") (sha256 (base32 "05apmwibkmn1icx05l8aw241lhymcx01zvk5i499cb150bijj7li"))= )) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments `(#:parallel-tests? #f #:phases @@ -1731,16 +1731,16 @@ information.") (add-after 'unpack 'patch-gtk-doc-scan (lambda* (#:key inputs #:allow-other-keys) (substitute* "gtk-doc.xsl" - (("http://docbook.sourceforge.net/release/xsl/current/html= /chunk.xsl") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/html/chunk.xsl")) - (("http://docbook.sourceforge.net/release/xsl/current/comm= on/en.xml") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/common/en.xml"))) + (("http://docbook.sourceforge.net/release/xsl/current/htm= l/chunk.xsl") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/html/chunk.xsl")) + (("http://docbook.sourceforge.net/release/xsl/current/com= mon/en.xml") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/common/en.xml"))) #t)) (add-after 'patch-gtk-doc-scan 'patch-test-out (lambda _ @@ -1749,7 +1749,7 @@ information.") ;; generator metafont outputs a lot of extra lines, this ;; test would always fail. Disable it for now. (substitute* "tests/Makefile.in" - (("empty.sh sanity.sh") "empty.sh")) + (("empty.sh sanity.sh") "empty.sh")) #t)) (add-before 'configure 'fix-docbook (lambda* (#:key inputs #:allow-other-keys) --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0013-gnu-gtk-doc-Correct-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0013-gnu-gtk-doc-Correct-inputs.patch" =46rom 766060ed794d40b8ad6a5b8d4ac4e542cd1ef7e1 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 08:58:34 -0500 Subject: [PATCH 13/56] gnu: gtk-doc: Correct inputs. * gnu/packages/gtk.scm (gtk-doc) [native-inputs]: Add glib:bin, perl and python-wrapper. [inputs]: Add python-anytree, python-lxml, python-parameterized, python-pygments, python-unittest2 and yelp-tools. Remove perl. --- gnu/packages/gtk.scm | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 41a300be8c..463c2419d3 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1779,21 +1779,29 @@ information.") (assoc-ref %build-inputs "docbook-xml") "/xml/dtd/docbook/catalog.xml")))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) ("itstool" ,itstool) - ("libxml" ,libxml2) - ("gettext" ,gettext-minimal) - ("bc" ,bc))) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper))) (inputs - `(("perl" ,perl) - ("python" ,python) - ("xsltproc" ,libxslt) + `(("bc" ,bc) ("dblatex" ,dblatex) ("docbook-xml" ,docbook-xml-4.3) ("docbook-xsl" ,docbook-xsl) - ("source-highlight" ,source-highlight) ("glib" ,glib) - ("python-six" ,python-six))) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("python" ,python) + ("python-anytree" ,python-anytree) + ("python-lxml" ,python-lxml) + ("python-parameterized" ,python-parameterized) + ("python-pygments" ,python-pygments) + ("python-unittest2" ,python-unittest2) + ("source-highlight" ,source-highlight) + ("yelp-tools" ,yelp-tools))) (home-page "https://www.gtk.org/gtk-doc/") (synopsis "Documentation generator from C source code") (description --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0014-gnu-gtk-doc-Update-to-1.32.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0014-gnu-gtk-doc-Update-to-1.32.patch" =46rom 7e396e38cb729b7f0031948ed0a9f117eb85c074 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 09:08:32 -0500 Subject: [PATCH 14/56] gnu: gtk-doc: Update to 1.32. * gnu/packages/gtk.scm (gtk-doc) [version]: Update to 1.32. [arguments]<#:phases>['patch-test-out]: Remove phase. ['disable-failing-tests]: New phase. ['set-HOME]: New phase. --- gnu/packages/gtk.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 463c2419d3..d91e268f6d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1714,7 +1714,7 @@ information.") (define-public gtk-doc (package (name "gtk-doc") - (version "1.28") + (version "1.32") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1722,7 +1722,7 @@ information.") name "-" version ".tar.xz")) (sha256 (base32 - "05apmwibkmn1icx05l8aw241lhymcx01zvk5i499cb150bijj7li"))= )) + "0z4h1dggpimygdp719l457jvqilps4qcfpk31jmj3jqpzcsg03ny"))= )) (build-system glib-or-gtk-build-system) (arguments `(#:parallel-tests? #f @@ -1742,14 +1742,11 @@ information.") ,(package-version docbook-xsl) "/common/en.xml"))) #t)) - (add-after 'patch-gtk-doc-scan 'patch-test-out + (add-after 'unpack 'disable-failing-tests (lambda _ - ;; sanity.sh counts the number of status lines. Since our - ;; texlive regenerates the fonts every time and the font - ;; generator metafont outputs a lot of extra lines, this - ;; test would always fail. Disable it for now. (substitute* "tests/Makefile.in" - (("empty.sh sanity.sh") "empty.sh")) + (("annotations.sh bugs.sh empty.sh fail.sh gobject.sh pro= gram.sh") + "")) #t)) (add-before 'configure 'fix-docbook (lambda* (#:key inputs #:allow-other-keys) @@ -1766,6 +1763,12 @@ information.") "^catalog.xml$")) " \"http://docbook.sourceforge.net/releas= e/xsl/"))) #t)) + (add-before 'build 'set-HOME + (lambda _ + ;; FIXME: dblatex with texlive-union does not find the buil= t + ;; metafonts, so it tries to generate them in HOME. + (setenv "HOME" "/tmp") + #t)) (add-after 'install 'wrap-executables (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0015-gnu-gtk-doc-Enable-help.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0015-gnu-gtk-doc-Enable-help.patch" =46rom ea135ee7fc0ada283f3f99281e108ad36522060e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 09:13:14 -0500 Subject: [PATCH 15/56] gnu: gtk-doc: Enable help. * gnu/packages/gtk.scm (gtk-doc) [outputs]: New output 'help'. [arguments]<#:configure-flags>[--with-help-dir]: New flag. --- gnu/packages/gtk.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d91e268f6d..468a6180c5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1724,6 +1724,7 @@ information.") (base32 "0z4h1dggpimygdp719l457jvqilps4qcfpk31jmj3jqpzcsg03ny"))= )) (build-system glib-or-gtk-build-system) + (outputs '("out" "help")) (arguments `(#:parallel-tests? #f #:phases @@ -1780,7 +1781,10 @@ information.") #:configure-flags (list (string-append "--with-xml-catalog=3D" (assoc-ref %build-inputs "docbook-xml") - "/xml/dtd/docbook/catalog.xml")))) + "/xml/dtd/docbook/catalog.xml") + (string-append "--with-help-dir=3D" + (assoc-ref %outputs "help") + "/share/help")))) (native-inputs `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0016-gnu-gtk-doc-Update-synopsis-description-home-page-an.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0016-gnu-gtk-doc-Update-synopsis-description-home-page-an.pa"; filename*1="tch" =46rom 800160bf205504274014af09881c7a3190c01115 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 09:20:40 -0500 Subject: [PATCH 16/56] gnu: gtk-doc: Update synopsis, description, home-p= age and license. * gnu/packages/gtk.scm (gtk-doc) [home-page]: Modify. [synopsis]: Modify. [description]: Modify. [license]: Add fdl1.1+. --- gnu/packages/gtk.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 468a6180c5..ecdafc93ba 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1809,13 +1809,19 @@ information.") ("python-unittest2" ,python-unittest2) ("source-highlight" ,source-highlight) ("yelp-tools" ,yelp-tools))) - (home-page "https://www.gtk.org/gtk-doc/") - (synopsis "Documentation generator from C source code") - (description - "GTK-Doc generates API documentation from comments added to C code.= It is -typically used to document the public API of GTK+ and GNOME libraries, b= ut it -can also be used to document application code.") - (license license:gpl2+))) + (home-page "https://wiki.gnome.org/DocumentationProject/GtkDoc") + (synopsis "GTK+ DocBook Documentation Generator") + (description "GtkDoc is a tool used to extract API documentation fro= m C-code +like Doxygen, but handles documentation of GObject (including signals an= d +properties) that makes it very suitable for GTK+ apps and libraries. It= uses +docbook for intermediate files and can produce html by default and pdf/m= an-pages +with some extra work.") + (license + (list + ;; Docs. + license:fdl1.1+ + ;; Others. + license:gpl2+)))) =20 (define-public gtk-engines (package --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0017-gnu-gobject-introspection-Propagate-glib.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0017-gnu-gobject-introspection-Propagate-glib.patch" =46rom b131bf73717ca06d9424d0691c7b6bf64d9ab0bf Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 09:59:44 -0500 Subject: [PATCH 17/56] gnu: gobject-introspection: Propagate glib. * gnu/packages/glib.scm (gobject-introspection) [inputs]: Move glib to ..= =2E [propagated-inputs]: ... here. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index fa0e2e3c9a..2f2bc17fb7 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -388,11 +388,11 @@ functions for strings and common data structures.")= (inputs `(("bison" ,bison) ("flex" ,flex) - ("glib" ,glib) ("python" ,python-wrapper) ("zlib" ,zlib))) (propagated-inputs - `(;; In practice, GIR users will need libffi when using + `(("glib" ,glib) + ;; In practice, GIR users will need libffi when using ;; gobject-introspection. ("libffi" ,libffi))) (native-search-paths --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0018-gnu-cairo-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0018-gnu-cairo-Make-some-cosmetic-changes.patch" =46rom 3bfa4e96e03e6c43e7b28e9beb58992416a0ae55 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 4 Dec 2020 00:49:10 -0500 Subject: [PATCH 18/56] gnu: cairo: Make some cosmetic changes. * gnu/packages/gtk.scm (cairo): Make some cosmetic changes. --- gnu/packages/gtk.scm | 82 ++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index ecdafc93ba..201cdd7a8f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -123,57 +123,57 @@ tools have full access to view and control running = applications.") =20 (define-public cairo (package - (name "cairo") - (version "1.16.0") - (source (origin - (method url-fetch) - (uri (string-append "https://cairographics.org/releases/cair= o-" - version ".tar.xz")) - (sha256 - (base32 - "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))))= - (build-system gnu-build-system) - (propagated-inputs - `(("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glib" ,glib) - ("libpng" ,libpng) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libxrender" ,libxrender) - ("pixman" ,pixman))) - (inputs - `(("ghostscript" ,ghostscript) - ("libspectre" ,libspectre) - ("poppler" ,poppler) - ("xorgproto" ,xorgproto) - ("zlib" ,zlib))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("python" ,python-wrapper))) + (name "cairo") + (version "1.16.0") + (source + (origin + (method url-fetch) + (uri + (string-append "https://cairographics.org/releases/cairo-" + version ".tar.xz")) + (sha256 + (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))= )) + (build-system gnu-build-system) (arguments - `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/201= 3-06/msg00085.html - #:configure-flags '("--enable-tee" ;needed for GNU Icecat - "--enable-xml" ;for cairo-xml support - "--disable-static"))) - (synopsis "2D graphics library") - (description - "Cairo is a 2D graphics library with support for multiple output dev= ices. -Currently supported output targets include the X Window System (via both= -Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG fi= le + `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013= -06/msg00085.html + #:configure-flags + (list + "--enable-tee" ;needed for GNU Icecat + "--enable-xml" ;for cairo-xml support + "--disable-static"))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (inputs + `(("ghostscript" ,ghostscript) + ("libspectre" ,libspectre) + ("poppler" ,poppler) + ("xorgproto" ,xorgproto) + ("zlib" ,zlib))) + (propagated-inputs + `(("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("glib" ,glib) + ("libpng" ,libpng) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxrender" ,libxrender) + ("pixman" ,pixman))) + (synopsis "2D graphics library") + (description "Cairo is a 2D graphics library with support for multip= le output +devices. Currently supported output targets include the X Window System= (via +both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and S= VG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.= - Cairo is designed to produce consistent output on all output media while= taking advantage of display hardware acceleration when available eg. through the X Render Extension). - The cairo API provides operations similar to the drawing operators of PostScript and PDF. Operations in cairo including stroking and filling = cubic B=C3=A9zier splines, transforming and compositing translucent images, an= d antialiased text rendering. All drawing operations can be transformed b= y any affine transformation (scale, rotation, shear, etc.).") - (license license:lgpl2.1) ; or Mozilla Public License 1.1 - (home-page "https://cairographics.org/"))) + (home-page "https://cairographics.org/") + (license license:lgpl2.1))) ; or Mozilla Public License 1.1 =20 (define-public cairo-sans-poppler ;; Variant used to break the dependency cycle between Poppler and Cair= o. --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0019-gnu-cairo-Change-build-system.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0019-gnu-cairo-Change-build-system.patch" =46rom 6d8dbf86b868d5f0bd0da8092e7b6c42fad0cfb1 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 4 Dec 2020 00:51:10 -0500 Subject: [PATCH 19/56] gnu: cairo: Change build-system. * gnu/packages/gtk.scm (cairo) [build-system]: Change from gnu to glib-or= -gtk. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 201cdd7a8f..538edce843 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -133,7 +133,7 @@ tools have full access to view and control running ap= plications.") version ".tar.xz")) (sha256 (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))= )) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013= -06/msg00085.html #:configure-flags --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0020-gnu-cairo-Move-documentation-to-separate-output.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0020-gnu-cairo-Move-documentation-to-separate-output.patch" =46rom 34f6e80b178714f19a39b860811a9ac27236f400 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 4 Dec 2020 00:53:16 -0500 Subject: [PATCH 20/56] gnu: cairo: Move documentation to separate output.= * gnu/packages/gtk.scm (cairo) [outputs]: New output "doc". [arguments]<#:configure-flags>[--with-html-dir]: New flag. --- gnu/packages/gtk.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 538edce843..94de9dffac 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -134,13 +134,17 @@ tools have full access to view and control running = applications.") (sha256 (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))= )) (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) (arguments `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013= -06/msg00085.html #:configure-flags (list - "--enable-tee" ;needed for GNU Icecat - "--enable-xml" ;for cairo-xml support - "--disable-static"))) + "--enable-tee" ;needed for GNU Icecat + "--enable-xml" ;for cairo-xml support + "--disable-static" + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html")))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python-wrapper))) --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0021-gnu-cairo-Enable-some-features.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0021-gnu-cairo-Enable-some-features.patch" =46rom f39ca12c33f7d987aa3e3e5df8f1fae53a6fa74a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 4 Dec 2020 01:02:00 -0500 Subject: [PATCH 21/56] gnu: cairo: Enable some features. * gnu/packages/gtk.scm (cairo) [native-inputs]: Add gobject-introspection= =2E [inputs]: Add libdrm. Remove xorgproto and zlib. [propagated-inputs]: Add libxcb. --- gnu/packages/gtk.scm | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 94de9dffac..104aaf4ebb 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -139,30 +139,45 @@ tools have full access to view and control running = applications.") `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013= -06/msg00085.html #:configure-flags (list - "--enable-tee" ;needed for GNU Icecat - "--enable-xml" ;for cairo-xml support "--disable-static" + ;; XXX: To be enabled. + ;; "--enable-gallium=3Dyes" + ;; "--enable-gl=3Dyes" + ;; " --enable-glesv2=3Dyes" + ;; "--enable-glesv3=3Dyes" + ;; "--enable-cogl=3Dyes" + ;; "--enable-directfb=3Dyes" + ;; "--enable-vg=3Dyes" + "--enable-tee=3Dyes" + "--enable-xml=3Dyes" (string-append "--with-html-dir=3D" (assoc-ref %outputs "doc") "/share/gtk-doc/html")))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (inputs - `(("ghostscript" ,ghostscript) + `(("drm" ,libdrm) + ("ghostscript" ,ghostscript) ("libspectre" ,libspectre) - ("poppler" ,poppler) - ("xorgproto" ,xorgproto) - ("zlib" ,zlib))) + ("poppler" ,poppler))) (propagated-inputs - `(("fontconfig" ,fontconfig) + `( ;; ("cogl" ,cogl) + ;; ("directfb" ,directfb) + ("fontconfig" ,fontconfig) + ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("glib" ,glib) + ;; ("gtk+" ,gtk+) ("libpng" ,libpng) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libxrender" ,libxrender) - ("pixman" ,pixman))) + ;; ("librsvg" ,librsvg) + ;; ("opengl" ,mesa) + ("pixman" ,pixman) + ("x11" ,libx11) + ("xcb" ,libxcb) + ("xext" ,libxext) + ("xrender" ,libxrender))) (synopsis "2D graphics library") (description "Cairo is a 2D graphics library with support for multip= le output devices. Currently supported output targets include the X Window System= (via --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0022-gnu-cairo-Update-synopsis-description-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0022-gnu-cairo-Update-synopsis-description-and-license.patch" =46rom 7deee5f922f609590063e9c0933144c216a278a6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 4 Dec 2020 01:04:37 -0500 Subject: [PATCH 22/56] gnu: cairo: Update synopsis, description and licen= se. * gnu/packages/gtk.scm (cairo) [synopsis]: Modify. [description]: Modify. [license]: Modify. --- gnu/packages/gtk.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 104aaf4ebb..7a13d56416 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -178,21 +178,17 @@ tools have full access to view and control running = applications.") ("xcb" ,libxcb) ("xext" ,libxext) ("xrender" ,libxrender))) - (synopsis "2D graphics library") + (synopsis "Multi-platform 2D graphics library") (description "Cairo is a 2D graphics library with support for multip= le output devices. Currently supported output targets include the X Window System= (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and S= VG file -output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.= -Cairo is designed to produce consistent output on all output media while= -taking advantage of display hardware acceleration when available -eg. through the X Render Extension). -The cairo API provides operations similar to the drawing operators of -PostScript and PDF. Operations in cairo including stroking and filling = cubic -B=C3=A9zier splines, transforming and compositing translucent images, an= d -antialiased text rendering. All drawing operations can be transformed b= y any -affine transformation (scale, rotation, shear, etc.).") +output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.= ") (home-page "https://cairographics.org/") - (license license:lgpl2.1))) ; or Mozilla Public License 1.1 + (license + ;; This project is dual-licensed. + (list + license:lgpl2.1+ + license:mpl1.1)))) =20 (define-public cairo-sans-poppler ;; Variant used to break the dependency cycle between Poppler and Cair= o. --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0023-gnu-cairomm-Update-to-1.16.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0023-gnu-cairomm-Update-to-1.16.0.patch" =46rom ae59225fb90f407259548631aa6b52005f59fbdc Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 06:49:16 -0400 Subject: [PATCH 23/56] gnu: cairomm: Update to 1.16.0. * gnu/packages/gtk.scm (cairomm)[version]: Update to 1.16.0. [build-system]: Change from gnu to meson. [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dboost-shared]: New flag. <#:make-flags>: Remove argument. [native-inputs]: Add boost and mm-common. --- gnu/packages/gtk.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 7a13d56416..e7251b59fb 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -58,6 +58,7 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages boost) #:use-module (gnu packages build-tools) #:use-module (gnu packages texinfo) #:use-module (gnu packages check) @@ -1255,19 +1256,24 @@ guile-gnome-platform (GNOME developer libraries),= and guile-gtksourceview.") (define-public cairomm (package (name "cairomm") - (version "1.12.2") + (version "1.16.0") (source (origin (method url-fetch) (uri (string-append "https://www.cairographics.org/release= s/" - name "-" version ".tar.gz")) + name "-" version ".tar.xz")) (sha256 (base32 - "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25"))= )) - (build-system gnu-build-system) + "1ya4y7qa000cjawqwswbqv26y5icfkmhs5iiiil4dxgrqn91923y"))= )) + (build-system meson-build-system) (arguments - ;; The examples lack -lcairo. - '(#:make-flags '("LDFLAGS=3D-lcairo"))) - (native-inputs `(("pkg-config" ,pkg-config))) + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Dboost-shared=3Dtrue"))) + (native-inputs + `(("boost" ,boost) + ("mm-common" ,mm-common) + ("pkg-config" ,pkg-config))) (propagated-inputs `(("libsigc++" ,libsigc++) ("freetype" ,freetype) --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0024-gnu-cairomm-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0024-gnu-cairomm-Enable-documentation.patch" =46rom f95b6f1ad0d0b2041655321f2dcce6491c83e1e8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 07:07:14 -0400 Subject: [PATCH 24/56] gnu: cairomm: Enable documentation. * gnu/packages/gtk.scm (cairomm)[outputs]: New output "doc". [arguments]<#:configure-flags>[-Dbuild-documentation]: New flag. <#:phases>['move-doc]: New phase. [native-inputs]: Add doxygen, graphviz, perl and libxslt. --- gnu/packages/gtk.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e7251b59fb..85cb71a5a2 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1265,15 +1265,32 @@ guile-gnome-platform (GNOME developer libraries),= and guile-gtksourceview.") (base32 "1ya4y7qa000cjawqwswbqv26y5icfkmhs5iiiil4dxgrqn91923y"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:configure-flags (list - "-Dboost-shared=3Dtrue"))) + "-Dbuild-documentation=3Dtrue" + "-Dboost-shared=3Dtrue") + #: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/doc") + (string-append doc "/share/doc")) + #t)))))) (native-inputs `(("boost" ,boost) + ("dot" ,graphviz) + ("doxygen" ,doxygen) ("mm-common" ,mm-common) - ("pkg-config" ,pkg-config))) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs `(("libsigc++" ,libsigc++) ("freetype" ,freetype) --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0025-gnu-pango-Add-missing-arguments.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0025-gnu-pango-Add-missing-arguments.patch" =46rom 70d153548b9e1160342edea90e20873e857abb8e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:11:10 -0500 Subject: [PATCH 25/56] gnu: pango: Add missing arguments. * gnu/packages/gtk.scm (pango) [arguments]<#:glib-or-gtk?>: New argument.= --- gnu/packages/gtk.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 85cb71a5a2..229383fb7a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -326,7 +326,8 @@ applications.") "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6"))))= (build-system meson-build-system) (arguments - '(#:phases (modify-phases %standard-phases + '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases (modify-phases %standard-phases (add-after 'unpack 'disable-cantarell-tests (lambda _ (substitute* "tests/meson.build" --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0026-gnu-pango-Re-arrange-inputs-in-alphabetical-order.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0026-gnu-pango-Re-arrange-inputs-in-alphabetical-order.patch" =46rom 7dd04f6b1af8b2b8325dabb38e220703d0275020 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:17:09 -0500 Subject: [PATCH 26/56] gnu: pango: Re-arrange inputs in alphabetical orde= r. * gnu/packages/gtk.scm (pango) [propagated-inputs]: Modify. [native-inputs]: Modify. --- gnu/packages/gtk.scm | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 229383fb7a..abeabf092c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -337,24 +337,23 @@ applications.") (("\\[ 'test-itemize'.*") "") (("\\[ 'test-layout'.*") "")) #t))))) - (propagated-inputs - ;; These are all in Requires or Requires.private of the '.pc' files.= - `(("cairo" ,cairo) - ("fribidi" ,fribidi) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glib" ,glib) - ("harfbuzz" ,harfbuzz) - - ;; Some packages, such as Openbox, expect Pango to be built with t= he - ;; optional libxft support. - ("libxft" ,libxft))) - (inputs - `(("zlib" ,zlib))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ; glib-mkenums,= etc. - ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler= , etc. + (propagated-inputs + ;; These are all in Requires or Requires.private of the '.pc' files= =2E + `(("cairo" ,cairo) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("fribidi" ,fribidi) + ("glib" ,glib) + ("harfbuzz" ,harfbuzz) + ;; Some packages, such as Openbox, expect Pango to be built with = the + ;; optional libxft support. + ("libxft" ,libxft))) + (inputs + `(("zlib" ,zlib))) + (native-inputs + `(("glib" ,glib "bin") ; glib-mkenums, etc. + ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. + ("pkg-config" ,pkg-config))) (synopsis "GNOME text and font handling library") (description "Pango is the core text and font handling library used in GNOME --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0027-gnu-pango-Update-to-1.48.3.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0027-gnu-pango-Update-to-1.48.3.patch" =46rom 643851ad3dec45a189d08589772b825f61bff30d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 23 Mar 2021 23:32:15 -0400 Subject: [PATCH 27/56] gnu: pango: Update to 1.48.3. * gnu/packages/gtk.scm (pango) [version]: Update to 1.48.3. [arguments]<#:phases>['disable-cantarell-tests]: Modify. [propagated-inputs]: Add libthai and libxrender. [native-inputs]: Add help2man, perl and python-wrapper. --- gnu/packages/gtk.scm | 69 ++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index abeabf092c..d7ded6a704 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -78,6 +78,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) + #:use-module (gnu packages man) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -313,30 +314,31 @@ applications.") =20 (define-public pango (package - (name "pango") - (version "1.44.7") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/pango/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (patches (search-patches "pango-skip-libthai-test.patch")) - (sha256 - (base32 - "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6"))))= - (build-system meson-build-system) - (arguments - '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas - #:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-cantarell-tests - (lambda _ - (substitute* "tests/meson.build" - ;; XXX FIXME: These tests require "font-cantarell= ", but - ;; adding it here would introduce a circular depe= ndency. - (("\\[ 'test-harfbuzz'.*") "") - (("\\[ 'test-itemize'.*") "") - (("\\[ 'test-layout'.*") "")) - #t))))) + (name "pango") + (version "1.48.3") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/pango/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (patches (search-patches "pango-skip-libthai-test.patch"))= + (sha256 + (base32 + "0ijbkcs6217ygzphlpi0vajxkccifdbsl0jdjpy8wz11h9f19sin"))= )) + (build-system meson-build-system) + (arguments + '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-cantarell-tests + (lambda _ + (substitute* "tests/meson.build" + ;; XXX FIXME: These tests require "font-cantarel= l", but + ;; adding it here would introduce a circular dep= endency. + (("\\[ 'test-layout'.*") "") + (("\\[ 'test-itemize'.*") "") + (("\\[ 'test-font'.*") "") + (("\\[ 'test-harfbuzz'.*") "")) + #t))))) (propagated-inputs ;; These are all in Requires or Requires.private of the '.pc' files= =2E `(("cairo" ,cairo) @@ -345,22 +347,27 @@ applications.") ("fribidi" ,fribidi) ("glib" ,glib) ("harfbuzz" ,harfbuzz) + ("libthai" ,libthai) ;; Some packages, such as Openbox, expect Pango to be built with = the ;; optional libxft support. - ("libxft" ,libxft))) + ("libxft" ,libxft) + ("libxrender" ,libxrender))) (inputs `(("zlib" ,zlib))) (native-inputs `(("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. - ("pkg-config" ,pkg-config))) - (synopsis "GNOME text and font handling library") - (description - "Pango is the core text and font handling library used in GNOME + ("help2man" ,help2man) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (synopsis "GNOME text and font handling library") + (description + "Pango is the core text and font handling library used in GNOME applications. It has extensive support for the different writing system= s used throughout the world.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/pango/"))) + (license license:lgpl2.0+) + (home-page "https://developer.gnome.org/pango/"))) =20 (define-public pango-1.42 (package --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0028-gnu-pango-Update-synopsis-description-and-home-page.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0028-gnu-pango-Update-synopsis-description-and-home-page.pat"; filename*1="ch" =46rom 1a1c7ff16967ad7a66fd92e2347b273d5b2c0e44 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:24:42 -0500 Subject: [PATCH 28/56] gnu: pango: Update synopsis, description and home-= page. * gnu/packages/gtk.scm (pango) [synopsis]: Modify. [description]: Modify. [home-page]: Modify. --- gnu/packages/gtk.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d7ded6a704..9f6df9c777 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -361,13 +361,14 @@ applications.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) - (synopsis "GNOME text and font handling library") - (description - "Pango is the core text and font handling library used in GNOME -applications. It has extensive support for the different writing system= s -used throughout the world.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/pango/"))) + (synopsis "Text and font handling library") + (description "Pango is a library for laying out and rendering of tex= t, with +an emphasis on internationalization. Pango can be used anywhere that te= xt +layout is needed, though most of the work on Pango so far has been done = in the +context of the GTK+ widget toolkit. Pango forms the core of text and fo= nt +handling for GTK+-2.x.") + (home-page "https://pango.gnome.org/") + (license license:lgpl2.0+))) =20 (define-public pango-1.42 (package --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0029-gnu-pangomm-Update-to-2.48.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0029-gnu-pangomm-Update-to-2.48.0.patch" =46rom 066cd8b805286aaf4df363bcf4d89b8ab6e45fc4 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 07:42:10 -0400 Subject: [PATCH 29/56] gnu: pangomm: Update to 2.48.0. * gnu/packages/gtk.scm (pango)[version]: Update to 2.48.0. [build-system]: Change from gnu to meson. [arguments]<#:glib-or-gtk?>: New argument. [native-inputs]: Add m4 and mm-common. --- gnu/packages/gtk.scm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 9f6df9c777..81fbeb066b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1331,17 +1331,22 @@ library.") (define-public pangomm (package (name "pangomm") - (version "2.42.0") + (version "2.48.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0mmzxp3wniaafkxr30sb22mq9x44xckb5d60h1bl99lkzxks0vfa")))= ) - (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config))) + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0y2vyp6azvhrii6rzs89kr08wg8z1p562awyr812131zqdsd83ly"))= )) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas + (native-inputs + `(("m4" ,m4) + ("mm-common" ,mm-common) + ("pkg-config" ,pkg-config))) (propagated-inputs `(("cairo" ,cairo) ("cairomm" ,cairomm) --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0030-gnu-pangomm-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0030-gnu-pangomm-Enable-documentation.patch" =46rom d35d8b5a5b35cb8188856d160038b8f89a91919a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 07:47:41 -0400 Subject: [PATCH 30/56] gnu: pangomm: Enable documentation. * gnu/packages/gtk.scm (pangomm)[outputs]: New output "doc". [arguments]<#:configure-flags>[-Dbuild-documentation]: New flag. <#:phases>['move-doc]: New phase. [native-inputs]: Add doxygen, graphviz, perl and libxslt. --- gnu/packages/gtk.scm | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 81fbeb066b..42b33fb99a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1341,12 +1341,31 @@ library.") (base32 "0y2vyp6azvhrii6rzs89kr08wg8z1p562awyr812131zqdsd83ly"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Dbuild-documentation=3Dtrue") + #: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/doc") + (string-append doc "/share/doc")) + #t)))))) (native-inputs - `(("m4" ,m4) + `(("dot" ,graphviz) + ("doxygen" ,doxygen) + ("m4" ,m4) ("mm-common" ,mm-common) - ("pkg-config" ,pkg-config))) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs `(("cairo" ,cairo) ("cairomm" ,cairomm) --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0031-gnu-gdk-pixbuf-Add-missing-arguments.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0031-gnu-gdk-pixbuf-Add-missing-arguments.patch" =46rom 1d0a31e0832501ea84e9a79b011cb9cc4783f952 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:29:02 -0500 Subject: [PATCH 31/56] gnu: gdk-pixbuf: Add missing arguments. * gnu/packages/gtk.scm (gdk-pixbuf) [arguments]<#:glib-or-gtk?>: New argu= ment. --- gnu/packages/gtk.scm | 81 ++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 42b33fb99a..da3c82f901 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -580,50 +580,51 @@ highlighting and other features typical of a source= code editor.") =20 (define-public gdk-pixbuf (package - (name "gdk-pixbuf") - (version "2.42.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3"))))= - (build-system meson-build-system) - (arguments - `(#:meson ,meson-0.55 - #:configure-flags '("-Dinstalled_tests=3Dfalse") - #:phases - (modify-phases %standard-phases - ;; 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 + (name "gdk-pixbuf") + (version "2.42.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3"))= )) + (build-system meson-build-system) + (arguments + `(#:meson ,meson-0.55 + #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags '("-Dinstalled_tests=3Dfalse") + #:phases + (modify-phases %standard-phases + ;; 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) ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ; glib-mkenums= , etc. + ("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= + (synopsis "GNOME image loading and manipulation library") + (description + "GdkPixbuf is a library for image loading and manipulation develope= d in the GNOME project.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/gdk-pixbuf/"))) + (license license:lgpl2.0+) + (home-page "https://developer.gnome.org/gdk-pixbuf/"))) =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.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0032-gnu-gdk-pixbuf-Correct-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0032-gnu-gdk-pixbuf-Correct-inputs.patch" =46rom 82315a2aa6ea9693ead68958bb1ae35756781b12 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:35:56 -0500 Subject: [PATCH 32/56] gnu: gdk-pixbuf: Correct inputs. * gnu/packages/gtk.scm (gdk-pixbuf) [propagated-inputs]: Add libx11. Remove libpng. [inputs]: Add libpng. Remove libx11. --- gnu/packages/gtk.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index da3c82f901..ab6c2851bc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -607,13 +607,14 @@ highlighting and other features typical of a source= code editor.") (propagated-inputs `( ;; Required by gdk-pixbuf-2.0.pc ("glib" ,glib) - ("libpng" ,libpng) + ;; Required by gdk-pixbuf-xlib-2.0.pc + ("libx11" ,libx11) ;; Used for testing and required at runtime. ("shared-mime-info" ,shared-mime-info))) (inputs `(("libjpeg" ,libjpeg-turbo) - ("libtiff" ,libtiff) - ("libx11" ,libx11))) + ("libpng" ,libpng) + ("libtiff" ,libtiff))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0033-gnu-gdk-pixbuf-Enable-jasper-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0033-gnu-gdk-pixbuf-Enable-jasper-support.patch" =46rom f81a7f77b227c5a76d1cacd2014f97818a4b08f7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:41:10 -0500 Subject: [PATCH 33/56] gnu: gdk-pixbuf: Enable jasper support. * gnu/packages/gtk.scm (gdk-pixbuf) [arguments]<#:configure-flags>[-Djasp= er]: New flag. [inputs]: Add jasper. --- gnu/packages/gtk.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index ab6c2851bc..3085bb9302 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -594,7 +594,7 @@ highlighting and other features typical of a source c= ode editor.") (arguments `(#:meson ,meson-0.55 #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas - #:configure-flags '("-Dinstalled_tests=3Dfalse") + #:configure-flags '("-Dinstalled_tests=3Dfalse" "-Djasper=3Dtrue"= ) #:phases (modify-phases %standard-phases ;; The slow tests take longer than the specified timeout. @@ -612,7 +612,8 @@ highlighting and other features typical of a source c= ode editor.") ;; Used for testing and required at runtime. ("shared-mime-info" ,shared-mime-info))) (inputs - `(("libjpeg" ,libjpeg-turbo) + `(("jasper" ,jasper) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff))) (native-inputs --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0034-gnu-gdk-pixbuf-Fix-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0034-gnu-gdk-pixbuf-Fix-documentation.patch" =46rom 251784d0b66482bd9d47a61e0077b463b3771dee Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:50:46 -0500 Subject: [PATCH 34/56] gnu: gdk-pixbuf: Fix documentation. * gnu/packages/gtk.scm (gdk-pixbuf) [arguments]<#:phases>['patch-docbook]= : New phase. [native-inputs]: Add docbook-xml and docbook-xsl. --- gnu/packages/gtk.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3085bb9302..79fbe8b4e8 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -593,10 +593,22 @@ highlighting and other features typical of a source= code editor.") (build-system meson-build-system) (arguments `(#:meson ,meson-0.55 - #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:configure-flags '("-Dinstalled_tests=3Dfalse" "-Djasper=3Dtrue"= ) #: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.2/"))) + (substitute* (find-files "." "\\.xml$") + (("http://www.oasis-open.org/docbook/xml/4\\.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) ;; The slow tests take longer than the specified timeout. ,@(if (any (cute string=3D? <> (%current-system)) '("armhf-linux" "aarch64-linux")) @@ -617,10 +629,12 @@ highlighting and other features typical of a source= code editor.") ("libpng" ,libpng) ("libtiff" ,libtiff))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("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. + ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. + ("pkg-config" ,pkg-config))) (synopsis "GNOME image loading and manipulation library") (description "GdkPixbuf is a library for image loading and manipulation develope= d --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0035-gnu-gdk-pixbuf-Update-to-2.42.4.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0035-gnu-gdk-pixbuf-Update-to-2.42.4.patch" =46rom 47c185cde70784a1196dbb136e29ca750d2fa28a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:53:43 -0500 Subject: [PATCH 35/56] gnu: gdk-pixbuf: Update to 2.42.4. * gnu/packages/gtk.scm (gdk-pixbuf) [version]: Update to 2.42.4. [native-inputs]: Add perl and libxslt. --- gnu/packages/gtk.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 79fbe8b4e8..d8d9663f96 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -581,7 +581,7 @@ highlighting and other features typical of a source c= ode editor.") (define-public gdk-pixbuf (package (name "gdk-pixbuf") - (version "2.42.2") + (version "2.42.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -589,7 +589,7 @@ highlighting and other features typical of a source c= ode editor.") name "-" version ".tar.xz")) (sha256 (base32 - "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3"))= )) + "0k9f9177qxaryaxprwrhqnv5p2gdq4a8i6y05gm98qa8izc5v77y"))= )) (build-system meson-build-system) (arguments `(#:meson ,meson-0.55 @@ -634,7 +634,9 @@ highlighting and other features typical of a source c= ode editor.") ("gettext" ,gettext-minimal) ("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. - ("pkg-config" ,pkg-config))) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (synopsis "GNOME image loading and manipulation library") (description "GdkPixbuf is a library for image loading and manipulation develope= d --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0036-gnu-gdk-pixbuf-Update-synopsis-description-home-page.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0036-gnu-gdk-pixbuf-Update-synopsis-description-home-page.pa"; filename*1="tch" =46rom e43fd023938282d532bef53dff63c86643c25c1f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:56:29 -0500 Subject: [PATCH 36/56] gnu: gdk-pixbuf: Update synopsis, description, home-page and license. * gnu/packages/gtk.scm (gdk-pixbuf) [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Update to lgpl2.1+. --- gnu/packages/gtk.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d8d9663f96..448f745348 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -637,12 +637,12 @@ highlighting and other features typical of a source= code editor.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt))) - (synopsis "GNOME image loading and manipulation library") - (description - "GdkPixbuf is a library for image loading and manipulation develope= d -in the GNOME project.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/gdk-pixbuf/"))) + (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.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0037-gnu-gdk-pixbuf-Disable-failing-tests.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0037-gnu-gdk-pixbuf-Disable-failing-tests.patch" =46rom 629222090d04d77320a96113e4d0ab8f36a557bc Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:00:10 -0500 Subject: [PATCH 37/56] gnu: gdk-pixbuf: Disable failing tests. * gnu/packages/gtk.scm (gdk-pixbuf) [arguments]<#:phases>['disable-failin= g-tests]: New phase. --- gnu/packages/gtk.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 448f745348..ffcd5b0a8b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -609,6 +609,12 @@ highlighting and other features typical of a source = code editor.") (string-append (assoc-ref inputs "docbook-xml") "/xml/dtd/docbook/")))) #t)) + (add-before 'configure 'disable-failing-tests + (lambda _ + (substitute* "tests/meson.build" + (("\\[ 'pixbuf-fail', \\['conform', 'slow'\\], \\],") + "")) + #t)) ;; The slow tests take longer than the specified timeout. ,@(if (any (cute string=3D? <> (%current-system)) '("armhf-linux" "aarch64-linux")) --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0038-gnu-gdk-pixbuf-svg-Correct-package-definition-to-inc.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0038-gnu-gdk-pixbuf-svg-Correct-package-definition-to-inc.pa"; filename*1="tch" =46rom 64304d6df762d4f2eee457b325178fcd5ea6bcff Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:08:24 -0500 Subject: [PATCH 38/56] gnu: gdk-pixbuf+svg: Correct package definition to= include changes from gdk-pixbuf. * gnu/packages/gtk.scm (gdk-pixbuf+svg) [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 ffcd5b0a8b..392ba0d492 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -660,10 +660,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")) @@ -677,9 +676,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.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0039-gnu-vala-Change-build-system.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0039-gnu-vala-Change-build-system.patch" =46rom b1af4b828070993303cc32327e9877f1ab872dae Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:20:37 -0500 Subject: [PATCH 39/56] gnu: vala: Change build-system. * gnu/packages/gnome.scm (vala) [build-system]: Change from gnu to glib-o= r-gtk. --- gnu/packages/gnome.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 36e3346499..9c990c5512 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4262,28 +4262,28 @@ passwords in the GNOME keyring.") (sha256 (base32 "1nx5xjarpkl9hgy0qbqfczx7d7clh5g1r8xr5xp8b97c5fsc2rb1"))= )) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments '(#:phases (modify-phases %standard-phases (add-before 'check 'pre-check - (lambda _ - (setenv "CC" "gcc") - (substitute* "valadoc/tests/libvaladoc\ + (lambda _ + (setenv "CC" "gcc") + (substitute* "valadoc/tests/libvaladoc\ /tests-extra-environment.sh" - (("export PKG_CONFIG_PATH=3D" m) - (string-append m "$PKG_CONFIG_PATH:")))))))) + (("export PKG_CONFIG_PATH=3D" m) + (string-append m "$PKG_CONFIG_PATH:")))))))) (native-inputs `(("pkg-config" ,pkg-config) ("flex" ,flex) ("bison" ,bison) ("xsltproc" ,libxslt) - ("dbus" ,dbus) ; for dbus tes= ts + ("dbus" ,dbus) ; for dbus tests ("gobject-introspection" ,gobject-introspection))) ; for gir test= s (inputs `(("graphviz" ,graphviz))) (propagated-inputs - `(("glib" ,glib))) ; required by libvala-0.40.pc + `(("glib" ,glib))) ; required by libvala-0.40.pc (home-page "https://wiki.gnome.org/Projects/Vala/") (synopsis "Compiler for the GObject type system") (description --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0040-gnu-vala-Enable-coverage-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0040-gnu-vala-Enable-coverage-support.patch" =46rom bdc8b8a32f20c9695db3f2daf351b5933dd1007a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:23:56 -0500 Subject: [PATCH 40/56] gnu: vala: Enable coverage support. * gnu/packages/gnome.scm (vala) [arguments]<#:configure-flags> [--enable-coverage]: New flag. --- gnu/packages/gnome.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9c990c5512..d5de60f5d1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4264,7 +4264,8 @@ passwords in the GNOME keyring.") "1nx5xjarpkl9hgy0qbqfczx7d7clh5g1r8xr5xp8b97c5fsc2rb1"))= )) (build-system glib-or-gtk-build-system) (arguments - '(#:phases + '(#:configure-flags '("--enable-coverage") + #:phases (modify-phases %standard-phases (add-before 'check 'pre-check (lambda _ --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0041-gnu-vala-Fix-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0041-gnu-vala-Fix-documentation.patch" =46rom 4f1d955509fab0c9f4f2999e83f412d0bb7731d8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:30:26 -0500 Subject: [PATCH 41/56] gnu: vala: Fix documentation. * gnu/packages/gnome.scm (vala) [arguments]<#:phases>['patch-docbook-xml]= : New phase. [native-inputs]: Add docbook-xml and docbook-xsl. --- gnu/packages/gnome.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d5de60f5d1..49fdfa9014 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4267,6 +4267,14 @@ passwords in the GNOME keyring.") '(#:configure-flags '("--enable-coverage") #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc/manual" + (substitute* '("manual.xml" "version.xml.in") + (("http://www.oasis-open.org/docbook/xml/4.4/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) (add-before 'check 'pre-check (lambda _ (setenv "CC" "gcc") @@ -4276,6 +4284,8 @@ passwords in the GNOME keyring.") (string-append m "$PKG_CONFIG_PATH:")))))))) (native-inputs `(("pkg-config" ,pkg-config) + ("docbook-xml" ,docbook-xml-4.4) + ("docbook-xsl" ,docbook-xsl) ("flex" ,flex) ("bison" ,bison) ("xsltproc" ,libxslt) --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0042-gnu-vala-Update-to-0.52.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0042-gnu-vala-Update-to-0.52.0.patch" =46rom caa8ab0a04cd4ec54b53f2036cd72b97b03c1dfb Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:34:48 -0500 Subject: [PATCH 42/56] gnu: vala: Update to 0.52.0. * gnu/packages/gnome.scm (vala) [version]: Update to 0.52.0. [native-inputs]: Add help2man and perl. [inputs]: Move graphviz to ... [propagated-inputs]: ... here. --- gnu/packages/gnome.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 49fdfa9014..821e4a00eb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -141,6 +141,7 @@ #:use-module (gnu packages lirc) #:use-module (gnu packages lua) #:use-module (gnu packages mail) + #:use-module (gnu packages man) #:use-module (gnu packages mp3) #:use-module (gnu packages multiprecision) #:use-module (gnu packages music) @@ -4253,7 +4254,7 @@ passwords in the GNOME keyring.") (define-public vala (package (name "vala") - (version "0.50.3") + (version "0.52.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/vala/" @@ -4261,7 +4262,7 @@ passwords in the GNOME keyring.") "vala-" version ".tar.xz")) (sha256 (base32 - "1nx5xjarpkl9hgy0qbqfczx7d7clh5g1r8xr5xp8b97c5fsc2rb1"))= )) + "12y6p8wdjp01vmfhxg2cgh32xnyqq6ivblvrar9clnj6vc867qhx"))= )) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags '("--enable-coverage") @@ -4283,18 +4284,19 @@ passwords in the GNOME keyring.") (("export PKG_CONFIG_PATH=3D" m) (string-append m "$PKG_CONFIG_PATH:")))))))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("bison" ,bison) + ("dbus" ,dbus) ; for dbus tests ("docbook-xml" ,docbook-xml-4.4) ("docbook-xsl" ,docbook-xsl) ("flex" ,flex) - ("bison" ,bison) - ("xsltproc" ,libxslt) - ("dbus" ,dbus) ; for dbus tests - ("gobject-introspection" ,gobject-introspection))) ; for gir test= s - (inputs - `(("graphviz" ,graphviz))) + ("gobject-introspection" ,gobject-introspection) ; for gir tests + ("help2man" ,help2man) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs - `(("glib" ,glib))) ; required by libvala-0.40.pc + `(("glib" ,glib) ; required by libvala-0.40.pc + ("libgvc" ,graphviz))) (home-page "https://wiki.gnome.org/Projects/Vala/") (synopsis "Compiler for the GObject type system") (description --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0043-gnu-vala-Update-synopsis-and-description.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0043-gnu-vala-Update-synopsis-and-description.patch" =46rom ac5a1ab6ebce5893f57ab4d59aa03ebb59eb2c5c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:38:26 -0500 Subject: [PATCH 43/56] gnu: vala: Update synopsis and description. * gnu/packages/gnome.scm (vala) [synopsis]: Modify. [description]: Modify. --- gnu/packages/gnome.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 821e4a00eb..c378bdb325 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4298,12 +4298,12 @@ passwords in the GNOME keyring.") `(("glib" ,glib) ; required by libvala-0.40.pc ("libgvc" ,graphviz))) (home-page "https://wiki.gnome.org/Projects/Vala/") - (synopsis "Compiler for the GObject type system") - (description - "Vala is a programming language that aims to bring modern programmi= ng -language features to GNOME developers without imposing any additional ru= ntime -requirements and without using a different ABI compared to applications = and -libraries written in C.") + (synopsis "Compiler using the GObject type system") + (description "Vala is a programming language using modern high level= +abstractions without imposing additional runtime requirements and withou= t using +a different ABI compared to applications and libraries written in C. Va= la uses +the GObject type system and has additional code generation routines that= make +targeting the GNOME stack simple.") (license license:lgpl2.1+))) =20 (define-public vte --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0044-gnu-libgsf-Change-build-system.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0044-gnu-libgsf-Change-build-system.patch" =46rom b3f83605e0fc2a2dc2084e344be645fe35f59df3 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:53:42 -0500 Subject: [PATCH 44/56] gnu: libgsf: Change build-system. * gnu/packages/gnome.scm (libgsf) [build-system]: Change from gnu to glib= -or-gtk. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c378bdb325..3b98b50d3b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3258,7 +3258,7 @@ XML/CSS rendering engine.") (sha256 (base32 "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"))= )) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags '("--disable-static"))) (native-inputs --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0045-gnu-libgsf-Make-separate-output-for-binaries.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0045-gnu-libgsf-Make-separate-output-for-binaries.patch" =46rom 90b5c27933d42df54ffba2b4c0d6b3695c3f8021 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:56:04 -0500 Subject: [PATCH 45/56] gnu: libgsf: Make separate output for binaries. * gnu/packages/gnome.scm (libgsf) [outputs]: New output "bin". --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3b98b50d3b..6f8c00ca82 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3259,6 +3259,7 @@ XML/CSS rendering engine.") (base32 "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"))= )) (build-system glib-or-gtk-build-system) + (outputs '("out" "bin")) (arguments '(#:configure-flags '("--disable-static"))) (native-inputs --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0046-gnu-libgsf-Re-arrange-inputs-in-alphabetical-order.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0046-gnu-libgsf-Re-arrange-inputs-in-alphabetical-order.patc"; filename*1="h" =46rom 5c0558597c01fc51a67e1e4cf6fc681214e73241 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:02:14 -0500 Subject: [PATCH 46/56] gnu: libgsf: Re-arrange inputs in alphabetical ord= er. * gnu/packages/gnome.scm (libgsf) [native-inputs]: Modify. [inputs]: Modify. --- gnu/packages/gnome.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6f8c00ca82..eebd5d1a1f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3263,15 +3263,13 @@ XML/CSS rendering engine.") (arguments '(#:configure-flags '("--disable-static"))) (native-inputs - `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - - ;; For tests. + `(("gettext" ,gettext-minimal) ("perl" ,perl) - ("perl-xml-parser" ,perl-xml-parser))) + ("perl-xml-parser" ,perl-xml-parser) + ("pkg-config" ,pkg-config))) (inputs - `(("zlib" ,zlib) - ("bzip2" ,bzip2))) + `(("bzip2" ,bzip2) + ("zlib" ,zlib))) (propagated-inputs `(("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0047-gnu-libgsf-Enable-missing-features.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0047-gnu-libgsf-Enable-missing-features.patch" =46rom 296a65a95336f80399d71238f260b0cf7e3301fa Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:08:10 -0500 Subject: [PATCH 47/56] gnu: libgsf: Enable missing features. * gnu/packages/gnome.scm (libgsf) [arguments]<#:configure-flag>[--enable-= introspection]: New flag. [--with-gir-dir=3D]: New flag. [--with-typelib-dir=3D]: New flag. [--with-zlib]: New flag. [--with-bz2]: New flag. [native-inputs]: Add gobject-introspection. --- gnu/packages/gnome.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eebd5d1a1f..7a729274f0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3261,9 +3261,27 @@ XML/CSS rendering engine.") (build-system glib-or-gtk-build-system) (outputs '("out" "bin")) (arguments - '(#:configure-flags '("--disable-static"))) + `(#:configure-flags + (list + "--disable-static" + "--enable-introspection" + (string-append "--with-gir-dir=3D" + (assoc-ref %outputs "out") + "/share/gir-" + ,(version-major + (package-version gobject-introspection)) + ".0") + (string-append "--with-typelib-dir=3D" + (assoc-ref %outputs "out") + "/lib/girepository-" + ,(version-major + (package-version gobject-introspection)) + ".0") + "--with-zlib" + "--with-bz2"))) (native-inputs `(("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) ("perl" ,perl) ("perl-xml-parser" ,perl-xml-parser) ("pkg-config" ,pkg-config))) --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0048-gnu-libgsf-Correct-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0048-gnu-libgsf-Correct-inputs.patch" =46rom ea43092958eea175b16ad6a91b7ec0b0cedf87a8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:11:02 -0500 Subject: [PATCH 48/56] gnu: libgsf: Correct inputs. * gnu/packages/gnome.scm (libgsf) [native-inputs]: Add python-wrapper. [propagated-inputs]: Move gdk-pixbuf to ... [inputs]: ... here. --- gnu/packages/gnome.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7a729274f0..790edba464 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3284,13 +3284,14 @@ XML/CSS rendering engine.") ("gobject-introspection" ,gobject-introspection) ("perl" ,perl) ("perl-xml-parser" ,perl-xml-parser) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) (inputs `(("bzip2" ,bzip2) + ("gdk-pixbuf" ,gdk-pixbuf) ("zlib" ,zlib))) (propagated-inputs - `(("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) + `(("glib" ,glib) ("libxml2" ,libxml2))) (home-page "https://www.gnome.org/projects/libgsf") (synopsis "GNOME's Structured File Library") --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0049-gnu-libgsf-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0049-gnu-libgsf-Enable-documentation.patch" =46rom e60375bca051acaa156ececa0075adb658015e44 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:20:52 -0500 Subject: [PATCH 49/56] gnu: libgsf: Enable documentation. * gnu/packages/gnome.scm (libgsf) [outputs]: New output "doc". [arguments]<#:configure-flags>[--with-html-dir]: New flag. [native-inputs]: Add docbook-xml. --- gnu/packages/gnome.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 790edba464..08db85917a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3259,7 +3259,7 @@ XML/CSS rendering engine.") (base32 "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"))= )) (build-system glib-or-gtk-build-system) - (outputs '("out" "bin")) + (outputs '("out" "bin" "doc")) (arguments `(#:configure-flags (list @@ -3277,10 +3277,24 @@ XML/CSS rendering engine.") ,(version-major (package-version gobject-introspection)) ".0") + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html") "--with-zlib" - "--with-bz2"))) + "--with-bz2") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* "gsf-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.5/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t))))) (native-inputs - `(("gettext" ,gettext-minimal) + `(("docbook-xml" ,docbook-xml) + ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) ("perl" ,perl) ("perl-xml-parser" ,perl-xml-parser) --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0050-gnu-libgsf-Update-synopsis-description-home-page-and.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0050-gnu-libgsf-Update-synopsis-description-home-page-and.pa"; filename*1="tch" =46rom e8559862320e1c8ed3eab5a81f889a05a8148419 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:22:54 -0500 Subject: [PATCH 50/56] gnu: libgsf: Update synopsis, description, home-pa= ge and license. * gnu/packages/gnome.scm (libgsf) [synopsis]: Modify. [home-page]: Modify. [description]: Modify. [license]: Modify. --- gnu/packages/gnome.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 08db85917a..67f00539e7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3307,14 +3307,16 @@ XML/CSS rendering engine.") (propagated-inputs `(("glib" ,glib) ("libxml2" ,libxml2))) - (home-page "https://www.gnome.org/projects/libgsf") - (synopsis "GNOME's Structured File Library") - (description - "Libgsf aims to provide an efficient extensible I/O abstraction for= -dealing with different structured file formats.") - - ;; LGPLv2.1-only. - (license license:lgpl2.1))) + (synopsis "G Structured File Library") + (description "Libgsf aims to provide an efficient extensible I/O abs= traction +for dealing with different structured file formats.") + (home-page "https://gitlab.gnome.org/GNOME/libgsf") + (license + (list + ;; Library + license:lgpl2.1+ + ;; Others + license:lgpl2.0+)))) =20 (define-public librsvg (package --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0051-gnu-atk-Re-arrange-inputs-in-alphabetical-order.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0051-gnu-atk-Re-arrange-inputs-in-alphabetical-order.patch" =46rom 1ff140785d5154e540f27aaae421fa406dad59a0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:39:47 -0500 Subject: [PATCH 51/56] gnu: atk: Re-arrange inputs in alphabetical order.= * gnu/packages/gtk.scm (atk) [native-inputs]: Modify. --- gnu/packages/gtk.scm | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 392ba0d492..5b18a030dc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -98,30 +98,30 @@ =20 (define-public atk (package - (name "atk") - (version "2.34.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l"))))= - (build-system meson-build-system) - (propagated-inputs `(("glib" ,glib))) ; required by atk.pc - (native-inputs - `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ; glib-mkenums,= etc. - ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler= , etc. - (synopsis "GNOME accessibility toolkit") - (description - "ATK provides the set of accessibility interfaces that are implement= ed + (name "atk") + (version "2.34.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l"))= )) + (build-system meson-build-system) + (propagated-inputs `(("glib" ,glib))) ; required by atk.pc + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib" ,glib "bin") ; glib-mkenums, etc. + ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. + ("pkg-config" ,pkg-config))) + (synopsis "GNOME accessibility toolkit") + (description + "ATK provides the set of accessibility interfaces that are implemen= ted by other toolkits and applications. Using the ATK interfaces, accessibi= lity tools have full access to view and control running applications.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/atk/"))) + (license license:lgpl2.0+) + (home-page "https://developer.gnome.org/atk/"))) =20 (define-public cairo (package --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0052-gnu-atk-Update-to-2.36.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0052-gnu-atk-Update-to-2.36.0.patch" =46rom c125c4207235c60507cd1541e22b5335246ba912 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:44:36 -0500 Subject: [PATCH 52/56] gnu: atk: Update to 2.36.0. * gnu/packages/gtk.scm (atk) [version]: Update to 2.36.0. [arguments]<#:glib-or-gtk?>: New argument. --- gnu/packages/gtk.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5b18a030dc..dee979a012 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -99,7 +99,7 @@ (define-public atk (package (name "atk") - (version "2.34.1") + (version "2.36.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -107,8 +107,10 @@ name "-" version ".tar.xz")) (sha256 (base32 - "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l"))= )) + "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv"))= )) (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas (propagated-inputs `(("glib" ,glib))) ; required by atk.pc (native-inputs `(("gettext" ,gettext-minimal) --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0053-gnu-atk-Update-home-page-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0053-gnu-atk-Update-home-page-and-license.patch" =46rom 080fd5731b57764dd02b3809e7ed438fe0a8d6e0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:46:00 -0500 Subject: [PATCH 53/56] gnu: atk: Update home-page and license. * gnu/packages/gtk.scm (atk) [home-page]: Modify. [license]: Update to lgpl2.1+. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index dee979a012..92c628d3a1 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -122,8 +122,8 @@ "ATK provides the set of accessibility interfaces that are implemen= ted by other toolkits and applications. Using the ATK interfaces, accessibi= lity tools have full access to view and control running applications.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/atk/"))) + (license license:lgpl2.1+) + (home-page "https://wiki.gnome.org/Accessibility"))) =20 (define-public cairo (package --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0054-gnu-atkmm-Update-to-2.36.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0054-gnu-atkmm-Update-to-2.36.0.patch" =46rom c5c824f5103b3e48915195acd3615c18975d42e2 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:50:53 -0500 Subject: [PATCH 54/56] gnu: atkmm: Update to 2.36.0. * gnu/packages/gtk.scm (atkmm) [version]: Update to 2.36.0. [build-system]: Change from gnu to meson. [arguments]<#:glib-or-gtk?>: New argument. [native-inputs]: Add m4, mm-common, perl and libxslt. --- gnu/packages/gtk.scm | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 92c628d3a1..b9878e68dd 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -78,6 +78,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) + #:use-module (gnu packages m4) #:use-module (gnu packages man) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) @@ -1425,17 +1426,24 @@ library.") (define-public atkmm (package (name "atkmm") - (version "2.28.0") + (version "2.36.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c")))= ) - (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config))) + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0wwr0663jrqx2klsasffd9wpk3kqnwisj1y3ahdkjdk5hzrsjgy9"))= )) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas + (native-inputs + `(("m4" ,m4) + ("mm-common" ,mm-common) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs `(("glibmm" ,glibmm) ("atk" ,atk))) (home-page "https://www.gtkmm.org") --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0055-gnu-atkmm-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0055-gnu-atkmm-Enable-documentation.patch" =46rom fe613e4f485fad11921b39890cd2e712333ed519 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 24 Mar 2021 22:46:44 -0400 Subject: [PATCH 55/56] gnu: atkmm: Enable documentation. * gnu/packages/gtk.scm (atkmm) [outputs]: Add new output "doc". [arguments]<#:configure-flags>[-Denable-documentation]: New flag. [arguments]<#:phases>['move-doc]: New phase. [native-inputs]: Add graphviz, doxygen. --- gnu/packages/gtk.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b9878e68dd..7c3e384f47 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -74,6 +74,7 @@ #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages graphviz) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages libffi) @@ -1436,10 +1437,27 @@ library.") (base32 "0wwr0663jrqx2klsasffd9wpk3kqnwisj1y3ahdkjdk5hzrsjgy9"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Dbuild-documentation=3Dtrue") + #: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/doc") + (string-append doc "/share/doc")) + #t)))))) (native-inputs - `(("m4" ,m4) + `(("dot" ,graphviz) + ("doxygen" ,doxygen) + ("m4" ,m4) ("mm-common" ,mm-common) ("perl" ,perl) ("pkg-config" ,pkg-config) --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3 Content-Type: text/x-patch; charset=UTF-8; name="0056-gnu-atkmm-Update-synopsis-description-home-page-and-.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0056-gnu-atkmm-Update-synopsis-description-home-page-and-.pa"; filename*1="tch" =46rom 634e43a0fd9dabe5387169086ec3142f00c99d1e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 13:01:19 -0500 Subject: [PATCH 56/56] gnu: atkmm: Update synopsis, description, home-pag= e and license. * gnu/packages/gtk.scm (atkmm) [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Add gpl2+. --- gnu/packages/gtk.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 7c3e384f47..9c5474393d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1464,12 +1464,15 @@ library.") ("xsltproc" ,libxslt))) (propagated-inputs `(("glibmm" ,glibmm) ("atk" ,atk))) - (home-page "https://www.gtkmm.org") - (synopsis "C++ interface to the ATK accessibility library") - (description - "ATKmm provides a C++ programming interface to the ATK accessibilit= y -toolkit.") - (license license:lgpl2.1+))) + (synopsis "C++ bindings for ATK") + (description "ATKmm is the C++ binding for the ATK library.") + (home-page "https://wiki.gnome.org/Accessibility") + (license + (list + ;; Library + license:lgpl2.1+ + ;; Tools + license:gpl2+)))) =20 (define-public gtkmm (package --=20 2.31.0 --------------0F79ABA1FFD960FD0A3963A3-- --eADj2hk9hu2mUgoABcyrjlrgntpzQ8YJ1-- --VtjJH3IgXV8VZB3lKXI2ilZPxQzLOOVDB Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYFx9RAUDAAAAAAAKCRBfWBZkf4vlUSI9 AQDGZ7SD/0Rapn8e8w9itjqBKlVTv48xj3DnONJjpj25JAD/YZiuW6VL+W4+LcW9gba/rJxiA2LE 2LvPoZEGtvs8Hwg= =Naa5 -----END PGP SIGNATURE----- --VtjJH3IgXV8VZB3lKXI2ilZPxQzLOOVDB-- From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 25 21:00:53 2021 Received: (at 42958) by debbugs.gnu.org; 26 Mar 2021 01:00:53 +0000 Received: from localhost ([127.0.0.1]:39977 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPaqL-00007i-2g for submit@debbugs.gnu.org; Thu, 25 Mar 2021 21:00:53 -0400 Received: from out2.migadu.com ([188.165.223.204]:36600) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPaqI-00007Y-9J for 42958@debbugs.gnu.org; Thu, 25 Mar 2021 21:00:51 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1616720447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=oOQwvI/DYFe7KQmwuqu5QLOzWCs9TQH90WpaGlGaZ9g=; b=LWij1AP9e6FpaHNNOE00U+2bB/dgwQKuKZG4cqCDgi9HXmBwK4Kpu15tsXiuKsv78Eqd6l A4L5Mq4/74ecNPWXUZ9kKsVyFq5Tg05/y/oOTkXPT0ujFYekPaAaRg9glV88n2D0hHnabt EUoZpPdeK0i9q0Aq5AB+hL1368uOZF3mQTshQjBV3roJJ85rtv9ICtftqOu5+mZyROPIbh hgxEkjznI4FnxBaEWuARzoLJ95MPQ7BD+dVpZaL8KRyKpaqImy2WuU9LOtX600uWr+arwp EXAeoxHELE1ne/cXIWx9zFoG7q7yAIMXeZILdk/PY0IlsiHzjEiIVfctmWGB6g== From: Raghav Gururajan To: 42958@debbugs.gnu.org, Danny Milosavljevic , Ricardo Wurmus , =?UTF-8?Q?L=c3=a9o_Le_Bouter?= References: <7bef0b9f-b8a6-bd56-52e7-e283d8342470@raghavgururajan.name> <2b0dc6df-d533-8793-697c-82d664e93ddb@raghavgururajan.name> Subject: Re: Big changes from wip-desktop. Message-ID: Date: Thu, 25 Mar 2021 21:00:43 -0400 MIME-Version: 1.0 In-Reply-To: <2b0dc6df-d533-8793-697c-82d664e93ddb@raghavgururajan.name> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="5BjXLCrUYP3oznVW6eIc6z4vdW6utvMvS" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Debbugs-Envelope-To: 42958 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --5BjXLCrUYP3oznVW6eIc6z4vdW6utvMvS Content-Type: multipart/mixed; boundary="dDxfzwX6rz34VPYhf3Q9bmqQqxdK3vbmV"; protected-headers="v1" From: Raghav Gururajan To: 42958@debbugs.gnu.org, Danny Milosavljevic , Ricardo Wurmus , =?UTF-8?Q?L=c3=a9o_Le_Bouter?= Message-ID: Subject: Re: Big changes from wip-desktop. References: <7bef0b9f-b8a6-bd56-52e7-e283d8342470@raghavgururajan.name> <2b0dc6df-d533-8793-697c-82d664e93ddb@raghavgururajan.name> In-Reply-To: <2b0dc6df-d533-8793-697c-82d664e93ddb@raghavgururajan.name> --dDxfzwX6rz34VPYhf3Q9bmqQqxdK3vbmV Content-Type: multipart/mixed; boundary="------------13C838295F3F8C51CF879FBC" Content-Language: en-US This is a multi-part message in MIME format. --------------13C838295F3F8C51CF879FBC Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable @(rekado|lle-bout|danny) > Could any of you please review and merge the attached patches to=20 > core-updates? >=20 > These patches has been successfully built on bayfront, from which you=20 > can obtain substitutes, if needed. >=20 > I will send some more patches for this #42958 by tomorrow. >=20 > It would be great if we could together finish-off this #42958 ASAP, so = > that I can bring remaining patches from wip-deskop. >=20 > P.S > Please pardon two cosmetic changes patches, which were done very long=20 > ago and had to use it to cleanly apply succeeding patches. Also, I must= =20 > have used #t with lambda out of habit. Since there was master <--> core-updates merge, here I have attached=20 rebased patches. Thanks to L=C3=A9o Le Bouter. Regards, RG. --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-glib-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-glib-Make-some-cosmetic-changes.patch" =46rom 8d8b0bd7f2178d8c0abe1eb27317acbca6dee262 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 06:39:29 -0500 Subject: [PATCH 01/56] gnu: glib: Make some cosmetic changes. * gnu/packages/patches/glib-CVE-2021-27218.patch gnu/packages/patches/glib-CVE-2021-27219-01.patch gnu/packages/patches/glib-CVE-2021-27219-02.patch gnu/packages/patches/glib-CVE-2021-27219-03.patch gnu/packages/patches/glib-CVE-2021-27219-04.patch gnu/packages/patches/glib-CVE-2021-27219-05.patch gnu/packages/patches/glib-CVE-2021-27219-06.patch gnu/packages/patches/glib-CVE-2021-27219-07.patch gnu/packages/patches/glib-CVE-2021-27219-08.patch gnu/packages/patches/glib-CVE-2021-27219-09.patch gnu/packages/patches/glib-CVE-2021-27219-10.patch gnu/packages/patches/glib-CVE-2021-27219-11.patch gnu/packages/patches/glib-CVE-2021-27219-12.patch gnu/packages/patches/glib-CVE-2021-27219-13.patch gnu/packages/patches/glib-CVE-2021-27219-14.patch gnu/packages/patches/glib-CVE-2021-27219-15.patch gnu/packages/patches/glib-CVE-2021-27219-16.patch gnu/packages/patches/glib-CVE-2021-27219-17.patch gnu/packages/patches/glib-CVE-2021-27219-18.patch gnu/packages/patches/glib-CVE-2021-28153.patch: Remove patches. * gnu/local.mk (dist_patch_DATA): Unregister them. * gnu/packages/glib.scm (glib): Make some cosmetic changes. [replacement]: Remove. (glib/fixed): Remove. --- gnu/local.mk | 20 - gnu/packages/glib.scm | 454 ++++++++---------- .../patches/glib-CVE-2021-27218.patch | 132 ----- .../patches/glib-CVE-2021-27219-01.patch | 176 ------- .../patches/glib-CVE-2021-27219-02.patch | 264 ---------- .../patches/glib-CVE-2021-27219-03.patch | 136 ------ .../patches/glib-CVE-2021-27219-04.patch | 308 ------------ .../patches/glib-CVE-2021-27219-05.patch | 47 -- .../patches/glib-CVE-2021-27219-06.patch | 94 ---- .../patches/glib-CVE-2021-27219-07.patch | 118 ----- .../patches/glib-CVE-2021-27219-08.patch | 94 ---- .../patches/glib-CVE-2021-27219-09.patch | 98 ---- .../patches/glib-CVE-2021-27219-10.patch | 52 -- .../patches/glib-CVE-2021-27219-11.patch | 57 --- .../patches/glib-CVE-2021-27219-12.patch | 30 -- .../patches/glib-CVE-2021-27219-13.patch | 32 -- .../patches/glib-CVE-2021-27219-14.patch | 32 -- .../patches/glib-CVE-2021-27219-15.patch | 95 ---- .../patches/glib-CVE-2021-27219-16.patch | 43 -- .../patches/glib-CVE-2021-27219-17.patch | 37 -- .../patches/glib-CVE-2021-27219-18.patch | 232 --------- .../patches/glib-CVE-2021-28153.patch | 283 ----------- 22 files changed, 202 insertions(+), 2632 deletions(-) delete mode 100644 gnu/packages/patches/glib-CVE-2021-27218.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-01.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-02.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-03.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-04.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-05.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-06.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-07.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-08.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-09.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-10.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-11.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-12.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-13.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-14.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-15.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-16.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-17.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-18.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-28153.patch diff --git a/gnu/local.mk b/gnu/local.mk index ce0a79fb4d..d924b20bcf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1082,26 +1082,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ %D%/packages/patches/glib-tests-timer.patch \ - %D%/packages/patches/glib-CVE-2021-27218.patch \ - %D%/packages/patches/glib-CVE-2021-27219-01.patch \ - %D%/packages/patches/glib-CVE-2021-27219-02.patch \ - %D%/packages/patches/glib-CVE-2021-27219-03.patch \ - %D%/packages/patches/glib-CVE-2021-27219-04.patch \ - %D%/packages/patches/glib-CVE-2021-27219-05.patch \ - %D%/packages/patches/glib-CVE-2021-27219-06.patch \ - %D%/packages/patches/glib-CVE-2021-27219-07.patch \ - %D%/packages/patches/glib-CVE-2021-27219-08.patch \ - %D%/packages/patches/glib-CVE-2021-27219-09.patch \ - %D%/packages/patches/glib-CVE-2021-27219-10.patch \ - %D%/packages/patches/glib-CVE-2021-27219-11.patch \ - %D%/packages/patches/glib-CVE-2021-27219-12.patch \ - %D%/packages/patches/glib-CVE-2021-27219-13.patch \ - %D%/packages/patches/glib-CVE-2021-27219-14.patch \ - %D%/packages/patches/glib-CVE-2021-27219-15.patch \ - %D%/packages/patches/glib-CVE-2021-27219-16.patch \ - %D%/packages/patches/glib-CVE-2021-27219-17.patch \ - %D%/packages/patches/glib-CVE-2021-27219-18.patch \ - %D%/packages/patches/glib-CVE-2021-28153.patch \ %D%/packages/patches/glibc-CVE-2018-11236.patch \ %D%/packages/patches/glibc-CVE-2018-11237.patch \ %D%/packages/patches/glibc-CVE-2019-7309.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 0ddaf4d0b9..a446ce1ace 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -170,258 +170,208 @@ shared NFS home directories.") =20 (define glib (package - (name "glib") - (version "2.62.6") - (replacement glib/fixed) - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" - name "/" (string-take version 4) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh")) - (patches (search-patches "glib-appinfo-watch.patch" - "glib-tests-timer.patch")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "tests/spawn-test.c" - (("/bin/sh") "sh")) - #t)))) - (build-system meson-build-system) - (outputs '("out" ; everything - "bin" ; glib-mkenums, gtester, etc.; depends on = Python - "debug")) - (propagated-inputs - `(("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc - ("libffi" ,libffi) ; in the Requires.private field of gobject-2.0.= pc - ;; These are in the Requires.private field of gio-2.0.pc - ("util-linux" ,util-linux "lib") ;for libmount - ("zlib" ,zlib))) - (native-inputs - `(("gettext" ,gettext-minimal) - ("m4" ,m4) ; for installing m4 macros - ("dbus" ,dbus) ; for GDBus tests - ("pkg-config" ,pkg-config) - ("python" ,python-minimal-wrapper) - ("perl" ,perl) ; needed by GIO tests - ("tzdata" ,tzdata-for-tests))) ; for tests/gdatet= ime.c - (arguments - `(#:disallowed-references (,tzdata-for-tests) - #:configure-flags '("-Dselinux=3Ddisabled") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-dbus-launch-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((dbus (assoc-ref inputs "dbus"))) - (substitute* "gio/gdbusaddress.c" - (("command_line =3D g_strdup_printf \\(\"dbus-launch") - (string-append "command_line =3D g_strdup_printf (\"" - dbus "/bin/dbus-launch"))) - #t))) - (add-after 'unpack 'patch-gio-launch-desktop - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; See also - ;; for another future fix. - (substitute* "gio/gdesktopappinfo.c" - (("gio-launch-desktop") - (string-append out "/libexec/gio-launch-desktop"))) - #t))) - ;; TODO: Remove the conditional in the next core-updates cycle. - ;; Needed to build glib on slower ARM nodes. - ,@(if (string-prefix? "arm" (%current-system)) - `((add-after 'unpack 'increase-test-timeout - (lambda _ - (substitute* "meson.build" - (("test_timeout =3D 60") - "test_timeout =3D 120") - (("test_timeout_slow =3D 120") - "test_timeout_slow =3D 180"))))) - '()) - (add-before 'build 'pre-build - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; For tests/gdatetime.c. - (setenv "TZDIR" - (string-append (assoc-ref inputs "tzdata") - "/share/zoneinfo")) - - ;; Some tests want write access there. - (setenv "HOME" (getcwd)) - (setenv "XDG_CACHE_HOME" (getcwd)) - #t)) - (add-after 'unpack 'disable-failing-tests - (lambda _ - (let ((disable - (lambda (test-file test-paths) - (define pattern+procs - (map (lambda (test-path) - (cons - ;; XXX: only works for single line statem= ents. - (format #f "g_test_add_func.*\"~a\".*" te= st-path) - (const ""))) - test-paths)) - (substitute test-file pattern+procs))) - (failing-tests - '(("glib/tests/thread.c" - (;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-xe= n-amd64 - ;; as found on hydra.gnu.org, and strace(1) doesn= 't - ;; recognize it. - "/thread/thread4")) - - ;; This tries to find programs in FHS directories. - ("glib/tests/utils.c" - ("/utils/find-program")) - - ;; This fails because "glib/tests/echo-script" cann= ot be - ;; found. - ("glib/tests/spawn-singlethread.c" - ("/gthread/spawn-script")) - - ("glib/tests/timer.c" - (;; fails if compiler optimizations are enabled, w= hich they - ;; are by default. - "/timer/stop")) - - ("gio/tests/gapplication.c" - (;; XXX: proven to be unreliable. See: - ;; - ;; - "/gapplication/quit" - - ;; XXX: fails randomly for unknown reason. See: - ;; - "/gapplication/local-actions")) - - ("gio/tests/contenttype.c" - (;; XXX: requires shared-mime-info. - "/contenttype/guess" - "/contenttype/guess_svg_from_data" - "/contenttype/subtype" - "/contenttype/list" - "/contenttype/icon" - "/contenttype/symbolic-icon" - "/contenttype/tree")) - - ("gio/tests/appinfo.c" - (;; XXX: requires update-desktop-database. - "/appinfo/associations")) - - ("gio/tests/desktop-app-info.c" - (;; XXX: requires update-desktop-database. - "/desktop-app-info/delete" - "/desktop-app-info/default" - "/desktop-app-info/fallback" - "/desktop-app-info/lastused" - "/desktop-app-info/search")) - - ("gio/tests/gdbus-peer.c" - (;; Requires /etc/machine-id. - "/gdbus/codegen-peer-to-peer")) - - ("gio/tests/gdbus-address-get-session.c" - (;; Requires /etc/machine-id. - "/gdbus/x11-autolaunch")) - - ("gio/tests/gsocketclient-slow.c" - (;; These tests tries to resolve "localhost", and = fails. - "/socket-client/happy-eyeballs/slow" - "/socket-client/happy-eyeballs/cancellation/delay= ed")) - - ))) - (for-each (lambda (x) (apply disable x)) failing-tests) - #t))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (if tests? - (begin - (setenv "MESON_TESTTHREADS" - (number->string (parallel-job-count))) - ;; Do not run tests marked as "flaky". - (invoke "meson" "test" "--no-suite" "flaky")) - #t))) - ;; TODO: meson does not permit the bindir to be outside of prefi= x. - ;; See https://github.com/mesonbuild/meson/issues/2561 - ;; We can remove this once meson is patched. - (add-after 'install 'move-executables - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (assoc-ref outputs "bin"))) - (mkdir-p bin) - (rename-file (string-append out "/bin") - (string-append bin "/bin")) - ;; This one is an implementation detail of glib. - ;; It is wrong that that's in "/bin" in the first place, - ;; but that's what upstream is doing right now. - ;; See . - (mkdir (string-append out "/libexec")) - (rename-file (string-append bin "/bin/gio-launch-desktop")= - (string-append out "/libexec/gio-launch-deskt= op")) - ;; Do not refer to "bindir", which points to "${prefix}/bi= n". - ;; We don't patch "bindir" to point to "$bin/bin", because= that - ;; would create a reference cycle between the "out" and "b= in" - ;; outputs. - (substitute* (list (string-append out "/lib/pkgconfig/gio-= 2.0.pc") - (string-append out "/lib/pkgconfig/glib= -2.0.pc")) - (("bindir=3D\\$\\{prefix\\}/bin") "") - (("=3D\\$\\{bindir\\}/") "=3D")) - #t)))))) - ;; TODO: see above for explanation. - ;; #:configure-flags (list (string-append "--bindir=3D" - ;; (assoc-ref %outputs "bin= ") - ;; "/bin")) - - (native-search-paths - ;; This variable is not really "owned" by GLib, but several related - ;; packages refer to it: gobject-introspection's tools use it as a s= earch - ;; path for .gir files, and it's also a search path for schemas prod= uced - ;; by 'glib-compile-schemas'. - (list (search-path-specification - (variable "XDG_DATA_DIRS") - (files '("share"))) - ;; To load extra gio modules from glib-networking, etc. - (search-path-specification - (variable "GIO_EXTRA_MODULES") - (files '("lib/gio/modules"))))) - (search-paths native-search-paths) - (properties '((hidden? . #t))) - - (synopsis "Thread-safe general utility library; basis of GTK+ and GNO= ME") - (description - "GLib provides data structure handling for C, portability wrappers, -and interfaces for such runtime functionality as an event loop, threads,= -dynamic loading, and an object system.") - (home-page "https://developer.gnome.org/glib/") - (license license:lgpl2.1+))) - -(define glib/fixed - (package - (inherit glib) - (source (origin - (inherit (package-source glib)) - (patches - (append (search-patches "glib-CVE-2021-27218.patch" - "glib-CVE-2021-27219-01.patch" - "glib-CVE-2021-27219-02.patch" - "glib-CVE-2021-27219-03.patch" - "glib-CVE-2021-27219-04.patch" - "glib-CVE-2021-27219-05.patch" - "glib-CVE-2021-27219-06.patch" - "glib-CVE-2021-27219-07.patch" - "glib-CVE-2021-27219-08.patch" - "glib-CVE-2021-27219-09.patch" - "glib-CVE-2021-27219-10.patch" - "glib-CVE-2021-27219-11.patch" - "glib-CVE-2021-27219-12.patch" - "glib-CVE-2021-27219-13.patch" - "glib-CVE-2021-27219-14.patch" - "glib-CVE-2021-27219-15.patch" - "glib-CVE-2021-27219-16.patch" - "glib-CVE-2021-27219-17.patch" - "glib-CVE-2021-27219-18.patch" - "glib-CVE-2021-28153.patch") - (origin-patches (package-source glib)))))))) + (name "glib") + (version "2.62.6") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" + name "/" (string-take version 4) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh"))= + (patches + (search-patches "glib-tests-timer.patch" "glib-appinfo-watch.pat= ch")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "tests/spawn-test.c" + (("/bin/sh") "sh")) + #t)))) + (properties '((hidden? . #t))) + (build-system meson-build-system) + (outputs '("out" ; everything + "bin")) ; glib-mkenums, gtester, etc.; depends on Python + (arguments + `(#:disallowed-references (,tzdata-for-tests) + #:phases + (modify-phases %standard-phases + ;; TODO: Remove the conditional in the next core-updates cycle.= + ;; Needed to build glib on slower ARM nodes. + ,@(if (string-prefix? "arm" (%current-system)) + `((add-after 'unpack 'increase-test-timeout + (lambda _ + (substitute* "meson.build" + (("test_timeout =3D 60") + "test_timeout =3D 90") + (("test_timeout_slow =3D 120") + "test_timeout_slow =3D 180"))))) + '()) + (add-after 'unpack 'patch-dbus-launch-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((dbus (assoc-ref inputs "dbus"))) + (substitute* "gio/gdbusaddress.c" + (("command_line =3D g_strdup_printf \\(\"dbus-launch") + (string-append "command_line =3D g_strdup_printf (\"" + dbus "/bin/dbus-launch"))) + #t))) + (add-after 'unpack 'patch-gio-launch-desktop + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; See also + ;; for another future fix. + (substitute* "gio/gdesktopappinfo.c" + (("gio-launch-desktop") + (string-append out "/libexec/gio-launch-desktop"))) + #t))) + (add-before 'build 'pre-build + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; For tests/gdatetime.c. + (setenv "TZDIR" + (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo")) + ;; Some tests want write access there. + (setenv "HOME" (getcwd)) + (setenv "XDG_CACHE_HOME" (getcwd)) + #t)) + (add-after 'unpack 'disable-failing-tests + (lambda _ + (let ((disable + (lambda (test-file test-paths) + (define pattern+procs + (map (lambda (test-path) + (cons + ;; XXX: only works for single line state= ments. + (format #f "g_test_add_func.*\"~a\".*" t= est-path) + (const ""))) + test-paths)) + (substitute test-file pattern+procs))) + (failing-tests + '(("glib/tests/thread.c" + ( ;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-= xen-amd64 + ;; as found on hydra.gnu.org, and strace(1) does= n't + ;; recognize it. + "/thread/thread4")) + ;; This tries to find programs in FHS directories.= + ("glib/tests/utils.c" + ("/utils/find-program")) + ;; This fails because "glib/tests/echo-script" can= not be + ;; found. + ("glib/tests/spawn-singlethread.c" + ("/gthread/spawn-script")) + ("glib/tests/timer.c" + ( ;; fails if compiler optimizations are enabled,= which they + ;; are by default. + "/timer/stop")) + ("gio/tests/gapplication.c" + ( ;; XXX: proven to be unreliable. See: + ;; + ;; + "/gapplication/quit" + ;; XXX: fails randomly for unknown reason. See: + ;; + "/gapplication/local-actions")) + ("gio/tests/contenttype.c" + ( ;; XXX: requires shared-mime-info. + "/contenttype/guess" + "/contenttype/guess_svg_from_data" + "/contenttype/subtype" + "/contenttype/list" + "/contenttype/icon" + "/contenttype/symbolic-icon" + "/contenttype/tree")) + ("gio/tests/appinfo.c" + ( ;; XXX: requires update-desktop-database. + "/appinfo/associations")) + ("gio/tests/desktop-app-info.c" + ( ;; XXX: requires update-desktop-database. + "/desktop-app-info/delete" + "/desktop-app-info/default" + "/desktop-app-info/fallback" + "/desktop-app-info/lastused" + "/desktop-app-info/search")) + ("gio/tests/gdbus-peer.c" + ( ;; Requires /etc/machine-id. + "/gdbus/codegen-peer-to-peer")) + ("gio/tests/gdbus-address-get-session.c" + ( ;; Requires /etc/machine-id. + "/gdbus/x11-autolaunch")) + ("gio/tests/gsocketclient-slow.c" + ( ;; These tests tries to resolve "localhost", an= d fails. + "/socket-client/happy-eyeballs/slow" + "/socket-client/happy-eyeballs/cancellation/dela= yed"))))) + (for-each (lambda (x) (apply disable x)) failing-tests) + #t))) + (replace 'check + (lambda _ + (setenv "MESON_TESTTHREADS" + (number->string (parallel-job-count))) + ;; Do not run tests marked as "flaky". + (invoke "meson" "test" "--no-suite" "flaky"))) + ;; TODO: meson does not permit the bindir to be outside of pref= ix. + ;; See https://github.com/mesonbuild/meson/issues/2561 + ;; We can remove this once meson is patched. + (add-after 'install 'move-executables + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) + (mkdir-p bin) + (rename-file (string-append out "/bin") + (string-append bin "/bin")) + ;; This one is an implementation detail of glib. + ;; It is wrong that that's in "/bin" in the first place, + ;; but that's what upstream is doing right now. + ;; See .= + (mkdir (string-append out "/libexec")) + (rename-file (string-append bin "/bin/gio-launch-desktop"= ) + (string-append out "/libexec/gio-launch-desk= top")) + ;; Do not refer to "bindir", which points to "${prefix}/b= in". + ;; We don't patch "bindir" to point to "$bin/bin", becaus= e that + ;; would create a reference cycle between the "out" and "= bin" + ;; outputs. + (substitute* (list (string-append out "/lib/pkgconfig/gio= -2.0.pc") + (string-append out "/lib/pkgconfig/gli= b-2.0.pc")) + (("bindir=3D\\$\\{prefix\\}/bin") "") + (("=3D\\$\\{bindir\\}/") "=3D")) + #t)))))) + ;; TODO: see above for explanation. + ;; #:configure-flags (list (string-append "--bindir=3D" + ;; (assoc-ref %outputs "bin")= + ;; "/bin")) + (native-inputs + `(("dbus" ,dbus) ; for GDBus tests + ("gettext" ,gettext-minimal) + ("m4" ,m4) ; for installing m4 macros + ("perl" ,perl) ; needed by GIO tests + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("tzdata" ,tzdata-for-tests))) ; for tests/gdatetime.c + (propagated-inputs + `(("libffi" ,libffi) ; in the Requires.private field of gobject-2.0= =2Epc + ("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc + ("util-linux" ,util-linux "lib") ;for libmount + ("zlib" ,zlib))) ; in the Requires.private field of glib-2.0.pc + (native-search-paths + ;; This variable is not really "owned" by GLib, but several related= + ;; packages refer to it: gobject-introspection's tools use it as a = search + ;; path for .gir files, and it's also a search path for schemas pro= duced + ;; by 'glib-compile-schemas'. + (list + (search-path-specification + (variable "XDG_DATA_DIRS") + (files '("share"))) + ;; To load extra gio modules from glib-networking, etc. + (search-path-specification + (variable "GIO_EXTRA_MODULES") + (files '("lib/gio/modules"))))) + (search-paths native-search-paths) + (synopsis "Thread-safe general utility library; basis of GTK+ and GN= OME") + (description "GLib provides data structure handling for C, portabili= ty +wrappers, and interfaces for such runtime functionality as an event loop= , +threads, dynamic loading, and an object system.") + (home-page "https://developer.gnome.org/glib/") + (license license:lgpl2.1+))) =20 (define-public glib-with-documentation ;; glib's doc must be built in a separate package since it requires gt= k-doc, diff --git a/gnu/packages/patches/glib-CVE-2021-27218.patch b/gnu/package= s/patches/glib-CVE-2021-27218.patch deleted file mode 100644 index 00fa5ebf79..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27218.patch +++ /dev/null @@ -1,132 +0,0 @@ -Backport of: - -From 0f384c88a241bbbd884487b1c40b7b75f1e638d3 Mon Sep 17 00:00:00 2001 -From: Krzesimir Nowak -Date: Wed, 10 Feb 2021 23:51:07 +0100 -Subject: [PATCH] gbytearray: Do not accept too large byte arrays - -GByteArray uses guint for storing the length of the byte array, but it -also has a constructor (g_byte_array_new_take) that takes length as a -gsize. gsize may be larger than guint (64 bits for gsize vs 32 bits -for guint). It is possible to call the function with a value greater -than G_MAXUINT, which will result in silent length truncation. This -may happen as a result of unreffing GBytes into GByteArray, so rather -be loud about it. - -(Test case tweaked by Philip Withnall.) - -(Backport 2.66: Add #include gstrfuncsprivate.h in the test case for -`g_memdup2()`.) ---- - glib/garray.c | 6 ++++++ - glib/gbytes.c | 4 ++++ - glib/tests/bytes.c | 35 ++++++++++++++++++++++++++++++++++- - 3 files changed, 44 insertions(+), 1 deletion(-) - -diff --git a/glib/garray.c b/glib/garray.c -index 942e74c9f..fb1a42aaf 100644 ---- a/glib/garray.c -+++ b/glib/garray.c -@@ -2013,6 +2013,10 @@ g_byte_array_new (void) - * Create byte array containing the data. The data will be owned by the= array - * and will be freed with g_free(), i.e. it could be allocated using g_= strdup(). - * -+ * Do not use it if @len is greater than %G_MAXUINT. #GByteArray -+ * stores the length of its data in #guint, which may be shorter than -+ * #gsize. -+ * - * Since: 2.32 - * - * Returns: (transfer full): a new #GByteArray -@@ -2024,6 +2028,8 @@ g_byte_array_new_take (guint8 *data, - GByteArray *array; - GRealArray *real; -=20 -+ g_return_val_if_fail (len <=3D G_MAXUINT, NULL); -+ - array =3D g_byte_array_new (); - real =3D (GRealArray *)array; - g_assert (real->data =3D=3D NULL); -diff --git a/glib/gbytes.c b/glib/gbytes.c -index 7b72886e5..d56abe6c3 100644 ---- a/glib/gbytes.c -+++ b/glib/gbytes.c -@@ -519,6 +519,10 @@ g_bytes_unref_to_data (GBytes *bytes, - * g_bytes_new(), g_bytes_new_take() or g_byte_array_free_to_bytes(). I= n all - * other cases the data is copied. - * -+ * Do not use it if @bytes contains more than %G_MAXUINT -+ * bytes. #GByteArray stores the length of its data in #guint, which -+ * may be shorter than #gsize, that @bytes is using. -+ * - * Returns: (transfer full): a new mutable #GByteArray containing the s= ame byte data - * - * Since: 2.32 -diff --git a/glib/tests/bytes.c b/glib/tests/bytes.c -index 5ea5c2b35..15a6aaad6 100644 ---- a/glib/tests/bytes.c -+++ b/glib/tests/bytes.c -@@ -10,12 +10,12 @@ - */ -=20 - #undef G_DISABLE_ASSERT --#undef G_LOG_DOMAIN -=20 - #include - #include - #include - #include "glib.h" -+#include "glib/gstrfuncsprivate.h" -=20 - /* Keep in sync with glib/gbytes.c */ - struct _GBytes -@@ -333,6 +333,38 @@ test_to_array_transferred (void) - g_byte_array_unref (array); - } -=20 -+static void -+test_to_array_transferred_oversize (void) -+{ -+ g_test_message ("g_bytes_unref_to_array() can only take GBytes up to = " -+ "G_MAXUINT in length; test that longer ones are rejec= ted"); -+ -+ if (sizeof (guint) >=3D sizeof (gsize)) -+ { -+ g_test_skip ("Skipping test as guint is not smaller than gsize");= -+ } -+ else if (g_test_undefined ()) -+ { -+ GByteArray *array =3D NULL; -+ GBytes *bytes =3D NULL; -+ gpointer data =3D g_memdup2 (NYAN, N_NYAN); -+ gsize len =3D ((gsize) G_MAXUINT) + 1; -+ -+ bytes =3D g_bytes_new_take (data, len); -+ g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, -+ "g_byte_array_new_take: assertion 'len <=3D= G_MAXUINT' failed"); -+ array =3D g_bytes_unref_to_array (g_steal_pointer (&bytes)); -+ g_test_assert_expected_messages (); -+ g_assert_null (array); -+ -+ g_free (data); -+ } -+ else -+ { -+ g_test_skip ("Skipping test as testing undefined behaviour is dis= abled"); -+ } -+} -+ - static void - test_to_array_two_refs (void) - { -@@ -410,6 +442,7 @@ main (int argc, char *argv[]) - g_test_add_func ("/bytes/to-array/transfered", test_to_array_transfer= red); - g_test_add_func ("/bytes/to-array/two-refs", test_to_array_two_refs);= - g_test_add_func ("/bytes/to-array/non-malloc", test_to_array_non_mall= oc); -+ g_test_add_func ("/bytes/to-array/transferred/oversize", test_to_arra= y_transferred_oversize); - g_test_add_func ("/bytes/null", test_null); -=20 - return g_test_run (); ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-01.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-01.patch deleted file mode 100644 index 5db360d468..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-01.patch +++ /dev/null @@ -1,176 +0,0 @@ -Backport of: - -From 5e5f75a77e399c638be66d74e5daa8caeb433e00 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 13:30:52 +0000 -Subject: [PATCH 01/11] gstrfuncs: Add internal g_memdup2() function -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -This will replace the existing `g_memdup()` function for use within -GLib. It has an unavoidable security flaw of taking its `byte_size` -argument as a `guint` rather than as a `gsize`. Most callers will -expect it to be a `gsize`, and may pass in large values which could -silently be truncated, resulting in an undersize allocation compared -to what the caller expects. - -This could lead to a classic buffer overflow vulnerability for many -callers of `g_memdup()`. - -`g_memdup2()`, in comparison, takes its `byte_size` as a `gsize`. - -Spotted by Kevin Backhouse of GHSL. - -In GLib 2.68, `g_memdup2()` will be a new public API. In this version -for backport to older stable releases, it=E2=80=99s a new `static inline= ` API -in a private header, so that use of `g_memdup()` within GLib can be -fixed without adding a new API in a stable release series. - -Signed-off-by: Philip Withnall -Helps: GHSL-2021-045 -Helps: #2319 ---- - docs/reference/glib/meson.build | 1 + - glib/gstrfuncsprivate.h | 55 +++++++++++++++++++++++++++++++++ - glib/meson.build | 1 + - glib/tests/strfuncs.c | 23 ++++++++++++++ - 4 files changed, 80 insertions(+) - create mode 100644 glib/gstrfuncsprivate.h - -diff --git a/docs/reference/glib/meson.build b/docs/reference/glib/meson= =2Ebuild -index bba7649f0..ee39f6d04 100644 ---- a/docs/reference/glib/meson.build -+++ b/docs/reference/glib/meson.build -@@ -22,6 +22,7 @@ if get_option('gtk_doc') - 'gprintfint.h', - 'gmirroringtable.h', - 'gscripttable.h', -+ 'gstrfuncsprivate.h', - 'glib-mirroring-tab', - 'gnulib', - 'pcre', -diff --git a/glib/gstrfuncsprivate.h b/glib/gstrfuncsprivate.h -new file mode 100644 -index 000000000..85c88328a ---- /dev/null -+++ b/glib/gstrfuncsprivate.h -@@ -0,0 +1,55 @@ -+/* GLIB - Library of useful routines for C programming -+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacD= onald -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see . -+ */ -+ -+#include -+#include -+ -+/* -+ * g_memdup2: -+ * @mem: (nullable): the memory to copy. -+ * @byte_size: the number of bytes to copy. -+ * -+ * Allocates @byte_size bytes of memory, and copies @byte_size bytes in= to it -+ * from @mem. If @mem is %NULL it returns %NULL. -+ * -+ * This replaces g_memdup(), which was prone to integer overflows when -+ * converting the argument from a #gsize to a #guint. -+ * -+ * This static inline version is a backport of the new public API from -+ * GLib 2.68, kept internal to GLib for backport to older stable releas= es. -+ * See https://gitlab.gnome.org/GNOME/glib/-/issues/2319. -+ * -+ * Returns: (nullable): a pointer to the newly-allocated copy of the me= mory, -+ * or %NULL if @mem is %NULL. -+ * Since: 2.68 -+ */ -+static inline gpointer -+g_memdup2 (gconstpointer mem, -+ gsize byte_size) -+{ -+ gpointer new_mem; -+ -+ if (mem && byte_size !=3D 0) -+ { -+ new_mem =3D g_malloc (byte_size); -+ memcpy (new_mem, mem, byte_size); -+ } -+ else -+ new_mem =3D NULL; -+ -+ return new_mem; -+} -diff --git a/glib/meson.build b/glib/meson.build -index aaf5f00f5..5a6eea397 100644 ---- a/glib/meson.build -+++ b/glib/meson.build -@@ -268,6 +268,7 @@ glib_sources =3D files( - 'gslist.c', - 'gstdio.c', - 'gstrfuncs.c', -+ 'gstrfuncsprivate.h', - 'gstring.c', - 'gstringchunk.c', - 'gtestutils.c', -diff --git a/glib/tests/strfuncs.c b/glib/tests/strfuncs.c -index e1f9619c7..d968afff9 100644 ---- a/glib/tests/strfuncs.c -+++ b/glib/tests/strfuncs.c -@@ -32,6 +32,8 @@ - #include - #include "glib.h" -=20 -+#include "gstrfuncsprivate.h" -+ - #if defined (_MSC_VER) && (_MSC_VER <=3D 1800) - #define isnan(x) _isnan(x) -=20 -@@ -219,6 +221,26 @@ test_memdup (void) - g_free (str_dup); - } -=20 -+/* Testing g_memdup2() function with various positive and negative case= s */ -+static void -+test_memdup2 (void) -+{ -+ gchar *str_dup =3D NULL; -+ const gchar *str =3D "The quick brown fox jumps over the lazy dog"; -+ -+ /* Testing negative cases */ -+ g_assert_null (g_memdup2 (NULL, 1024)); -+ g_assert_null (g_memdup2 (str, 0)); -+ g_assert_null (g_memdup2 (NULL, 0)); -+ -+ /* Testing normal usage cases */ -+ str_dup =3D g_memdup2 (str, strlen (str) + 1); -+ g_assert_nonnull (str_dup); -+ g_assert_cmpstr (str, =3D=3D, str_dup); -+ -+ g_free (str_dup); -+} -+ - /* Testing g_strpcpy() function with various positive and negative case= s */ - static void - test_stpcpy (void) -@@ -2523,6 +2545,7 @@ main (int argc, - g_test_add_func ("/strfuncs/has-prefix", test_has_prefix); - g_test_add_func ("/strfuncs/has-suffix", test_has_suffix); - g_test_add_func ("/strfuncs/memdup", test_memdup); -+ g_test_add_func ("/strfuncs/memdup2", test_memdup2); - g_test_add_func ("/strfuncs/stpcpy", test_stpcpy); - g_test_add_func ("/strfuncs/str_match_string", test_str_match_string)= ; - g_test_add_func ("/strfuncs/str_tokenize_and_fold", test_str_tokenize= _and_fold); ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-02.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-02.patch deleted file mode 100644 index 431959fa8f..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-02.patch +++ /dev/null @@ -1,264 +0,0 @@ -Backport of: - -From be8834340a2d928ece82025463ae23dee2c333d0 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 13:37:56 +0000 -Subject: [PATCH 02/11] gio: Use g_memdup2() instead of g_memdup() in obv= ious - places -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -Convert all the call sites which use `g_memdup()`=E2=80=99s length argum= ent -trivially (for example, by passing a `sizeof()`), so that they use -`g_memdup2()` instead. - -In almost all of these cases the use of `g_memdup()` would not have -caused problems, but it will soon be deprecated, so best port away from -it. - -Signed-off-by: Philip Withnall -Helps: #2319 ---- - gio/gdbusconnection.c | 5 +++-- - gio/gdbusinterfaceskeleton.c | 3 ++- - gio/gfile.c | 7 ++++--- - gio/gsettingsschema.c | 5 +++-- - gio/gwin32registrykey.c | 8 +++++--- - gio/tests/async-close-output-stream.c | 6 ++++-- - gio/tests/gdbus-export.c | 5 +++-- - gio/win32/gwinhttpfile.c | 9 +++++---- - 8 files changed, 29 insertions(+), 19 deletions(-) - -diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c -index f1f0921d4..d56453486 100644 ---- a/gio/gdbusconnection.c -+++ b/gio/gdbusconnection.c -@@ -110,6 +110,7 @@ - #include "gasyncinitable.h" - #include "giostream.h" - #include "gasyncresult.h" -+#include "gstrfuncsprivate.h" - #include "gtask.h" - #include "gmarshal-internal.h" -=20 -@@ -3997,7 +3998,7 @@ _g_dbus_interface_vtable_copy (const GDBusInterfac= eVTable *vtable) - /* Don't waste memory by copying padding - remember to update this - * when changing struct _GDBusInterfaceVTable in gdbusconnection.h - */ -- return g_memdup ((gconstpointer) vtable, 3 * sizeof (gpointer)); -+ return g_memdup2 ((gconstpointer) vtable, 3 * sizeof (gpointer)); - } -=20 - static void -@@ -4014,7 +4015,7 @@ _g_dbus_subtree_vtable_copy (const GDBusSubtreeVTa= ble *vtable) - /* Don't waste memory by copying padding - remember to update this - * when changing struct _GDBusSubtreeVTable in gdbusconnection.h - */ -- return g_memdup ((gconstpointer) vtable, 3 * sizeof (gpointer)); -+ return g_memdup2 ((gconstpointer) vtable, 3 * sizeof (gpointer)); - } -=20 - static void -diff --git a/gio/gdbusinterfaceskeleton.c b/gio/gdbusinterfaceskeleton.c= -index 4a06516c1..4a4b719a5 100644 ---- a/gio/gdbusinterfaceskeleton.c -+++ b/gio/gdbusinterfaceskeleton.c -@@ -28,6 +28,7 @@ - #include "gdbusmethodinvocation.h" - #include "gdbusconnection.h" - #include "gmarshal-internal.h" -+#include "gstrfuncsprivate.h" - #include "gtask.h" - #include "gioerror.h" -=20 -@@ -701,7 +702,7 @@ add_connection_locked (GDBusInterfaceSkeleton *inter= face_, - * properly before building the hooked_vtable, so we create it - * once at the last minute. - */ -- interface_->priv->hooked_vtable =3D g_memdup (g_dbus_interface_sk= eleton_get_vtable (interface_), sizeof (GDBusInterfaceVTable)); -+ interface_->priv->hooked_vtable =3D g_memdup2 (g_dbus_interface_s= keleton_get_vtable (interface_), sizeof (GDBusInterfaceVTable)); - interface_->priv->hooked_vtable->method_call =3D skeleton_interce= pt_handle_method_call; - } -=20 -diff --git a/gio/gfile.c b/gio/gfile.c -index ba93f7c75..88b341e7d 100644 ---- a/gio/gfile.c -+++ b/gio/gfile.c -@@ -60,6 +60,7 @@ - #include "gasyncresult.h" - #include "gioerror.h" - #include "glibintl.h" -+#include "gstrfuncsprivate.h" -=20 -=20 - /** -@@ -7884,7 +7885,7 @@ measure_disk_usage_progress (gboolean reporting, - g_main_context_invoke_full (g_task_get_context (task), - g_task_get_priority (task), - measure_disk_usage_invoke_progress, -- g_memdup (&progress, sizeof progress), -+ g_memdup2 (&progress, sizeof progress), - g_free); - } -=20 -@@ -7902,7 +7903,7 @@ measure_disk_usage_thread (GTask *task, - data->progress_callback ? measure_disk= _usage_progress : NULL, task, - &result.disk_usage, &result.num_dirs, = &result.num_files, - &error)) -- g_task_return_pointer (task, g_memdup (&result, sizeof result), g_f= ree); -+ g_task_return_pointer (task, g_memdup2 (&result, sizeof result), g_= free); - else - g_task_return_error (task, error); - } -@@ -7926,7 +7927,7 @@ g_file_real_measure_disk_usage_async (GFile = *file, -=20 - task =3D g_task_new (file, cancellable, callback, user_data); - g_task_set_source_tag (task, g_file_real_measure_disk_usage_async); -- g_task_set_task_data (task, g_memdup (&data, sizeof data), g_free); -+ g_task_set_task_data (task, g_memdup2 (&data, sizeof data), g_free); - g_task_set_priority (task, io_priority); -=20 - g_task_run_in_thread (task, measure_disk_usage_thread); -diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c -index 3a60b8c64..dded9b1ca 100644 ---- a/gio/gsettingsschema.c -+++ b/gio/gsettingsschema.c -@@ -20,6 +20,7 @@ -=20 - #include "gsettingsschema-internal.h" - #include "gsettings.h" -+#include "gstrfuncsprivate.h" -=20 - #include "gvdb/gvdb-reader.h" - #include "strinfo.c" -@@ -1058,9 +1059,9 @@ g_settings_schema_list_children (GSettingsSchema *= schema) -=20 - if (g_str_has_suffix (key, "/")) - { -- gint length =3D strlen (key); -+ gsize length =3D strlen (key); -=20 -- strv[j] =3D g_memdup (key, length); -+ strv[j] =3D g_memdup2 (key, length); - strv[j][length - 1] =3D '\0'; - j++; - } -diff --git a/gio/gwin32registrykey.c b/gio/gwin32registrykey.c -index c19fede4e..619fd48af 100644 ---- a/gio/gwin32registrykey.c -+++ b/gio/gwin32registrykey.c -@@ -28,6 +28,8 @@ - #include - #include -=20 -+#include "gstrfuncsprivate.h" -+ - #ifndef _WDMDDK_ - typedef enum _KEY_INFORMATION_CLASS { - KeyBasicInformation, -@@ -247,7 +249,7 @@ g_win32_registry_value_iter_copy (const GWin32Regist= ryValueIter *iter) - new_iter->value_name_size =3D iter->value_name_size; -=20 - if (iter->value_data !=3D NULL) -- new_iter->value_data =3D g_memdup (iter->value_data, iter->value_da= ta_size); -+ new_iter->value_data =3D g_memdup2 (iter->value_data, iter->value_d= ata_size); -=20 - new_iter->value_data_size =3D iter->value_data_size; -=20 -@@ -268,8 +270,8 @@ g_win32_registry_value_iter_copy (const GWin32Regist= ryValueIter *iter) - new_iter->value_data_expanded_charsize =3D iter->value_data_expanded_= charsize; -=20 - if (iter->value_data_expanded_u8 !=3D NULL) -- new_iter->value_data_expanded_u8 =3D g_memdup (iter->value_data_exp= anded_u8, -- iter->value_data_expan= ded_charsize); -+ new_iter->value_data_expanded_u8 =3D g_memdup2 (iter->value_data_ex= panded_u8, -+ iter->value_data_expa= nded_charsize); -=20 - new_iter->value_data_expanded_u8_size =3D iter->value_data_expanded_c= harsize; -=20 -diff --git a/gio/tests/async-close-output-stream.c b/gio/tests/async-clo= se-output-stream.c -index 5f6620275..d3f97a119 100644 ---- a/gio/tests/async-close-output-stream.c -+++ b/gio/tests/async-close-output-stream.c -@@ -24,6 +24,8 @@ - #include - #include -=20 -+#include "gstrfuncsprivate.h" -+ - #define DATA_TO_WRITE "Hello world\n" -=20 - typedef struct -@@ -147,9 +149,9 @@ prepare_data (SetupData *data, -=20 - data->expected_size =3D g_memory_output_stream_get_data_size (G_MEMOR= Y_OUTPUT_STREAM (data->data_stream)); -=20 -- g_assert_cmpint (data->expected_size, >, 0); -+ g_assert_cmpuint (data->expected_size, >, 0); -=20 -- data->expected_output =3D g_memdup (written, (guint)data->expected_si= ze); -+ data->expected_output =3D g_memdup2 (written, data->expected_size); -=20 - /* then recreate the streams and prepare them for the asynchronous cl= ose */ - destroy_streams (data); -diff --git a/gio/tests/gdbus-export.c b/gio/tests/gdbus-export.c -index 506c7458a..5513306f8 100644 ---- a/gio/tests/gdbus-export.c -+++ b/gio/tests/gdbus-export.c -@@ -23,6 +23,7 @@ - #include -=20 - #include "gdbus-tests.h" -+#include "gstrfuncsprivate.h" -=20 - /* all tests rely on a shared mainloop */ - static GMainLoop *loop =3D NULL; -@@ -671,7 +672,7 @@ subtree_introspect (GDBusConnection *connectio= n, - g_assert_not_reached (); - } -=20 -- return g_memdup (interfaces, 2 * sizeof (void *)); -+ return g_memdup2 (interfaces, 2 * sizeof (void *)); - } -=20 - static const GDBusInterfaceVTable * -@@ -727,7 +728,7 @@ dynamic_subtree_introspect (GDBusConnection *c= onnection, - { - const GDBusInterfaceInfo *interfaces[2] =3D { &dyna_interface_info, N= ULL }; -=20 -- return g_memdup (interfaces, 2 * sizeof (void *)); -+ return g_memdup2 (interfaces, 2 * sizeof (void *)); - } -=20 - static const GDBusInterfaceVTable * -diff --git a/gio/win32/gwinhttpfile.c b/gio/win32/gwinhttpfile.c -index cf5eed31d..040ee8564 100644 ---- a/gio/win32/gwinhttpfile.c -+++ b/gio/win32/gwinhttpfile.c -@@ -29,6 +29,7 @@ - #include "gio/gfile.h" - #include "gio/gfileattribute.h" - #include "gio/gfileinfo.h" -+#include "gstrfuncsprivate.h" - #include "gwinhttpfile.h" - #include "gwinhttpfileinputstream.h" - #include "gwinhttpfileoutputstream.h" -@@ -393,10 +394,10 @@ g_winhttp_file_resolve_relative_path (GFile *= file, - child =3D g_object_new (G_TYPE_WINHTTP_FILE, NULL); - child->vfs =3D winhttp_file->vfs; - child->url =3D winhttp_file->url; -- child->url.lpszScheme =3D g_memdup (winhttp_file->url.lpszScheme, (wi= nhttp_file->url.dwSchemeLength+1)*2); -- child->url.lpszHostName =3D g_memdup (winhttp_file->url.lpszHostName,= (winhttp_file->url.dwHostNameLength+1)*2); -- child->url.lpszUserName =3D g_memdup (winhttp_file->url.lpszUserName,= (winhttp_file->url.dwUserNameLength+1)*2); -- child->url.lpszPassword =3D g_memdup (winhttp_file->url.lpszPassword,= (winhttp_file->url.dwPasswordLength+1)*2); -+ child->url.lpszScheme =3D g_memdup2 (winhttp_file->url.lpszScheme, (w= inhttp_file->url.dwSchemeLength+1)*2); -+ child->url.lpszHostName =3D g_memdup2 (winhttp_file->url.lpszHostName= , (winhttp_file->url.dwHostNameLength+1)*2); -+ child->url.lpszUserName =3D g_memdup2 (winhttp_file->url.lpszUserName= , (winhttp_file->url.dwUserNameLength+1)*2); -+ child->url.lpszPassword =3D g_memdup2 (winhttp_file->url.lpszPassword= , (winhttp_file->url.dwPasswordLength+1)*2); - child->url.lpszUrlPath =3D wnew_path; - child->url.dwUrlPathLength =3D wcslen (wnew_path); - child->url.lpszExtraInfo =3D NULL; ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-03.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-03.patch deleted file mode 100644 index 99e849c43c..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-03.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 6110caea45b235420b98cd41d845cc92238f6781 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 13:39:25 +0000 -Subject: [PATCH 03/11] gobject: Use g_memdup2() instead of g_memdup() in= - obvious places -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -Convert all the call sites which use `g_memdup()`=E2=80=99s length argum= ent -trivially (for example, by passing a `sizeof()`), so that they use -`g_memdup2()` instead. - -In almost all of these cases the use of `g_memdup()` would not have -caused problems, but it will soon be deprecated, so best port away from -it. - -Signed-off-by: Philip Withnall -Helps: #2319 ---- - gobject/gsignal.c | 3 ++- - gobject/gtype.c | 9 +++++---- - gobject/gtypemodule.c | 3 ++- - gobject/tests/param.c | 4 +++- - 4 files changed, 12 insertions(+), 7 deletions(-) - -diff --git a/gobject/gsignal.c b/gobject/gsignal.c -index 77d8f211e..41c54ab57 100644 ---- a/gobject/gsignal.c -+++ b/gobject/gsignal.c -@@ -28,6 +28,7 @@ - #include -=20 - #include "gsignal.h" -+#include "gstrfuncsprivate.h" - #include "gtype-private.h" - #include "gbsearcharray.h" - #include "gvaluecollector.h" -@@ -1730,7 +1731,7 @@ g_signal_newv (const gchar *signal_name, - node->single_va_closure_is_valid =3D FALSE; - node->flags =3D signal_flags & G_SIGNAL_FLAGS_MASK; - node->n_params =3D n_params; -- node->param_types =3D g_memdup (param_types, sizeof (GType) * n_param= s); -+ node->param_types =3D g_memdup2 (param_types, sizeof (GType) * n_para= ms); - node->return_type =3D return_type; - node->class_closure_bsa =3D NULL; - if (accumulator) -diff --git a/gobject/gtype.c b/gobject/gtype.c -index 7d3789400..8441b90e9 100644 ---- a/gobject/gtype.c -+++ b/gobject/gtype.c -@@ -33,6 +33,7 @@ -=20 - #include "glib-private.h" - #include "gconstructor.h" -+#include "gstrfuncsprivate.h" -=20 - #ifdef G_OS_WIN32 - #include -@@ -1470,7 +1471,7 @@ type_add_interface_Wm (TypeNode *node,= - iholder->next =3D iface_node_get_holders_L (iface); - iface_node_set_holders_W (iface, iholder); - iholder->instance_type =3D NODE_TYPE (node); -- iholder->info =3D info ? g_memdup (info, sizeof (*info)) : NULL; -+ iholder->info =3D info ? g_memdup2 (info, sizeof (*info)) : NULL; - iholder->plugin =3D plugin; -=20 - /* create an iface entry for this type */ -@@ -1731,7 +1732,7 @@ type_iface_retrieve_holder_info_Wm (TypeNode *ifac= e, - INVALID_RECURSION ("g_type_plugin_*", iholder->plugin, NODE_NAM= E (iface)); - =20 - check_interface_info_I (iface, instance_type, &tmp_info); -- iholder->info =3D g_memdup (&tmp_info, sizeof (tmp_info)); -+ iholder->info =3D g_memdup2 (&tmp_info, sizeof (tmp_info)); - } - =20 - return iholder; /* we don't modify write lock upon returning NULL */ -@@ -2016,10 +2017,10 @@ type_iface_vtable_base_init_Wm (TypeNode *iface,= - IFaceEntry *pentry =3D type_lookup_iface_entry_L (pnode, iface); - =20 - if (pentry) -- vtable =3D g_memdup (pentry->vtable, iface->data->iface.vtable_size); -+ vtable =3D g_memdup2 (pentry->vtable, iface->data->iface.vtable_size);= - } - if (!vtable) -- vtable =3D g_memdup (iface->data->iface.dflt_vtable, iface->data->i= face.vtable_size); -+ vtable =3D g_memdup2 (iface->data->iface.dflt_vtable, iface->data->= iface.vtable_size); - entry->vtable =3D vtable; - vtable->g_type =3D NODE_TYPE (iface); - vtable->g_instance_type =3D NODE_TYPE (node); -diff --git a/gobject/gtypemodule.c b/gobject/gtypemodule.c -index 4ecaf8c88..20911fafd 100644 ---- a/gobject/gtypemodule.c -+++ b/gobject/gtypemodule.c -@@ -19,6 +19,7 @@ -=20 - #include -=20 -+#include "gstrfuncsprivate.h" - #include "gtypeplugin.h" - #include "gtypemodule.h" -=20 -@@ -436,7 +437,7 @@ g_type_module_register_type (GTypeModule *module= , - module_type_info->loaded =3D TRUE; - module_type_info->info =3D *type_info; - if (type_info->value_table) -- module_type_info->info.value_table =3D g_memdup (type_info->value_t= able, -+ module_type_info->info.value_table =3D g_memdup2 (type_info->value_= table, - sizeof (GTypeValueTable)); -=20 - return module_type_info->type; -diff --git a/gobject/tests/param.c b/gobject/tests/param.c -index 758289bf8..971cff162 100644 ---- a/gobject/tests/param.c -+++ b/gobject/tests/param.c -@@ -2,6 +2,8 @@ - #include - #include -=20 -+#include "gstrfuncsprivate.h" -+ - static void - test_param_value (void) - { -@@ -851,7 +853,7 @@ main (int argc, char *argv[]) - test_path =3D g_strdup_printf ("/param/implement/subprocess= /%d-%d-%d-%d", - data.change_this_flag, data.ch= ange_this_type, - data.use_this_flag, data.use_t= his_type); -- test_data =3D g_memdup (&data, sizeof (TestParamImplementDa= ta)); -+ test_data =3D g_memdup2 (&data, sizeof (TestParamImplementD= ata)); - g_test_add_data_func_full (test_path, test_data, test_param= _implement_child, g_free); - g_free (test_path); - } ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-04.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-04.patch deleted file mode 100644 index 3ae01f34b1..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-04.patch +++ /dev/null @@ -1,308 +0,0 @@ -Backport of: - -From 0736b7c1e7cf4232c5d7eb2b0fbfe9be81bd3baa Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 13:41:21 +0000 -Subject: [PATCH 04/11] glib: Use g_memdup2() instead of g_memdup() in ob= vious - places -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -Convert all the call sites which use `g_memdup()`=E2=80=99s length argum= ent -trivially (for example, by passing a `sizeof()` or an existing `gsize` -variable), so that they use `g_memdup2()` instead. - -In almost all of these cases the use of `g_memdup()` would not have -caused problems, but it will soon be deprecated, so best port away from -it - -In particular, this fixes an overflow within `g_bytes_new()`, identified= -as GHSL-2021-045 by GHSL team member Kevin Backhouse. - -Signed-off-by: Philip Withnall -Fixes: GHSL-2021-045 -Helps: #2319 ---- - glib/gbytes.c | 6 ++++-- - glib/gdir.c | 3 ++- - glib/ghash.c | 7 ++++--- - glib/giochannel.c | 3 ++- - glib/gslice.c | 3 ++- - glib/gtestutils.c | 3 ++- - glib/gvariant.c | 7 ++++--- - glib/gvarianttype.c | 3 ++- - glib/tests/array-test.c | 4 +++- - glib/tests/option-context.c | 6 ++++-- - 10 files changed, 29 insertions(+), 16 deletions(-) - -diff --git a/glib/gbytes.c b/glib/gbytes.c -index d56abe6c3..dee494820 100644 ---- a/glib/gbytes.c -+++ b/glib/gbytes.c -@@ -34,6 +34,8 @@ -=20 - #include -=20 -+#include "gstrfuncsprivate.h" -+ - /** - * GBytes: - * -@@ -95,7 +97,7 @@ g_bytes_new (gconstpointer data, - { - g_return_val_if_fail (data !=3D NULL || size =3D=3D 0, NULL); -=20 -- return g_bytes_new_take (g_memdup (data, size), size); -+ return g_bytes_new_take (g_memdup2 (data, size), size); - } -=20 - /** -@@ -499,7 +501,7 @@ g_bytes_unref_to_data (GBytes *bytes, - * Copy: Non g_malloc (or compatible) allocator, or static memory= , - * so we have to copy, and then unref. - */ -- result =3D g_memdup (bytes->data, bytes->size); -+ result =3D g_memdup2 (bytes->data, bytes->size); - *size =3D bytes->size; - g_bytes_unref (bytes); - } -diff --git a/glib/gdir.c b/glib/gdir.c -index 6b85e99c8..6747a8c6f 100644 ---- a/glib/gdir.c -+++ b/glib/gdir.c -@@ -37,6 +37,7 @@ - #include "gconvert.h" - #include "gfileutils.h" - #include "gstrfuncs.h" -+#include "gstrfuncsprivate.h" - #include "gtestutils.h" - #include "glibintl.h" -=20 -@@ -112,7 +113,7 @@ g_dir_open_with_errno (const gchar *path, - return NULL; - #endif -=20 -- return g_memdup (&dir, sizeof dir); -+ return g_memdup2 (&dir, sizeof dir); - } -=20 - /** -diff --git a/glib/ghash.c b/glib/ghash.c -index e61b03788..26f26062b 100644 ---- a/glib/ghash.c -+++ b/glib/ghash.c -@@ -34,6 +34,7 @@ - #include "gmacros.h" - #include "glib-private.h" - #include "gstrfuncs.h" -+#include "gstrfuncsprivate.h" - #include "gatomic.h" - #include "gtestutils.h" - #include "gslice.h" -@@ -964,7 +965,7 @@ g_hash_table_ensure_keyval_fits (GHashTable *hash_ta= ble, gpointer key, gpointer - if (hash_table->have_big_keys) - { - if (key !=3D value) -- hash_table->values =3D g_memdup (hash_table->keys, sizeof (= gpointer) * hash_table->size); -+ hash_table->values =3D g_memdup2 (hash_table->keys, sizeof = (gpointer) * hash_table->size); - /* Keys and values are both big now, so no need for further c= hecks */ - return; - } -@@ -972,7 +973,7 @@ g_hash_table_ensure_keyval_fits (GHashTable *hash_ta= ble, gpointer key, gpointer - { - if (key !=3D value) - { -- hash_table->values =3D g_memdup (hash_table->keys, sizeof= (guint) * hash_table->size); -+ hash_table->values =3D g_memdup2 (hash_table->keys, sizeo= f (guint) * hash_table->size); - is_a_set =3D FALSE; - } - } -@@ -1000,7 +1001,7 @@ g_hash_table_ensure_keyval_fits (GHashTable *hash_= table, gpointer key, gpointer -=20 - /* Just split if necessary */ - if (is_a_set && key !=3D value) -- hash_table->values =3D g_memdup (hash_table->keys, sizeof (gpointer= ) * hash_table->size); -+ hash_table->values =3D g_memdup2 (hash_table->keys, sizeof (gpointe= r) * hash_table->size); -=20 - #endif - } -diff --git a/glib/giochannel.c b/glib/giochannel.c -index 1956e9dc6..15927c391 100644 ---- a/glib/giochannel.c -+++ b/glib/giochannel.c -@@ -37,6 +37,7 @@ - #include "giochannel.h" -=20 - #include "gstrfuncs.h" -+#include "gstrfuncsprivate.h" - #include "gtestutils.h" - #include "glibintl.h" -=20 -@@ -892,7 +893,7 @@ g_io_channel_set_line_term (GIOChannel *channel, - length =3D strlen (line_term); -=20 - g_free (channel->line_term); -- channel->line_term =3D line_term ? g_memdup (line_term, length) : NUL= L; -+ channel->line_term =3D line_term ? g_memdup2 (line_term, length) : NU= LL; - channel->line_term_len =3D length; - } -=20 -diff --git a/glib/gslice.c b/glib/gslice.c -index 4c758c3be..bcdbb8853 100644 ---- a/glib/gslice.c -+++ b/glib/gslice.c -@@ -41,6 +41,7 @@ - #include "gmain.h" - #include "gmem.h" /* gslice.h */ - #include "gstrfuncs.h" -+#include "gstrfuncsprivate.h" - #include "gutils.h" - #include "gtrashstack.h" - #include "gtestutils.h" -@@ -350,7 +351,7 @@ g_slice_get_config_state (GSliceConfig ckey, - array[i++] =3D allocator->contention_counters[address]; - array[i++] =3D allocator_get_magazine_threshold (allocator, addre= ss); - *n_values =3D i; -- return g_memdup (array, sizeof (array[0]) * *n_values); -+ return g_memdup2 (array, sizeof (array[0]) * *n_values); - default: - return NULL; - } -diff --git a/glib/gtestutils.c b/glib/gtestutils.c -index dd789482f..5887ecc36 100644 ---- a/glib/gtestutils.c -+++ b/glib/gtestutils.c -@@ -49,6 +49,7 @@ - #include "gpattern.h" - #include "grand.h" - #include "gstrfuncs.h" -+#include "gstrfuncsprivate.h" - #include "gtimer.h" - #include "gslice.h" - #include "gspawn.h" -@@ -3798,7 +3799,7 @@ g_test_log_extract (GTestLogBuffer *tbuffer) - if (p <=3D tbuffer->data->str + mlength) - { - g_string_erase (tbuffer->data, 0, mlength); -- tbuffer->msgs =3D g_slist_prepend (tbuffer->msgs, g_memdup (&= msg, sizeof (msg))); -+ tbuffer->msgs =3D g_slist_prepend (tbuffer->msgs, g_memdup2 (= &msg, sizeof (msg))); - return TRUE; - } -=20 -diff --git a/glib/gvariant.c b/glib/gvariant.c -index b61bf7278..d6f68a9ea 100644 ---- a/glib/gvariant.c -+++ b/glib/gvariant.c -@@ -33,6 +33,7 @@ -=20 - #include -=20 -+#include "gstrfuncsprivate.h" -=20 - /** - * SECTION:gvariant -@@ -725,7 +726,7 @@ g_variant_new_variant (GVariant *value) - g_variant_ref_sink (value); -=20 - return g_variant_new_from_children (G_VARIANT_TYPE_VARIANT, -- g_memdup (&value, sizeof value), -+ g_memdup2 (&value, sizeof value),= - 1, g_variant_is_trusted (value));= - } -=20 -@@ -1229,7 +1230,7 @@ g_variant_new_fixed_array (const GVariantType *el= ement_type, - return NULL; - } -=20 -- data =3D g_memdup (elements, n_elements * element_size); -+ data =3D g_memdup2 (elements, n_elements * element_size); - value =3D g_variant_new_from_data (array_type, data, - n_elements * element_size, - FALSE, g_free, data); -@@ -1908,7 +1909,7 @@ g_variant_dup_bytestring (GVariant *value, - if (length) - *length =3D size; -=20 -- return g_memdup (original, size + 1); -+ return g_memdup2 (original, size + 1); - } -=20 - /** -diff --git a/glib/gvarianttype.c b/glib/gvarianttype.c -index 1a228f73b..07659ff12 100644 ---- a/glib/gvarianttype.c -+++ b/glib/gvarianttype.c -@@ -28,6 +28,7 @@ -=20 - #include -=20 -+#include "gstrfuncsprivate.h" -=20 - /** - * SECTION:gvarianttype -@@ -1181,7 +1182,7 @@ g_variant_type_new_tuple (const GVariantType * con= st *items, - g_assert (offset < sizeof buffer); - buffer[offset++] =3D ')'; -=20 -- return (GVariantType *) g_memdup (buffer, offset); -+ return (GVariantType *) g_memdup2 (buffer, offset); - } -=20 - /** -diff --git a/glib/tests/array-test.c b/glib/tests/array-test.c -index 3fcf1136a..11982f822 100644 ---- a/glib/tests/array-test.c -+++ b/glib/tests/array-test.c -@@ -29,6 +29,8 @@ - #include - #include "glib.h" -=20 -+#include "gstrfuncsprivate.h" -+ - /* Test data to be passed to any function which calls g_array_new(), pr= oviding - * the parameters for that call. Most #GArray tests should be repeated = for all - * possible values of #ArrayTestData. */ -@@ -1642,7 +1644,7 @@ byte_array_new_take (void) - GByteArray *gbarray; - guint8 *data; -=20 -- data =3D g_memdup ("woooweeewow", 11); -+ data =3D g_memdup2 ("woooweeewow", 11); - gbarray =3D g_byte_array_new_take (data, 11); - g_assert (gbarray->data =3D=3D data); - g_assert_cmpuint (gbarray->len, =3D=3D, 11); -diff --git a/glib/tests/option-context.c b/glib/tests/option-context.c -index 149d22353..88d2b80d1 100644 ---- a/glib/tests/option-context.c -+++ b/glib/tests/option-context.c -@@ -27,6 +27,8 @@ - #include - #include -=20 -+#include "gstrfuncsprivate.h" -+ - static GOptionEntry main_entries[] =3D { - { "main-switch", 0, 0, - G_OPTION_ARG_NONE, NULL, -@@ -256,7 +258,7 @@ join_stringv (int argc, char **argv) - static char ** - copy_stringv (char **argv, int argc) - { -- return g_memdup (argv, sizeof (char *) * (argc + 1)); -+ return g_memdup2 (argv, sizeof (char *) * (argc + 1)); - } -=20 - static void -@@ -2323,7 +2325,7 @@ test_group_parse (void) - g_option_context_add_group (context, group); -=20 - argv =3D split_string ("program --test arg1 -f arg2 --group-test arg3= --frob arg4 -z arg5", &argc); -- orig_argv =3D g_memdup (argv, (argc + 1) * sizeof (char *)); -+ orig_argv =3D g_memdup2 (argv, (argc + 1) * sizeof (char *)); -=20 - retval =3D g_option_context_parse (context, &argc, &argv, &error); -=20 ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-05.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-05.patch deleted file mode 100644 index 62bce1b188..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-05.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0cbad673215ec8a049b7fe2ff44b0beed31b376e Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 16:12:24 +0000 -Subject: [PATCH 05/11] gwinhttpfile: Avoid arithmetic overflow when - calculating a size -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -The members of `URL_COMPONENTS` (`winhttp_file->url`) are `DWORD`s, i.e.= -32-bit unsigned integers. Adding to and multiplying them may cause them -to overflow the unsigned integer bounds, even if the result is passed to= -`g_memdup2()` which accepts a `gsize`. - -Cast the `URL_COMPONENTS` members to `gsize` first to ensure that the -arithmetic is done in terms of `gsize`s rather than unsigned integers. - -Spotted by Sebastian Dr=C3=B6ge. - -Signed-off-by: Philip Withnall -Helps: #2319 ---- - gio/win32/gwinhttpfile.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/gio/win32/gwinhttpfile.c b/gio/win32/gwinhttpfile.c -index 040ee8564..246ec0578 100644 ---- a/gio/win32/gwinhttpfile.c -+++ b/gio/win32/gwinhttpfile.c -@@ -394,10 +394,10 @@ g_winhttp_file_resolve_relative_path (GFile *= file, - child =3D g_object_new (G_TYPE_WINHTTP_FILE, NULL); - child->vfs =3D winhttp_file->vfs; - child->url =3D winhttp_file->url; -- child->url.lpszScheme =3D g_memdup2 (winhttp_file->url.lpszScheme, (w= inhttp_file->url.dwSchemeLength+1)*2); -- child->url.lpszHostName =3D g_memdup2 (winhttp_file->url.lpszHostName= , (winhttp_file->url.dwHostNameLength+1)*2); -- child->url.lpszUserName =3D g_memdup2 (winhttp_file->url.lpszUserName= , (winhttp_file->url.dwUserNameLength+1)*2); -- child->url.lpszPassword =3D g_memdup2 (winhttp_file->url.lpszPassword= , (winhttp_file->url.dwPasswordLength+1)*2); -+ child->url.lpszScheme =3D g_memdup2 (winhttp_file->url.lpszScheme, ((= gsize) winhttp_file->url.dwSchemeLength + 1) * 2); -+ child->url.lpszHostName =3D g_memdup2 (winhttp_file->url.lpszHostName= , ((gsize) winhttp_file->url.dwHostNameLength + 1) * 2); -+ child->url.lpszUserName =3D g_memdup2 (winhttp_file->url.lpszUserName= , ((gsize) winhttp_file->url.dwUserNameLength + 1) * 2); -+ child->url.lpszPassword =3D g_memdup2 (winhttp_file->url.lpszPassword= , ((gsize) winhttp_file->url.dwPasswordLength + 1) * 2); - child->url.lpszUrlPath =3D wnew_path; - child->url.dwUrlPathLength =3D wcslen (wnew_path); - child->url.lpszExtraInfo =3D NULL; ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-06.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-06.patch deleted file mode 100644 index 4e2435f5fd..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-06.patch +++ /dev/null @@ -1,94 +0,0 @@ -From f9ee2275cbc312c0b4cdbc338a4fbb76eb36fb9a Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 13:49:00 +0000 -Subject: [PATCH 06/11] gdatainputstream: Handle stop_chars_len internall= y as - gsize - -Previously it was handled as a `gssize`, which meant that if the -`stop_chars` string was longer than `G_MAXSSIZE` there would be an -overflow. - -Signed-off-by: Philip Withnall -Helps: #2319 ---- - gio/gdatainputstream.c | 25 +++++++++++++++++-------- - 1 file changed, 17 insertions(+), 8 deletions(-) - -diff --git a/gio/gdatainputstream.c b/gio/gdatainputstream.c -index 2e7750cb5..2cdcbda19 100644 ---- a/gio/gdatainputstream.c -+++ b/gio/gdatainputstream.c -@@ -27,6 +27,7 @@ - #include "gioenumtypes.h" - #include "gioerror.h" - #include "glibintl.h" -+#include "gstrfuncsprivate.h" -=20 - #include -=20 -@@ -856,7 +857,7 @@ static gssize - scan_for_chars (GDataInputStream *stream, - gsize *checked_out, - const char *stop_chars, -- gssize stop_chars_len) -+ gsize stop_chars_len) - { - GBufferedInputStream *bstream; - const char *buffer; -@@ -952,7 +953,7 @@ typedef struct - gsize checked; -=20 - gchar *stop_chars; -- gssize stop_chars_len; -+ gsize stop_chars_len; - gsize length; - } GDataInputStreamReadData; -=20 -@@ -1078,12 +1079,17 @@ g_data_input_stream_read_async (GDataInputStream= *stream, - { - GDataInputStreamReadData *data; - GTask *task; -+ gsize stop_chars_len_unsigned; -=20 - data =3D g_slice_new0 (GDataInputStreamReadData); -- if (stop_chars_len =3D=3D -1) -- stop_chars_len =3D strlen (stop_chars); -- data->stop_chars =3D g_memdup (stop_chars, stop_chars_len); -- data->stop_chars_len =3D stop_chars_len; -+ -+ if (stop_chars_len < 0) -+ stop_chars_len_unsigned =3D strlen (stop_chars); -+ else -+ stop_chars_len_unsigned =3D (gsize) stop_chars_len; -+ -+ data->stop_chars =3D g_memdup2 (stop_chars, stop_chars_len_unsigned);= -+ data->stop_chars_len =3D stop_chars_len_unsigned; - data->last_saw_cr =3D FALSE; -=20 - task =3D g_task_new (stream, cancellable, callback, user_data); -@@ -1338,17 +1344,20 @@ g_data_input_stream_read_upto (GDataInputStream = *stream, - gssize found_pos; - gssize res; - char *data_until; -+ gsize stop_chars_len_unsigned; -=20 - g_return_val_if_fail (G_IS_DATA_INPUT_STREAM (stream), NULL); -=20 - if (stop_chars_len < 0) -- stop_chars_len =3D strlen (stop_chars); -+ stop_chars_len_unsigned =3D strlen (stop_chars); -+ else -+ stop_chars_len_unsigned =3D (gsize) stop_chars_len; -=20 - bstream =3D G_BUFFERED_INPUT_STREAM (stream); -=20 - checked =3D 0; -=20 -- while ((found_pos =3D scan_for_chars (stream, &checked, stop_chars, s= top_chars_len)) =3D=3D -1) -+ while ((found_pos =3D scan_for_chars (stream, &checked, stop_chars, s= top_chars_len_unsigned)) =3D=3D -1) - { - if (g_buffered_input_stream_get_available (bstream) =3D=3D - g_buffered_input_stream_get_buffer_size (bstream)) ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-07.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-07.patch deleted file mode 100644 index dad3d285f4..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-07.patch +++ /dev/null @@ -1,118 +0,0 @@ -Backport of: - -From 2aaf593a9eb96d84fe3be740aca2810a97d95592 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 13:50:37 +0000 -Subject: [PATCH 07/11] gwin32: Use gsize internally in g_wcsdup() -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -This allows it to handle strings up to length `G_MAXSIZE` =E2=80=94 prev= iously -it would overflow with such strings. - -Update the several copies of it identically. - -Signed-off-by: Philip Withnall -Helps: #2319 ---- - gio/gwin32appinfo.c | 33 ++++++++++++++++++++++++++------- - gio/gwin32registrykey.c | 34 ++++++++++++++++++++++++++-------- - 2 files changed, 52 insertions(+), 15 deletions(-) - -diff --git a/gio/gwin32appinfo.c b/gio/gwin32appinfo.c -index 9f335b370..dd7a96a4a 100644 ---- a/gio/gwin32appinfo.c -+++ b/gio/gwin32appinfo.c -@@ -464,15 +464,34 @@ static GWin32RegistryKey *applications_key; - /* Watch this key */ - static GWin32RegistryKey *classes_root_key; -=20 -+static gsize -+g_utf16_len (const gunichar2 *str) -+{ -+ gsize result; -+ -+ for (result =3D 0; str[0] !=3D 0; str++, result++) -+ ; -+ -+ return result; -+} -+ - static gunichar2 * --g_wcsdup (const gunichar2 *str, gssize str_size) -+g_wcsdup (const gunichar2 *str, gssize str_len) - { -- if (str_size =3D=3D -1) -- { -- str_size =3D wcslen (str) + 1; -- str_size *=3D sizeof (gunichar2); -- } -- return g_memdup (str, str_size); -+ gsize str_len_unsigned; -+ gsize str_size; -+ -+ g_return_val_if_fail (str !=3D NULL, NULL); -+ -+ if (str_len < 0) -+ str_len_unsigned =3D g_utf16_len (str); -+ else -+ str_len_unsigned =3D (gsize) str_len; -+ -+ g_assert (str_len_unsigned <=3D G_MAXSIZE / sizeof (gunichar2) - 1); -+ str_size =3D (str_len_unsigned + 1) * sizeof (gunichar2); -+ -+ return g_memdup2 (str, str_size); - } -=20 - #define URL_ASSOCIATIONS L"HKEY_CURRENT_USER\\Software\\Microsoft\\Wind= ows\\Shell\\Associations\\UrlAssociations\\" -diff --git a/gio/gwin32registrykey.c b/gio/gwin32registrykey.c -index 619fd48af..fbd65311a 100644 ---- a/gio/gwin32registrykey.c -+++ b/gio/gwin32registrykey.c -@@ -127,16 +127,34 @@ typedef enum - G_WIN32_REGISTRY_UPDATED_PATH =3D 1, - } GWin32RegistryKeyUpdateFlag; -=20 -+static gsize -+g_utf16_len (const gunichar2 *str) -+{ -+ gsize result; -+ -+ for (result =3D 0; str[0] !=3D 0; str++, result++) -+ ; -+ -+ return result; -+} -+ - static gunichar2 * --g_wcsdup (const gunichar2 *str, -- gssize str_size) -+g_wcsdup (const gunichar2 *str, gssize str_len) - { -- if (str_size =3D=3D -1) -- { -- str_size =3D wcslen (str) + 1; -- str_size *=3D sizeof (gunichar2); -- } -- return g_memdup (str, str_size); -+ gsize str_len_unsigned; -+ gsize str_size; -+ -+ g_return_val_if_fail (str !=3D NULL, NULL); -+ -+ if (str_len < 0) -+ str_len_unsigned =3D g_utf16_len (str); -+ else -+ str_len_unsigned =3D (gsize) str_len; -+ -+ g_assert (str_len_unsigned <=3D G_MAXSIZE / sizeof (gunichar2) - 1); -+ str_size =3D (str_len_unsigned + 1) * sizeof (gunichar2); -+ -+ return g_memdup2 (str, str_size); - } -=20 - /** ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-08.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-08.patch deleted file mode 100644 index 2c021ad317..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-08.patch +++ /dev/null @@ -1,94 +0,0 @@ -From ba8ca443051f93a74c0d03d62e70402036f967a5 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 13:58:32 +0000 -Subject: [PATCH 08/11] gkeyfilesettingsbackend: Handle long keys when - converting paths - -Previously, the code in `convert_path()` could not handle keys longer -than `G_MAXINT`, and would overflow if that was exceeded. - -Convert the code to use `gsize` and `g_memdup2()` throughout, and -change from identifying the position of the final slash in the string -using a signed offset `i`, to using a pointer to the character (and -`strrchr()`). This allows the slash to be at any position in a -`G_MAXSIZE`-long string, without sacrificing a bit of the offset for -indicating whether a slash was found. - -Signed-off-by: Philip Withnall -Helps: #2319 ---- - gio/gkeyfilesettingsbackend.c | 21 ++++++++++----------- - 1 file changed, 10 insertions(+), 11 deletions(-) - -diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend= =2Ec -index cd5765afd..25b057672 100644 ---- a/gio/gkeyfilesettingsbackend.c -+++ b/gio/gkeyfilesettingsbackend.c -@@ -33,6 +33,7 @@ - #include "gfilemonitor.h" - #include "gsimplepermission.h" - #include "gsettingsbackendinternal.h" -+#include "gstrfuncsprivate.h" - #include "giomodule-priv.h" - #include "gportalsupport.h" -=20 -@@ -145,8 +146,8 @@ convert_path (GKeyfileSettingsBackend *kfsb, - gchar **group, - gchar **basename) - { -- gint key_len =3D strlen (key); -- gint i; -+ gsize key_len =3D strlen (key); -+ const gchar *last_slash; -=20 - if (key_len < kfsb->prefix_len || - memcmp (key, kfsb->prefix, kfsb->prefix_len) !=3D 0) -@@ -155,38 +156,36 @@ convert_path (GKeyfileSettingsBackend *kfsb, - key_len -=3D kfsb->prefix_len; - key +=3D kfsb->prefix_len; -=20 -- for (i =3D key_len; i >=3D 0; i--) -- if (key[i] =3D=3D '/') -- break; -+ last_slash =3D strrchr (key, '/'); -=20 - if (kfsb->root_group) - { - /* if a root_group was specified, make sure the user hasn't given= - * a path that ghosts that group name - */ -- if (i =3D=3D kfsb->root_group_len && memcmp (key, kfsb->root_grou= p, i) =3D=3D 0) -+ if (last_slash !=3D NULL && (last_slash - key) =3D=3D kfsb->root_= group_len && memcmp (key, kfsb->root_group, last_slash - key) =3D=3D 0) - return FALSE; - } - else - { - /* if no root_group was given, ensure that the user gave a path *= / -- if (i =3D=3D -1) -+ if (last_slash =3D=3D NULL) - return FALSE; - } -=20 - if (group) - { -- if (i >=3D 0) -+ if (last_slash !=3D NULL) - { -- *group =3D g_memdup (key, i + 1); -- (*group)[i] =3D '\0'; -+ *group =3D g_memdup2 (key, (last_slash - key) + 1); -+ (*group)[(last_slash - key)] =3D '\0'; - } - else - *group =3D g_strdup (kfsb->root_group); - } -=20 - if (basename) -- *basename =3D g_memdup (key + i + 1, key_len - i); -+ *basename =3D g_memdup2 (last_slash + 1, key_len - (last_slash - ke= y)); -=20 - return TRUE; - } ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-09.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-09.patch deleted file mode 100644 index 4de0c1b349..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-09.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 65ec7f4d6e8832c481f6e00e2eb007b9a60024ce Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 14:00:53 +0000 -Subject: [PATCH 09/11] gsocket: Use gsize to track native sockaddr's siz= e -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -Don=E2=80=99t use an `int`, that=E2=80=99s potentially too small. In pra= ctical terms, -this is not a problem, since no socket address is going to be that big. - -By making these changes we can use `g_memdup2()` without warnings, -though. Fewer warnings is good. - -Signed-off-by: Philip Withnall -Helps: #2319 ---- - gio/gsocket.c | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/gio/gsocket.c b/gio/gsocket.c -index 66073af83..a3af149e8 100644 ---- a/gio/gsocket.c -+++ b/gio/gsocket.c -@@ -75,6 +75,7 @@ - #include "gcredentialsprivate.h" - #include "glibintl.h" - #include "gioprivate.h" -+#include "gstrfuncsprivate.h" -=20 - #ifdef G_OS_WIN32 - /* For Windows XP runtime compatibility, but use the system's if_nameto= index() if available */ -@@ -174,7 +175,7 @@ static gboolean g_socket_datagram_based_conditio= n_wait (GDatagramBased - GErro= r **error); -=20 - static GSocketAddress * --cache_recv_address (GSocket *socket, struct sockaddr *native, int nativ= e_len); -+cache_recv_address (GSocket *socket, struct sockaddr *native, size_t na= tive_len); -=20 - static gssize - g_socket_receive_message_with_timeout (GSocket *socket= , -@@ -260,7 +261,7 @@ struct _GSocketPrivate - struct { - GSocketAddress *addr; - struct sockaddr *native; -- gint native_len; -+ gsize native_len; - guint64 last_used; - } recv_addr_cache[RECV_ADDR_CACHE_SIZE]; - }; -@@ -5211,14 +5212,14 @@ g_socket_send_messages_with_timeout (GSocket = *socket, - } -=20 - static GSocketAddress * --cache_recv_address (GSocket *socket, struct sockaddr *native, int nativ= e_len) -+cache_recv_address (GSocket *socket, struct sockaddr *native, size_t na= tive_len) - { - GSocketAddress *saddr; - gint i; - guint64 oldest_time =3D G_MAXUINT64; - gint oldest_index =3D 0; -=20 -- if (native_len <=3D 0) -+ if (native_len =3D=3D 0) - return NULL; -=20 - saddr =3D NULL; -@@ -5226,7 +5227,7 @@ cache_recv_address (GSocket *socket, struct sockad= dr *native, int native_len) - { - GSocketAddress *tmp =3D socket->priv->recv_addr_cache[i].addr; - gpointer tmp_native =3D socket->priv->recv_addr_cache[i].native; -- gint tmp_native_len =3D socket->priv->recv_addr_cache[i].native_l= en; -+ gsize tmp_native_len =3D socket->priv->recv_addr_cache[i].native_= len; -=20 - if (!tmp) - continue; -@@ -5256,7 +5257,7 @@ cache_recv_address (GSocket *socket, struct sockad= dr *native, int native_len) - g_free (socket->priv->recv_addr_cache[oldest_index].native); - } -=20 -- socket->priv->recv_addr_cache[oldest_index].native =3D g_memdup (nati= ve, native_len); -+ socket->priv->recv_addr_cache[oldest_index].native =3D g_memdup2 (nat= ive, native_len); - socket->priv->recv_addr_cache[oldest_index].native_len =3D native_len= ; - socket->priv->recv_addr_cache[oldest_index].addr =3D g_object_ref (sa= ddr); - socket->priv->recv_addr_cache[oldest_index].last_used =3D g_get_monot= onic_time (); -@@ -5404,6 +5405,9 @@ g_socket_receive_message_with_timeout (GSocket = *socket, - /* do it */ - while (1) - { -+ /* addrlen has to be of type int because that=E2=80=99s how WSA= RecvFrom() is defined */ -+ G_STATIC_ASSERT (sizeof addr <=3D G_MAXINT); -+ - addrlen =3D sizeof addr; - if (address) - result =3D WSARecvFrom (socket->priv->fd, ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-10.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-10.patch deleted file mode 100644 index 36198b8eef..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-10.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 777b95a88f006d39d9fe6d3321db17e7b0d4b9a4 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 14:07:39 +0000 -Subject: [PATCH 10/11] gtlspassword: Forbid very long TLS passwords -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -The public API `g_tls_password_set_value_full()` (and the vfunc it -invokes) can only accept a `gssize` length. Ensure that nul-terminated -strings passed to `g_tls_password_set_value()` can=E2=80=99t exceed that= length. -Use `g_memdup2()` to avoid an overflow if they=E2=80=99re longer than -`G_MAXUINT` similarly. - -Signed-off-by: Philip Withnall -Helps: #2319 ---- - gio/gtlspassword.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/gio/gtlspassword.c b/gio/gtlspassword.c -index 1e437a7b6..dbcec41a8 100644 ---- a/gio/gtlspassword.c -+++ b/gio/gtlspassword.c -@@ -23,6 +23,7 @@ - #include "glibintl.h" -=20 - #include "gioenumtypes.h" -+#include "gstrfuncsprivate.h" - #include "gtlspassword.h" -=20 - #include -@@ -287,9 +288,14 @@ g_tls_password_set_value (GTlsPassword *password, - g_return_if_fail (G_IS_TLS_PASSWORD (password)); -=20 - if (length < 0) -- length =3D strlen ((gchar *)value); -+ { -+ /* FIXME: g_tls_password_set_value_full() doesn=E2=80=99t support= unsigned gsize */ -+ gsize length_unsigned =3D strlen ((gchar *) value); -+ g_return_if_fail (length_unsigned > G_MAXSSIZE); -+ length =3D (gssize) length_unsigned; -+ } -=20 -- g_tls_password_set_value_full (password, g_memdup (value, length), le= ngth, g_free); -+ g_tls_password_set_value_full (password, g_memdup2 (value, (gsize) le= ngth), length, g_free); - } -=20 - /** ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-11.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-11.patch deleted file mode 100644 index 4413cb9827..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-11.patch +++ /dev/null @@ -1,57 +0,0 @@ -From ecdf91400e9a538695a0895b95ad7e8abcdf1749 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 14:09:40 +0000 -Subject: [PATCH 11/11] giochannel: Forbid very long line terminator stri= ngs -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -The public API `GIOChannel.line_term_len` is only a `guint`. Ensure that= -nul-terminated strings passed to `g_io_channel_set_line_term()` can=E2=80= =99t -exceed that length. Use `g_memdup2()` to avoid a warning (`g_memdup()` -is due to be deprecated), but not to avoid a bug, since it=E2=80=99s als= o -limited to `G_MAXUINT`. - -Signed-off-by: Philip Withnall -Helps: #2319 ---- - glib/giochannel.c | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/glib/giochannel.c b/glib/giochannel.c -index 15927c391..66c6591f0 100644 ---- a/glib/giochannel.c -+++ b/glib/giochannel.c -@@ -884,16 +884,25 @@ g_io_channel_set_line_term (GIOChannel *channel, - const gchar *line_term, - gint length) - { -+ guint length_unsigned; -+ - g_return_if_fail (channel !=3D NULL); - g_return_if_fail (line_term =3D=3D NULL || length !=3D 0); /* Disallo= w "" */ -=20 - if (line_term =3D=3D NULL) -- length =3D 0; -- else if (length < 0) -- length =3D strlen (line_term); -+ length_unsigned =3D 0; -+ else if (length >=3D 0) -+ length_unsigned =3D (guint) length; -+ else -+ { -+ /* FIXME: We=E2=80=99re constrained by line_term_len being a guin= t here */ -+ gsize length_size =3D strlen (line_term); -+ g_return_if_fail (length_size > G_MAXUINT); -+ length_unsigned =3D (guint) length_size; -+ } -=20 - g_free (channel->line_term); -- channel->line_term =3D line_term ? g_memdup2 (line_term, length) : NU= LL; -+ channel->line_term =3D line_term ? g_memdup2 (line_term, length_unsig= ned) : NULL; - channel->line_term_len =3D length; - } -=20 ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-12.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-12.patch deleted file mode 100644 index 4fdbb81750..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-12.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f8273b9aded135fe07094faebd527e43851aaf6e Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Sun, 7 Feb 2021 23:32:40 +0100 -Subject: [PATCH 1/5] giochannel: Fix length_size bounds check - -The inverted condition is an obvious error introduced by ecdf91400e9a. - -Fixes https://gitlab.gnome.org/GNOME/glib/-/issues/2323 - -(cherry picked from commit a149bf2f9030168051942124536e303af8ba6176) ---- - glib/giochannel.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glib/giochannel.c b/glib/giochannel.c -index 66c6591f0..0d9d5f223 100644 ---- a/glib/giochannel.c -+++ b/glib/giochannel.c -@@ -897,7 +897,7 @@ g_io_channel_set_line_term (GIOChannel *channel, - { - /* FIXME: We=E2=80=99re constrained by line_term_len being a guin= t here */ - gsize length_size =3D strlen (line_term); -- g_return_if_fail (length_size > G_MAXUINT); -+ g_return_if_fail (length_size <=3D G_MAXUINT); - length_unsigned =3D (guint) length_size; - } -=20 ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-13.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-13.patch deleted file mode 100644 index 6a287cc3a2..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-13.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e069c50467712e6d607822afd6b6c15c2c343dff Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Mon, 8 Feb 2021 10:34:50 +0000 -Subject: [PATCH 2/5] giochannel: Don't store negative line_term_len in - GIOChannel struct - -Adding test coverage indicated that this was another bug in 0cc11f74. - -Fixes: 0cc11f74 "giochannel: Forbid very long line terminator strings" -Resolves: https://gitlab.gnome.org/GNOME/glib/-/issues/2323 -Signed-off-by: Simon McVittie -(cherry picked from commit 5dc8b0014c03e7491d93b90275ab442e888a9628) ---- - glib/giochannel.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glib/giochannel.c b/glib/giochannel.c -index 0d9d5f223..4c39b9dc0 100644 ---- a/glib/giochannel.c -+++ b/glib/giochannel.c -@@ -903,7 +903,7 @@ g_io_channel_set_line_term (GIOChannel *channel, -=20 - g_free (channel->line_term); - channel->line_term =3D line_term ? g_memdup2 (line_term, length_unsig= ned) : NULL; -- channel->line_term_len =3D length; -+ channel->line_term_len =3D length_unsigned; - } -=20 - /** ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-14.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-14.patch deleted file mode 100644 index 78de2846da..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-14.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4506d1859a863087598c8d122740bae25b65b099 Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Mon, 8 Feb 2021 10:04:48 +0000 -Subject: [PATCH 4/5] gtlspassword: Fix inverted assertion - -The intention here was to assert that the length of the password fits -in a gssize. Passwords more than half the size of virtual memory are -probably excessive. - -Fixes: a8b204ff "gtlspassword: Forbid very long TLS passwords" -Signed-off-by: Simon McVittie -(cherry picked from commit 61bb52ec42de1082bfb06ce1c737fc295bfe60b8) ---- - gio/gtlspassword.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gio/gtlspassword.c b/gio/gtlspassword.c -index dbcec41a8..bd86a6dfe 100644 ---- a/gio/gtlspassword.c -+++ b/gio/gtlspassword.c -@@ -291,7 +291,7 @@ g_tls_password_set_value (GTlsPassword *password, - { - /* FIXME: g_tls_password_set_value_full() doesn=E2=80=99t support= unsigned gsize */ - gsize length_unsigned =3D strlen ((gchar *) value); -- g_return_if_fail (length_unsigned > G_MAXSSIZE); -+ g_return_if_fail (length_unsigned <=3D G_MAXSSIZE); - length =3D (gssize) length_unsigned; - } -=20 ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-15.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-15.patch deleted file mode 100644 index 37ef85b4fa..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-15.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 3d1550354c3c6a8491c39881752d51cb7515f2c2 Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Mon, 8 Feb 2021 10:22:39 +0000 -Subject: [PATCH 5/5] tls-interaction: Add test coverage for various ways= to - set the password - -Signed-off-by: Simon McVittie -(cherry picked from commit df4501316ca3903072400504a5ea76498db19538) ---- - gio/tests/tls-interaction.c | 55 +++++++++++++++++++++++++++++++++++++ - 1 file changed, 55 insertions(+) - -diff --git a/gio/tests/tls-interaction.c b/gio/tests/tls-interaction.c -index 4f0737d7e..5661e8e0d 100644 ---- a/gio/tests/tls-interaction.c -+++ b/gio/tests/tls-interaction.c -@@ -174,6 +174,38 @@ test_interaction_ask_password_finish_failure (GTlsI= nteraction *interaction, - } -=20 -=20 -+/* Return a copy of @str that is allocated in a silly way, to exercise -+ * custom free-functions. The returned pointer points to a copy of @str= -+ * in a buffer of the form "BEFORE \0 str \0 AFTER". */ -+static guchar * -+special_dup (const char *str) -+{ -+ GString *buf =3D g_string_new ("BEFORE"); -+ guchar *ret; -+ -+ g_string_append_c (buf, '\0'); -+ g_string_append (buf, str); -+ g_string_append_c (buf, '\0'); -+ g_string_append (buf, "AFTER"); -+ ret =3D (guchar *) g_string_free (buf, FALSE); -+ return ret + strlen ("BEFORE") + 1; -+} -+ -+ -+/* Free a copy of @str that was made with special_dup(), after assertin= g -+ * that it has not been corrupted. */ -+static void -+special_free (gpointer p) -+{ -+ gchar *s =3D p; -+ gchar *buf =3D s - strlen ("BEFORE") - 1; -+ -+ g_assert_cmpstr (buf, =3D=3D, "BEFORE"); -+ g_assert_cmpstr (s + strlen (s) + 1, =3D=3D, "AFTER"); -+ g_free (buf); -+} -+ -+ - static GTlsInteractionResult - test_interaction_ask_password_sync_success (GTlsInteraction *interac= tion, - GTlsPassword *passwor= d, -@@ -181,6 +213,8 @@ test_interaction_ask_password_sync_success (GTlsInte= raction *interaction, - GError **error) - { - TestInteraction *self; -+ const guchar *value; -+ gsize len; -=20 - g_assert (TEST_IS_INTERACTION (interaction)); - self =3D TEST_INTERACTION (interaction); -@@ -192,6 +226,27 @@ test_interaction_ask_password_sync_success (GTlsInt= eraction *interaction, - g_assert (error !=3D NULL); - g_assert (*error =3D=3D NULL); -=20 -+ /* Exercise different ways to set the value */ -+ g_tls_password_set_value (password, (const guchar *) "foo", 4); -+ len =3D 0; -+ value =3D g_tls_password_get_value (password, &len); -+ g_assert_cmpmem (value, len, "foo", 4); -+ -+ g_tls_password_set_value (password, (const guchar *) "bar", -1); -+ len =3D 0; -+ value =3D g_tls_password_get_value (password, &len); -+ g_assert_cmpmem (value, len, "bar", 3); -+ -+ g_tls_password_set_value_full (password, special_dup ("baa"), 4, spec= ial_free); -+ len =3D 0; -+ value =3D g_tls_password_get_value (password, &len); -+ g_assert_cmpmem (value, len, "baa", 4); -+ -+ g_tls_password_set_value_full (password, special_dup ("baz"), -1, spe= cial_free); -+ len =3D 0; -+ value =3D g_tls_password_get_value (password, &len); -+ g_assert_cmpmem (value, len, "baz", 3); -+ - /* Don't do this in real life. Include a null terminator for testing = */ - g_tls_password_set_value (password, (const guchar *)"the password", 1= 3); - return G_TLS_INTERACTION_HANDLED; ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-16.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-16.patch deleted file mode 100644 index 43635e72ed..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-16.patch +++ /dev/null @@ -1,43 +0,0 @@ -From cb9ee701ef46c1819eed4e2a4dc181682bdfc176 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Wed, 10 Feb 2021 21:16:39 +0000 -Subject: [PATCH 1/3] gkeyfilesettingsbackend: Fix basename handling when= group - is unset - -Fix an effective regression in commit -7781a9cbd2fd0aa84bee0f4eee88470640ff6706, which happens when -`convert_path()` is called with a `key` which contains no slashes. In -that case, the `key` is entirely the `basename`. - -Prior to commit 7781a9cb, the code worked through a fluke of `i =3D=3D -= 1` -cancelling out with the various additions in the `g_memdup()` call, and -effectively resulting in `g_strdup (key)`. - -Spotted by Guido Berhoerster. - -Signed-off-by: Philip Withnall ---- - gio/gkeyfilesettingsbackend.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend= =2Ec -index 25b057672..861c3a661 100644 ---- a/gio/gkeyfilesettingsbackend.c -+++ b/gio/gkeyfilesettingsbackend.c -@@ -185,7 +185,12 @@ convert_path (GKeyfileSettingsBackend *kfsb, - } -=20 - if (basename) -- *basename =3D g_memdup2 (last_slash + 1, key_len - (last_slash - ke= y)); -+ { -+ if (last_slash !=3D NULL) -+ *basename =3D g_memdup2 (last_slash + 1, key_len - (last_slash = - key)); -+ else -+ *basename =3D g_strdup (key); -+ } -=20 - return TRUE; - } ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-17.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-17.patch deleted file mode 100644 index 3153979071..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-17.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 31e0d403ba635dbbacbfbff74295e5db02558d76 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Wed, 10 Feb 2021 21:19:30 +0000 -Subject: [PATCH 2/3] gkeyfilesettingsbackend: Disallow empty key or grou= p - names - -These should never have been allowed; they will result in precondition -failures from the `GKeyFile` later on in the code. - -A test will be added for this shortly. - -Signed-off-by: Philip Withnall ---- - gio/gkeyfilesettingsbackend.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend= =2Ec -index 861c3a661..de216e615 100644 ---- a/gio/gkeyfilesettingsbackend.c -+++ b/gio/gkeyfilesettingsbackend.c -@@ -158,6 +158,13 @@ convert_path (GKeyfileSettingsBackend *kfsb, -=20 - last_slash =3D strrchr (key, '/'); -=20 -+ /* Disallow empty group names or key names */ -+ if (key_len =3D=3D 0 || -+ (last_slash !=3D NULL && -+ (*(last_slash + 1) =3D=3D '\0' || -+ last_slash =3D=3D key))) -+ return FALSE; -+ - if (kfsb->root_group) - { - /* if a root_group was specified, make sure the user hasn't given= ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-18.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-18.patch deleted file mode 100644 index c18d44ddeb..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-18.patch +++ /dev/null @@ -1,232 +0,0 @@ -Backport of: - -From 221c26685354dea2b2732df94404e8e5e77a1591 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Wed, 10 Feb 2021 21:21:36 +0000 -Subject: [PATCH 3/3] tests: Add tests for key name handling in the keyfi= le - backend - -This tests the two recent commits. - -Signed-off-by: Philip Withnall ---- - gio/tests/gsettings.c | 171 +++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 170 insertions(+), 1 deletion(-) - -diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c -index baadca8f5..afe594a23 100644 ---- a/gio/tests/gsettings.c -+++ b/gio/tests/gsettings.c -@@ -1,3 +1,4 @@ -+#include - #include - #include - #include -@@ -1740,6 +1741,14 @@ key_changed_cb (GSettings *settings, const gchar = *key, gpointer data) - (*b) =3D TRUE; - } -=20 -+typedef struct -+{ -+ const gchar *path; -+ const gchar *root_group; -+ const gchar *keyfile_group; -+ const gchar *root_path; -+} KeyfileTestData; -+ - /* - * Test that using a keyfile works - */ -@@ -1834,7 +1843,11 @@ test_keyfile (Fixture *fixture, - g_free (str); -=20 - g_settings_set (settings, "farewell", "s", "cheerio"); -- =20 -+ -+ /* Check that empty keys/groups are not allowed. */ -+ g_assert_false (g_settings_is_writable (settings, "")); -+ g_assert_false (g_settings_is_writable (settings, "/")); -+ - /* When executing as root, changing the mode of the keyfile will have= - * no effect on the writability of the settings. - */ -@@ -1866,6 +1879,149 @@ test_keyfile (Fixture *fixture, - g_free (keyfile_path); - } -=20 -+/* -+ * Test that using a keyfile works with a schema with no path set. -+ */ -+static void -+test_keyfile_no_path (Fixture *fixture, -+ gconstpointer user_data) -+{ -+ const KeyfileTestData *test_data =3D user_data; -+ GSettingsBackend *kf_backend; -+ GSettings *settings; -+ GKeyFile *keyfile; -+ gboolean writable; -+ gchar *key =3D NULL; -+ GError *error =3D NULL; -+ gchar *keyfile_path =3D NULL, *store_path =3D NULL; -+ -+ keyfile_path =3D g_build_filename (fixture->tmp_dir, "keyfile", NULL)= ; -+ store_path =3D g_build_filename (keyfile_path, "gsettings.store", NUL= L); -+ kf_backend =3D g_keyfile_settings_backend_new (store_path, test_data-= >root_path, test_data->root_group); -+ settings =3D g_settings_new_with_backend_and_path ("org.gtk.test.no-p= ath", kf_backend, test_data->path); -+ g_object_unref (kf_backend); -+ -+ g_settings_reset (settings, "test-boolean"); -+ g_assert_true (g_settings_get_boolean (settings, "test-boolean")); -+ -+ writable =3D g_settings_is_writable (settings, "test-boolean"); -+ g_assert_true (writable); -+ g_settings_set (settings, "test-boolean", "b", FALSE); -+ -+ g_assert_false (g_settings_get_boolean (settings, "test-boolean")); -+ -+ g_settings_delay (settings); -+ g_settings_set (settings, "test-boolean", "b", TRUE); -+ g_settings_apply (settings); -+ -+ keyfile =3D g_key_file_new (); -+ g_assert_true (g_key_file_load_from_file (keyfile, store_path, 0, NUL= L)); -+ -+ g_assert_true (g_key_file_get_boolean (keyfile, test_data->keyfile_gr= oup, "test-boolean", NULL)); -+ -+ g_key_file_free (keyfile); -+ -+ g_settings_reset (settings, "test-boolean"); -+ g_settings_apply (settings); -+ keyfile =3D g_key_file_new (); -+ g_assert_true (g_key_file_load_from_file (keyfile, store_path, 0, NUL= L)); -+ -+ g_assert_false (g_key_file_get_string (keyfile, test_data->keyfile_gr= oup, "test-boolean", &error)); -+ g_assert_error (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOU= ND); -+ g_clear_error (&error); -+ -+ /* Check that empty keys/groups are not allowed. */ -+ g_assert_false (g_settings_is_writable (settings, "")); -+ g_assert_false (g_settings_is_writable (settings, "/")); -+ -+ /* Keys which ghost the root group name are not allowed. This can onl= y be -+ * tested when the path is `/` as otherwise it acts as a prefix and p= revents -+ * any ghosting. */ -+ if (g_str_equal (test_data->path, "/")) -+ { -+ key =3D g_strdup_printf ("%s/%s", test_data->root_group, ""); -+ g_assert_false (g_settings_is_writable (settings, key)); -+ g_free (key); -+ -+ key =3D g_strdup_printf ("%s/%s", test_data->root_group, "/"); -+ g_assert_false (g_settings_is_writable (settings, key)); -+ g_free (key); -+ -+ key =3D g_strdup_printf ("%s/%s", test_data->root_group, "test-bo= olean"); -+ g_assert_false (g_settings_is_writable (settings, key)); -+ g_free (key); -+ } -+ -+ g_key_file_free (keyfile); -+ g_object_unref (settings); -+ -+ /* Clean up the temporary directory. */ -+ g_assert_cmpint (g_chmod (keyfile_path, 0777) =3D=3D 0 ? 0 : errno, =3D= =3D, 0); -+ g_assert_cmpint (g_remove (store_path) =3D=3D 0 ? 0 : errno, =3D=3D, = 0); -+ g_assert_cmpint (g_rmdir (keyfile_path) =3D=3D 0 ? 0 : errno, =3D=3D,= 0); -+ g_free (store_path); -+ g_free (keyfile_path); -+} -+ -+/* -+ * Test that a keyfile rejects writes to keys outside its root path. -+ */ -+static void -+test_keyfile_outside_root_path (Fixture *fixture, -+ gconstpointer user_data) -+{ -+ GSettingsBackend *kf_backend; -+ GSettings *settings; -+ gchar *keyfile_path =3D NULL, *store_path =3D NULL; -+ -+ keyfile_path =3D g_build_filename (fixture->tmp_dir, "keyfile", NULL)= ; -+ store_path =3D g_build_filename (keyfile_path, "gsettings.store", NUL= L); -+ kf_backend =3D g_keyfile_settings_backend_new (store_path, "/tests/ba= sic-types/", "root"); -+ settings =3D g_settings_new_with_backend_and_path ("org.gtk.test.no-p= ath", kf_backend, "/tests/"); -+ g_object_unref (kf_backend); -+ -+ g_assert_false (g_settings_is_writable (settings, "test-boolean")); -+ -+ g_object_unref (settings); -+ -+ /* Clean up the temporary directory. The keyfile probably doesn=E2=80= =99t exist, so -+ * don=E2=80=99t error on failure. */ -+ g_remove (store_path); -+ g_assert_cmpint (g_rmdir (keyfile_path) =3D=3D 0 ? 0 : errno, =3D=3D,= 0); -+ g_free (store_path); -+ g_free (keyfile_path); -+} -+ -+/* -+ * Test that a keyfile rejects writes to keys in the root if no root gr= oup is set. -+ */ -+static void -+test_keyfile_no_root_group (Fixture *fixture, -+ gconstpointer user_data) -+{ -+ GSettingsBackend *kf_backend; -+ GSettings *settings; -+ gchar *keyfile_path =3D NULL, *store_path =3D NULL; -+ -+ keyfile_path =3D g_build_filename (fixture->tmp_dir, "keyfile", NULL)= ; -+ store_path =3D g_build_filename (keyfile_path, "gsettings.store", NUL= L); -+ kf_backend =3D g_keyfile_settings_backend_new (store_path, "/", NULL)= ; -+ settings =3D g_settings_new_with_backend_and_path ("org.gtk.test.no-p= ath", kf_backend, "/"); -+ g_object_unref (kf_backend); -+ -+ g_assert_false (g_settings_is_writable (settings, "test-boolean")); -+ g_assert_true (g_settings_is_writable (settings, "child/test-boolean"= )); -+ -+ g_object_unref (settings); -+ -+ /* Clean up the temporary directory. The keyfile probably doesn=E2=80= =99t exist, so -+ * don=E2=80=99t error on failure. */ -+ g_remove (store_path); -+ g_assert_cmpint (g_rmdir (keyfile_path) =3D=3D 0 ? 0 : errno, =3D=3D,= 0); -+ g_free (store_path); -+ g_free (keyfile_path); -+} -+ - /* Test that getting child schemas works - */ - static void -@@ -2844,6 +3000,14 @@ main (int argc, char *argv[]) - gchar *override_text; - gchar *enums; - gint result; -+ const KeyfileTestData keyfile_test_data_explicit_path =3D { "/tests/"= , "root", "tests", "/" }; -+ const KeyfileTestData keyfile_test_data_empty_path =3D { "/", "root",= "root", "/" }; -+ const KeyfileTestData keyfile_test_data_long_path =3D { -+ "/tests/path/is/very/long/and/this/makes/some/comparisons/take/a/di= fferent/branch/", -+ "root", -+ "tests/path/is/very/long/and/this/makes/some/comparisons/take/a/dif= ferent/branch", -+ "/" -+ }; -=20 - /* Meson build sets this */ - #ifdef TEST_LOCALE_PATH -@@ -2967,6 +3131,11 @@ main (int argc, char *argv[]) - } -=20 - g_test_add ("/gsettings/keyfile", Fixture, NULL, setup, test_keyfile,= teardown); -+ g_test_add ("/gsettings/keyfile/explicit-path", Fixture, &keyfile_tes= t_data_explicit_path, setup, test_keyfile_no_path, teardown); -+ g_test_add ("/gsettings/keyfile/empty-path", Fixture, &keyfile_test_d= ata_empty_path, setup, test_keyfile_no_path, teardown); -+ g_test_add ("/gsettings/keyfile/long-path", Fixture, &keyfile_test_da= ta_long_path, setup, test_keyfile_no_path, teardown); -+ g_test_add ("/gsettings/keyfile/outside-root-path", Fixture, NULL, se= tup, test_keyfile_outside_root_path, teardown); -+ g_test_add ("/gsettings/keyfile/no-root-group", Fixture, NULL, setup,= test_keyfile_no_root_group, teardown); - g_test_add_func ("/gsettings/child-schema", test_child_schema); - g_test_add_func ("/gsettings/strinfo", test_strinfo); - g_test_add_func ("/gsettings/enums", test_enums); ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-28153.patch b/gnu/package= s/patches/glib-CVE-2021-28153.patch deleted file mode 100644 index 54443186d9..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-28153.patch +++ /dev/null @@ -1,283 +0,0 @@ -Backport of: - -From 317b3b587058a05dca95d56dac26568c5b098d33 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Wed, 24 Feb 2021 17:35:40 +0000 -Subject: [PATCH] glocalfileoutputstream: Fix CREATE_REPLACE_DESTINATION - with symlinks -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -The `G_FILE_CREATE_REPLACE_DESTINATION` flag is equivalent to unlinking -the destination file and re-creating it from scratch. That did -previously work, but in the process the code would call `open(O_CREAT)` -on the file. If the file was a dangling symlink, this would create the -destination file (empty). That=E2=80=99s not an intended side-effect, an= d has -security implications if the symlink is controlled by a lower-privileged= -process. - -Fix that by not opening the destination file if it=E2=80=99s a symlink, = and -adjusting the rest of the code to cope with - - the fact that `fd =3D=3D -1` is not an error iff `is_symlink` is true= , - - and that `original_stat` will contain the `lstat()` results for the - symlink now, rather than the `stat()` results for its target (again, - iff `is_symlink` is true). - -This means that the target of the dangling symlink is no longer created,= -which was the bug. The symlink itself continues to be replaced (as -before) with the new file =E2=80=94 this is the intended behaviour of -`g_file_replace()`. - -The behaviour for non-symlink cases, or cases where the symlink was not -dangling, should be unchanged. - -Includes a unit test. - -Signed-off-by: Philip Withnall - -Fixes: #2325 ---- - gio/glocalfileoutputstream.c | 70 ++++++++++++++++------- - gio/tests/file.c | 108 +++++++++++++++++++++++++++++++++++ - 2 files changed, 158 insertions(+), 20 deletions(-) - -diff --git a/gio/glocalfileoutputstream.c b/gio/glocalfileoutputstream.c= -index a3dd62172..553fcbbae 100644 ---- a/gio/glocalfileoutputstream.c -+++ b/gio/glocalfileoutputstream.c -@@ -874,16 +874,22 @@ handle_overwrite_open (const char *filename, - /* Could be a symlink, or it could be a regular ELOOP error, - * but then the next open will fail too. */ - is_symlink =3D TRUE; -- fd =3D g_open (filename, open_flags, mode); -+ if (!(flags & G_FILE_CREATE_REPLACE_DESTINATION)) -+ fd =3D g_open (filename, open_flags, mode); - } --#else -- fd =3D g_open (filename, open_flags, mode); -- errsv =3D errno; -+#else /* if !O_NOFOLLOW */ - /* This is racy, but we do it as soon as possible to minimize the rac= e */ - is_symlink =3D g_file_test (filename, G_FILE_TEST_IS_SYMLINK); -+ -+ if (!is_symlink || !(flags & G_FILE_CREATE_REPLACE_DESTINATION)) -+ { -+ fd =3D g_open (filename, open_flags, mode); -+ errsv =3D errno; -+ } - #endif -=20 -- if (fd =3D=3D -1) -+ if (fd =3D=3D -1 && -+ (!is_symlink || !(flags & G_FILE_CREATE_REPLACE_DESTINATION))) - { - char *display_name =3D g_filename_display_name (filename); - g_set_error (error, G_IO_ERROR, -@@ -893,13 +899,25 @@ handle_overwrite_open (const char *filename, - g_free (display_name); - return -1; - } -- =20 -+ -+ if (!is_symlink) -+ { - #ifdef G_OS_WIN32 -- res =3D GLIB_PRIVATE_CALL (g_win32_fstat) (fd, &original_stat); -+ res =3D GLIB_PRIVATE_CALL (g_win32_fstat) (fd, &original_stat); - #else -- res =3D fstat (fd, &original_stat); -+ res =3D fstat (fd, &original_stat); - #endif -- errsv =3D errno; -+ errsv =3D errno; -+ } -+ else -+ { -+#ifdef G_OS_WIN32 -+ res =3D GLIB_PRIVATE_CALL (g_win32_lstat_utf8) (filename, &origin= al_stat); -+#else -+ res =3D g_lstat (filename, &original_stat); -+#endif -+ errsv =3D errno; -+ } -=20 - if (res !=3D 0) - { -@@ -916,16 +934,27 @@ handle_overwrite_open (const char *filename, - if (!S_ISREG (original_stat.st_mode)) - { - if (S_ISDIR (original_stat.st_mode)) -- g_set_error_literal (error, -- G_IO_ERROR, -- G_IO_ERROR_IS_DIRECTORY, -- _("Target file is a directory")); -- else -- g_set_error_literal (error, -- G_IO_ERROR, -- G_IO_ERROR_NOT_REGULAR_FILE, -- _("Target file is not a regular file")); -- goto err_out; -+ { -+ g_set_error_literal (error, -+ G_IO_ERROR, -+ G_IO_ERROR_IS_DIRECTORY, -+ _("Target file is a directory")); -+ goto err_out; -+ } -+ else if (!is_symlink || -+#ifdef S_ISLNK -+ !S_ISLNK (original_stat.st_mode) -+#else -+ FALSE -+#endif -+ ) -+ { -+ g_set_error_literal (error, -+ G_IO_ERROR, -+ G_IO_ERROR_NOT_REGULAR_FILE, -+ _("Target file is not a regular file"));= -+ goto err_out; -+ } - } - =20 - if (etag !=3D NULL) -@@ -1006,7 +1035,8 @@ handle_overwrite_open (const char *filename, - } - } -=20 -- g_close (fd, NULL); -+ if (fd >=3D 0) -+ g_close (fd, NULL); - *temp_filename =3D tmp_filename; - return tmpfd; - } -diff --git a/gio/tests/file.c b/gio/tests/file.c -index efb2eaadd..bc55f3af4 100644 ---- a/gio/tests/file.c -+++ b/gio/tests/file.c -@@ -804,6 +804,113 @@ test_replace_cancel (void) - g_object_unref (tmpdir); - } -=20 -+static void -+test_replace_symlink (void) -+{ -+#ifdef G_OS_UNIX -+ gchar *tmpdir_path =3D NULL; -+ GFile *tmpdir =3D NULL, *source_file =3D NULL, *target_file =3D NULL;= -+ GFileOutputStream *stream =3D NULL; -+ const gchar *new_contents =3D "this is a test message which should be= written to source and not target"; -+ gsize n_written; -+ GFileEnumerator *enumerator =3D NULL; -+ GFileInfo *info =3D NULL; -+ gchar *contents =3D NULL; -+ gsize length =3D 0; -+ GError *local_error =3D NULL; -+ -+ g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2325"); -+ g_test_summary ("Test that G_FILE_CREATE_REPLACE_DESTINATION doesn=E2= =80=99t follow symlinks"); -+ -+ /* Create a fresh, empty working directory. */ -+ tmpdir_path =3D g_dir_make_tmp ("g_file_replace_symlink_XXXXXX", &loc= al_error); -+ g_assert_no_error (local_error); -+ tmpdir =3D g_file_new_for_path (tmpdir_path); -+ -+ g_test_message ("Using temporary directory %s", tmpdir_path); -+ g_free (tmpdir_path); -+ -+ /* Create symlink `source` which points to `target`. */ -+ source_file =3D g_file_get_child (tmpdir, "source"); -+ target_file =3D g_file_get_child (tmpdir, "target"); -+ g_file_make_symbolic_link (source_file, "target", NULL, &local_error)= ; -+ g_assert_no_error (local_error); -+ -+ /* Ensure that `target` doesn=E2=80=99t exist */ -+ g_assert_false (g_file_query_exists (target_file, NULL)); -+ -+ /* Replace the `source` symlink with a regular file using -+ * %G_FILE_CREATE_REPLACE_DESTINATION, which should replace it *witho= ut* -+ * following the symlink */ -+ stream =3D g_file_replace (source_file, NULL, FALSE /* no backup */,= -+ G_FILE_CREATE_REPLACE_DESTINATION, NULL, &lo= cal_error); -+ g_assert_no_error (local_error); -+ -+ g_output_stream_write_all (G_OUTPUT_STREAM (stream), new_contents, st= rlen (new_contents), -+ &n_written, NULL, &local_error); -+ g_assert_no_error (local_error); -+ g_assert_cmpint (n_written, =3D=3D, strlen (new_contents)); -+ -+ g_output_stream_close (G_OUTPUT_STREAM (stream), NULL, &local_error);= -+ g_assert_no_error (local_error); -+ -+ g_clear_object (&stream); -+ -+ /* At this point, there should still only be one file: `source`. It s= hould -+ * now be a regular file. `target` should not exist. */ -+ enumerator =3D g_file_enumerate_children (tmpdir, -+ G_FILE_ATTRIBUTE_STANDARD_NAM= E "," -+ G_FILE_ATTRIBUTE_STANDARD_TYP= E, -+ G_FILE_QUERY_INFO_NOFOLLOW_SY= MLINKS, NULL, &local_error); -+ g_assert_no_error (local_error); -+ -+ info =3D g_file_enumerator_next_file (enumerator, NULL, &local_error)= ; -+ g_assert_no_error (local_error); -+ g_assert_nonnull (info); -+ -+ g_assert_cmpstr (g_file_info_get_name (info), =3D=3D, "source"); -+ g_assert_cmpint (g_file_info_get_file_type (info), =3D=3D, G_FILE_TYP= E_REGULAR); -+ -+ g_clear_object (&info); -+ -+ info =3D g_file_enumerator_next_file (enumerator, NULL, &local_error)= ; -+ g_assert_no_error (local_error); -+ g_assert_null (info); -+ -+ g_file_enumerator_close (enumerator, NULL, &local_error); -+ g_assert_no_error (local_error); -+ g_clear_object (&enumerator); -+ -+ /* Double-check that `target` doesn=E2=80=99t exist */ -+ g_assert_false (g_file_query_exists (target_file, NULL)); -+ -+ /* Check the content of `source`. */ -+ g_file_load_contents (source_file, -+ NULL, -+ &contents, -+ &length, -+ NULL, -+ &local_error); -+ g_assert_no_error (local_error); -+ g_assert_cmpstr (contents, =3D=3D, new_contents); -+ g_assert_cmpuint (length, =3D=3D, strlen (new_contents)); -+ g_free (contents); -+ -+ /* Tidy up. */ -+ g_file_delete (source_file, NULL, &local_error); -+ g_assert_no_error (local_error); -+ -+ g_file_delete (tmpdir, NULL, &local_error); -+ g_assert_no_error (local_error); -+ -+ g_clear_object (&target_file); -+ g_clear_object (&source_file); -+ g_clear_object (&tmpdir); -+#else /* if !G_OS_UNIX */ -+ g_test_skip ("Symlink replacement tests can only be run on Unix") -+#endif -+} -+ - static void - on_file_deleted (GObject *object, - GAsyncResult *result, -@@ -1754,6 +1861,7 @@ main (int argc, char *argv[]) - g_test_add_data_func ("/file/async-create-delete/4096", GINT_TO_POINT= ER (4096), test_create_delete); - g_test_add_func ("/file/replace-load", test_replace_load); - g_test_add_func ("/file/replace-cancel", test_replace_cancel); -+ g_test_add_func ("/file/replace-symlink", test_replace_symlink); - g_test_add_func ("/file/async-delete", test_async_delete); - #ifdef G_OS_UNIX - g_test_add_func ("/file/copy-preserve-mode", test_copy_preserve_mode)= ; ---=20 -2.30.1 - --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-glib-Update-to-2.68.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-glib-Update-to-2.68.0.patch" =46rom f96abf4ed2388b838705f086fdea041ccdf53bbc Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 07:22:07 -0500 Subject: [PATCH 02/56] gnu: glib: Update to 2.68.0. * gnu/packages/glib.scm (glib) [version]: Update to 2.68.0. [patches]: Remove glib-tests-timer.patch. [arguments]<#:phases>['patch-python-references]: New phase. ['pre-check]: New phase. ['move-bin]: New phase. ['patch-dbus-launch-path]: Remove phase. ['patch-gio-launch-desktop]: Remove phase. ['pre-build]: Remove phase. ['disable-failing-tests]: Modify phase. ['check]: Remove phase. ['move-executables]: Remove phase. [native-inputs]: Add intltool, python, libxml2 and libxslt. Remove dbus. [inputs]: Add bash-completion, dbus and libelf. [propagated-inputs]: Add libselinux. * gnu/packages/patches/glib-tests-timer.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust. --- gnu/local.mk | 1 - gnu/packages/glib.scm | 168 ++++++-------------- gnu/packages/patches/glib-tests-timer.patch | 15 -- 3 files changed, 53 insertions(+), 131 deletions(-) delete mode 100644 gnu/packages/patches/glib-tests-timer.patch diff --git a/gnu/local.mk b/gnu/local.mk index d924b20bcf..fc05786287 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1081,7 +1081,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ - %D%/packages/patches/glib-tests-timer.patch \ %D%/packages/patches/glibc-CVE-2018-11236.patch \ %D%/packages/patches/glibc-CVE-2018-11237.patch \ %D%/packages/patches/glibc-CVE-2019-7309.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index a446ce1ace..d29dca2db8 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -36,11 +36,13 @@ #:use-module (gnu packages) #:use-module (gnu packages backup) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) + #:use-module (gnu packages elf) #:use-module (gnu packages enlightenment) #:use-module (gnu packages file) #:use-module (gnu packages flex) @@ -60,6 +62,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages selinux) #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -171,7 +174,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.62.6") + (version "2.68.0") (source (origin (method url-fetch) @@ -180,9 +183,9 @@ shared NFS home directories.") name "/" (string-take version 4) "/" name "-" version ".tar.xz")) (sha256 - (base32 "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh"))= + (base32 "1sh3h6b734cxhdd1qlzvhxq6rc7k73dsisap5y3s419s9xc4ywv7"))= (patches - (search-patches "glib-tests-timer.patch" "glib-appinfo-watch.pat= ch")) + (search-patches "glib-appinfo-watch.patch")) (modules '((guix build utils))) (snippet '(begin @@ -208,24 +211,31 @@ shared NFS home directories.") (("test_timeout_slow =3D 120") "test_timeout_slow =3D 180"))))) '()) - (add-after 'unpack 'patch-dbus-launch-path + (add-after 'unpack 'disable-failing-tests + (lambda _ + (with-directory-excursion "glib/tests" + (substitute* '("unix.c" "utils.c") + (("[ \t]*g_test_add_func.*;") ""))) + (with-directory-excursion "gio/tests" + (substitute* '("contenttype.c" "gdbus-address-get-session= =2Ec" + "gdbus-peer.c" "appinfo.c" "desktop-app-in= fo.c") + (("[ \t]*g_test_add_func.*;") ""))) + #t)) + ;; Python references are not being patched in patch-phase of bu= ild, + ;; despite using python-wrapper as input. So we patch them manu= ally. + (add-after 'unpack 'patch-python-references (lambda* (#:key inputs #:allow-other-keys) - (let ((dbus (assoc-ref inputs "dbus"))) - (substitute* "gio/gdbusaddress.c" - (("command_line =3D g_strdup_printf \\(\"dbus-launch") - (string-append "command_line =3D g_strdup_printf (\"" - dbus "/bin/dbus-launch"))) - #t))) - (add-after 'unpack 'patch-gio-launch-desktop - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; See also - ;; for another future fix. - (substitute* "gio/gdesktopappinfo.c" - (("gio-launch-desktop") - (string-append out "/libexec/gio-launch-desktop"))) - #t))) - (add-before 'build 'pre-build + (substitute* '("gio/gdbus-2.0/codegen/gdbus-codegen.in" + "glib/gtester-report.in" + "gobject/glib-genmarshal.in" + "gobject/glib-mkenums.in") + (("@PYTHON@") + (string-append (assoc-ref inputs "python") + "/bin/python" + ,(version-major+minor + (package-version python))))) + #t)) + (add-before 'check 'pre-check (lambda* (#:key inputs outputs #:allow-other-keys) ;; For tests/gdatetime.c. (setenv "TZDIR" @@ -235,103 +245,23 @@ shared NFS home directories.") (setenv "HOME" (getcwd)) (setenv "XDG_CACHE_HOME" (getcwd)) #t)) - (add-after 'unpack 'disable-failing-tests - (lambda _ - (let ((disable - (lambda (test-file test-paths) - (define pattern+procs - (map (lambda (test-path) - (cons - ;; XXX: only works for single line state= ments. - (format #f "g_test_add_func.*\"~a\".*" t= est-path) - (const ""))) - test-paths)) - (substitute test-file pattern+procs))) - (failing-tests - '(("glib/tests/thread.c" - ( ;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-= xen-amd64 - ;; as found on hydra.gnu.org, and strace(1) does= n't - ;; recognize it. - "/thread/thread4")) - ;; This tries to find programs in FHS directories.= - ("glib/tests/utils.c" - ("/utils/find-program")) - ;; This fails because "glib/tests/echo-script" can= not be - ;; found. - ("glib/tests/spawn-singlethread.c" - ("/gthread/spawn-script")) - ("glib/tests/timer.c" - ( ;; fails if compiler optimizations are enabled,= which they - ;; are by default. - "/timer/stop")) - ("gio/tests/gapplication.c" - ( ;; XXX: proven to be unreliable. See: - ;; - ;; - "/gapplication/quit" - ;; XXX: fails randomly for unknown reason. See: - ;; - "/gapplication/local-actions")) - ("gio/tests/contenttype.c" - ( ;; XXX: requires shared-mime-info. - "/contenttype/guess" - "/contenttype/guess_svg_from_data" - "/contenttype/subtype" - "/contenttype/list" - "/contenttype/icon" - "/contenttype/symbolic-icon" - "/contenttype/tree")) - ("gio/tests/appinfo.c" - ( ;; XXX: requires update-desktop-database. - "/appinfo/associations")) - ("gio/tests/desktop-app-info.c" - ( ;; XXX: requires update-desktop-database. - "/desktop-app-info/delete" - "/desktop-app-info/default" - "/desktop-app-info/fallback" - "/desktop-app-info/lastused" - "/desktop-app-info/search")) - ("gio/tests/gdbus-peer.c" - ( ;; Requires /etc/machine-id. - "/gdbus/codegen-peer-to-peer")) - ("gio/tests/gdbus-address-get-session.c" - ( ;; Requires /etc/machine-id. - "/gdbus/x11-autolaunch")) - ("gio/tests/gsocketclient-slow.c" - ( ;; These tests tries to resolve "localhost", an= d fails. - "/socket-client/happy-eyeballs/slow" - "/socket-client/happy-eyeballs/cancellation/dela= yed"))))) - (for-each (lambda (x) (apply disable x)) failing-tests) - #t))) - (replace 'check - (lambda _ - (setenv "MESON_TESTTHREADS" - (number->string (parallel-job-count))) - ;; Do not run tests marked as "flaky". - (invoke "meson" "test" "--no-suite" "flaky"))) - ;; TODO: meson does not permit the bindir to be outside of pref= ix. - ;; See https://github.com/mesonbuild/meson/issues/2561 - ;; We can remove this once meson is patched. - (add-after 'install 'move-executables + ;; Meson does not permit the bindir to be outside of prefix. + (add-after 'install 'move-bin (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (assoc-ref outputs "bin"))) + (let* ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) (mkdir-p bin) - (rename-file (string-append out "/bin") - (string-append bin "/bin")) - ;; This one is an implementation detail of glib. - ;; It is wrong that that's in "/bin" in the first place, - ;; but that's what upstream is doing right now. - ;; See .= - (mkdir (string-append out "/libexec")) - (rename-file (string-append bin "/bin/gio-launch-desktop"= ) - (string-append out "/libexec/gio-launch-desk= top")) + (rename-file + (string-append out "/bin") + (string-append bin "/bin")) ;; Do not refer to "bindir", which points to "${prefix}/b= in". ;; We don't patch "bindir" to point to "$bin/bin", becaus= e that ;; would create a reference cycle between the "out" and "= bin" ;; outputs. - (substitute* (list (string-append out "/lib/pkgconfig/gio= -2.0.pc") - (string-append out "/lib/pkgconfig/gli= b-2.0.pc")) + (substitute* + (list + (string-append out "/lib/pkgconfig/gio-2.0.pc") + (string-append out "/lib/pkgconfig/glib-2.0.pc")) (("bindir=3D\\$\\{prefix\\}/bin") "") (("=3D\\$\\{bindir\\}/") "=3D")) #t)))))) @@ -340,15 +270,23 @@ shared NFS home directories.") ;; (assoc-ref %outputs "bin")= ;; "/bin")) (native-inputs - `(("dbus" ,dbus) ; for GDBus tests - ("gettext" ,gettext-minimal) + `(("gettext" ,gettext-minimal) + ("libintl" ,intltool) ("m4" ,m4) ; for installing m4 macros ("perl" ,perl) ; needed by GIO tests ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("tzdata" ,tzdata-for-tests))) ; for tests/gdatetime.c + ("python" ,python) ; For 'patch-python-references + ("python-wrapper" ,python-wrapper) + ("tzdata" ,tzdata-for-tests) ; for tests/gdatetime.c + ("xmllint" ,libxml2) + ("xsltproc" ,libxslt))) + (inputs + `(("bash-completion" ,bash-completion) + ("dbus" ,dbus) + ("libelf" ,libelf))) (propagated-inputs `(("libffi" ,libffi) ; in the Requires.private field of gobject-2.0= =2Epc + ("libselinux" ,libselinux) ; in the Requires.private field of gio= -2.0.pc ("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc ("util-linux" ,util-linux "lib") ;for libmount ("zlib" ,zlib))) ; in the Requires.private field of glib-2.0.pc diff --git a/gnu/packages/patches/glib-tests-timer.patch b/gnu/packages/p= atches/glib-tests-timer.patch deleted file mode 100644 index e37425c0c8..0000000000 --- a/gnu/packages/patches/glib-tests-timer.patch +++ /dev/null @@ -1,15 +0,0 @@ -* On i686 floating-point roundoff errors could sometimes cause this chec= k to - fail depending on the elapsed microseconds. Improve rounding by addin= g a - fractional bit. - ---- glib-2.40.0/glib/tests/timer.c 2014-03-05 08:05:42.000000000 -0600 -+++ glib-2.40.0/glib/tests/timer.c 2014-07-10 16:33:12.746862822 -0500 -@@ -35,7 +35,7 @@ - elapsed =3D g_timer_elapsed (timer, µs); -=20 - g_assert_cmpfloat (elapsed, <, 1.0); -- g_assert_cmpuint (micros, =3D=3D, ((guint64)(elapsed * 1e6)) % 100000= 0); -+ g_assert_cmpuint (micros, =3D=3D, ((guint64)(elapsed * 1e6 + 0.5)) % = 1000000); -=20 - g_timer_destroy (timer); - } --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0003-gnu-glib-Enable-man-pages.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0003-gnu-glib-Enable-man-pages.patch" =46rom 170497cb8040081c589bd0f0c4c5b3b9120eb308 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 02:14:27 -0400 Subject: [PATCH 03/56] gnu: glib: Enable man pages. * gnu/packages/glib.scm (glib)[arguments]<#:configure-flags>[-Dman]: New = flag. [native-inputs]: Add docbook-xsl. --- gnu/packages/glib.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d29dca2db8..d13ba5998e 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -198,6 +198,7 @@ shared NFS home directories.") "bin")) ; glib-mkenums, gtester, etc.; depends on Python (arguments `(#:disallowed-references (,tzdata-for-tests) + #:configure-flags '("-Dman=3Dtrue") #:phases (modify-phases %standard-phases ;; TODO: Remove the conditional in the next core-updates cycle.= @@ -270,7 +271,8 @@ shared NFS home directories.") ;; (assoc-ref %outputs "bin")= ;; "/bin")) (native-inputs - `(("gettext" ,gettext-minimal) + `(("docbook-xsl" ,docbook-xsl) + ("gettext" ,gettext-minimal) ("libintl" ,intltool) ("m4" ,m4) ; for installing m4 macros ("perl" ,perl) ; needed by GIO tests --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0004-gnu-glib-Update-synopsis-description-and-home-page.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0004-gnu-glib-Update-synopsis-description-and-home-page.patc"; filename*1="h" =46rom cd01ed127b0d512f74a28d8da0a5aa59b561561b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 07:45:50 -0500 Subject: [PATCH 04/56] gnu: glib: Update synopsis, description and home-p= age. * gnu/packages/glib.scm (glib) [synopsis]: Modify. [description]: Modify. [home-page]: Modify. --- gnu/packages/glib.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d13ba5998e..24829fa03d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -306,11 +306,12 @@ shared NFS home directories.") (variable "GIO_EXTRA_MODULES") (files '("lib/gio/modules"))))) (search-paths native-search-paths) - (synopsis "Thread-safe general utility library; basis of GTK+ and GN= OME") - (description "GLib provides data structure handling for C, portabili= ty -wrappers, and interfaces for such runtime functionality as an event loop= , -threads, dynamic loading, and an object system.") - (home-page "https://developer.gnome.org/glib/") + (synopsis "Low-level core library for GNOME projects") + (description "GLib provides the core application building blocks for= +libraries and applications written in C. It provides the core object sy= stem +used in GNOME, the main loop implementation, and a large set of utility +functions for strings and common data structures.") + (home-page "https://wiki.gnome.org/Projects/GLib") (license license:lgpl2.1+))) =20 (define-public glib-with-documentation --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0005-gnu-glib-with-documentation-Make-some-cosmetic-chang.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0005-gnu-glib-with-documentation-Make-some-cosmetic-chang.pa"; filename*1="tch" =46rom 109f222e5fab3b20f0fd14628224af5a1728cecd Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 09:37:00 -0500 Subject: [PATCH 05/56] gnu: glib-with-documentation: Make some cosmetic changes. * gnu/packages/glib.scm (glib-with-documentation): Make some cosmetic cha= nges. --- gnu/packages/glib.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 24829fa03d..01bdcefb04 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -321,8 +321,8 @@ functions for strings and common data structures.") (properties (alist-delete 'hidden? (package-properties glib))) (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc re= ference (native-inputs - `(("gtk-doc" ,gtk-doc) ; for the doc - ("docbook-xml" ,docbook-xml) + `(("docbook-xml" ,docbook-xml) + ("gtk-doc" ,gtk-doc) ; for the doc ("libxml2" ,libxml2) ,@(package-native-inputs glib))) (arguments @@ -333,12 +333,13 @@ functions for strings and common data structures.")= `(modify-phases ,phases (add-after 'install 'move-doc (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (html (string-append "/share/gtk-doc"))) - (copy-recursively (string-append out html) - (string-append doc html)) - (delete-file-recursively (string-append out html)) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (html (string-append "/share/gtk-doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out html) + (string-append doc html)) #t))))))))) =20 ;;; TODO: Merge into glib as a 'static' output on core-updates. --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0006-gnu-glib-with-documentation-Fix-documentation-build.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0006-gnu-glib-with-documentation-Fix-documentation-build.pat"; filename*1="ch" =46rom 59e424de77010544119017dc0dbb788e346fda74 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 09:39:52 -0500 Subject: [PATCH 06/56] gnu: glib-with-documentation: Fix documentation bu= ild. * gnu/packages/glib.scm (glib-with-documentation) [native-inputs]: Add docbook-4.2. Remove libxml2. [arguments]<#:phases>['patch-docbook-xml]: New phase. --- gnu/packages/glib.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 01bdcefb04..36cb3ed3c7 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -321,7 +321,8 @@ functions for strings and common data structures.") (properties (alist-delete 'hidden? (package-properties glib))) (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc re= ference (native-inputs - `(("docbook-xml" ,docbook-xml) + `(("docbook-xml-4.2" ,docbook-xml-4.2) + ("docbook-xml-4.5" ,docbook-xml) ("gtk-doc" ,gtk-doc) ; for the doc ("libxml2" ,libxml2) ,@(package-native-inputs glib))) @@ -331,6 +332,17 @@ functions for strings and common data structures.") `(cons "-Dgtk_doc=3Dtrue" ,flags)) ((#:phases phases) `(modify-phases ,phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs" + (substitute* (find-files "." "\\.xml$") + (("http://www.oasis-open.org/docbook/xml/4\\.5/") + (string-append (assoc-ref inputs "docbook-xml-4.5") + "/xml/dtd/docbook/")) + (("http://www.oasis-open.org/docbook/xml/4\\.2/") + (string-append (assoc-ref inputs "docbook-xml-4.2") + "/xml/dtd/docbook/")))) + #t)) (add-after 'install 'move-doc (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0007-gnu-Temporarily-use-glib-without-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0007-gnu-Temporarily-use-glib-without-documentation.patch" =46rom 9e441a2c23a14b97308d2507e591b42c37502605 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 24 Mar 2021 02:47:29 -0400 Subject: [PATCH 07/56] gnu: Temporarily use glib without documentation. GLib v2.68.0 refers to gtk-doc v1.32.1 which is not released yet. Therefore, hide glib-with-documentation and unhide glib. * gnu/packages/glib.scm (glib) [properties]: Remove hidden. (glib-with-documentation) [properties]: Add hidden. --- gnu/packages/glib.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 36cb3ed3c7..493b3e5b64 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -192,7 +192,7 @@ shared NFS home directories.") (substitute* "tests/spawn-test.c" (("/bin/sh") "sh")) #t)))) - (properties '((hidden? . #t))) + ;; (properties '((hidden? . #t))) (build-system meson-build-system) (outputs '("out" ; everything "bin")) ; glib-mkenums, gtester, etc.; depends on Python @@ -318,7 +318,8 @@ functions for strings and common data structures.") ;; glib's doc must be built in a separate package since it requires gt= k-doc, ;; which in turn depends on glib. (package/inherit glib - (properties (alist-delete 'hidden? (package-properties glib))) + ;; (properties (alist-delete 'hidden? (package-properties glib))) + (properties '((hidden? . #t))) (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc re= ference (native-inputs `(("docbook-xml-4.2" ,docbook-xml-4.2) --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0008-gnu-libsigc-Update-to-3.0.6.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0008-gnu-libsigc-Update-to-3.0.6.patch" =46rom b0729d8d4921460155b7ec6ab704e70eeff6e9cc Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 24 Mar 2021 23:28:10 -0400 Subject: [PATCH 08/56] gnu: libsigc++: Update to 3.0.6. * gnu/packages/glib.scm (libsigc++)[version]: Update to 3.0.6. [build-system]: Change from gnu to meson. [native-inputs]: Add mm-common, perl, libxml2 and libxslt. [inputs]: Add boost. [license]: Update to lgpl3+. --- gnu/packages/glib.scm | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 493b3e5b64..9e472eb3a0 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) + #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages docbook) @@ -570,18 +571,25 @@ by GDBus included in Glib.") (define libsigc++ (package (name "libsigc++") - (version "2.10.3") + (version "3.0.6") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/libsigc++/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "11j7j1jv4z58d9s7jvl42fnqa1dzl4idgil9r45cjv1w673dys0b")))= ) - (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config) - ("m4" ,m4))) + (method url-fetch) + (uri (string-append "mirror://gnome/sources/libsigc++/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1kn57b039lg20182lnchl1ys27vf34brn43f895cal8nc7sdq3mp"))= )) + (build-system meson-build-system) + (native-inputs + `(("m4" ,m4) + ("mm-common" ,mm-common) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xmllint" ,libxml2) + ("xsltproc" ,libxslt))) + (inputs + `(("boost" ,boost))) (home-page "https://libsigcplusplus.github.io/libsigcplusplus/") (synopsis "Type-safe callback system for standard C++") (description @@ -592,7 +600,7 @@ static or virtual. =20 It also contains adaptor classes for connection of dissimilar callbacks = and has an ease of use unmatched by other C++ callback libraries.") - (license license:lgpl2.1+))) + (license license:lgpl3+))) =20 (define glibmm (package --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0009-gnu-libsigc-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0009-gnu-libsigc-Enable-documentation.patch" =46rom 23774d4549c1a152a4290d31541090a496db3fe4 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 00:07:52 -0400 Subject: [PATCH 09/56] gnu: libsigc++: Enable documentation. * gnu/packages/glib.scm (libsigc++)[outputs]: New output "doc". [arguments]<#:configure-flags>[-Dbuild-documentation]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. [native-inputs]: Add dblatex, doxygen and graphviz. --- gnu/packages/glib.scm | 45 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9e472eb3a0..1f6098becf 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -49,6 +49,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) + #:use-module (gnu packages graphviz) #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages libffi) @@ -581,8 +582,36 @@ by GDBus included in Glib.") (base32 "1kn57b039lg20182lnchl1ys27vf34brn43f895cal8nc7sdq3mp"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) + (arguments + `(#:configure-flags + (list + "-Dbuild-documentation=3Dtrue") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs" + (substitute* (find-files "." "\\.xml$") + (("http://www.oasis-open.org/docbook/xml/4\\.1\\.2/") + (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/doc") + (string-append doc "/share/doc")) + #t)))))) (native-inputs - `(("m4" ,m4) + `(("docbook-xml" ,docbook-xml-4.1.2) + ("docbook-xsl" ,docbook-xsl) + ("dot" ,graphviz) + ("doxygen" ,doxygen) + ("m4" ,m4) ("mm-common" ,mm-common) ("perl" ,perl) ("pkg-config" ,pkg-config) @@ -594,12 +623,12 @@ by GDBus included in Glib.") (synopsis "Type-safe callback system for standard C++") (description "Libsigc++ implements a type-safe callback system for standard C++.= It -allows you to define signals and to connect those signals to any callbac= k -function, either global or a member function, regardless of whether it i= s -static or virtual. + allows you to define signals and to connect those signals to any ca= llback + function, either global or a member function, regardless of whether= it is + static or virtual. =20 -It also contains adaptor classes for connection of dissimilar callbacks = and -has an ease of use unmatched by other C++ callback libraries.") + It also contains adaptor classes for connection of dissimilar callb= acks and + has an ease of use unmatched by other C++ callback libraries.") (license license:lgpl3+))) =20 (define glibmm @@ -631,8 +660,8 @@ has an ease of use unmatched by other C++ callback li= braries.") ;; to open a TLS session; just skip it. (substitute* "tests/giomm_tls_client/main.cc" (("Gio::init.*$") - "return 77;\n")) - #t))))) + "return 77 ;\n")) + #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin"))) (propagated-inputs --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0010-gnu-glibmm-Update-to-2.68.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0010-gnu-glibmm-Update-to-2.68.0.patch" =46rom aecb79dbf9aa217cf84fe9b1411468aa4d44bd4c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 01:56:45 -0400 Subject: [PATCH 10/56] gnu: glibmm: Update to 2.68.0. * gnu/packages/glib.scm (glibmm)[version]: Update to 2.68.0. [arguments]<#:phases>['pre-build]: Remove phase. ['disable-failing-tests]: New phase. [native-inputs]: Add m4, mm-common, perl and libxslt. --- gnu/packages/glib.scm | 50 +++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 1f6098becf..ac46b5ce45 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -634,36 +634,36 @@ by GDBus included in Glib.") (define glibmm (package (name "glibmm") - (version "2.62.0") + (version "2.68.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/glibmm/" - (version-major+minor version) - "/glibmm-" version ".tar.xz")) - (sha256 - (base32 - "1ziwx6r7k7wbvg4qq1rgrv8zninapgrmhn1hs6926a3krh9ryr9n")))= ) - (build-system gnu-build-system) + (method url-fetch) + (uri (string-append "mirror://gnome/sources/glibmm/" + (version-major+minor version) + "/glibmm-" version ".tar.xz")) + (sha256 + (base32 + "0xgkyhb2876mcyyib5rk3ya9aingyj68h02nl22yvkhx35rqbwy1"))= )) + (build-system meson-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'build 'pre-build + (add-after 'unpack 'disable-failing-tests (lambda _ - ;; This test uses /etc/fstab as an example file to read - ;; from; choose a better example. - (substitute* "tests/giomm_simple/main.cc" - (("/etc/fstab") - (string-append (getcwd) - "/tests/giomm_simple/main.cc"))) - - ;; This test does a DNS lookup, and then expects to be able= - ;; to open a TLS session; just skip it. - (substitute* "tests/giomm_tls_client/main.cc" - (("Gio::init.*$") - "return 77 ;\n")) - #t))))) - (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin"))) + (substitute* "tests/meson.build" + ;; This test uses /etc/fstab as an example file to read + ;; from; disable it. + (("[ \t]*.*giomm_simple.*$") "") + ;; This test does a DNS lookup, and then expects to be ab= le + ;; to open a TLS session; just skip it. + (("[ \t]*.*giomm_tls_client.*$") "")) + #t))))) + (native-inputs + `(("glib:bin" ,glib "bin") + ("m4" ,m4) + ("mm-common" ,mm-common) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs `(("libsigc++" ,libsigc++) ("glib" ,glib))) --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0011-gnu-glibmm-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0011-gnu-glibmm-Enable-documentation.patch" =46rom 8ced07a179fe52541f8b87d1fefea5aac0b05332 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 03:04:01 -0400 Subject: [PATCH 11/56] gnu: glibmm: Enable documentation. * gnu/packages/glib.scm (glibmm)[outputs]: New output "doc". [arguments]<#:configure-flags>[-Dbuild-documentation]: New flag. <#:phases>['move-doc]: New phase. [native-inputs]: Add doxygen and graphviz. --- gnu/packages/glib.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index ac46b5ce45..bff6f281cd 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -644,8 +644,12 @@ by GDBus included in Glib.") (base32 "0xgkyhb2876mcyyib5rk3ya9aingyj68h02nl22yvkhx35rqbwy1"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - `(#:phases + `(#:configure-flags + (list + "-Dbuild-documentation=3Dtrue") + #:phases (modify-phases %standard-phases (add-after 'unpack 'disable-failing-tests (lambda _ @@ -656,9 +660,20 @@ by GDBus included in Glib.") ;; This test does a DNS lookup, and then expects to be ab= le ;; to open a TLS session; just skip it. (("[ \t]*.*giomm_tls_client.*$") "")) - #t))))) + #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/doc") + (string-append doc "/share/doc")) + #t)))))) (native-inputs - `(("glib:bin" ,glib "bin") + `(("dot" ,graphviz) + ("doxygen" ,doxygen) + ("glib:bin" ,glib "bin") ("m4" ,m4) ("mm-common" ,mm-common) ("perl" ,perl) --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0012-gnu-gtk-doc-Change-build-system.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0012-gnu-gtk-doc-Change-build-system.patch" =46rom a967d8c345584aee0a689cc0eac94cbcb9ce418c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 08:51:02 -0500 Subject: [PATCH 12/56] gnu: gtk-doc: Change build-system. * gnu/packages/gtk.scm (gtk-doc) [build-system]: Change from gnu to glib-= or-gtk. --- gnu/packages/gtk.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f0c1fcccb2..dadd6bbf42 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1742,7 +1742,7 @@ information.") (sha256 (base32 "05apmwibkmn1icx05l8aw241lhymcx01zvk5i499cb150bijj7li"))= )) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments `(#:parallel-tests? #f #:phases @@ -1750,16 +1750,16 @@ information.") (add-after 'unpack 'patch-gtk-doc-scan (lambda* (#:key inputs #:allow-other-keys) (substitute* "gtk-doc.xsl" - (("http://docbook.sourceforge.net/release/xsl/current/html= /chunk.xsl") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/html/chunk.xsl")) - (("http://docbook.sourceforge.net/release/xsl/current/comm= on/en.xml") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/common/en.xml"))) + (("http://docbook.sourceforge.net/release/xsl/current/htm= l/chunk.xsl") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/html/chunk.xsl")) + (("http://docbook.sourceforge.net/release/xsl/current/com= mon/en.xml") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/common/en.xml"))) #t)) (add-after 'patch-gtk-doc-scan 'patch-test-out (lambda _ @@ -1768,7 +1768,7 @@ information.") ;; generator metafont outputs a lot of extra lines, this ;; test would always fail. Disable it for now. (substitute* "tests/Makefile.in" - (("empty.sh sanity.sh") "empty.sh")) + (("empty.sh sanity.sh") "empty.sh")) #t)) (add-before 'configure 'fix-docbook (lambda* (#:key inputs #:allow-other-keys) --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0013-gnu-gtk-doc-Correct-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0013-gnu-gtk-doc-Correct-inputs.patch" =46rom 2be0bd0434356b90b2751182d345f506c7cd0393 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 08:58:34 -0500 Subject: [PATCH 13/56] gnu: gtk-doc: Correct inputs. * gnu/packages/gtk.scm (gtk-doc) [native-inputs]: Add glib:bin, perl and python-wrapper. [inputs]: Add python-anytree, python-lxml, python-parameterized, python-pygments, python-unittest2 and yelp-tools. Remove perl. --- gnu/packages/gtk.scm | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index dadd6bbf42..049815b8e5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1798,21 +1798,29 @@ information.") (assoc-ref %build-inputs "docbook-xml") "/xml/dtd/docbook/catalog.xml")))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) ("itstool" ,itstool) - ("libxml" ,libxml2) - ("gettext" ,gettext-minimal) - ("bc" ,bc))) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper))) (inputs - `(("perl" ,perl) - ("python" ,python) - ("xsltproc" ,libxslt) + `(("bc" ,bc) ("dblatex" ,dblatex) ("docbook-xml" ,docbook-xml-4.3) ("docbook-xsl" ,docbook-xsl) - ("source-highlight" ,source-highlight) ("glib" ,glib) - ("python-six" ,python-six))) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("python" ,python) + ("python-anytree" ,python-anytree) + ("python-lxml" ,python-lxml) + ("python-parameterized" ,python-parameterized) + ("python-pygments" ,python-pygments) + ("python-unittest2" ,python-unittest2) + ("source-highlight" ,source-highlight) + ("yelp-tools" ,yelp-tools))) (home-page "https://www.gtk.org/gtk-doc/") (synopsis "Documentation generator from C source code") (description --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0014-gnu-gtk-doc-Update-to-1.32.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0014-gnu-gtk-doc-Update-to-1.32.patch" =46rom 865089af4a405af3da349610d66e8e705a8dddf9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 09:08:32 -0500 Subject: [PATCH 14/56] gnu: gtk-doc: Update to 1.32. * gnu/packages/gtk.scm (gtk-doc) [version]: Update to 1.32. [arguments]<#:phases>['patch-test-out]: Remove phase. ['disable-failing-tests]: New phase. ['set-HOME]: New phase. --- gnu/packages/gtk.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 049815b8e5..2322b5c627 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1733,7 +1733,7 @@ information.") (define-public gtk-doc (package (name "gtk-doc") - (version "1.28") + (version "1.32") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1741,7 +1741,7 @@ information.") name "-" version ".tar.xz")) (sha256 (base32 - "05apmwibkmn1icx05l8aw241lhymcx01zvk5i499cb150bijj7li"))= )) + "0z4h1dggpimygdp719l457jvqilps4qcfpk31jmj3jqpzcsg03ny"))= )) (build-system glib-or-gtk-build-system) (arguments `(#:parallel-tests? #f @@ -1761,14 +1761,11 @@ information.") ,(package-version docbook-xsl) "/common/en.xml"))) #t)) - (add-after 'patch-gtk-doc-scan 'patch-test-out + (add-after 'unpack 'disable-failing-tests (lambda _ - ;; sanity.sh counts the number of status lines. Since our - ;; texlive regenerates the fonts every time and the font - ;; generator metafont outputs a lot of extra lines, this - ;; test would always fail. Disable it for now. (substitute* "tests/Makefile.in" - (("empty.sh sanity.sh") "empty.sh")) + (("annotations.sh bugs.sh empty.sh fail.sh gobject.sh pro= gram.sh") + "")) #t)) (add-before 'configure 'fix-docbook (lambda* (#:key inputs #:allow-other-keys) @@ -1785,6 +1782,12 @@ information.") "^catalog.xml$")) " \"http://docbook.sourceforge.net/releas= e/xsl/"))) #t)) + (add-before 'build 'set-HOME + (lambda _ + ;; FIXME: dblatex with texlive-union does not find the buil= t + ;; metafonts, so it tries to generate them in HOME. + (setenv "HOME" "/tmp") + #t)) (add-after 'install 'wrap-executables (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0015-gnu-gtk-doc-Enable-help.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0015-gnu-gtk-doc-Enable-help.patch" =46rom adb1bbfaebbcb0336212ecbc1b59cca26f271b9a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 09:13:14 -0500 Subject: [PATCH 15/56] gnu: gtk-doc: Enable help. * gnu/packages/gtk.scm (gtk-doc) [outputs]: New output 'help'. [arguments]<#:configure-flags>[--with-help-dir]: New flag. --- gnu/packages/gtk.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 2322b5c627..4d3017da73 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1743,6 +1743,7 @@ information.") (base32 "0z4h1dggpimygdp719l457jvqilps4qcfpk31jmj3jqpzcsg03ny"))= )) (build-system glib-or-gtk-build-system) + (outputs '("out" "help")) (arguments `(#:parallel-tests? #f #:phases @@ -1799,7 +1800,10 @@ information.") #:configure-flags (list (string-append "--with-xml-catalog=3D" (assoc-ref %build-inputs "docbook-xml") - "/xml/dtd/docbook/catalog.xml")))) + "/xml/dtd/docbook/catalog.xml") + (string-append "--with-help-dir=3D" + (assoc-ref %outputs "help") + "/share/help")))) (native-inputs `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0016-gnu-gtk-doc-Update-synopsis-description-home-page-an.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0016-gnu-gtk-doc-Update-synopsis-description-home-page-an.pa"; filename*1="tch" =46rom 8a73dc42b1a80e908f6b13496ab8944fb175c1cf Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 09:20:40 -0500 Subject: [PATCH 16/56] gnu: gtk-doc: Update synopsis, description, home-p= age and license. * gnu/packages/gtk.scm (gtk-doc) [home-page]: Modify. [synopsis]: Modify. [description]: Modify. [license]: Add fdl1.1+. --- gnu/packages/gtk.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4d3017da73..4c7b253060 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1828,13 +1828,19 @@ information.") ("python-unittest2" ,python-unittest2) ("source-highlight" ,source-highlight) ("yelp-tools" ,yelp-tools))) - (home-page "https://www.gtk.org/gtk-doc/") - (synopsis "Documentation generator from C source code") - (description - "GTK-Doc generates API documentation from comments added to C code.= It is -typically used to document the public API of GTK+ and GNOME libraries, b= ut it -can also be used to document application code.") - (license license:gpl2+))) + (home-page "https://wiki.gnome.org/DocumentationProject/GtkDoc") + (synopsis "GTK+ DocBook Documentation Generator") + (description "GtkDoc is a tool used to extract API documentation fro= m C-code +like Doxygen, but handles documentation of GObject (including signals an= d +properties) that makes it very suitable for GTK+ apps and libraries. It= uses +docbook for intermediate files and can produce html by default and pdf/m= an-pages +with some extra work.") + (license + (list + ;; Docs. + license:fdl1.1+ + ;; Others. + license:gpl2+)))) =20 (define-public gtk-engines (package --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0017-gnu-gobject-introspection-Propagate-glib.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0017-gnu-gobject-introspection-Propagate-glib.patch" =46rom d7df90e58a162fcacb0f6064523767f91fd17baa Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 09:59:44 -0500 Subject: [PATCH 17/56] gnu: gobject-introspection: Propagate glib. * gnu/packages/glib.scm (gobject-introspection) [inputs]: Move glib to ..= =2E [propagated-inputs]: ... here. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index bff6f281cd..7d31b1dc73 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -416,11 +416,11 @@ functions for strings and common data structures.")= (inputs `(("bison" ,bison) ("flex" ,flex) - ("glib" ,glib) ("python" ,python-wrapper) ("zlib" ,zlib))) (propagated-inputs - `(;; In practice, GIR users will need libffi when using + `(("glib" ,glib) + ;; In practice, GIR users will need libffi when using ;; gobject-introspection. ("libffi" ,libffi))) (native-search-paths --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0018-gnu-cairo-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0018-gnu-cairo-Make-some-cosmetic-changes.patch" =46rom 9fa9752ba9b28cd8ecc6d7d539cf0a05133682ce Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 4 Dec 2020 00:49:10 -0500 Subject: [PATCH 18/56] gnu: cairo: Make some cosmetic changes. * gnu/packages/patches/cairo-CVE-2018-19876.patch, gnu/packages/patches/cairo-CVE-2020-35492.patch: Remove patches. * gnu/local.mk (dist_patch_DATA): Unregister them. * gnu/packages/gtk.scm (cairo): Make some cosmetic changes. [replacement]: Remove. (cairo/fixed): Remove. --- gnu/local.mk | 2 - gnu/packages/gtk.scm | 92 +++++++++---------- .../patches/cairo-CVE-2018-19876.patch | 37 -------- .../patches/cairo-CVE-2020-35492.patch | 49 ---------- 4 files changed, 41 insertions(+), 139 deletions(-) delete mode 100644 gnu/packages/patches/cairo-CVE-2018-19876.patch delete mode 100644 gnu/packages/patches/cairo-CVE-2020-35492.patch diff --git a/gnu/local.mk b/gnu/local.mk index fc05786287..73f3ffbcf5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -878,8 +878,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/bpftrace-disable-bfd-disasm.patch \ %D%/packages/patches/busybox-CVE-2021-28831.patch \ %D%/packages/patches/byobu-writable-status.patch \ - %D%/packages/patches/cairo-CVE-2018-19876.patch \ - %D%/packages/patches/cairo-CVE-2020-35492.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-sqlite.patch \ %D%/packages/patches/calibre-remove-test-unrar.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4c7b253060..d9adfe28ea 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -123,67 +123,57 @@ tools have full access to view and control running = applications.") =20 (define-public cairo (package - (name "cairo") - (version "1.16.0") - (replacement cairo/fixed) - (source (origin - (method url-fetch) - (uri (string-append "https://cairographics.org/releases/cair= o-" - version ".tar.xz")) - (sha256 - (base32 - "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))))= - (build-system gnu-build-system) - (propagated-inputs - `(("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glib" ,glib) - ("libpng" ,libpng) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libxrender" ,libxrender) - ("pixman" ,pixman))) - (inputs - `(("ghostscript" ,ghostscript) - ("libspectre" ,libspectre) - ("poppler" ,poppler) - ("xorgproto" ,xorgproto) - ("zlib" ,zlib))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("python" ,python-wrapper))) + (name "cairo") + (version "1.16.0") + (source + (origin + (method url-fetch) + (uri + (string-append "https://cairographics.org/releases/cairo-" + version ".tar.xz")) + (sha256 + (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))= )) + (build-system gnu-build-system) (arguments - `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/201= 3-06/msg00085.html - #:configure-flags '("--enable-tee" ;needed for GNU Icecat - "--enable-xml" ;for cairo-xml support - "--disable-static"))) - (synopsis "2D graphics library") - (description - "Cairo is a 2D graphics library with support for multiple output dev= ices. -Currently supported output targets include the X Window System (via both= -Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG fi= le + `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013= -06/msg00085.html + #:configure-flags + (list + "--enable-tee" ;needed for GNU Icecat + "--enable-xml" ;for cairo-xml support + "--disable-static"))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (inputs + `(("ghostscript" ,ghostscript) + ("libspectre" ,libspectre) + ("poppler" ,poppler) + ("xorgproto" ,xorgproto) + ("zlib" ,zlib))) + (propagated-inputs + `(("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("glib" ,glib) + ("libpng" ,libpng) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxrender" ,libxrender) + ("pixman" ,pixman))) + (synopsis "2D graphics library") + (description "Cairo is a 2D graphics library with support for multip= le output +devices. Currently supported output targets include the X Window System= (via +both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and S= VG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.= - Cairo is designed to produce consistent output on all output media while= taking advantage of display hardware acceleration when available eg. through the X Render Extension). - The cairo API provides operations similar to the drawing operators of PostScript and PDF. Operations in cairo including stroking and filling = cubic B=C3=A9zier splines, transforming and compositing translucent images, an= d antialiased text rendering. All drawing operations can be transformed b= y any affine transformation (scale, rotation, shear, etc.).") - (license license:lgpl2.1) ; or Mozilla Public License 1.1 - (home-page "https://cairographics.org/"))) - -(define cairo/fixed - (package - (inherit cairo) - (source (origin - (inherit (package-source cairo)) - (patches (append (search-patches "cairo-CVE-2018-19876.pat= ch" - "cairo-CVE-2020-35492.pat= ch") - (origin-patches (package-source cairo))))= )))) + (home-page "https://cairographics.org/") + (license license:lgpl2.1))) ; or Mozilla Public License 1.1 =20 (define-public cairo-sans-poppler ;; Variant used to break the dependency cycle between Poppler and Cair= o. diff --git a/gnu/packages/patches/cairo-CVE-2018-19876.patch b/gnu/packag= es/patches/cairo-CVE-2018-19876.patch deleted file mode 100644 index c0fba2ecaa..0000000000 --- a/gnu/packages/patches/cairo-CVE-2018-19876.patch +++ /dev/null @@ -1,37 +0,0 @@ -Copied from Debian. - -From: Carlos Garcia Campos -Date: Mon, 19 Nov 2018 12:33:07 +0100 -Subject: ft: Use FT_Done_MM_Var instead of free when available in - cairo_ft_apply_variations - -Fixes a crash when using freetype >=3D 2.9 - -[This is considered to be security-sensitive because WebKitGTK+ sets its= -own memory allocator, which is not compatible with system free(), making= -this a remotely triggerable denial of service or memory corruption.] - -Origin: upstream, commit:90e85c2493fdfa3551f202ff10282463f1e36645 -Bug: https://gitlab.freedesktop.org/cairo/cairo/merge_requests/5 -Bug-Debian: https://bugs.debian.org/916389 -Bug-CVE: CVE-2018-19876 ---- - src/cairo-ft-font.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c -index 325dd61..981973f 100644 ---- a/src/cairo-ft-font.c -+++ b/src/cairo-ft-font.c -@@ -2393,7 +2393,11 @@ skip: - done: - free (coords); - free (current_coords); -+#if HAVE_FT_DONE_MM_VAR -+ FT_Done_MM_Var (face->glyph->library, ft_mm_var); -+#else - free (ft_mm_var); -+#endif - } - } -=20 diff --git a/gnu/packages/patches/cairo-CVE-2020-35492.patch b/gnu/packag= es/patches/cairo-CVE-2020-35492.patch deleted file mode 100644 index e8b90fa5c5..0000000000 --- a/gnu/packages/patches/cairo-CVE-2020-35492.patch +++ /dev/null @@ -1,49 +0,0 @@ -Copied from Debian. - -From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001 -From: Heiko Lewin -Date: Tue, 15 Dec 2020 16:48:19 +0100 -Subject: [PATCH] Fix mask usage in image-compositor - -[trimmed test case, since not used in Debian build] - ---- - src/cairo-image-compositor.c | 8 ++-- - ---- cairo-1.16.0.orig/src/cairo-image-compositor.c -+++ cairo-1.16.0/src/cairo-image-compositor.c -@@ -2601,14 +2601,14 @@ _inplace_src_spans (void *abstract_rende - unsigned num_spans) - { - cairo_image_span_renderer_t *r =3D abstract_renderer; -- uint8_t *m; -+ uint8_t *m, *base =3D (uint8_t*)pixman_image_get_data(r->mask); - int x0; -=20 - if (num_spans =3D=3D 0) - return CAIRO_STATUS_SUCCESS; -=20 - x0 =3D spans[0].x; -- m =3D r->_buf; -+ m =3D base; - do { - int len =3D spans[1].x - spans[0].x; - if (len >=3D r->u.composite.run_length && spans[0].coverage =3D=3D 0xf= f) { -@@ -2646,7 +2646,7 @@ _inplace_src_spans (void *abstract_rende - spans[0].x, y, - spans[1].x - spans[0].x, h); -=20 -- m =3D r->_buf; -+ m =3D base; - x0 =3D spans[1].x; - } else if (spans[0].coverage =3D=3D 0x0) { - if (spans[0].x !=3D x0) { -@@ -2675,7 +2675,7 @@ _inplace_src_spans (void *abstract_rende - #endif - } -=20 -- m =3D r->_buf; -+ m =3D base; - x0 =3D spans[1].x; - } else { - *m++ =3D spans[0].coverage; --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0019-gnu-cairo-Change-build-system.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0019-gnu-cairo-Change-build-system.patch" =46rom 2d93be247899688e378bfd267bc884a5152ada2d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 4 Dec 2020 00:51:10 -0500 Subject: [PATCH 19/56] gnu: cairo: Change build-system. * gnu/packages/gtk.scm (cairo) [build-system]: Change from gnu to glib-or= -gtk. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d9adfe28ea..27c132ab59 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -133,7 +133,7 @@ tools have full access to view and control running ap= plications.") version ".tar.xz")) (sha256 (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))= )) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013= -06/msg00085.html #:configure-flags --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0020-gnu-cairo-Move-documentation-to-separate-output.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0020-gnu-cairo-Move-documentation-to-separate-output.patch" =46rom 403c8fb54e60c69e1a11863c226efffbb9952b2e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 4 Dec 2020 00:53:16 -0500 Subject: [PATCH 20/56] gnu: cairo: Move documentation to separate output.= * gnu/packages/gtk.scm (cairo) [outputs]: New output "doc". [arguments]<#:configure-flags>[--with-html-dir]: New flag. --- gnu/packages/gtk.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 27c132ab59..6dd281e2bc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -134,13 +134,17 @@ tools have full access to view and control running = applications.") (sha256 (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))= )) (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) (arguments `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013= -06/msg00085.html #:configure-flags (list - "--enable-tee" ;needed for GNU Icecat - "--enable-xml" ;for cairo-xml support - "--disable-static"))) + "--enable-tee" ;needed for GNU Icecat + "--enable-xml" ;for cairo-xml support + "--disable-static" + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html")))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python-wrapper))) --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0021-gnu-cairo-Enable-some-features.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0021-gnu-cairo-Enable-some-features.patch" =46rom 67db52bb67fb57967c869a6e852288a2a32101a1 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 4 Dec 2020 01:02:00 -0500 Subject: [PATCH 21/56] gnu: cairo: Enable some features. * gnu/packages/gtk.scm (cairo) [native-inputs]: Add gobject-introspection= =2E [inputs]: Add libdrm. Remove xorgproto and zlib. [propagated-inputs]: Add libxcb. --- gnu/packages/gtk.scm | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 6dd281e2bc..f1f71c2612 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -139,30 +139,45 @@ tools have full access to view and control running = applications.") `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013= -06/msg00085.html #:configure-flags (list - "--enable-tee" ;needed for GNU Icecat - "--enable-xml" ;for cairo-xml support "--disable-static" + ;; XXX: To be enabled. + ;; "--enable-gallium=3Dyes" + ;; "--enable-gl=3Dyes" + ;; " --enable-glesv2=3Dyes" + ;; "--enable-glesv3=3Dyes" + ;; "--enable-cogl=3Dyes" + ;; "--enable-directfb=3Dyes" + ;; "--enable-vg=3Dyes" + "--enable-tee=3Dyes" + "--enable-xml=3Dyes" (string-append "--with-html-dir=3D" (assoc-ref %outputs "doc") "/share/gtk-doc/html")))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (inputs - `(("ghostscript" ,ghostscript) + `(("drm" ,libdrm) + ("ghostscript" ,ghostscript) ("libspectre" ,libspectre) - ("poppler" ,poppler) - ("xorgproto" ,xorgproto) - ("zlib" ,zlib))) + ("poppler" ,poppler))) (propagated-inputs - `(("fontconfig" ,fontconfig) + `( ;; ("cogl" ,cogl) + ;; ("directfb" ,directfb) + ("fontconfig" ,fontconfig) + ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("glib" ,glib) + ;; ("gtk+" ,gtk+) ("libpng" ,libpng) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libxrender" ,libxrender) - ("pixman" ,pixman))) + ;; ("librsvg" ,librsvg) + ;; ("opengl" ,mesa) + ("pixman" ,pixman) + ("x11" ,libx11) + ("xcb" ,libxcb) + ("xext" ,libxext) + ("xrender" ,libxrender))) (synopsis "2D graphics library") (description "Cairo is a 2D graphics library with support for multip= le output devices. Currently supported output targets include the X Window System= (via --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0022-gnu-cairo-Update-synopsis-description-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0022-gnu-cairo-Update-synopsis-description-and-license.patch" =46rom 2dd3536d8cddbfd502aace1582b764242a0fb04e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 4 Dec 2020 01:04:37 -0500 Subject: [PATCH 22/56] gnu: cairo: Update synopsis, description and licen= se. * gnu/packages/gtk.scm (cairo) [synopsis]: Modify. [description]: Modify. [license]: Modify. --- gnu/packages/gtk.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f1f71c2612..92a6dfc723 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -178,21 +178,17 @@ tools have full access to view and control running = applications.") ("xcb" ,libxcb) ("xext" ,libxext) ("xrender" ,libxrender))) - (synopsis "2D graphics library") + (synopsis "Multi-platform 2D graphics library") (description "Cairo is a 2D graphics library with support for multip= le output devices. Currently supported output targets include the X Window System= (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and S= VG file -output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.= -Cairo is designed to produce consistent output on all output media while= -taking advantage of display hardware acceleration when available -eg. through the X Render Extension). -The cairo API provides operations similar to the drawing operators of -PostScript and PDF. Operations in cairo including stroking and filling = cubic -B=C3=A9zier splines, transforming and compositing translucent images, an= d -antialiased text rendering. All drawing operations can be transformed b= y any -affine transformation (scale, rotation, shear, etc.).") +output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.= ") (home-page "https://cairographics.org/") - (license license:lgpl2.1))) ; or Mozilla Public License 1.1 + (license + ;; This project is dual-licensed. + (list + license:lgpl2.1+ + license:mpl1.1)))) =20 (define-public cairo-sans-poppler ;; Variant used to break the dependency cycle between Poppler and Cair= o. --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0023-gnu-cairomm-Update-to-1.16.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0023-gnu-cairomm-Update-to-1.16.0.patch" =46rom cf19f2b3a3d937b35fb1293f1ee5649824358afd Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 06:49:16 -0400 Subject: [PATCH 23/56] gnu: cairomm: Update to 1.16.0. * gnu/packages/gtk.scm (cairomm)[version]: Update to 1.16.0. [build-system]: Change from gnu to meson. [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dboost-shared]: New flag. <#:make-flags>: Remove argument. [native-inputs]: Add boost and mm-common. --- gnu/packages/gtk.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 92a6dfc723..82d59ed60b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -58,6 +58,7 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages boost) #:use-module (gnu packages build-tools) #:use-module (gnu packages texinfo) #:use-module (gnu packages check) @@ -1264,19 +1265,24 @@ guile-gnome-platform (GNOME developer libraries),= and guile-gtksourceview.") (define-public cairomm (package (name "cairomm") - (version "1.12.2") + (version "1.16.0") (source (origin (method url-fetch) (uri (string-append "https://www.cairographics.org/release= s/" - name "-" version ".tar.gz")) + name "-" version ".tar.xz")) (sha256 (base32 - "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25"))= )) - (build-system gnu-build-system) + "1ya4y7qa000cjawqwswbqv26y5icfkmhs5iiiil4dxgrqn91923y"))= )) + (build-system meson-build-system) (arguments - ;; The examples lack -lcairo. - '(#:make-flags '("LDFLAGS=3D-lcairo"))) - (native-inputs `(("pkg-config" ,pkg-config))) + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Dboost-shared=3Dtrue"))) + (native-inputs + `(("boost" ,boost) + ("mm-common" ,mm-common) + ("pkg-config" ,pkg-config))) (propagated-inputs `(("libsigc++" ,libsigc++) ("freetype" ,freetype) --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0024-gnu-cairomm-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0024-gnu-cairomm-Enable-documentation.patch" =46rom 13129ff9d6fd5656ecbe7f01cdd55e18d7beaad8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 07:07:14 -0400 Subject: [PATCH 24/56] gnu: cairomm: Enable documentation. * gnu/packages/gtk.scm (cairomm)[outputs]: New output "doc". [arguments]<#:configure-flags>[-Dbuild-documentation]: New flag. <#:phases>['move-doc]: New phase. [native-inputs]: Add doxygen, graphviz, perl and libxslt. --- gnu/packages/gtk.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 82d59ed60b..4c3514c2a9 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1274,15 +1274,32 @@ guile-gnome-platform (GNOME developer libraries),= and guile-gtksourceview.") (base32 "1ya4y7qa000cjawqwswbqv26y5icfkmhs5iiiil4dxgrqn91923y"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:configure-flags (list - "-Dboost-shared=3Dtrue"))) + "-Dbuild-documentation=3Dtrue" + "-Dboost-shared=3Dtrue") + #: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/doc") + (string-append doc "/share/doc")) + #t)))))) (native-inputs `(("boost" ,boost) + ("dot" ,graphviz) + ("doxygen" ,doxygen) ("mm-common" ,mm-common) - ("pkg-config" ,pkg-config))) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs `(("libsigc++" ,libsigc++) ("freetype" ,freetype) --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0025-gnu-pango-Add-missing-arguments.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0025-gnu-pango-Add-missing-arguments.patch" =46rom a7445cc9a1fee8ca1b388a69cf28799355c5bef6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:11:10 -0500 Subject: [PATCH 25/56] gnu: pango: Add missing arguments. * gnu/packages/gtk.scm (pango) [arguments]<#:glib-or-gtk?>: New argument.= --- gnu/packages/gtk.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4c3514c2a9..1e0cdbe265 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -325,7 +325,8 @@ applications.") "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6"))))= (build-system meson-build-system) (arguments - '(#:phases (modify-phases %standard-phases + '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases (modify-phases %standard-phases (add-after 'unpack 'disable-cantarell-tests (lambda _ (substitute* "tests/meson.build" --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0026-gnu-pango-Re-arrange-inputs-in-alphabetical-order.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0026-gnu-pango-Re-arrange-inputs-in-alphabetical-order.patch" =46rom f92c4e9e56a05d10774c03883163b78a409054dd Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:17:09 -0500 Subject: [PATCH 26/56] gnu: pango: Re-arrange inputs in alphabetical orde= r. * gnu/packages/gtk.scm (pango) [propagated-inputs]: Modify. [native-inputs]: Modify. --- gnu/packages/gtk.scm | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 1e0cdbe265..e5d2a2b9a4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -336,24 +336,23 @@ applications.") (("\\[ 'test-itemize'.*") "") (("\\[ 'test-layout'.*") "")) #t))))) - (propagated-inputs - ;; These are all in Requires or Requires.private of the '.pc' files.= - `(("cairo" ,cairo) - ("fribidi" ,fribidi) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glib" ,glib) - ("harfbuzz" ,harfbuzz) - - ;; Some packages, such as Openbox, expect Pango to be built with t= he - ;; optional libxft support. - ("libxft" ,libxft))) - (inputs - `(("zlib" ,zlib))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ; glib-mkenums,= etc. - ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler= , etc. + (propagated-inputs + ;; These are all in Requires or Requires.private of the '.pc' files= =2E + `(("cairo" ,cairo) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("fribidi" ,fribidi) + ("glib" ,glib) + ("harfbuzz" ,harfbuzz) + ;; Some packages, such as Openbox, expect Pango to be built with = the + ;; optional libxft support. + ("libxft" ,libxft))) + (inputs + `(("zlib" ,zlib))) + (native-inputs + `(("glib" ,glib "bin") ; glib-mkenums, etc. + ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. + ("pkg-config" ,pkg-config))) (synopsis "GNOME text and font handling library") (description "Pango is the core text and font handling library used in GNOME --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0027-gnu-pango-Update-to-1.48.3.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0027-gnu-pango-Update-to-1.48.3.patch" =46rom 457f6775855abb52eb6af8e1197df003dbf06e72 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 23 Mar 2021 23:32:15 -0400 Subject: [PATCH 27/56] gnu: pango: Update to 1.48.3. * gnu/packages/gtk.scm (pango) [version]: Update to 1.48.3. [arguments]<#:phases>['disable-cantarell-tests]: Modify. [propagated-inputs]: Add libthai and libxrender. [native-inputs]: Add help2man, perl and python-wrapper. --- gnu/packages/gtk.scm | 69 ++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e5d2a2b9a4..93c8c46bea 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -78,6 +78,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) + #:use-module (gnu packages man) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -312,30 +313,31 @@ applications.") =20 (define-public pango (package - (name "pango") - (version "1.44.7") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/pango/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (patches (search-patches "pango-skip-libthai-test.patch")) - (sha256 - (base32 - "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6"))))= - (build-system meson-build-system) - (arguments - '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas - #:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-cantarell-tests - (lambda _ - (substitute* "tests/meson.build" - ;; XXX FIXME: These tests require "font-cantarell= ", but - ;; adding it here would introduce a circular depe= ndency. - (("\\[ 'test-harfbuzz'.*") "") - (("\\[ 'test-itemize'.*") "") - (("\\[ 'test-layout'.*") "")) - #t))))) + (name "pango") + (version "1.48.3") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/pango/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (patches (search-patches "pango-skip-libthai-test.patch"))= + (sha256 + (base32 + "0ijbkcs6217ygzphlpi0vajxkccifdbsl0jdjpy8wz11h9f19sin"))= )) + (build-system meson-build-system) + (arguments + '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-cantarell-tests + (lambda _ + (substitute* "tests/meson.build" + ;; XXX FIXME: These tests require "font-cantarel= l", but + ;; adding it here would introduce a circular dep= endency. + (("\\[ 'test-layout'.*") "") + (("\\[ 'test-itemize'.*") "") + (("\\[ 'test-font'.*") "") + (("\\[ 'test-harfbuzz'.*") "")) + #t))))) (propagated-inputs ;; These are all in Requires or Requires.private of the '.pc' files= =2E `(("cairo" ,cairo) @@ -344,22 +346,27 @@ applications.") ("fribidi" ,fribidi) ("glib" ,glib) ("harfbuzz" ,harfbuzz) + ("libthai" ,libthai) ;; Some packages, such as Openbox, expect Pango to be built with = the ;; optional libxft support. - ("libxft" ,libxft))) + ("libxft" ,libxft) + ("libxrender" ,libxrender))) (inputs `(("zlib" ,zlib))) (native-inputs `(("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. - ("pkg-config" ,pkg-config))) - (synopsis "GNOME text and font handling library") - (description - "Pango is the core text and font handling library used in GNOME + ("help2man" ,help2man) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (synopsis "GNOME text and font handling library") + (description + "Pango is the core text and font handling library used in GNOME applications. It has extensive support for the different writing system= s used throughout the world.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/pango/"))) + (license license:lgpl2.0+) + (home-page "https://developer.gnome.org/pango/"))) =20 (define-public pango-1.42 (package --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0028-gnu-pango-Update-synopsis-description-and-home-page.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0028-gnu-pango-Update-synopsis-description-and-home-page.pat"; filename*1="ch" =46rom d85b2c15cf6463ef98b0a49db825c14bc534e28d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:24:42 -0500 Subject: [PATCH 28/56] gnu: pango: Update synopsis, description and home-= page. * gnu/packages/gtk.scm (pango) [synopsis]: Modify. [description]: Modify. [home-page]: Modify. --- gnu/packages/gtk.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 93c8c46bea..700977fc55 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -360,13 +360,14 @@ applications.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) - (synopsis "GNOME text and font handling library") - (description - "Pango is the core text and font handling library used in GNOME -applications. It has extensive support for the different writing system= s -used throughout the world.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/pango/"))) + (synopsis "Text and font handling library") + (description "Pango is a library for laying out and rendering of tex= t, with +an emphasis on internationalization. Pango can be used anywhere that te= xt +layout is needed, though most of the work on Pango so far has been done = in the +context of the GTK+ widget toolkit. Pango forms the core of text and fo= nt +handling for GTK+-2.x.") + (home-page "https://pango.gnome.org/") + (license license:lgpl2.0+))) =20 (define-public pango-1.42 (package --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0029-gnu-pangomm-Update-to-2.48.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0029-gnu-pangomm-Update-to-2.48.0.patch" =46rom fadec9e7b29ebd93a3052209d0f0e5942940cb18 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 07:42:10 -0400 Subject: [PATCH 29/56] gnu: pangomm: Update to 2.48.0. * gnu/packages/gtk.scm (pango)[version]: Update to 2.48.0. [build-system]: Change from gnu to meson. [arguments]<#:glib-or-gtk?>: New argument. [native-inputs]: Add m4 and mm-common. --- gnu/packages/gtk.scm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 700977fc55..e3afdc5d64 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1340,17 +1340,22 @@ library.") (define-public pangomm (package (name "pangomm") - (version "2.42.0") + (version "2.48.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0mmzxp3wniaafkxr30sb22mq9x44xckb5d60h1bl99lkzxks0vfa")))= ) - (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config))) + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0y2vyp6azvhrii6rzs89kr08wg8z1p562awyr812131zqdsd83ly"))= )) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas + (native-inputs + `(("m4" ,m4) + ("mm-common" ,mm-common) + ("pkg-config" ,pkg-config))) (propagated-inputs `(("cairo" ,cairo) ("cairomm" ,cairomm) --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0030-gnu-pangomm-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0030-gnu-pangomm-Enable-documentation.patch" =46rom f55217fbe8a09dd12a28a9202efd5f7dc8ec9c17 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 07:47:41 -0400 Subject: [PATCH 30/56] gnu: pangomm: Enable documentation. * gnu/packages/gtk.scm (pangomm)[outputs]: New output "doc". [arguments]<#:configure-flags>[-Dbuild-documentation]: New flag. <#:phases>['move-doc]: New phase. [native-inputs]: Add doxygen, graphviz, perl and libxslt. --- gnu/packages/gtk.scm | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e3afdc5d64..3d8a7b926b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1350,12 +1350,31 @@ library.") (base32 "0y2vyp6azvhrii6rzs89kr08wg8z1p562awyr812131zqdsd83ly"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Dbuild-documentation=3Dtrue") + #: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/doc") + (string-append doc "/share/doc")) + #t)))))) (native-inputs - `(("m4" ,m4) + `(("dot" ,graphviz) + ("doxygen" ,doxygen) + ("m4" ,m4) ("mm-common" ,mm-common) - ("pkg-config" ,pkg-config))) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs `(("cairo" ,cairo) ("cairomm" ,cairomm) --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0031-gnu-gdk-pixbuf-Add-missing-arguments.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0031-gnu-gdk-pixbuf-Add-missing-arguments.patch" =46rom b1282f298084d59f32dd0887e03a94869eb71982 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:29:02 -0500 Subject: [PATCH 31/56] gnu: gdk-pixbuf: Add missing arguments. * gnu/packages/patches/gdk-pixbuf-CVE-2020-29385.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Unregister it. * gnu/packages/gtk.scm (gdk-pixbuf) [arguments]<#:glib-or-gtk?>: New argu= ment. [replacement]: Remove. (gdk-pixbuf/fixed): Remove. --- gnu/local.mk | 1 - gnu/packages/gtk.scm | 91 +++++++++---------- .../patches/gdk-pixbuf-CVE-2020-29385.patch | 53 ----------- 3 files changed, 41 insertions(+), 104 deletions(-) delete mode 100644 gnu/packages/patches/gdk-pixbuf-CVE-2020-29385.patch diff --git a/gnu/local.mk b/gnu/local.mk index 73f3ffbcf5..7591a90c49 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1060,7 +1060,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/gdb-hurd.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-brect-bounds.patch \ - %D%/packages/patches/gdk-pixbuf-CVE-2020-29385.patch \ %D%/packages/patches/gdm-default-session.patch \ %D%/packages/patches/geary-CVE-2020-24661.patch \ %D%/packages/patches/genimage-signedness.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3d8a7b926b..513a4ef1a6 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -579,60 +579,51 @@ highlighting and other features typical of a source= code editor.") =20 (define-public gdk-pixbuf (package - (name "gdk-pixbuf") - (version "2.42.2") - (replacement gdk-pixbuf/fixed) - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3"))))= - (build-system meson-build-system) - (arguments - `(#:meson ,meson-0.55 - #:configure-flags '("-Dinstalled_tests=3Dfalse") - #:phases - (modify-phases %standard-phases - ;; 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 + (name "gdk-pixbuf") + (version "2.42.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3"))= )) + (build-system meson-build-system) + (arguments + `(#:meson ,meson-0.55 + #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags '("-Dinstalled_tests=3Dfalse") + #:phases + (modify-phases %standard-phases + ;; 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) ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ; glib-mkenums= , etc. + ("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= + (synopsis "GNOME image loading and manipulation library") + (description + "GdkPixbuf is a library for image loading and manipulation develope= d in the GNOME project.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/gdk-pixbuf/"))) - -(define gdk-pixbuf/fixed - (package - (inherit gdk-pixbuf) - (source (origin - (inherit (package-source gdk-pixbuf)) - (patches - (append (search-patches "gdk-pixbuf-CVE-2020-29385.patch"= ) - (origin-patches (package-source gdk-pixbuf)))))))= ) + (license license:lgpl2.0+) + (home-page "https://developer.gnome.org/gdk-pixbuf/"))) =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= diff --git a/gnu/packages/patches/gdk-pixbuf-CVE-2020-29385.patch b/gnu/p= ackages/patches/gdk-pixbuf-CVE-2020-29385.patch deleted file mode 100644 index e6ac4de00b..0000000000 --- a/gnu/packages/patches/gdk-pixbuf-CVE-2020-29385.patch +++ /dev/null @@ -1,53 +0,0 @@ -Fix CVE-2020-29385. Note that we omit the binary test file -tests/test-images/fail/hang_114.gif from the following commit, to avoid -requiring 'git' to apply the patch. - - -From bdd3acbd48a575d418ba6bf1b32d7bda2fae1c81 Mon Sep 17 00:00:00 2001 -From: Robert Ancell -Date: Mon, 30 Nov 2020 12:26:12 +1300 -Subject: [PATCH] gif: Fix LZW decoder accepting invalid LZW code. - -The code value after a reset wasn't being validated, which means we woul= d -accept invalid codes. This could cause an infinite loop in the decoder. - -Fixes CVE-2020-29385 - -Fixes https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/164 ---- - gdk-pixbuf/lzw.c | 13 +++++++------ - tests/test-images/fail/hang_114.gif | Bin 0 -> 5561 bytes - 2 files changed, 7 insertions(+), 6 deletions(-) - create mode 100644 tests/test-images/fail/hang_114.gif - -diff --git a/gdk-pixbuf/lzw.c b/gdk-pixbuf/lzw.c -index 9e052a6f7..105daf2b1 100644 ---- a/gdk-pixbuf/lzw.c -+++ b/gdk-pixbuf/lzw.c -@@ -195,19 +195,20 @@ lzw_decoder_feed (LZWDecoder *self, - if (self->last_code !=3D self->clear_co= de && self->code_table_size < MAX_CODES) { - if (self->code < self->code_tab= le_size) - add_code (self, self->c= ode); -- else if (self->code =3D=3D self= ->code_table_size) -+ else - add_code (self, self->l= ast_code); -- else { -- /* Invalid code receive= d - just stop here */ -- self->last_code =3D sel= f->eoi_code; -- return output_length; -- } -=20 - /* When table is full increase = code size */ - if (self->code_table_size =3D=3D= (1 << self->code_size) && self->code_size < LZW_CODE_MAX) - self->code_size++; - } -=20 -+ /* Invalid code received - just stop he= re */ -+ if (self->code >=3D self->code_table_si= ze) { -+ self->last_code =3D self->eoi_c= ode; -+ return output_length; -+ } -+ - /* Convert codeword into indexes */ - n_written +=3D write_indexes (self, out= put + n_written, output_length - n_written); - } --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0032-gnu-gdk-pixbuf-Correct-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0032-gnu-gdk-pixbuf-Correct-inputs.patch" =46rom 877125c4a835cc2d08ecefbda0eac3191267a848 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:35:56 -0500 Subject: [PATCH 32/56] gnu: gdk-pixbuf: Correct inputs. * gnu/packages/gtk.scm (gdk-pixbuf) [propagated-inputs]: Add libx11. Remove libpng. [inputs]: Add libpng. Remove libx11. --- gnu/packages/gtk.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 513a4ef1a6..a6bf1bb5b9 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -606,13 +606,14 @@ highlighting and other features typical of a source= code editor.") (propagated-inputs `( ;; Required by gdk-pixbuf-2.0.pc ("glib" ,glib) - ("libpng" ,libpng) + ;; Required by gdk-pixbuf-xlib-2.0.pc + ("libx11" ,libx11) ;; Used for testing and required at runtime. ("shared-mime-info" ,shared-mime-info))) (inputs `(("libjpeg" ,libjpeg-turbo) - ("libtiff" ,libtiff) - ("libx11" ,libx11))) + ("libpng" ,libpng) + ("libtiff" ,libtiff))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0033-gnu-gdk-pixbuf-Enable-jasper-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0033-gnu-gdk-pixbuf-Enable-jasper-support.patch" =46rom 959112e16f2d74c8c6695b7765a501481a97c0cf Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:41:10 -0500 Subject: [PATCH 33/56] gnu: gdk-pixbuf: Enable jasper support. * gnu/packages/gtk.scm (gdk-pixbuf) [arguments]<#:configure-flags>[-Djasp= er]: New flag. [inputs]: Add jasper. --- gnu/packages/gtk.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a6bf1bb5b9..44f688469d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -593,7 +593,7 @@ highlighting and other features typical of a source c= ode editor.") (arguments `(#:meson ,meson-0.55 #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas - #:configure-flags '("-Dinstalled_tests=3Dfalse") + #:configure-flags '("-Dinstalled_tests=3Dfalse" "-Djasper=3Dtrue"= ) #:phases (modify-phases %standard-phases ;; The slow tests take longer than the specified timeout. @@ -611,7 +611,8 @@ highlighting and other features typical of a source c= ode editor.") ;; Used for testing and required at runtime. ("shared-mime-info" ,shared-mime-info))) (inputs - `(("libjpeg" ,libjpeg-turbo) + `(("jasper" ,jasper) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff))) (native-inputs --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0034-gnu-gdk-pixbuf-Fix-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0034-gnu-gdk-pixbuf-Fix-documentation.patch" =46rom d3007442312b687e287d255650550d5c7f0c39c7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:50:46 -0500 Subject: [PATCH 34/56] gnu: gdk-pixbuf: Fix documentation. * gnu/packages/gtk.scm (gdk-pixbuf) [arguments]<#:phases>['patch-docbook]= : New phase. [native-inputs]: Add docbook-xml and docbook-xsl. --- gnu/packages/gtk.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 44f688469d..e6e19fb650 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -592,10 +592,22 @@ highlighting and other features typical of a source= code editor.") (build-system meson-build-system) (arguments `(#:meson ,meson-0.55 - #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:configure-flags '("-Dinstalled_tests=3Dfalse" "-Djasper=3Dtrue"= ) #: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.2/"))) + (substitute* (find-files "." "\\.xml$") + (("http://www.oasis-open.org/docbook/xml/4\\.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) ;; The slow tests take longer than the specified timeout. ,@(if (any (cute string=3D? <> (%current-system)) '("armhf-linux" "aarch64-linux")) @@ -616,10 +628,12 @@ highlighting and other features typical of a source= code editor.") ("libpng" ,libpng) ("libtiff" ,libtiff))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("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. + ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. + ("pkg-config" ,pkg-config))) (synopsis "GNOME image loading and manipulation library") (description "GdkPixbuf is a library for image loading and manipulation develope= d --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0035-gnu-gdk-pixbuf-Update-to-2.42.4.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0035-gnu-gdk-pixbuf-Update-to-2.42.4.patch" =46rom 06fb7b3fce2e10e2428c052f87a74a9c481fd5b0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:53:43 -0500 Subject: [PATCH 35/56] gnu: gdk-pixbuf: Update to 2.42.4. * gnu/packages/gtk.scm (gdk-pixbuf) [version]: Update to 2.42.4. [native-inputs]: Add perl and libxslt. --- gnu/packages/gtk.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e6e19fb650..1ae09a2283 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -580,7 +580,7 @@ highlighting and other features typical of a source c= ode editor.") (define-public gdk-pixbuf (package (name "gdk-pixbuf") - (version "2.42.2") + (version "2.42.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -588,7 +588,7 @@ highlighting and other features typical of a source c= ode editor.") name "-" version ".tar.xz")) (sha256 (base32 - "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3"))= )) + "0k9f9177qxaryaxprwrhqnv5p2gdq4a8i6y05gm98qa8izc5v77y"))= )) (build-system meson-build-system) (arguments `(#:meson ,meson-0.55 @@ -633,7 +633,9 @@ highlighting and other features typical of a source c= ode editor.") ("gettext" ,gettext-minimal) ("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. - ("pkg-config" ,pkg-config))) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (synopsis "GNOME image loading and manipulation library") (description "GdkPixbuf is a library for image loading and manipulation develope= d --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0036-gnu-gdk-pixbuf-Update-synopsis-description-home-page.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0036-gnu-gdk-pixbuf-Update-synopsis-description-home-page.pa"; filename*1="tch" =46rom 1244000f3b9e476bbd1c921aa8d31f16e09e1cdd Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:56:29 -0500 Subject: [PATCH 36/56] gnu: gdk-pixbuf: Update synopsis, description, home-page and license. * gnu/packages/gtk.scm (gdk-pixbuf) [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Update to lgpl2.1+. --- gnu/packages/gtk.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 1ae09a2283..4c5b381ec0 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -636,12 +636,12 @@ highlighting and other features typical of a source= code editor.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt))) - (synopsis "GNOME image loading and manipulation library") - (description - "GdkPixbuf is a library for image loading and manipulation develope= d -in the GNOME project.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/gdk-pixbuf/"))) + (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.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0037-gnu-gdk-pixbuf-Disable-failing-tests.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0037-gnu-gdk-pixbuf-Disable-failing-tests.patch" =46rom 682540178cb8df7da4031d2b15c1b4fe0f2fcade Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:00:10 -0500 Subject: [PATCH 37/56] gnu: gdk-pixbuf: Disable failing tests. * gnu/packages/gtk.scm (gdk-pixbuf) [arguments]<#:phases>['disable-failin= g-tests]: New phase. --- gnu/packages/gtk.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4c5b381ec0..1e688a40e2 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -608,6 +608,12 @@ highlighting and other features typical of a source = code editor.") (string-append (assoc-ref inputs "docbook-xml") "/xml/dtd/docbook/")))) #t)) + (add-before 'configure 'disable-failing-tests + (lambda _ + (substitute* "tests/meson.build" + (("\\[ 'pixbuf-fail', \\['conform', 'slow'\\], \\],") + "")) + #t)) ;; The slow tests take longer than the specified timeout. ,@(if (any (cute string=3D? <> (%current-system)) '("armhf-linux" "aarch64-linux")) --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0038-gnu-gdk-pixbuf-svg-Correct-package-definition-to-inc.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0038-gnu-gdk-pixbuf-svg-Correct-package-definition-to-inc.pa"; filename*1="tch" =46rom bd265819591e71d0f99db89a8473fdf0f0ced3eb Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:08:24 -0500 Subject: [PATCH 38/56] gnu: gdk-pixbuf+svg: Correct package definition to= include changes from gdk-pixbuf. * gnu/packages/gtk.scm (gdk-pixbuf+svg) [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 1e688a40e2..59c92ab4dd 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -659,10 +659,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")) @@ -676,9 +675,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.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0039-gnu-vala-Change-build-system.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0039-gnu-vala-Change-build-system.patch" =46rom 785af5d8aa06859e8de074d64ded9289b09f4e34 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:20:37 -0500 Subject: [PATCH 39/56] gnu: vala: Change build-system. * gnu/packages/gnome.scm (vala) [build-system]: Change from gnu to glib-o= r-gtk. --- gnu/packages/gnome.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c69fb21ba5..bbc82cfcd1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4279,28 +4279,28 @@ passwords in the GNOME keyring.") (sha256 (base32 "1nx5xjarpkl9hgy0qbqfczx7d7clh5g1r8xr5xp8b97c5fsc2rb1"))= )) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments '(#:phases (modify-phases %standard-phases (add-before 'check 'pre-check - (lambda _ - (setenv "CC" "gcc") - (substitute* "valadoc/tests/libvaladoc\ + (lambda _ + (setenv "CC" "gcc") + (substitute* "valadoc/tests/libvaladoc\ /tests-extra-environment.sh" - (("export PKG_CONFIG_PATH=3D" m) - (string-append m "$PKG_CONFIG_PATH:")))))))) + (("export PKG_CONFIG_PATH=3D" m) + (string-append m "$PKG_CONFIG_PATH:")))))))) (native-inputs `(("pkg-config" ,pkg-config) ("flex" ,flex) ("bison" ,bison) ("xsltproc" ,libxslt) - ("dbus" ,dbus) ; for dbus tes= ts + ("dbus" ,dbus) ; for dbus tests ("gobject-introspection" ,gobject-introspection))) ; for gir test= s (inputs `(("graphviz" ,graphviz))) (propagated-inputs - `(("glib" ,glib))) ; required by libvala-0.40.pc + `(("glib" ,glib))) ; required by libvala-0.40.pc (home-page "https://wiki.gnome.org/Projects/Vala/") (synopsis "Compiler for the GObject type system") (description --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0040-gnu-vala-Enable-coverage-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0040-gnu-vala-Enable-coverage-support.patch" =46rom 399fd3ee73eb6c36ce907a6e86f850902a31212a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:23:56 -0500 Subject: [PATCH 40/56] gnu: vala: Enable coverage support. * gnu/packages/gnome.scm (vala) [arguments]<#:configure-flags> [--enable-coverage]: New flag. --- gnu/packages/gnome.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bbc82cfcd1..ca4484ce3e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4281,7 +4281,8 @@ passwords in the GNOME keyring.") "1nx5xjarpkl9hgy0qbqfczx7d7clh5g1r8xr5xp8b97c5fsc2rb1"))= )) (build-system glib-or-gtk-build-system) (arguments - '(#:phases + '(#:configure-flags '("--enable-coverage") + #:phases (modify-phases %standard-phases (add-before 'check 'pre-check (lambda _ --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0041-gnu-vala-Fix-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0041-gnu-vala-Fix-documentation.patch" =46rom 09728014e0a3fdc8349fc0955f0e8b3797c79721 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:30:26 -0500 Subject: [PATCH 41/56] gnu: vala: Fix documentation. * gnu/packages/gnome.scm (vala) [arguments]<#:phases>['patch-docbook-xml]= : New phase. [native-inputs]: Add docbook-xml and docbook-xsl. --- gnu/packages/gnome.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ca4484ce3e..92c46158ac 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4284,6 +4284,14 @@ passwords in the GNOME keyring.") '(#:configure-flags '("--enable-coverage") #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc/manual" + (substitute* '("manual.xml" "version.xml.in") + (("http://www.oasis-open.org/docbook/xml/4.4/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) (add-before 'check 'pre-check (lambda _ (setenv "CC" "gcc") @@ -4293,6 +4301,8 @@ passwords in the GNOME keyring.") (string-append m "$PKG_CONFIG_PATH:")))))))) (native-inputs `(("pkg-config" ,pkg-config) + ("docbook-xml" ,docbook-xml-4.4) + ("docbook-xsl" ,docbook-xsl) ("flex" ,flex) ("bison" ,bison) ("xsltproc" ,libxslt) --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0042-gnu-vala-Update-to-0.52.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0042-gnu-vala-Update-to-0.52.0.patch" =46rom 3feec74ac048b3993553e078a57dceb67a74a1f8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:34:48 -0500 Subject: [PATCH 42/56] gnu: vala: Update to 0.52.0. * gnu/packages/gnome.scm (vala) [version]: Update to 0.52.0. [native-inputs]: Add help2man and perl. [inputs]: Move graphviz to ... [propagated-inputs]: ... here. --- gnu/packages/gnome.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 92c46158ac..70e3c38e20 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -141,6 +141,7 @@ #:use-module (gnu packages lirc) #:use-module (gnu packages lua) #:use-module (gnu packages mail) + #:use-module (gnu packages man) #:use-module (gnu packages mp3) #:use-module (gnu packages multiprecision) #:use-module (gnu packages music) @@ -4270,7 +4271,7 @@ passwords in the GNOME keyring.") (define-public vala (package (name "vala") - (version "0.50.3") + (version "0.52.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/vala/" @@ -4278,7 +4279,7 @@ passwords in the GNOME keyring.") "vala-" version ".tar.xz")) (sha256 (base32 - "1nx5xjarpkl9hgy0qbqfczx7d7clh5g1r8xr5xp8b97c5fsc2rb1"))= )) + "12y6p8wdjp01vmfhxg2cgh32xnyqq6ivblvrar9clnj6vc867qhx"))= )) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags '("--enable-coverage") @@ -4300,18 +4301,19 @@ passwords in the GNOME keyring.") (("export PKG_CONFIG_PATH=3D" m) (string-append m "$PKG_CONFIG_PATH:")))))))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("bison" ,bison) + ("dbus" ,dbus) ; for dbus tests ("docbook-xml" ,docbook-xml-4.4) ("docbook-xsl" ,docbook-xsl) ("flex" ,flex) - ("bison" ,bison) - ("xsltproc" ,libxslt) - ("dbus" ,dbus) ; for dbus tests - ("gobject-introspection" ,gobject-introspection))) ; for gir test= s - (inputs - `(("graphviz" ,graphviz))) + ("gobject-introspection" ,gobject-introspection) ; for gir tests + ("help2man" ,help2man) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs - `(("glib" ,glib))) ; required by libvala-0.40.pc + `(("glib" ,glib) ; required by libvala-0.40.pc + ("libgvc" ,graphviz))) (home-page "https://wiki.gnome.org/Projects/Vala/") (synopsis "Compiler for the GObject type system") (description --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0043-gnu-vala-Update-synopsis-and-description.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0043-gnu-vala-Update-synopsis-and-description.patch" =46rom 6ca7fb87c3fff6fcb5b2be8bea3421245b1f4487 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:38:26 -0500 Subject: [PATCH 43/56] gnu: vala: Update synopsis and description. * gnu/packages/gnome.scm (vala) [synopsis]: Modify. [description]: Modify. --- gnu/packages/gnome.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 70e3c38e20..f071fd857e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4315,12 +4315,12 @@ passwords in the GNOME keyring.") `(("glib" ,glib) ; required by libvala-0.40.pc ("libgvc" ,graphviz))) (home-page "https://wiki.gnome.org/Projects/Vala/") - (synopsis "Compiler for the GObject type system") - (description - "Vala is a programming language that aims to bring modern programmi= ng -language features to GNOME developers without imposing any additional ru= ntime -requirements and without using a different ABI compared to applications = and -libraries written in C.") + (synopsis "Compiler using the GObject type system") + (description "Vala is a programming language using modern high level= +abstractions without imposing additional runtime requirements and withou= t using +a different ABI compared to applications and libraries written in C. Va= la uses +the GObject type system and has additional code generation routines that= make +targeting the GNOME stack simple.") (license license:lgpl2.1+))) =20 (define-public vte --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0044-gnu-libgsf-Change-build-system.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0044-gnu-libgsf-Change-build-system.patch" =46rom e370ae58e08ae8c1fc02cb0a9857a83c315c70bb Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:53:42 -0500 Subject: [PATCH 44/56] gnu: libgsf: Change build-system. * gnu/packages/gnome.scm (libgsf) [build-system]: Change from gnu to glib= -or-gtk. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f071fd857e..a415dde77a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3274,7 +3274,7 @@ XML/CSS rendering engine.") (sha256 (base32 "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"))= )) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags '("--disable-static"))) (native-inputs --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0045-gnu-libgsf-Make-separate-output-for-binaries.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0045-gnu-libgsf-Make-separate-output-for-binaries.patch" =46rom 1875a2d7dd7aaba4ffb2a141d764ade7d1659cfc Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:56:04 -0500 Subject: [PATCH 45/56] gnu: libgsf: Make separate output for binaries. * gnu/packages/gnome.scm (libgsf) [outputs]: New output "bin". --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a415dde77a..fae4c3a4ff 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3275,6 +3275,7 @@ XML/CSS rendering engine.") (base32 "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"))= )) (build-system glib-or-gtk-build-system) + (outputs '("out" "bin")) (arguments '(#:configure-flags '("--disable-static"))) (native-inputs --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0046-gnu-libgsf-Re-arrange-inputs-in-alphabetical-order.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0046-gnu-libgsf-Re-arrange-inputs-in-alphabetical-order.patc"; filename*1="h" =46rom 4c9c2173600143f3158253c713103ecc4bf6c12d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:02:14 -0500 Subject: [PATCH 46/56] gnu: libgsf: Re-arrange inputs in alphabetical ord= er. * gnu/packages/gnome.scm (libgsf) [native-inputs]: Modify. [inputs]: Modify. --- gnu/packages/gnome.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fae4c3a4ff..3f110d786f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3279,15 +3279,13 @@ XML/CSS rendering engine.") (arguments '(#:configure-flags '("--disable-static"))) (native-inputs - `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - - ;; For tests. + `(("gettext" ,gettext-minimal) ("perl" ,perl) - ("perl-xml-parser" ,perl-xml-parser))) + ("perl-xml-parser" ,perl-xml-parser) + ("pkg-config" ,pkg-config))) (inputs - `(("zlib" ,zlib) - ("bzip2" ,bzip2))) + `(("bzip2" ,bzip2) + ("zlib" ,zlib))) (propagated-inputs `(("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0047-gnu-libgsf-Enable-missing-features.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0047-gnu-libgsf-Enable-missing-features.patch" =46rom 8a321ef51562a347464ef1805507920c334c331b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:08:10 -0500 Subject: [PATCH 47/56] gnu: libgsf: Enable missing features. * gnu/packages/gnome.scm (libgsf) [arguments]<#:configure-flag>[--enable-= introspection]: New flag. [--with-gir-dir=3D]: New flag. [--with-typelib-dir=3D]: New flag. [--with-zlib]: New flag. [--with-bz2]: New flag. [native-inputs]: Add gobject-introspection. --- gnu/packages/gnome.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3f110d786f..48f8b09ba7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3277,9 +3277,27 @@ XML/CSS rendering engine.") (build-system glib-or-gtk-build-system) (outputs '("out" "bin")) (arguments - '(#:configure-flags '("--disable-static"))) + `(#:configure-flags + (list + "--disable-static" + "--enable-introspection" + (string-append "--with-gir-dir=3D" + (assoc-ref %outputs "out") + "/share/gir-" + ,(version-major + (package-version gobject-introspection)) + ".0") + (string-append "--with-typelib-dir=3D" + (assoc-ref %outputs "out") + "/lib/girepository-" + ,(version-major + (package-version gobject-introspection)) + ".0") + "--with-zlib" + "--with-bz2"))) (native-inputs `(("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) ("perl" ,perl) ("perl-xml-parser" ,perl-xml-parser) ("pkg-config" ,pkg-config))) --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0048-gnu-libgsf-Correct-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0048-gnu-libgsf-Correct-inputs.patch" =46rom f680a33f7530f1ed93a79d5fa611aedc8bef3c43 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:11:02 -0500 Subject: [PATCH 48/56] gnu: libgsf: Correct inputs. * gnu/packages/gnome.scm (libgsf) [native-inputs]: Add python-wrapper. [propagated-inputs]: Move gdk-pixbuf to ... [inputs]: ... here. --- gnu/packages/gnome.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 48f8b09ba7..101d87c96f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3300,13 +3300,14 @@ XML/CSS rendering engine.") ("gobject-introspection" ,gobject-introspection) ("perl" ,perl) ("perl-xml-parser" ,perl-xml-parser) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) (inputs `(("bzip2" ,bzip2) + ("gdk-pixbuf" ,gdk-pixbuf) ("zlib" ,zlib))) (propagated-inputs - `(("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) + `(("glib" ,glib) ("libxml2" ,libxml2))) (home-page "https://www.gnome.org/projects/libgsf") (synopsis "GNOME's Structured File Library") --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0049-gnu-libgsf-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0049-gnu-libgsf-Enable-documentation.patch" =46rom 136dccf07b3b885e42c20d3cde1a5222f772e784 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:20:52 -0500 Subject: [PATCH 49/56] gnu: libgsf: Enable documentation. * gnu/packages/gnome.scm (libgsf) [outputs]: New output "doc". [arguments]<#:configure-flags>[--with-html-dir]: New flag. [native-inputs]: Add docbook-xml. --- gnu/packages/gnome.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 101d87c96f..c715b4391b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3275,7 +3275,7 @@ XML/CSS rendering engine.") (base32 "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"))= )) (build-system glib-or-gtk-build-system) - (outputs '("out" "bin")) + (outputs '("out" "bin" "doc")) (arguments `(#:configure-flags (list @@ -3293,10 +3293,24 @@ XML/CSS rendering engine.") ,(version-major (package-version gobject-introspection)) ".0") + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html") "--with-zlib" - "--with-bz2"))) + "--with-bz2") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* "gsf-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.5/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t))))) (native-inputs - `(("gettext" ,gettext-minimal) + `(("docbook-xml" ,docbook-xml) + ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) ("perl" ,perl) ("perl-xml-parser" ,perl-xml-parser) --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0050-gnu-libgsf-Update-synopsis-description-home-page-and.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0050-gnu-libgsf-Update-synopsis-description-home-page-and.pa"; filename*1="tch" =46rom 75fd7eb6eea2cec68a9c22ef93cfa398920a4643 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:22:54 -0500 Subject: [PATCH 50/56] gnu: libgsf: Update synopsis, description, home-pa= ge and license. * gnu/packages/gnome.scm (libgsf) [synopsis]: Modify. [home-page]: Modify. [description]: Modify. [license]: Modify. --- gnu/packages/gnome.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c715b4391b..50d16a6048 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3323,14 +3323,16 @@ XML/CSS rendering engine.") (propagated-inputs `(("glib" ,glib) ("libxml2" ,libxml2))) - (home-page "https://www.gnome.org/projects/libgsf") - (synopsis "GNOME's Structured File Library") - (description - "Libgsf aims to provide an efficient extensible I/O abstraction for= -dealing with different structured file formats.") - - ;; LGPLv2.1-only. - (license license:lgpl2.1))) + (synopsis "G Structured File Library") + (description "Libgsf aims to provide an efficient extensible I/O abs= traction +for dealing with different structured file formats.") + (home-page "https://gitlab.gnome.org/GNOME/libgsf") + (license + (list + ;; Library + license:lgpl2.1+ + ;; Others + license:lgpl2.0+)))) =20 (define-public librsvg (package --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0051-gnu-atk-Re-arrange-inputs-in-alphabetical-order.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0051-gnu-atk-Re-arrange-inputs-in-alphabetical-order.patch" =46rom a14d05bad6659679a5a8d747d7c094f1f48f697d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:39:47 -0500 Subject: [PATCH 51/56] gnu: atk: Re-arrange inputs in alphabetical order.= * gnu/packages/gtk.scm (atk) [native-inputs]: Modify. --- gnu/packages/gtk.scm | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 59c92ab4dd..791cb43d1f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -98,30 +98,30 @@ =20 (define-public atk (package - (name "atk") - (version "2.34.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l"))))= - (build-system meson-build-system) - (propagated-inputs `(("glib" ,glib))) ; required by atk.pc - (native-inputs - `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ; glib-mkenums,= etc. - ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler= , etc. - (synopsis "GNOME accessibility toolkit") - (description - "ATK provides the set of accessibility interfaces that are implement= ed + (name "atk") + (version "2.34.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l"))= )) + (build-system meson-build-system) + (propagated-inputs `(("glib" ,glib))) ; required by atk.pc + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib" ,glib "bin") ; glib-mkenums, etc. + ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. + ("pkg-config" ,pkg-config))) + (synopsis "GNOME accessibility toolkit") + (description + "ATK provides the set of accessibility interfaces that are implemen= ted by other toolkits and applications. Using the ATK interfaces, accessibi= lity tools have full access to view and control running applications.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/atk/"))) + (license license:lgpl2.0+) + (home-page "https://developer.gnome.org/atk/"))) =20 (define-public cairo (package --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0052-gnu-atk-Update-to-2.36.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0052-gnu-atk-Update-to-2.36.0.patch" =46rom 171b527ff37c884d36f2fe880f789876b4ad7e45 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:44:36 -0500 Subject: [PATCH 52/56] gnu: atk: Update to 2.36.0. * gnu/packages/gtk.scm (atk) [version]: Update to 2.36.0. [arguments]<#:glib-or-gtk?>: New argument. --- gnu/packages/gtk.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 791cb43d1f..54efcee4ea 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -99,7 +99,7 @@ (define-public atk (package (name "atk") - (version "2.34.1") + (version "2.36.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -107,8 +107,10 @@ name "-" version ".tar.xz")) (sha256 (base32 - "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l"))= )) + "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv"))= )) (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas (propagated-inputs `(("glib" ,glib))) ; required by atk.pc (native-inputs `(("gettext" ,gettext-minimal) --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0053-gnu-atk-Update-home-page-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0053-gnu-atk-Update-home-page-and-license.patch" =46rom 0aac4344b3f95c5b48c2f0a5deded6c62c7686fc Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:46:00 -0500 Subject: [PATCH 53/56] gnu: atk: Update home-page and license. * gnu/packages/gtk.scm (atk) [home-page]: Modify. [license]: Update to lgpl2.1+. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 54efcee4ea..fa5f2455db 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -122,8 +122,8 @@ "ATK provides the set of accessibility interfaces that are implemen= ted by other toolkits and applications. Using the ATK interfaces, accessibi= lity tools have full access to view and control running applications.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/atk/"))) + (license license:lgpl2.1+) + (home-page "https://wiki.gnome.org/Accessibility"))) =20 (define-public cairo (package --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0054-gnu-atkmm-Update-to-2.36.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0054-gnu-atkmm-Update-to-2.36.0.patch" =46rom d9732bc5d67bc30c9e741d4f64e30b1d52a2d3d0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:50:53 -0500 Subject: [PATCH 54/56] gnu: atkmm: Update to 2.36.0. * gnu/packages/gtk.scm (atkmm) [version]: Update to 2.36.0. [build-system]: Change from gnu to meson. [arguments]<#:glib-or-gtk?>: New argument. [native-inputs]: Add m4, mm-common, perl and libxslt. --- gnu/packages/gtk.scm | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index fa5f2455db..bd58d24a7c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -78,6 +78,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) + #:use-module (gnu packages m4) #:use-module (gnu packages man) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) @@ -1424,17 +1425,24 @@ library.") (define-public atkmm (package (name "atkmm") - (version "2.28.0") + (version "2.36.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c")))= ) - (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config))) + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0wwr0663jrqx2klsasffd9wpk3kqnwisj1y3ahdkjdk5hzrsjgy9"))= )) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas + (native-inputs + `(("m4" ,m4) + ("mm-common" ,mm-common) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs `(("glibmm" ,glibmm) ("atk" ,atk))) (home-page "https://www.gtkmm.org") --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0055-gnu-atkmm-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0055-gnu-atkmm-Enable-documentation.patch" =46rom ba31e2bcfa20f413c799b585aa7c6e2d49601934 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 24 Mar 2021 22:46:44 -0400 Subject: [PATCH 55/56] gnu: atkmm: Enable documentation. * gnu/packages/gtk.scm (atkmm) [outputs]: Add new output "doc". [arguments]<#:configure-flags>[-Denable-documentation]: New flag. [arguments]<#:phases>['move-doc]: New phase. [native-inputs]: Add graphviz, doxygen. --- gnu/packages/gtk.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index bd58d24a7c..b6c4fe5174 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -74,6 +74,7 @@ #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages graphviz) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages libffi) @@ -1435,10 +1436,27 @@ library.") (base32 "0wwr0663jrqx2klsasffd9wpk3kqnwisj1y3ahdkjdk5hzrsjgy9"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Dbuild-documentation=3Dtrue") + #: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/doc") + (string-append doc "/share/doc")) + #t)))))) (native-inputs - `(("m4" ,m4) + `(("dot" ,graphviz) + ("doxygen" ,doxygen) + ("m4" ,m4) ("mm-common" ,mm-common) ("perl" ,perl) ("pkg-config" ,pkg-config) --=20 2.31.0 --------------13C838295F3F8C51CF879FBC Content-Type: text/x-patch; charset=UTF-8; name="0056-gnu-atkmm-Update-synopsis-description-home-page-and-.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0056-gnu-atkmm-Update-synopsis-description-home-page-and-.pa"; filename*1="tch" =46rom 3a8f8ff0c6418511d0087e68694e830d2006f430 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 13:01:19 -0500 Subject: [PATCH 56/56] gnu: atkmm: Update synopsis, description, home-pag= e and license. * gnu/packages/gtk.scm (atkmm) [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Add gpl2+. --- gnu/packages/gtk.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b6c4fe5174..6307303a83 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1463,12 +1463,15 @@ library.") ("xsltproc" ,libxslt))) (propagated-inputs `(("glibmm" ,glibmm) ("atk" ,atk))) - (home-page "https://www.gtkmm.org") - (synopsis "C++ interface to the ATK accessibility library") - (description - "ATKmm provides a C++ programming interface to the ATK accessibilit= y -toolkit.") - (license license:lgpl2.1+))) + (synopsis "C++ bindings for ATK") + (description "ATKmm is the C++ binding for the ATK library.") + (home-page "https://wiki.gnome.org/Accessibility") + (license + (list + ;; Library + license:lgpl2.1+ + ;; Tools + license:gpl2+)))) =20 (define-public gtkmm (package --=20 2.31.0 --------------13C838295F3F8C51CF879FBC-- --dDxfzwX6rz34VPYhf3Q9bmqQqxdK3vbmV-- --5BjXLCrUYP3oznVW6eIc6z4vdW6utvMvS Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYF0yOwUDAAAAAAAKCRBfWBZkf4vlUV3+ AP9YcdfP1XzQ9TJAN02cmvBMIyWqX8SOpOwljPKSsKm0+gEAmQQ8jKmqeGcm/gr2scgbCroqmH9F 4YRJgteHcUFOywE= =k6aO -----END PGP SIGNATURE----- --5BjXLCrUYP3oznVW6eIc6z4vdW6utvMvS-- From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 26 16:13:02 2021 Received: (at 42958) by debbugs.gnu.org; 26 Mar 2021 20:13:02 +0000 Received: from localhost ([127.0.0.1]:42569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPspK-0001aJ-Me for submit@debbugs.gnu.org; Fri, 26 Mar 2021 16:13:02 -0400 Received: from out0.migadu.com ([94.23.1.103]:17025) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPspI-0001Zl-JR for 42958@debbugs.gnu.org; Fri, 26 Mar 2021 16:13:01 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1616789577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=izpvXKHxxOjP+jif28wrf0sQP7QDr9JCqKNOhs9ol7Q=; b=J3pEwzr9YV2B/mg+IfRLgeVKY2ME2nOCHipkt2/tXLZiWchJ7z+d02rts/IU4QUjwz3RhJ 3JVps2WgpMfTHxPT90csPjEtMSqajkjegZlIGecnmk1njDINfBTgdX7GgPPWn62udDf7yD uHcrtDGyBBY9IgzONXeKmcVFmBP+07SEMr0t3K+piQiP98zuvxjSkG2YhzXSZM08LYJJ2I 1saA3CR811EEZlK3Vg/25AVvW+nGqev8XwA+Qd6ExGn9e8PYOU9051/KeATor1opld5TWn IxHrOc175qkeP1OqqOIIz/P5PIplJfpLOrOOJrF5ND7Br3z6AkixeWnoIcrnvA== From: Raghav Gururajan To: 42958@debbugs.gnu.org, Danny Milosavljevic , Ricardo Wurmus , =?UTF-8?Q?L=c3=a9o_Le_Bouter?= References: <7bef0b9f-b8a6-bd56-52e7-e283d8342470@raghavgururajan.name> <2b0dc6df-d533-8793-697c-82d664e93ddb@raghavgururajan.name> Subject: Re: Big changes from wip-desktop. Message-ID: Date: Fri, 26 Mar 2021 16:12:53 -0400 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="MzDGIQHB39ChpyvZQFSLI5LmFLN7G5B3y" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Debbugs-Envelope-To: 42958 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --MzDGIQHB39ChpyvZQFSLI5LmFLN7G5B3y Content-Type: multipart/mixed; boundary="LIn4P9zLjPoDx0S6xelR6K5fLYmYX0XOX"; protected-headers="v1" From: Raghav Gururajan To: 42958@debbugs.gnu.org, Danny Milosavljevic , Ricardo Wurmus , =?UTF-8?Q?L=c3=a9o_Le_Bouter?= Message-ID: Subject: Re: Big changes from wip-desktop. References: <7bef0b9f-b8a6-bd56-52e7-e283d8342470@raghavgururajan.name> <2b0dc6df-d533-8793-697c-82d664e93ddb@raghavgururajan.name> In-Reply-To: --LIn4P9zLjPoDx0S6xelR6K5fLYmYX0XOX Content-Type: multipart/mixed; boundary="------------D726024BDCC73DD6F6DDE6D8" Content-Language: en-US This is a multi-part message in MIME format. --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable @(rekado|lle-bout|danny) >> Could any of you please review and merge the attached patches to=20 >> core-updates? >> >> These patches has been successfully built on bayfront, from which you = >> can obtain substitutes, if needed. >> >> I will send some more patches for this #42958 by tomorrow. >> >> It would be great if we could together finish-off this #42958 ASAP, so= =20 >> that I can bring remaining patches from wip-deskop. >> >> P.S >> Please pardon two cosmetic changes patches, which were done very long = >> ago and had to use it to cleanly apply succeeding patches. Also, I=20 >> must have used #t with lambda out of habit. >=20 > Since there was master <--> core-updates merge, here I have attached=20 > rebased patches. Thanks to L=C3=A9o Le Bouter. So I have attached all the patches for this batch. These are=20 non-signed-off, just for the record. :) Regards, RG. --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-glib-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-glib-Make-some-cosmetic-changes.patch" =46rom 8d8b0bd7f2178d8c0abe1eb27317acbca6dee262 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 06:39:29 -0500 Subject: [PATCH 01/83] gnu: glib: Make some cosmetic changes. * gnu/packages/patches/glib-CVE-2021-27218.patch gnu/packages/patches/glib-CVE-2021-27219-01.patch gnu/packages/patches/glib-CVE-2021-27219-02.patch gnu/packages/patches/glib-CVE-2021-27219-03.patch gnu/packages/patches/glib-CVE-2021-27219-04.patch gnu/packages/patches/glib-CVE-2021-27219-05.patch gnu/packages/patches/glib-CVE-2021-27219-06.patch gnu/packages/patches/glib-CVE-2021-27219-07.patch gnu/packages/patches/glib-CVE-2021-27219-08.patch gnu/packages/patches/glib-CVE-2021-27219-09.patch gnu/packages/patches/glib-CVE-2021-27219-10.patch gnu/packages/patches/glib-CVE-2021-27219-11.patch gnu/packages/patches/glib-CVE-2021-27219-12.patch gnu/packages/patches/glib-CVE-2021-27219-13.patch gnu/packages/patches/glib-CVE-2021-27219-14.patch gnu/packages/patches/glib-CVE-2021-27219-15.patch gnu/packages/patches/glib-CVE-2021-27219-16.patch gnu/packages/patches/glib-CVE-2021-27219-17.patch gnu/packages/patches/glib-CVE-2021-27219-18.patch gnu/packages/patches/glib-CVE-2021-28153.patch: Remove patches. * gnu/local.mk (dist_patch_DATA): Unregister them. * gnu/packages/glib.scm (glib): Make some cosmetic changes. [replacement]: Remove. (glib/fixed): Remove. --- gnu/local.mk | 20 - gnu/packages/glib.scm | 454 ++++++++---------- .../patches/glib-CVE-2021-27218.patch | 132 ----- .../patches/glib-CVE-2021-27219-01.patch | 176 ------- .../patches/glib-CVE-2021-27219-02.patch | 264 ---------- .../patches/glib-CVE-2021-27219-03.patch | 136 ------ .../patches/glib-CVE-2021-27219-04.patch | 308 ------------ .../patches/glib-CVE-2021-27219-05.patch | 47 -- .../patches/glib-CVE-2021-27219-06.patch | 94 ---- .../patches/glib-CVE-2021-27219-07.patch | 118 ----- .../patches/glib-CVE-2021-27219-08.patch | 94 ---- .../patches/glib-CVE-2021-27219-09.patch | 98 ---- .../patches/glib-CVE-2021-27219-10.patch | 52 -- .../patches/glib-CVE-2021-27219-11.patch | 57 --- .../patches/glib-CVE-2021-27219-12.patch | 30 -- .../patches/glib-CVE-2021-27219-13.patch | 32 -- .../patches/glib-CVE-2021-27219-14.patch | 32 -- .../patches/glib-CVE-2021-27219-15.patch | 95 ---- .../patches/glib-CVE-2021-27219-16.patch | 43 -- .../patches/glib-CVE-2021-27219-17.patch | 37 -- .../patches/glib-CVE-2021-27219-18.patch | 232 --------- .../patches/glib-CVE-2021-28153.patch | 283 ----------- 22 files changed, 202 insertions(+), 2632 deletions(-) delete mode 100644 gnu/packages/patches/glib-CVE-2021-27218.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-01.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-02.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-03.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-04.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-05.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-06.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-07.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-08.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-09.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-10.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-11.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-12.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-13.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-14.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-15.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-16.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-17.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-27219-18.patch delete mode 100644 gnu/packages/patches/glib-CVE-2021-28153.patch diff --git a/gnu/local.mk b/gnu/local.mk index ce0a79fb4d..d924b20bcf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1082,26 +1082,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ %D%/packages/patches/glib-tests-timer.patch \ - %D%/packages/patches/glib-CVE-2021-27218.patch \ - %D%/packages/patches/glib-CVE-2021-27219-01.patch \ - %D%/packages/patches/glib-CVE-2021-27219-02.patch \ - %D%/packages/patches/glib-CVE-2021-27219-03.patch \ - %D%/packages/patches/glib-CVE-2021-27219-04.patch \ - %D%/packages/patches/glib-CVE-2021-27219-05.patch \ - %D%/packages/patches/glib-CVE-2021-27219-06.patch \ - %D%/packages/patches/glib-CVE-2021-27219-07.patch \ - %D%/packages/patches/glib-CVE-2021-27219-08.patch \ - %D%/packages/patches/glib-CVE-2021-27219-09.patch \ - %D%/packages/patches/glib-CVE-2021-27219-10.patch \ - %D%/packages/patches/glib-CVE-2021-27219-11.patch \ - %D%/packages/patches/glib-CVE-2021-27219-12.patch \ - %D%/packages/patches/glib-CVE-2021-27219-13.patch \ - %D%/packages/patches/glib-CVE-2021-27219-14.patch \ - %D%/packages/patches/glib-CVE-2021-27219-15.patch \ - %D%/packages/patches/glib-CVE-2021-27219-16.patch \ - %D%/packages/patches/glib-CVE-2021-27219-17.patch \ - %D%/packages/patches/glib-CVE-2021-27219-18.patch \ - %D%/packages/patches/glib-CVE-2021-28153.patch \ %D%/packages/patches/glibc-CVE-2018-11236.patch \ %D%/packages/patches/glibc-CVE-2018-11237.patch \ %D%/packages/patches/glibc-CVE-2019-7309.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 0ddaf4d0b9..a446ce1ace 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -170,258 +170,208 @@ shared NFS home directories.") =20 (define glib (package - (name "glib") - (version "2.62.6") - (replacement glib/fixed) - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" - name "/" (string-take version 4) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh")) - (patches (search-patches "glib-appinfo-watch.patch" - "glib-tests-timer.patch")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "tests/spawn-test.c" - (("/bin/sh") "sh")) - #t)))) - (build-system meson-build-system) - (outputs '("out" ; everything - "bin" ; glib-mkenums, gtester, etc.; depends on = Python - "debug")) - (propagated-inputs - `(("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc - ("libffi" ,libffi) ; in the Requires.private field of gobject-2.0.= pc - ;; These are in the Requires.private field of gio-2.0.pc - ("util-linux" ,util-linux "lib") ;for libmount - ("zlib" ,zlib))) - (native-inputs - `(("gettext" ,gettext-minimal) - ("m4" ,m4) ; for installing m4 macros - ("dbus" ,dbus) ; for GDBus tests - ("pkg-config" ,pkg-config) - ("python" ,python-minimal-wrapper) - ("perl" ,perl) ; needed by GIO tests - ("tzdata" ,tzdata-for-tests))) ; for tests/gdatet= ime.c - (arguments - `(#:disallowed-references (,tzdata-for-tests) - #:configure-flags '("-Dselinux=3Ddisabled") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-dbus-launch-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((dbus (assoc-ref inputs "dbus"))) - (substitute* "gio/gdbusaddress.c" - (("command_line =3D g_strdup_printf \\(\"dbus-launch") - (string-append "command_line =3D g_strdup_printf (\"" - dbus "/bin/dbus-launch"))) - #t))) - (add-after 'unpack 'patch-gio-launch-desktop - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; See also - ;; for another future fix. - (substitute* "gio/gdesktopappinfo.c" - (("gio-launch-desktop") - (string-append out "/libexec/gio-launch-desktop"))) - #t))) - ;; TODO: Remove the conditional in the next core-updates cycle. - ;; Needed to build glib on slower ARM nodes. - ,@(if (string-prefix? "arm" (%current-system)) - `((add-after 'unpack 'increase-test-timeout - (lambda _ - (substitute* "meson.build" - (("test_timeout =3D 60") - "test_timeout =3D 120") - (("test_timeout_slow =3D 120") - "test_timeout_slow =3D 180"))))) - '()) - (add-before 'build 'pre-build - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; For tests/gdatetime.c. - (setenv "TZDIR" - (string-append (assoc-ref inputs "tzdata") - "/share/zoneinfo")) - - ;; Some tests want write access there. - (setenv "HOME" (getcwd)) - (setenv "XDG_CACHE_HOME" (getcwd)) - #t)) - (add-after 'unpack 'disable-failing-tests - (lambda _ - (let ((disable - (lambda (test-file test-paths) - (define pattern+procs - (map (lambda (test-path) - (cons - ;; XXX: only works for single line statem= ents. - (format #f "g_test_add_func.*\"~a\".*" te= st-path) - (const ""))) - test-paths)) - (substitute test-file pattern+procs))) - (failing-tests - '(("glib/tests/thread.c" - (;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-xe= n-amd64 - ;; as found on hydra.gnu.org, and strace(1) doesn= 't - ;; recognize it. - "/thread/thread4")) - - ;; This tries to find programs in FHS directories. - ("glib/tests/utils.c" - ("/utils/find-program")) - - ;; This fails because "glib/tests/echo-script" cann= ot be - ;; found. - ("glib/tests/spawn-singlethread.c" - ("/gthread/spawn-script")) - - ("glib/tests/timer.c" - (;; fails if compiler optimizations are enabled, w= hich they - ;; are by default. - "/timer/stop")) - - ("gio/tests/gapplication.c" - (;; XXX: proven to be unreliable. See: - ;; - ;; - "/gapplication/quit" - - ;; XXX: fails randomly for unknown reason. See: - ;; - "/gapplication/local-actions")) - - ("gio/tests/contenttype.c" - (;; XXX: requires shared-mime-info. - "/contenttype/guess" - "/contenttype/guess_svg_from_data" - "/contenttype/subtype" - "/contenttype/list" - "/contenttype/icon" - "/contenttype/symbolic-icon" - "/contenttype/tree")) - - ("gio/tests/appinfo.c" - (;; XXX: requires update-desktop-database. - "/appinfo/associations")) - - ("gio/tests/desktop-app-info.c" - (;; XXX: requires update-desktop-database. - "/desktop-app-info/delete" - "/desktop-app-info/default" - "/desktop-app-info/fallback" - "/desktop-app-info/lastused" - "/desktop-app-info/search")) - - ("gio/tests/gdbus-peer.c" - (;; Requires /etc/machine-id. - "/gdbus/codegen-peer-to-peer")) - - ("gio/tests/gdbus-address-get-session.c" - (;; Requires /etc/machine-id. - "/gdbus/x11-autolaunch")) - - ("gio/tests/gsocketclient-slow.c" - (;; These tests tries to resolve "localhost", and = fails. - "/socket-client/happy-eyeballs/slow" - "/socket-client/happy-eyeballs/cancellation/delay= ed")) - - ))) - (for-each (lambda (x) (apply disable x)) failing-tests) - #t))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (if tests? - (begin - (setenv "MESON_TESTTHREADS" - (number->string (parallel-job-count))) - ;; Do not run tests marked as "flaky". - (invoke "meson" "test" "--no-suite" "flaky")) - #t))) - ;; TODO: meson does not permit the bindir to be outside of prefi= x. - ;; See https://github.com/mesonbuild/meson/issues/2561 - ;; We can remove this once meson is patched. - (add-after 'install 'move-executables - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (assoc-ref outputs "bin"))) - (mkdir-p bin) - (rename-file (string-append out "/bin") - (string-append bin "/bin")) - ;; This one is an implementation detail of glib. - ;; It is wrong that that's in "/bin" in the first place, - ;; but that's what upstream is doing right now. - ;; See . - (mkdir (string-append out "/libexec")) - (rename-file (string-append bin "/bin/gio-launch-desktop")= - (string-append out "/libexec/gio-launch-deskt= op")) - ;; Do not refer to "bindir", which points to "${prefix}/bi= n". - ;; We don't patch "bindir" to point to "$bin/bin", because= that - ;; would create a reference cycle between the "out" and "b= in" - ;; outputs. - (substitute* (list (string-append out "/lib/pkgconfig/gio-= 2.0.pc") - (string-append out "/lib/pkgconfig/glib= -2.0.pc")) - (("bindir=3D\\$\\{prefix\\}/bin") "") - (("=3D\\$\\{bindir\\}/") "=3D")) - #t)))))) - ;; TODO: see above for explanation. - ;; #:configure-flags (list (string-append "--bindir=3D" - ;; (assoc-ref %outputs "bin= ") - ;; "/bin")) - - (native-search-paths - ;; This variable is not really "owned" by GLib, but several related - ;; packages refer to it: gobject-introspection's tools use it as a s= earch - ;; path for .gir files, and it's also a search path for schemas prod= uced - ;; by 'glib-compile-schemas'. - (list (search-path-specification - (variable "XDG_DATA_DIRS") - (files '("share"))) - ;; To load extra gio modules from glib-networking, etc. - (search-path-specification - (variable "GIO_EXTRA_MODULES") - (files '("lib/gio/modules"))))) - (search-paths native-search-paths) - (properties '((hidden? . #t))) - - (synopsis "Thread-safe general utility library; basis of GTK+ and GNO= ME") - (description - "GLib provides data structure handling for C, portability wrappers, -and interfaces for such runtime functionality as an event loop, threads,= -dynamic loading, and an object system.") - (home-page "https://developer.gnome.org/glib/") - (license license:lgpl2.1+))) - -(define glib/fixed - (package - (inherit glib) - (source (origin - (inherit (package-source glib)) - (patches - (append (search-patches "glib-CVE-2021-27218.patch" - "glib-CVE-2021-27219-01.patch" - "glib-CVE-2021-27219-02.patch" - "glib-CVE-2021-27219-03.patch" - "glib-CVE-2021-27219-04.patch" - "glib-CVE-2021-27219-05.patch" - "glib-CVE-2021-27219-06.patch" - "glib-CVE-2021-27219-07.patch" - "glib-CVE-2021-27219-08.patch" - "glib-CVE-2021-27219-09.patch" - "glib-CVE-2021-27219-10.patch" - "glib-CVE-2021-27219-11.patch" - "glib-CVE-2021-27219-12.patch" - "glib-CVE-2021-27219-13.patch" - "glib-CVE-2021-27219-14.patch" - "glib-CVE-2021-27219-15.patch" - "glib-CVE-2021-27219-16.patch" - "glib-CVE-2021-27219-17.patch" - "glib-CVE-2021-27219-18.patch" - "glib-CVE-2021-28153.patch") - (origin-patches (package-source glib)))))))) + (name "glib") + (version "2.62.6") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" + name "/" (string-take version 4) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh"))= + (patches + (search-patches "glib-tests-timer.patch" "glib-appinfo-watch.pat= ch")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "tests/spawn-test.c" + (("/bin/sh") "sh")) + #t)))) + (properties '((hidden? . #t))) + (build-system meson-build-system) + (outputs '("out" ; everything + "bin")) ; glib-mkenums, gtester, etc.; depends on Python + (arguments + `(#:disallowed-references (,tzdata-for-tests) + #:phases + (modify-phases %standard-phases + ;; TODO: Remove the conditional in the next core-updates cycle.= + ;; Needed to build glib on slower ARM nodes. + ,@(if (string-prefix? "arm" (%current-system)) + `((add-after 'unpack 'increase-test-timeout + (lambda _ + (substitute* "meson.build" + (("test_timeout =3D 60") + "test_timeout =3D 90") + (("test_timeout_slow =3D 120") + "test_timeout_slow =3D 180"))))) + '()) + (add-after 'unpack 'patch-dbus-launch-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((dbus (assoc-ref inputs "dbus"))) + (substitute* "gio/gdbusaddress.c" + (("command_line =3D g_strdup_printf \\(\"dbus-launch") + (string-append "command_line =3D g_strdup_printf (\"" + dbus "/bin/dbus-launch"))) + #t))) + (add-after 'unpack 'patch-gio-launch-desktop + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; See also + ;; for another future fix. + (substitute* "gio/gdesktopappinfo.c" + (("gio-launch-desktop") + (string-append out "/libexec/gio-launch-desktop"))) + #t))) + (add-before 'build 'pre-build + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; For tests/gdatetime.c. + (setenv "TZDIR" + (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo")) + ;; Some tests want write access there. + (setenv "HOME" (getcwd)) + (setenv "XDG_CACHE_HOME" (getcwd)) + #t)) + (add-after 'unpack 'disable-failing-tests + (lambda _ + (let ((disable + (lambda (test-file test-paths) + (define pattern+procs + (map (lambda (test-path) + (cons + ;; XXX: only works for single line state= ments. + (format #f "g_test_add_func.*\"~a\".*" t= est-path) + (const ""))) + test-paths)) + (substitute test-file pattern+procs))) + (failing-tests + '(("glib/tests/thread.c" + ( ;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-= xen-amd64 + ;; as found on hydra.gnu.org, and strace(1) does= n't + ;; recognize it. + "/thread/thread4")) + ;; This tries to find programs in FHS directories.= + ("glib/tests/utils.c" + ("/utils/find-program")) + ;; This fails because "glib/tests/echo-script" can= not be + ;; found. + ("glib/tests/spawn-singlethread.c" + ("/gthread/spawn-script")) + ("glib/tests/timer.c" + ( ;; fails if compiler optimizations are enabled,= which they + ;; are by default. + "/timer/stop")) + ("gio/tests/gapplication.c" + ( ;; XXX: proven to be unreliable. See: + ;; + ;; + "/gapplication/quit" + ;; XXX: fails randomly for unknown reason. See: + ;; + "/gapplication/local-actions")) + ("gio/tests/contenttype.c" + ( ;; XXX: requires shared-mime-info. + "/contenttype/guess" + "/contenttype/guess_svg_from_data" + "/contenttype/subtype" + "/contenttype/list" + "/contenttype/icon" + "/contenttype/symbolic-icon" + "/contenttype/tree")) + ("gio/tests/appinfo.c" + ( ;; XXX: requires update-desktop-database. + "/appinfo/associations")) + ("gio/tests/desktop-app-info.c" + ( ;; XXX: requires update-desktop-database. + "/desktop-app-info/delete" + "/desktop-app-info/default" + "/desktop-app-info/fallback" + "/desktop-app-info/lastused" + "/desktop-app-info/search")) + ("gio/tests/gdbus-peer.c" + ( ;; Requires /etc/machine-id. + "/gdbus/codegen-peer-to-peer")) + ("gio/tests/gdbus-address-get-session.c" + ( ;; Requires /etc/machine-id. + "/gdbus/x11-autolaunch")) + ("gio/tests/gsocketclient-slow.c" + ( ;; These tests tries to resolve "localhost", an= d fails. + "/socket-client/happy-eyeballs/slow" + "/socket-client/happy-eyeballs/cancellation/dela= yed"))))) + (for-each (lambda (x) (apply disable x)) failing-tests) + #t))) + (replace 'check + (lambda _ + (setenv "MESON_TESTTHREADS" + (number->string (parallel-job-count))) + ;; Do not run tests marked as "flaky". + (invoke "meson" "test" "--no-suite" "flaky"))) + ;; TODO: meson does not permit the bindir to be outside of pref= ix. + ;; See https://github.com/mesonbuild/meson/issues/2561 + ;; We can remove this once meson is patched. + (add-after 'install 'move-executables + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) + (mkdir-p bin) + (rename-file (string-append out "/bin") + (string-append bin "/bin")) + ;; This one is an implementation detail of glib. + ;; It is wrong that that's in "/bin" in the first place, + ;; but that's what upstream is doing right now. + ;; See .= + (mkdir (string-append out "/libexec")) + (rename-file (string-append bin "/bin/gio-launch-desktop"= ) + (string-append out "/libexec/gio-launch-desk= top")) + ;; Do not refer to "bindir", which points to "${prefix}/b= in". + ;; We don't patch "bindir" to point to "$bin/bin", becaus= e that + ;; would create a reference cycle between the "out" and "= bin" + ;; outputs. + (substitute* (list (string-append out "/lib/pkgconfig/gio= -2.0.pc") + (string-append out "/lib/pkgconfig/gli= b-2.0.pc")) + (("bindir=3D\\$\\{prefix\\}/bin") "") + (("=3D\\$\\{bindir\\}/") "=3D")) + #t)))))) + ;; TODO: see above for explanation. + ;; #:configure-flags (list (string-append "--bindir=3D" + ;; (assoc-ref %outputs "bin")= + ;; "/bin")) + (native-inputs + `(("dbus" ,dbus) ; for GDBus tests + ("gettext" ,gettext-minimal) + ("m4" ,m4) ; for installing m4 macros + ("perl" ,perl) ; needed by GIO tests + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("tzdata" ,tzdata-for-tests))) ; for tests/gdatetime.c + (propagated-inputs + `(("libffi" ,libffi) ; in the Requires.private field of gobject-2.0= =2Epc + ("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc + ("util-linux" ,util-linux "lib") ;for libmount + ("zlib" ,zlib))) ; in the Requires.private field of glib-2.0.pc + (native-search-paths + ;; This variable is not really "owned" by GLib, but several related= + ;; packages refer to it: gobject-introspection's tools use it as a = search + ;; path for .gir files, and it's also a search path for schemas pro= duced + ;; by 'glib-compile-schemas'. + (list + (search-path-specification + (variable "XDG_DATA_DIRS") + (files '("share"))) + ;; To load extra gio modules from glib-networking, etc. + (search-path-specification + (variable "GIO_EXTRA_MODULES") + (files '("lib/gio/modules"))))) + (search-paths native-search-paths) + (synopsis "Thread-safe general utility library; basis of GTK+ and GN= OME") + (description "GLib provides data structure handling for C, portabili= ty +wrappers, and interfaces for such runtime functionality as an event loop= , +threads, dynamic loading, and an object system.") + (home-page "https://developer.gnome.org/glib/") + (license license:lgpl2.1+))) =20 (define-public glib-with-documentation ;; glib's doc must be built in a separate package since it requires gt= k-doc, diff --git a/gnu/packages/patches/glib-CVE-2021-27218.patch b/gnu/package= s/patches/glib-CVE-2021-27218.patch deleted file mode 100644 index 00fa5ebf79..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27218.patch +++ /dev/null @@ -1,132 +0,0 @@ -Backport of: - -From 0f384c88a241bbbd884487b1c40b7b75f1e638d3 Mon Sep 17 00:00:00 2001 -From: Krzesimir Nowak -Date: Wed, 10 Feb 2021 23:51:07 +0100 -Subject: [PATCH] gbytearray: Do not accept too large byte arrays - -GByteArray uses guint for storing the length of the byte array, but it -also has a constructor (g_byte_array_new_take) that takes length as a -gsize. gsize may be larger than guint (64 bits for gsize vs 32 bits -for guint). It is possible to call the function with a value greater -than G_MAXUINT, which will result in silent length truncation. This -may happen as a result of unreffing GBytes into GByteArray, so rather -be loud about it. - -(Test case tweaked by Philip Withnall.) - -(Backport 2.66: Add #include gstrfuncsprivate.h in the test case for -`g_memdup2()`.) ---- - glib/garray.c | 6 ++++++ - glib/gbytes.c | 4 ++++ - glib/tests/bytes.c | 35 ++++++++++++++++++++++++++++++++++- - 3 files changed, 44 insertions(+), 1 deletion(-) - -diff --git a/glib/garray.c b/glib/garray.c -index 942e74c9f..fb1a42aaf 100644 ---- a/glib/garray.c -+++ b/glib/garray.c -@@ -2013,6 +2013,10 @@ g_byte_array_new (void) - * Create byte array containing the data. The data will be owned by the= array - * and will be freed with g_free(), i.e. it could be allocated using g_= strdup(). - * -+ * Do not use it if @len is greater than %G_MAXUINT. #GByteArray -+ * stores the length of its data in #guint, which may be shorter than -+ * #gsize. -+ * - * Since: 2.32 - * - * Returns: (transfer full): a new #GByteArray -@@ -2024,6 +2028,8 @@ g_byte_array_new_take (guint8 *data, - GByteArray *array; - GRealArray *real; -=20 -+ g_return_val_if_fail (len <=3D G_MAXUINT, NULL); -+ - array =3D g_byte_array_new (); - real =3D (GRealArray *)array; - g_assert (real->data =3D=3D NULL); -diff --git a/glib/gbytes.c b/glib/gbytes.c -index 7b72886e5..d56abe6c3 100644 ---- a/glib/gbytes.c -+++ b/glib/gbytes.c -@@ -519,6 +519,10 @@ g_bytes_unref_to_data (GBytes *bytes, - * g_bytes_new(), g_bytes_new_take() or g_byte_array_free_to_bytes(). I= n all - * other cases the data is copied. - * -+ * Do not use it if @bytes contains more than %G_MAXUINT -+ * bytes. #GByteArray stores the length of its data in #guint, which -+ * may be shorter than #gsize, that @bytes is using. -+ * - * Returns: (transfer full): a new mutable #GByteArray containing the s= ame byte data - * - * Since: 2.32 -diff --git a/glib/tests/bytes.c b/glib/tests/bytes.c -index 5ea5c2b35..15a6aaad6 100644 ---- a/glib/tests/bytes.c -+++ b/glib/tests/bytes.c -@@ -10,12 +10,12 @@ - */ -=20 - #undef G_DISABLE_ASSERT --#undef G_LOG_DOMAIN -=20 - #include - #include - #include - #include "glib.h" -+#include "glib/gstrfuncsprivate.h" -=20 - /* Keep in sync with glib/gbytes.c */ - struct _GBytes -@@ -333,6 +333,38 @@ test_to_array_transferred (void) - g_byte_array_unref (array); - } -=20 -+static void -+test_to_array_transferred_oversize (void) -+{ -+ g_test_message ("g_bytes_unref_to_array() can only take GBytes up to = " -+ "G_MAXUINT in length; test that longer ones are rejec= ted"); -+ -+ if (sizeof (guint) >=3D sizeof (gsize)) -+ { -+ g_test_skip ("Skipping test as guint is not smaller than gsize");= -+ } -+ else if (g_test_undefined ()) -+ { -+ GByteArray *array =3D NULL; -+ GBytes *bytes =3D NULL; -+ gpointer data =3D g_memdup2 (NYAN, N_NYAN); -+ gsize len =3D ((gsize) G_MAXUINT) + 1; -+ -+ bytes =3D g_bytes_new_take (data, len); -+ g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, -+ "g_byte_array_new_take: assertion 'len <=3D= G_MAXUINT' failed"); -+ array =3D g_bytes_unref_to_array (g_steal_pointer (&bytes)); -+ g_test_assert_expected_messages (); -+ g_assert_null (array); -+ -+ g_free (data); -+ } -+ else -+ { -+ g_test_skip ("Skipping test as testing undefined behaviour is dis= abled"); -+ } -+} -+ - static void - test_to_array_two_refs (void) - { -@@ -410,6 +442,7 @@ main (int argc, char *argv[]) - g_test_add_func ("/bytes/to-array/transfered", test_to_array_transfer= red); - g_test_add_func ("/bytes/to-array/two-refs", test_to_array_two_refs);= - g_test_add_func ("/bytes/to-array/non-malloc", test_to_array_non_mall= oc); -+ g_test_add_func ("/bytes/to-array/transferred/oversize", test_to_arra= y_transferred_oversize); - g_test_add_func ("/bytes/null", test_null); -=20 - return g_test_run (); ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-01.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-01.patch deleted file mode 100644 index 5db360d468..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-01.patch +++ /dev/null @@ -1,176 +0,0 @@ -Backport of: - -From 5e5f75a77e399c638be66d74e5daa8caeb433e00 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 13:30:52 +0000 -Subject: [PATCH 01/11] gstrfuncs: Add internal g_memdup2() function -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -This will replace the existing `g_memdup()` function for use within -GLib. It has an unavoidable security flaw of taking its `byte_size` -argument as a `guint` rather than as a `gsize`. Most callers will -expect it to be a `gsize`, and may pass in large values which could -silently be truncated, resulting in an undersize allocation compared -to what the caller expects. - -This could lead to a classic buffer overflow vulnerability for many -callers of `g_memdup()`. - -`g_memdup2()`, in comparison, takes its `byte_size` as a `gsize`. - -Spotted by Kevin Backhouse of GHSL. - -In GLib 2.68, `g_memdup2()` will be a new public API. In this version -for backport to older stable releases, it=E2=80=99s a new `static inline= ` API -in a private header, so that use of `g_memdup()` within GLib can be -fixed without adding a new API in a stable release series. - -Signed-off-by: Philip Withnall -Helps: GHSL-2021-045 -Helps: #2319 ---- - docs/reference/glib/meson.build | 1 + - glib/gstrfuncsprivate.h | 55 +++++++++++++++++++++++++++++++++ - glib/meson.build | 1 + - glib/tests/strfuncs.c | 23 ++++++++++++++ - 4 files changed, 80 insertions(+) - create mode 100644 glib/gstrfuncsprivate.h - -diff --git a/docs/reference/glib/meson.build b/docs/reference/glib/meson= =2Ebuild -index bba7649f0..ee39f6d04 100644 ---- a/docs/reference/glib/meson.build -+++ b/docs/reference/glib/meson.build -@@ -22,6 +22,7 @@ if get_option('gtk_doc') - 'gprintfint.h', - 'gmirroringtable.h', - 'gscripttable.h', -+ 'gstrfuncsprivate.h', - 'glib-mirroring-tab', - 'gnulib', - 'pcre', -diff --git a/glib/gstrfuncsprivate.h b/glib/gstrfuncsprivate.h -new file mode 100644 -index 000000000..85c88328a ---- /dev/null -+++ b/glib/gstrfuncsprivate.h -@@ -0,0 +1,55 @@ -+/* GLIB - Library of useful routines for C programming -+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacD= onald -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, see . -+ */ -+ -+#include -+#include -+ -+/* -+ * g_memdup2: -+ * @mem: (nullable): the memory to copy. -+ * @byte_size: the number of bytes to copy. -+ * -+ * Allocates @byte_size bytes of memory, and copies @byte_size bytes in= to it -+ * from @mem. If @mem is %NULL it returns %NULL. -+ * -+ * This replaces g_memdup(), which was prone to integer overflows when -+ * converting the argument from a #gsize to a #guint. -+ * -+ * This static inline version is a backport of the new public API from -+ * GLib 2.68, kept internal to GLib for backport to older stable releas= es. -+ * See https://gitlab.gnome.org/GNOME/glib/-/issues/2319. -+ * -+ * Returns: (nullable): a pointer to the newly-allocated copy of the me= mory, -+ * or %NULL if @mem is %NULL. -+ * Since: 2.68 -+ */ -+static inline gpointer -+g_memdup2 (gconstpointer mem, -+ gsize byte_size) -+{ -+ gpointer new_mem; -+ -+ if (mem && byte_size !=3D 0) -+ { -+ new_mem =3D g_malloc (byte_size); -+ memcpy (new_mem, mem, byte_size); -+ } -+ else -+ new_mem =3D NULL; -+ -+ return new_mem; -+} -diff --git a/glib/meson.build b/glib/meson.build -index aaf5f00f5..5a6eea397 100644 ---- a/glib/meson.build -+++ b/glib/meson.build -@@ -268,6 +268,7 @@ glib_sources =3D files( - 'gslist.c', - 'gstdio.c', - 'gstrfuncs.c', -+ 'gstrfuncsprivate.h', - 'gstring.c', - 'gstringchunk.c', - 'gtestutils.c', -diff --git a/glib/tests/strfuncs.c b/glib/tests/strfuncs.c -index e1f9619c7..d968afff9 100644 ---- a/glib/tests/strfuncs.c -+++ b/glib/tests/strfuncs.c -@@ -32,6 +32,8 @@ - #include - #include "glib.h" -=20 -+#include "gstrfuncsprivate.h" -+ - #if defined (_MSC_VER) && (_MSC_VER <=3D 1800) - #define isnan(x) _isnan(x) -=20 -@@ -219,6 +221,26 @@ test_memdup (void) - g_free (str_dup); - } -=20 -+/* Testing g_memdup2() function with various positive and negative case= s */ -+static void -+test_memdup2 (void) -+{ -+ gchar *str_dup =3D NULL; -+ const gchar *str =3D "The quick brown fox jumps over the lazy dog"; -+ -+ /* Testing negative cases */ -+ g_assert_null (g_memdup2 (NULL, 1024)); -+ g_assert_null (g_memdup2 (str, 0)); -+ g_assert_null (g_memdup2 (NULL, 0)); -+ -+ /* Testing normal usage cases */ -+ str_dup =3D g_memdup2 (str, strlen (str) + 1); -+ g_assert_nonnull (str_dup); -+ g_assert_cmpstr (str, =3D=3D, str_dup); -+ -+ g_free (str_dup); -+} -+ - /* Testing g_strpcpy() function with various positive and negative case= s */ - static void - test_stpcpy (void) -@@ -2523,6 +2545,7 @@ main (int argc, - g_test_add_func ("/strfuncs/has-prefix", test_has_prefix); - g_test_add_func ("/strfuncs/has-suffix", test_has_suffix); - g_test_add_func ("/strfuncs/memdup", test_memdup); -+ g_test_add_func ("/strfuncs/memdup2", test_memdup2); - g_test_add_func ("/strfuncs/stpcpy", test_stpcpy); - g_test_add_func ("/strfuncs/str_match_string", test_str_match_string)= ; - g_test_add_func ("/strfuncs/str_tokenize_and_fold", test_str_tokenize= _and_fold); ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-02.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-02.patch deleted file mode 100644 index 431959fa8f..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-02.patch +++ /dev/null @@ -1,264 +0,0 @@ -Backport of: - -From be8834340a2d928ece82025463ae23dee2c333d0 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 13:37:56 +0000 -Subject: [PATCH 02/11] gio: Use g_memdup2() instead of g_memdup() in obv= ious - places -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -Convert all the call sites which use `g_memdup()`=E2=80=99s length argum= ent -trivially (for example, by passing a `sizeof()`), so that they use -`g_memdup2()` instead. - -In almost all of these cases the use of `g_memdup()` would not have -caused problems, but it will soon be deprecated, so best port away from -it. - -Signed-off-by: Philip Withnall -Helps: #2319 ---- - gio/gdbusconnection.c | 5 +++-- - gio/gdbusinterfaceskeleton.c | 3 ++- - gio/gfile.c | 7 ++++--- - gio/gsettingsschema.c | 5 +++-- - gio/gwin32registrykey.c | 8 +++++--- - gio/tests/async-close-output-stream.c | 6 ++++-- - gio/tests/gdbus-export.c | 5 +++-- - gio/win32/gwinhttpfile.c | 9 +++++---- - 8 files changed, 29 insertions(+), 19 deletions(-) - -diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c -index f1f0921d4..d56453486 100644 ---- a/gio/gdbusconnection.c -+++ b/gio/gdbusconnection.c -@@ -110,6 +110,7 @@ - #include "gasyncinitable.h" - #include "giostream.h" - #include "gasyncresult.h" -+#include "gstrfuncsprivate.h" - #include "gtask.h" - #include "gmarshal-internal.h" -=20 -@@ -3997,7 +3998,7 @@ _g_dbus_interface_vtable_copy (const GDBusInterfac= eVTable *vtable) - /* Don't waste memory by copying padding - remember to update this - * when changing struct _GDBusInterfaceVTable in gdbusconnection.h - */ -- return g_memdup ((gconstpointer) vtable, 3 * sizeof (gpointer)); -+ return g_memdup2 ((gconstpointer) vtable, 3 * sizeof (gpointer)); - } -=20 - static void -@@ -4014,7 +4015,7 @@ _g_dbus_subtree_vtable_copy (const GDBusSubtreeVTa= ble *vtable) - /* Don't waste memory by copying padding - remember to update this - * when changing struct _GDBusSubtreeVTable in gdbusconnection.h - */ -- return g_memdup ((gconstpointer) vtable, 3 * sizeof (gpointer)); -+ return g_memdup2 ((gconstpointer) vtable, 3 * sizeof (gpointer)); - } -=20 - static void -diff --git a/gio/gdbusinterfaceskeleton.c b/gio/gdbusinterfaceskeleton.c= -index 4a06516c1..4a4b719a5 100644 ---- a/gio/gdbusinterfaceskeleton.c -+++ b/gio/gdbusinterfaceskeleton.c -@@ -28,6 +28,7 @@ - #include "gdbusmethodinvocation.h" - #include "gdbusconnection.h" - #include "gmarshal-internal.h" -+#include "gstrfuncsprivate.h" - #include "gtask.h" - #include "gioerror.h" -=20 -@@ -701,7 +702,7 @@ add_connection_locked (GDBusInterfaceSkeleton *inter= face_, - * properly before building the hooked_vtable, so we create it - * once at the last minute. - */ -- interface_->priv->hooked_vtable =3D g_memdup (g_dbus_interface_sk= eleton_get_vtable (interface_), sizeof (GDBusInterfaceVTable)); -+ interface_->priv->hooked_vtable =3D g_memdup2 (g_dbus_interface_s= keleton_get_vtable (interface_), sizeof (GDBusInterfaceVTable)); - interface_->priv->hooked_vtable->method_call =3D skeleton_interce= pt_handle_method_call; - } -=20 -diff --git a/gio/gfile.c b/gio/gfile.c -index ba93f7c75..88b341e7d 100644 ---- a/gio/gfile.c -+++ b/gio/gfile.c -@@ -60,6 +60,7 @@ - #include "gasyncresult.h" - #include "gioerror.h" - #include "glibintl.h" -+#include "gstrfuncsprivate.h" -=20 -=20 - /** -@@ -7884,7 +7885,7 @@ measure_disk_usage_progress (gboolean reporting, - g_main_context_invoke_full (g_task_get_context (task), - g_task_get_priority (task), - measure_disk_usage_invoke_progress, -- g_memdup (&progress, sizeof progress), -+ g_memdup2 (&progress, sizeof progress), - g_free); - } -=20 -@@ -7902,7 +7903,7 @@ measure_disk_usage_thread (GTask *task, - data->progress_callback ? measure_disk= _usage_progress : NULL, task, - &result.disk_usage, &result.num_dirs, = &result.num_files, - &error)) -- g_task_return_pointer (task, g_memdup (&result, sizeof result), g_f= ree); -+ g_task_return_pointer (task, g_memdup2 (&result, sizeof result), g_= free); - else - g_task_return_error (task, error); - } -@@ -7926,7 +7927,7 @@ g_file_real_measure_disk_usage_async (GFile = *file, -=20 - task =3D g_task_new (file, cancellable, callback, user_data); - g_task_set_source_tag (task, g_file_real_measure_disk_usage_async); -- g_task_set_task_data (task, g_memdup (&data, sizeof data), g_free); -+ g_task_set_task_data (task, g_memdup2 (&data, sizeof data), g_free); - g_task_set_priority (task, io_priority); -=20 - g_task_run_in_thread (task, measure_disk_usage_thread); -diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c -index 3a60b8c64..dded9b1ca 100644 ---- a/gio/gsettingsschema.c -+++ b/gio/gsettingsschema.c -@@ -20,6 +20,7 @@ -=20 - #include "gsettingsschema-internal.h" - #include "gsettings.h" -+#include "gstrfuncsprivate.h" -=20 - #include "gvdb/gvdb-reader.h" - #include "strinfo.c" -@@ -1058,9 +1059,9 @@ g_settings_schema_list_children (GSettingsSchema *= schema) -=20 - if (g_str_has_suffix (key, "/")) - { -- gint length =3D strlen (key); -+ gsize length =3D strlen (key); -=20 -- strv[j] =3D g_memdup (key, length); -+ strv[j] =3D g_memdup2 (key, length); - strv[j][length - 1] =3D '\0'; - j++; - } -diff --git a/gio/gwin32registrykey.c b/gio/gwin32registrykey.c -index c19fede4e..619fd48af 100644 ---- a/gio/gwin32registrykey.c -+++ b/gio/gwin32registrykey.c -@@ -28,6 +28,8 @@ - #include - #include -=20 -+#include "gstrfuncsprivate.h" -+ - #ifndef _WDMDDK_ - typedef enum _KEY_INFORMATION_CLASS { - KeyBasicInformation, -@@ -247,7 +249,7 @@ g_win32_registry_value_iter_copy (const GWin32Regist= ryValueIter *iter) - new_iter->value_name_size =3D iter->value_name_size; -=20 - if (iter->value_data !=3D NULL) -- new_iter->value_data =3D g_memdup (iter->value_data, iter->value_da= ta_size); -+ new_iter->value_data =3D g_memdup2 (iter->value_data, iter->value_d= ata_size); -=20 - new_iter->value_data_size =3D iter->value_data_size; -=20 -@@ -268,8 +270,8 @@ g_win32_registry_value_iter_copy (const GWin32Regist= ryValueIter *iter) - new_iter->value_data_expanded_charsize =3D iter->value_data_expanded_= charsize; -=20 - if (iter->value_data_expanded_u8 !=3D NULL) -- new_iter->value_data_expanded_u8 =3D g_memdup (iter->value_data_exp= anded_u8, -- iter->value_data_expan= ded_charsize); -+ new_iter->value_data_expanded_u8 =3D g_memdup2 (iter->value_data_ex= panded_u8, -+ iter->value_data_expa= nded_charsize); -=20 - new_iter->value_data_expanded_u8_size =3D iter->value_data_expanded_c= harsize; -=20 -diff --git a/gio/tests/async-close-output-stream.c b/gio/tests/async-clo= se-output-stream.c -index 5f6620275..d3f97a119 100644 ---- a/gio/tests/async-close-output-stream.c -+++ b/gio/tests/async-close-output-stream.c -@@ -24,6 +24,8 @@ - #include - #include -=20 -+#include "gstrfuncsprivate.h" -+ - #define DATA_TO_WRITE "Hello world\n" -=20 - typedef struct -@@ -147,9 +149,9 @@ prepare_data (SetupData *data, -=20 - data->expected_size =3D g_memory_output_stream_get_data_size (G_MEMOR= Y_OUTPUT_STREAM (data->data_stream)); -=20 -- g_assert_cmpint (data->expected_size, >, 0); -+ g_assert_cmpuint (data->expected_size, >, 0); -=20 -- data->expected_output =3D g_memdup (written, (guint)data->expected_si= ze); -+ data->expected_output =3D g_memdup2 (written, data->expected_size); -=20 - /* then recreate the streams and prepare them for the asynchronous cl= ose */ - destroy_streams (data); -diff --git a/gio/tests/gdbus-export.c b/gio/tests/gdbus-export.c -index 506c7458a..5513306f8 100644 ---- a/gio/tests/gdbus-export.c -+++ b/gio/tests/gdbus-export.c -@@ -23,6 +23,7 @@ - #include -=20 - #include "gdbus-tests.h" -+#include "gstrfuncsprivate.h" -=20 - /* all tests rely on a shared mainloop */ - static GMainLoop *loop =3D NULL; -@@ -671,7 +672,7 @@ subtree_introspect (GDBusConnection *connectio= n, - g_assert_not_reached (); - } -=20 -- return g_memdup (interfaces, 2 * sizeof (void *)); -+ return g_memdup2 (interfaces, 2 * sizeof (void *)); - } -=20 - static const GDBusInterfaceVTable * -@@ -727,7 +728,7 @@ dynamic_subtree_introspect (GDBusConnection *c= onnection, - { - const GDBusInterfaceInfo *interfaces[2] =3D { &dyna_interface_info, N= ULL }; -=20 -- return g_memdup (interfaces, 2 * sizeof (void *)); -+ return g_memdup2 (interfaces, 2 * sizeof (void *)); - } -=20 - static const GDBusInterfaceVTable * -diff --git a/gio/win32/gwinhttpfile.c b/gio/win32/gwinhttpfile.c -index cf5eed31d..040ee8564 100644 ---- a/gio/win32/gwinhttpfile.c -+++ b/gio/win32/gwinhttpfile.c -@@ -29,6 +29,7 @@ - #include "gio/gfile.h" - #include "gio/gfileattribute.h" - #include "gio/gfileinfo.h" -+#include "gstrfuncsprivate.h" - #include "gwinhttpfile.h" - #include "gwinhttpfileinputstream.h" - #include "gwinhttpfileoutputstream.h" -@@ -393,10 +394,10 @@ g_winhttp_file_resolve_relative_path (GFile *= file, - child =3D g_object_new (G_TYPE_WINHTTP_FILE, NULL); - child->vfs =3D winhttp_file->vfs; - child->url =3D winhttp_file->url; -- child->url.lpszScheme =3D g_memdup (winhttp_file->url.lpszScheme, (wi= nhttp_file->url.dwSchemeLength+1)*2); -- child->url.lpszHostName =3D g_memdup (winhttp_file->url.lpszHostName,= (winhttp_file->url.dwHostNameLength+1)*2); -- child->url.lpszUserName =3D g_memdup (winhttp_file->url.lpszUserName,= (winhttp_file->url.dwUserNameLength+1)*2); -- child->url.lpszPassword =3D g_memdup (winhttp_file->url.lpszPassword,= (winhttp_file->url.dwPasswordLength+1)*2); -+ child->url.lpszScheme =3D g_memdup2 (winhttp_file->url.lpszScheme, (w= inhttp_file->url.dwSchemeLength+1)*2); -+ child->url.lpszHostName =3D g_memdup2 (winhttp_file->url.lpszHostName= , (winhttp_file->url.dwHostNameLength+1)*2); -+ child->url.lpszUserName =3D g_memdup2 (winhttp_file->url.lpszUserName= , (winhttp_file->url.dwUserNameLength+1)*2); -+ child->url.lpszPassword =3D g_memdup2 (winhttp_file->url.lpszPassword= , (winhttp_file->url.dwPasswordLength+1)*2); - child->url.lpszUrlPath =3D wnew_path; - child->url.dwUrlPathLength =3D wcslen (wnew_path); - child->url.lpszExtraInfo =3D NULL; ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-03.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-03.patch deleted file mode 100644 index 99e849c43c..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-03.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 6110caea45b235420b98cd41d845cc92238f6781 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 13:39:25 +0000 -Subject: [PATCH 03/11] gobject: Use g_memdup2() instead of g_memdup() in= - obvious places -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -Convert all the call sites which use `g_memdup()`=E2=80=99s length argum= ent -trivially (for example, by passing a `sizeof()`), so that they use -`g_memdup2()` instead. - -In almost all of these cases the use of `g_memdup()` would not have -caused problems, but it will soon be deprecated, so best port away from -it. - -Signed-off-by: Philip Withnall -Helps: #2319 ---- - gobject/gsignal.c | 3 ++- - gobject/gtype.c | 9 +++++---- - gobject/gtypemodule.c | 3 ++- - gobject/tests/param.c | 4 +++- - 4 files changed, 12 insertions(+), 7 deletions(-) - -diff --git a/gobject/gsignal.c b/gobject/gsignal.c -index 77d8f211e..41c54ab57 100644 ---- a/gobject/gsignal.c -+++ b/gobject/gsignal.c -@@ -28,6 +28,7 @@ - #include -=20 - #include "gsignal.h" -+#include "gstrfuncsprivate.h" - #include "gtype-private.h" - #include "gbsearcharray.h" - #include "gvaluecollector.h" -@@ -1730,7 +1731,7 @@ g_signal_newv (const gchar *signal_name, - node->single_va_closure_is_valid =3D FALSE; - node->flags =3D signal_flags & G_SIGNAL_FLAGS_MASK; - node->n_params =3D n_params; -- node->param_types =3D g_memdup (param_types, sizeof (GType) * n_param= s); -+ node->param_types =3D g_memdup2 (param_types, sizeof (GType) * n_para= ms); - node->return_type =3D return_type; - node->class_closure_bsa =3D NULL; - if (accumulator) -diff --git a/gobject/gtype.c b/gobject/gtype.c -index 7d3789400..8441b90e9 100644 ---- a/gobject/gtype.c -+++ b/gobject/gtype.c -@@ -33,6 +33,7 @@ -=20 - #include "glib-private.h" - #include "gconstructor.h" -+#include "gstrfuncsprivate.h" -=20 - #ifdef G_OS_WIN32 - #include -@@ -1470,7 +1471,7 @@ type_add_interface_Wm (TypeNode *node,= - iholder->next =3D iface_node_get_holders_L (iface); - iface_node_set_holders_W (iface, iholder); - iholder->instance_type =3D NODE_TYPE (node); -- iholder->info =3D info ? g_memdup (info, sizeof (*info)) : NULL; -+ iholder->info =3D info ? g_memdup2 (info, sizeof (*info)) : NULL; - iholder->plugin =3D plugin; -=20 - /* create an iface entry for this type */ -@@ -1731,7 +1732,7 @@ type_iface_retrieve_holder_info_Wm (TypeNode *ifac= e, - INVALID_RECURSION ("g_type_plugin_*", iholder->plugin, NODE_NAM= E (iface)); - =20 - check_interface_info_I (iface, instance_type, &tmp_info); -- iholder->info =3D g_memdup (&tmp_info, sizeof (tmp_info)); -+ iholder->info =3D g_memdup2 (&tmp_info, sizeof (tmp_info)); - } - =20 - return iholder; /* we don't modify write lock upon returning NULL */ -@@ -2016,10 +2017,10 @@ type_iface_vtable_base_init_Wm (TypeNode *iface,= - IFaceEntry *pentry =3D type_lookup_iface_entry_L (pnode, iface); - =20 - if (pentry) -- vtable =3D g_memdup (pentry->vtable, iface->data->iface.vtable_size); -+ vtable =3D g_memdup2 (pentry->vtable, iface->data->iface.vtable_size);= - } - if (!vtable) -- vtable =3D g_memdup (iface->data->iface.dflt_vtable, iface->data->i= face.vtable_size); -+ vtable =3D g_memdup2 (iface->data->iface.dflt_vtable, iface->data->= iface.vtable_size); - entry->vtable =3D vtable; - vtable->g_type =3D NODE_TYPE (iface); - vtable->g_instance_type =3D NODE_TYPE (node); -diff --git a/gobject/gtypemodule.c b/gobject/gtypemodule.c -index 4ecaf8c88..20911fafd 100644 ---- a/gobject/gtypemodule.c -+++ b/gobject/gtypemodule.c -@@ -19,6 +19,7 @@ -=20 - #include -=20 -+#include "gstrfuncsprivate.h" - #include "gtypeplugin.h" - #include "gtypemodule.h" -=20 -@@ -436,7 +437,7 @@ g_type_module_register_type (GTypeModule *module= , - module_type_info->loaded =3D TRUE; - module_type_info->info =3D *type_info; - if (type_info->value_table) -- module_type_info->info.value_table =3D g_memdup (type_info->value_t= able, -+ module_type_info->info.value_table =3D g_memdup2 (type_info->value_= table, - sizeof (GTypeValueTable)); -=20 - return module_type_info->type; -diff --git a/gobject/tests/param.c b/gobject/tests/param.c -index 758289bf8..971cff162 100644 ---- a/gobject/tests/param.c -+++ b/gobject/tests/param.c -@@ -2,6 +2,8 @@ - #include - #include -=20 -+#include "gstrfuncsprivate.h" -+ - static void - test_param_value (void) - { -@@ -851,7 +853,7 @@ main (int argc, char *argv[]) - test_path =3D g_strdup_printf ("/param/implement/subprocess= /%d-%d-%d-%d", - data.change_this_flag, data.ch= ange_this_type, - data.use_this_flag, data.use_t= his_type); -- test_data =3D g_memdup (&data, sizeof (TestParamImplementDa= ta)); -+ test_data =3D g_memdup2 (&data, sizeof (TestParamImplementD= ata)); - g_test_add_data_func_full (test_path, test_data, test_param= _implement_child, g_free); - g_free (test_path); - } ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-04.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-04.patch deleted file mode 100644 index 3ae01f34b1..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-04.patch +++ /dev/null @@ -1,308 +0,0 @@ -Backport of: - -From 0736b7c1e7cf4232c5d7eb2b0fbfe9be81bd3baa Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 13:41:21 +0000 -Subject: [PATCH 04/11] glib: Use g_memdup2() instead of g_memdup() in ob= vious - places -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -Convert all the call sites which use `g_memdup()`=E2=80=99s length argum= ent -trivially (for example, by passing a `sizeof()` or an existing `gsize` -variable), so that they use `g_memdup2()` instead. - -In almost all of these cases the use of `g_memdup()` would not have -caused problems, but it will soon be deprecated, so best port away from -it - -In particular, this fixes an overflow within `g_bytes_new()`, identified= -as GHSL-2021-045 by GHSL team member Kevin Backhouse. - -Signed-off-by: Philip Withnall -Fixes: GHSL-2021-045 -Helps: #2319 ---- - glib/gbytes.c | 6 ++++-- - glib/gdir.c | 3 ++- - glib/ghash.c | 7 ++++--- - glib/giochannel.c | 3 ++- - glib/gslice.c | 3 ++- - glib/gtestutils.c | 3 ++- - glib/gvariant.c | 7 ++++--- - glib/gvarianttype.c | 3 ++- - glib/tests/array-test.c | 4 +++- - glib/tests/option-context.c | 6 ++++-- - 10 files changed, 29 insertions(+), 16 deletions(-) - -diff --git a/glib/gbytes.c b/glib/gbytes.c -index d56abe6c3..dee494820 100644 ---- a/glib/gbytes.c -+++ b/glib/gbytes.c -@@ -34,6 +34,8 @@ -=20 - #include -=20 -+#include "gstrfuncsprivate.h" -+ - /** - * GBytes: - * -@@ -95,7 +97,7 @@ g_bytes_new (gconstpointer data, - { - g_return_val_if_fail (data !=3D NULL || size =3D=3D 0, NULL); -=20 -- return g_bytes_new_take (g_memdup (data, size), size); -+ return g_bytes_new_take (g_memdup2 (data, size), size); - } -=20 - /** -@@ -499,7 +501,7 @@ g_bytes_unref_to_data (GBytes *bytes, - * Copy: Non g_malloc (or compatible) allocator, or static memory= , - * so we have to copy, and then unref. - */ -- result =3D g_memdup (bytes->data, bytes->size); -+ result =3D g_memdup2 (bytes->data, bytes->size); - *size =3D bytes->size; - g_bytes_unref (bytes); - } -diff --git a/glib/gdir.c b/glib/gdir.c -index 6b85e99c8..6747a8c6f 100644 ---- a/glib/gdir.c -+++ b/glib/gdir.c -@@ -37,6 +37,7 @@ - #include "gconvert.h" - #include "gfileutils.h" - #include "gstrfuncs.h" -+#include "gstrfuncsprivate.h" - #include "gtestutils.h" - #include "glibintl.h" -=20 -@@ -112,7 +113,7 @@ g_dir_open_with_errno (const gchar *path, - return NULL; - #endif -=20 -- return g_memdup (&dir, sizeof dir); -+ return g_memdup2 (&dir, sizeof dir); - } -=20 - /** -diff --git a/glib/ghash.c b/glib/ghash.c -index e61b03788..26f26062b 100644 ---- a/glib/ghash.c -+++ b/glib/ghash.c -@@ -34,6 +34,7 @@ - #include "gmacros.h" - #include "glib-private.h" - #include "gstrfuncs.h" -+#include "gstrfuncsprivate.h" - #include "gatomic.h" - #include "gtestutils.h" - #include "gslice.h" -@@ -964,7 +965,7 @@ g_hash_table_ensure_keyval_fits (GHashTable *hash_ta= ble, gpointer key, gpointer - if (hash_table->have_big_keys) - { - if (key !=3D value) -- hash_table->values =3D g_memdup (hash_table->keys, sizeof (= gpointer) * hash_table->size); -+ hash_table->values =3D g_memdup2 (hash_table->keys, sizeof = (gpointer) * hash_table->size); - /* Keys and values are both big now, so no need for further c= hecks */ - return; - } -@@ -972,7 +973,7 @@ g_hash_table_ensure_keyval_fits (GHashTable *hash_ta= ble, gpointer key, gpointer - { - if (key !=3D value) - { -- hash_table->values =3D g_memdup (hash_table->keys, sizeof= (guint) * hash_table->size); -+ hash_table->values =3D g_memdup2 (hash_table->keys, sizeo= f (guint) * hash_table->size); - is_a_set =3D FALSE; - } - } -@@ -1000,7 +1001,7 @@ g_hash_table_ensure_keyval_fits (GHashTable *hash_= table, gpointer key, gpointer -=20 - /* Just split if necessary */ - if (is_a_set && key !=3D value) -- hash_table->values =3D g_memdup (hash_table->keys, sizeof (gpointer= ) * hash_table->size); -+ hash_table->values =3D g_memdup2 (hash_table->keys, sizeof (gpointe= r) * hash_table->size); -=20 - #endif - } -diff --git a/glib/giochannel.c b/glib/giochannel.c -index 1956e9dc6..15927c391 100644 ---- a/glib/giochannel.c -+++ b/glib/giochannel.c -@@ -37,6 +37,7 @@ - #include "giochannel.h" -=20 - #include "gstrfuncs.h" -+#include "gstrfuncsprivate.h" - #include "gtestutils.h" - #include "glibintl.h" -=20 -@@ -892,7 +893,7 @@ g_io_channel_set_line_term (GIOChannel *channel, - length =3D strlen (line_term); -=20 - g_free (channel->line_term); -- channel->line_term =3D line_term ? g_memdup (line_term, length) : NUL= L; -+ channel->line_term =3D line_term ? g_memdup2 (line_term, length) : NU= LL; - channel->line_term_len =3D length; - } -=20 -diff --git a/glib/gslice.c b/glib/gslice.c -index 4c758c3be..bcdbb8853 100644 ---- a/glib/gslice.c -+++ b/glib/gslice.c -@@ -41,6 +41,7 @@ - #include "gmain.h" - #include "gmem.h" /* gslice.h */ - #include "gstrfuncs.h" -+#include "gstrfuncsprivate.h" - #include "gutils.h" - #include "gtrashstack.h" - #include "gtestutils.h" -@@ -350,7 +351,7 @@ g_slice_get_config_state (GSliceConfig ckey, - array[i++] =3D allocator->contention_counters[address]; - array[i++] =3D allocator_get_magazine_threshold (allocator, addre= ss); - *n_values =3D i; -- return g_memdup (array, sizeof (array[0]) * *n_values); -+ return g_memdup2 (array, sizeof (array[0]) * *n_values); - default: - return NULL; - } -diff --git a/glib/gtestutils.c b/glib/gtestutils.c -index dd789482f..5887ecc36 100644 ---- a/glib/gtestutils.c -+++ b/glib/gtestutils.c -@@ -49,6 +49,7 @@ - #include "gpattern.h" - #include "grand.h" - #include "gstrfuncs.h" -+#include "gstrfuncsprivate.h" - #include "gtimer.h" - #include "gslice.h" - #include "gspawn.h" -@@ -3798,7 +3799,7 @@ g_test_log_extract (GTestLogBuffer *tbuffer) - if (p <=3D tbuffer->data->str + mlength) - { - g_string_erase (tbuffer->data, 0, mlength); -- tbuffer->msgs =3D g_slist_prepend (tbuffer->msgs, g_memdup (&= msg, sizeof (msg))); -+ tbuffer->msgs =3D g_slist_prepend (tbuffer->msgs, g_memdup2 (= &msg, sizeof (msg))); - return TRUE; - } -=20 -diff --git a/glib/gvariant.c b/glib/gvariant.c -index b61bf7278..d6f68a9ea 100644 ---- a/glib/gvariant.c -+++ b/glib/gvariant.c -@@ -33,6 +33,7 @@ -=20 - #include -=20 -+#include "gstrfuncsprivate.h" -=20 - /** - * SECTION:gvariant -@@ -725,7 +726,7 @@ g_variant_new_variant (GVariant *value) - g_variant_ref_sink (value); -=20 - return g_variant_new_from_children (G_VARIANT_TYPE_VARIANT, -- g_memdup (&value, sizeof value), -+ g_memdup2 (&value, sizeof value),= - 1, g_variant_is_trusted (value));= - } -=20 -@@ -1229,7 +1230,7 @@ g_variant_new_fixed_array (const GVariantType *el= ement_type, - return NULL; - } -=20 -- data =3D g_memdup (elements, n_elements * element_size); -+ data =3D g_memdup2 (elements, n_elements * element_size); - value =3D g_variant_new_from_data (array_type, data, - n_elements * element_size, - FALSE, g_free, data); -@@ -1908,7 +1909,7 @@ g_variant_dup_bytestring (GVariant *value, - if (length) - *length =3D size; -=20 -- return g_memdup (original, size + 1); -+ return g_memdup2 (original, size + 1); - } -=20 - /** -diff --git a/glib/gvarianttype.c b/glib/gvarianttype.c -index 1a228f73b..07659ff12 100644 ---- a/glib/gvarianttype.c -+++ b/glib/gvarianttype.c -@@ -28,6 +28,7 @@ -=20 - #include -=20 -+#include "gstrfuncsprivate.h" -=20 - /** - * SECTION:gvarianttype -@@ -1181,7 +1182,7 @@ g_variant_type_new_tuple (const GVariantType * con= st *items, - g_assert (offset < sizeof buffer); - buffer[offset++] =3D ')'; -=20 -- return (GVariantType *) g_memdup (buffer, offset); -+ return (GVariantType *) g_memdup2 (buffer, offset); - } -=20 - /** -diff --git a/glib/tests/array-test.c b/glib/tests/array-test.c -index 3fcf1136a..11982f822 100644 ---- a/glib/tests/array-test.c -+++ b/glib/tests/array-test.c -@@ -29,6 +29,8 @@ - #include - #include "glib.h" -=20 -+#include "gstrfuncsprivate.h" -+ - /* Test data to be passed to any function which calls g_array_new(), pr= oviding - * the parameters for that call. Most #GArray tests should be repeated = for all - * possible values of #ArrayTestData. */ -@@ -1642,7 +1644,7 @@ byte_array_new_take (void) - GByteArray *gbarray; - guint8 *data; -=20 -- data =3D g_memdup ("woooweeewow", 11); -+ data =3D g_memdup2 ("woooweeewow", 11); - gbarray =3D g_byte_array_new_take (data, 11); - g_assert (gbarray->data =3D=3D data); - g_assert_cmpuint (gbarray->len, =3D=3D, 11); -diff --git a/glib/tests/option-context.c b/glib/tests/option-context.c -index 149d22353..88d2b80d1 100644 ---- a/glib/tests/option-context.c -+++ b/glib/tests/option-context.c -@@ -27,6 +27,8 @@ - #include - #include -=20 -+#include "gstrfuncsprivate.h" -+ - static GOptionEntry main_entries[] =3D { - { "main-switch", 0, 0, - G_OPTION_ARG_NONE, NULL, -@@ -256,7 +258,7 @@ join_stringv (int argc, char **argv) - static char ** - copy_stringv (char **argv, int argc) - { -- return g_memdup (argv, sizeof (char *) * (argc + 1)); -+ return g_memdup2 (argv, sizeof (char *) * (argc + 1)); - } -=20 - static void -@@ -2323,7 +2325,7 @@ test_group_parse (void) - g_option_context_add_group (context, group); -=20 - argv =3D split_string ("program --test arg1 -f arg2 --group-test arg3= --frob arg4 -z arg5", &argc); -- orig_argv =3D g_memdup (argv, (argc + 1) * sizeof (char *)); -+ orig_argv =3D g_memdup2 (argv, (argc + 1) * sizeof (char *)); -=20 - retval =3D g_option_context_parse (context, &argc, &argv, &error); -=20 ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-05.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-05.patch deleted file mode 100644 index 62bce1b188..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-05.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0cbad673215ec8a049b7fe2ff44b0beed31b376e Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 16:12:24 +0000 -Subject: [PATCH 05/11] gwinhttpfile: Avoid arithmetic overflow when - calculating a size -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -The members of `URL_COMPONENTS` (`winhttp_file->url`) are `DWORD`s, i.e.= -32-bit unsigned integers. Adding to and multiplying them may cause them -to overflow the unsigned integer bounds, even if the result is passed to= -`g_memdup2()` which accepts a `gsize`. - -Cast the `URL_COMPONENTS` members to `gsize` first to ensure that the -arithmetic is done in terms of `gsize`s rather than unsigned integers. - -Spotted by Sebastian Dr=C3=B6ge. - -Signed-off-by: Philip Withnall -Helps: #2319 ---- - gio/win32/gwinhttpfile.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/gio/win32/gwinhttpfile.c b/gio/win32/gwinhttpfile.c -index 040ee8564..246ec0578 100644 ---- a/gio/win32/gwinhttpfile.c -+++ b/gio/win32/gwinhttpfile.c -@@ -394,10 +394,10 @@ g_winhttp_file_resolve_relative_path (GFile *= file, - child =3D g_object_new (G_TYPE_WINHTTP_FILE, NULL); - child->vfs =3D winhttp_file->vfs; - child->url =3D winhttp_file->url; -- child->url.lpszScheme =3D g_memdup2 (winhttp_file->url.lpszScheme, (w= inhttp_file->url.dwSchemeLength+1)*2); -- child->url.lpszHostName =3D g_memdup2 (winhttp_file->url.lpszHostName= , (winhttp_file->url.dwHostNameLength+1)*2); -- child->url.lpszUserName =3D g_memdup2 (winhttp_file->url.lpszUserName= , (winhttp_file->url.dwUserNameLength+1)*2); -- child->url.lpszPassword =3D g_memdup2 (winhttp_file->url.lpszPassword= , (winhttp_file->url.dwPasswordLength+1)*2); -+ child->url.lpszScheme =3D g_memdup2 (winhttp_file->url.lpszScheme, ((= gsize) winhttp_file->url.dwSchemeLength + 1) * 2); -+ child->url.lpszHostName =3D g_memdup2 (winhttp_file->url.lpszHostName= , ((gsize) winhttp_file->url.dwHostNameLength + 1) * 2); -+ child->url.lpszUserName =3D g_memdup2 (winhttp_file->url.lpszUserName= , ((gsize) winhttp_file->url.dwUserNameLength + 1) * 2); -+ child->url.lpszPassword =3D g_memdup2 (winhttp_file->url.lpszPassword= , ((gsize) winhttp_file->url.dwPasswordLength + 1) * 2); - child->url.lpszUrlPath =3D wnew_path; - child->url.dwUrlPathLength =3D wcslen (wnew_path); - child->url.lpszExtraInfo =3D NULL; ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-06.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-06.patch deleted file mode 100644 index 4e2435f5fd..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-06.patch +++ /dev/null @@ -1,94 +0,0 @@ -From f9ee2275cbc312c0b4cdbc338a4fbb76eb36fb9a Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 13:49:00 +0000 -Subject: [PATCH 06/11] gdatainputstream: Handle stop_chars_len internall= y as - gsize - -Previously it was handled as a `gssize`, which meant that if the -`stop_chars` string was longer than `G_MAXSSIZE` there would be an -overflow. - -Signed-off-by: Philip Withnall -Helps: #2319 ---- - gio/gdatainputstream.c | 25 +++++++++++++++++-------- - 1 file changed, 17 insertions(+), 8 deletions(-) - -diff --git a/gio/gdatainputstream.c b/gio/gdatainputstream.c -index 2e7750cb5..2cdcbda19 100644 ---- a/gio/gdatainputstream.c -+++ b/gio/gdatainputstream.c -@@ -27,6 +27,7 @@ - #include "gioenumtypes.h" - #include "gioerror.h" - #include "glibintl.h" -+#include "gstrfuncsprivate.h" -=20 - #include -=20 -@@ -856,7 +857,7 @@ static gssize - scan_for_chars (GDataInputStream *stream, - gsize *checked_out, - const char *stop_chars, -- gssize stop_chars_len) -+ gsize stop_chars_len) - { - GBufferedInputStream *bstream; - const char *buffer; -@@ -952,7 +953,7 @@ typedef struct - gsize checked; -=20 - gchar *stop_chars; -- gssize stop_chars_len; -+ gsize stop_chars_len; - gsize length; - } GDataInputStreamReadData; -=20 -@@ -1078,12 +1079,17 @@ g_data_input_stream_read_async (GDataInputStream= *stream, - { - GDataInputStreamReadData *data; - GTask *task; -+ gsize stop_chars_len_unsigned; -=20 - data =3D g_slice_new0 (GDataInputStreamReadData); -- if (stop_chars_len =3D=3D -1) -- stop_chars_len =3D strlen (stop_chars); -- data->stop_chars =3D g_memdup (stop_chars, stop_chars_len); -- data->stop_chars_len =3D stop_chars_len; -+ -+ if (stop_chars_len < 0) -+ stop_chars_len_unsigned =3D strlen (stop_chars); -+ else -+ stop_chars_len_unsigned =3D (gsize) stop_chars_len; -+ -+ data->stop_chars =3D g_memdup2 (stop_chars, stop_chars_len_unsigned);= -+ data->stop_chars_len =3D stop_chars_len_unsigned; - data->last_saw_cr =3D FALSE; -=20 - task =3D g_task_new (stream, cancellable, callback, user_data); -@@ -1338,17 +1344,20 @@ g_data_input_stream_read_upto (GDataInputStream = *stream, - gssize found_pos; - gssize res; - char *data_until; -+ gsize stop_chars_len_unsigned; -=20 - g_return_val_if_fail (G_IS_DATA_INPUT_STREAM (stream), NULL); -=20 - if (stop_chars_len < 0) -- stop_chars_len =3D strlen (stop_chars); -+ stop_chars_len_unsigned =3D strlen (stop_chars); -+ else -+ stop_chars_len_unsigned =3D (gsize) stop_chars_len; -=20 - bstream =3D G_BUFFERED_INPUT_STREAM (stream); -=20 - checked =3D 0; -=20 -- while ((found_pos =3D scan_for_chars (stream, &checked, stop_chars, s= top_chars_len)) =3D=3D -1) -+ while ((found_pos =3D scan_for_chars (stream, &checked, stop_chars, s= top_chars_len_unsigned)) =3D=3D -1) - { - if (g_buffered_input_stream_get_available (bstream) =3D=3D - g_buffered_input_stream_get_buffer_size (bstream)) ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-07.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-07.patch deleted file mode 100644 index dad3d285f4..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-07.patch +++ /dev/null @@ -1,118 +0,0 @@ -Backport of: - -From 2aaf593a9eb96d84fe3be740aca2810a97d95592 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 13:50:37 +0000 -Subject: [PATCH 07/11] gwin32: Use gsize internally in g_wcsdup() -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -This allows it to handle strings up to length `G_MAXSIZE` =E2=80=94 prev= iously -it would overflow with such strings. - -Update the several copies of it identically. - -Signed-off-by: Philip Withnall -Helps: #2319 ---- - gio/gwin32appinfo.c | 33 ++++++++++++++++++++++++++------- - gio/gwin32registrykey.c | 34 ++++++++++++++++++++++++++-------- - 2 files changed, 52 insertions(+), 15 deletions(-) - -diff --git a/gio/gwin32appinfo.c b/gio/gwin32appinfo.c -index 9f335b370..dd7a96a4a 100644 ---- a/gio/gwin32appinfo.c -+++ b/gio/gwin32appinfo.c -@@ -464,15 +464,34 @@ static GWin32RegistryKey *applications_key; - /* Watch this key */ - static GWin32RegistryKey *classes_root_key; -=20 -+static gsize -+g_utf16_len (const gunichar2 *str) -+{ -+ gsize result; -+ -+ for (result =3D 0; str[0] !=3D 0; str++, result++) -+ ; -+ -+ return result; -+} -+ - static gunichar2 * --g_wcsdup (const gunichar2 *str, gssize str_size) -+g_wcsdup (const gunichar2 *str, gssize str_len) - { -- if (str_size =3D=3D -1) -- { -- str_size =3D wcslen (str) + 1; -- str_size *=3D sizeof (gunichar2); -- } -- return g_memdup (str, str_size); -+ gsize str_len_unsigned; -+ gsize str_size; -+ -+ g_return_val_if_fail (str !=3D NULL, NULL); -+ -+ if (str_len < 0) -+ str_len_unsigned =3D g_utf16_len (str); -+ else -+ str_len_unsigned =3D (gsize) str_len; -+ -+ g_assert (str_len_unsigned <=3D G_MAXSIZE / sizeof (gunichar2) - 1); -+ str_size =3D (str_len_unsigned + 1) * sizeof (gunichar2); -+ -+ return g_memdup2 (str, str_size); - } -=20 - #define URL_ASSOCIATIONS L"HKEY_CURRENT_USER\\Software\\Microsoft\\Wind= ows\\Shell\\Associations\\UrlAssociations\\" -diff --git a/gio/gwin32registrykey.c b/gio/gwin32registrykey.c -index 619fd48af..fbd65311a 100644 ---- a/gio/gwin32registrykey.c -+++ b/gio/gwin32registrykey.c -@@ -127,16 +127,34 @@ typedef enum - G_WIN32_REGISTRY_UPDATED_PATH =3D 1, - } GWin32RegistryKeyUpdateFlag; -=20 -+static gsize -+g_utf16_len (const gunichar2 *str) -+{ -+ gsize result; -+ -+ for (result =3D 0; str[0] !=3D 0; str++, result++) -+ ; -+ -+ return result; -+} -+ - static gunichar2 * --g_wcsdup (const gunichar2 *str, -- gssize str_size) -+g_wcsdup (const gunichar2 *str, gssize str_len) - { -- if (str_size =3D=3D -1) -- { -- str_size =3D wcslen (str) + 1; -- str_size *=3D sizeof (gunichar2); -- } -- return g_memdup (str, str_size); -+ gsize str_len_unsigned; -+ gsize str_size; -+ -+ g_return_val_if_fail (str !=3D NULL, NULL); -+ -+ if (str_len < 0) -+ str_len_unsigned =3D g_utf16_len (str); -+ else -+ str_len_unsigned =3D (gsize) str_len; -+ -+ g_assert (str_len_unsigned <=3D G_MAXSIZE / sizeof (gunichar2) - 1); -+ str_size =3D (str_len_unsigned + 1) * sizeof (gunichar2); -+ -+ return g_memdup2 (str, str_size); - } -=20 - /** ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-08.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-08.patch deleted file mode 100644 index 2c021ad317..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-08.patch +++ /dev/null @@ -1,94 +0,0 @@ -From ba8ca443051f93a74c0d03d62e70402036f967a5 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 13:58:32 +0000 -Subject: [PATCH 08/11] gkeyfilesettingsbackend: Handle long keys when - converting paths - -Previously, the code in `convert_path()` could not handle keys longer -than `G_MAXINT`, and would overflow if that was exceeded. - -Convert the code to use `gsize` and `g_memdup2()` throughout, and -change from identifying the position of the final slash in the string -using a signed offset `i`, to using a pointer to the character (and -`strrchr()`). This allows the slash to be at any position in a -`G_MAXSIZE`-long string, without sacrificing a bit of the offset for -indicating whether a slash was found. - -Signed-off-by: Philip Withnall -Helps: #2319 ---- - gio/gkeyfilesettingsbackend.c | 21 ++++++++++----------- - 1 file changed, 10 insertions(+), 11 deletions(-) - -diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend= =2Ec -index cd5765afd..25b057672 100644 ---- a/gio/gkeyfilesettingsbackend.c -+++ b/gio/gkeyfilesettingsbackend.c -@@ -33,6 +33,7 @@ - #include "gfilemonitor.h" - #include "gsimplepermission.h" - #include "gsettingsbackendinternal.h" -+#include "gstrfuncsprivate.h" - #include "giomodule-priv.h" - #include "gportalsupport.h" -=20 -@@ -145,8 +146,8 @@ convert_path (GKeyfileSettingsBackend *kfsb, - gchar **group, - gchar **basename) - { -- gint key_len =3D strlen (key); -- gint i; -+ gsize key_len =3D strlen (key); -+ const gchar *last_slash; -=20 - if (key_len < kfsb->prefix_len || - memcmp (key, kfsb->prefix, kfsb->prefix_len) !=3D 0) -@@ -155,38 +156,36 @@ convert_path (GKeyfileSettingsBackend *kfsb, - key_len -=3D kfsb->prefix_len; - key +=3D kfsb->prefix_len; -=20 -- for (i =3D key_len; i >=3D 0; i--) -- if (key[i] =3D=3D '/') -- break; -+ last_slash =3D strrchr (key, '/'); -=20 - if (kfsb->root_group) - { - /* if a root_group was specified, make sure the user hasn't given= - * a path that ghosts that group name - */ -- if (i =3D=3D kfsb->root_group_len && memcmp (key, kfsb->root_grou= p, i) =3D=3D 0) -+ if (last_slash !=3D NULL && (last_slash - key) =3D=3D kfsb->root_= group_len && memcmp (key, kfsb->root_group, last_slash - key) =3D=3D 0) - return FALSE; - } - else - { - /* if no root_group was given, ensure that the user gave a path *= / -- if (i =3D=3D -1) -+ if (last_slash =3D=3D NULL) - return FALSE; - } -=20 - if (group) - { -- if (i >=3D 0) -+ if (last_slash !=3D NULL) - { -- *group =3D g_memdup (key, i + 1); -- (*group)[i] =3D '\0'; -+ *group =3D g_memdup2 (key, (last_slash - key) + 1); -+ (*group)[(last_slash - key)] =3D '\0'; - } - else - *group =3D g_strdup (kfsb->root_group); - } -=20 - if (basename) -- *basename =3D g_memdup (key + i + 1, key_len - i); -+ *basename =3D g_memdup2 (last_slash + 1, key_len - (last_slash - ke= y)); -=20 - return TRUE; - } ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-09.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-09.patch deleted file mode 100644 index 4de0c1b349..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-09.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 65ec7f4d6e8832c481f6e00e2eb007b9a60024ce Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 14:00:53 +0000 -Subject: [PATCH 09/11] gsocket: Use gsize to track native sockaddr's siz= e -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -Don=E2=80=99t use an `int`, that=E2=80=99s potentially too small. In pra= ctical terms, -this is not a problem, since no socket address is going to be that big. - -By making these changes we can use `g_memdup2()` without warnings, -though. Fewer warnings is good. - -Signed-off-by: Philip Withnall -Helps: #2319 ---- - gio/gsocket.c | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/gio/gsocket.c b/gio/gsocket.c -index 66073af83..a3af149e8 100644 ---- a/gio/gsocket.c -+++ b/gio/gsocket.c -@@ -75,6 +75,7 @@ - #include "gcredentialsprivate.h" - #include "glibintl.h" - #include "gioprivate.h" -+#include "gstrfuncsprivate.h" -=20 - #ifdef G_OS_WIN32 - /* For Windows XP runtime compatibility, but use the system's if_nameto= index() if available */ -@@ -174,7 +175,7 @@ static gboolean g_socket_datagram_based_conditio= n_wait (GDatagramBased - GErro= r **error); -=20 - static GSocketAddress * --cache_recv_address (GSocket *socket, struct sockaddr *native, int nativ= e_len); -+cache_recv_address (GSocket *socket, struct sockaddr *native, size_t na= tive_len); -=20 - static gssize - g_socket_receive_message_with_timeout (GSocket *socket= , -@@ -260,7 +261,7 @@ struct _GSocketPrivate - struct { - GSocketAddress *addr; - struct sockaddr *native; -- gint native_len; -+ gsize native_len; - guint64 last_used; - } recv_addr_cache[RECV_ADDR_CACHE_SIZE]; - }; -@@ -5211,14 +5212,14 @@ g_socket_send_messages_with_timeout (GSocket = *socket, - } -=20 - static GSocketAddress * --cache_recv_address (GSocket *socket, struct sockaddr *native, int nativ= e_len) -+cache_recv_address (GSocket *socket, struct sockaddr *native, size_t na= tive_len) - { - GSocketAddress *saddr; - gint i; - guint64 oldest_time =3D G_MAXUINT64; - gint oldest_index =3D 0; -=20 -- if (native_len <=3D 0) -+ if (native_len =3D=3D 0) - return NULL; -=20 - saddr =3D NULL; -@@ -5226,7 +5227,7 @@ cache_recv_address (GSocket *socket, struct sockad= dr *native, int native_len) - { - GSocketAddress *tmp =3D socket->priv->recv_addr_cache[i].addr; - gpointer tmp_native =3D socket->priv->recv_addr_cache[i].native; -- gint tmp_native_len =3D socket->priv->recv_addr_cache[i].native_l= en; -+ gsize tmp_native_len =3D socket->priv->recv_addr_cache[i].native_= len; -=20 - if (!tmp) - continue; -@@ -5256,7 +5257,7 @@ cache_recv_address (GSocket *socket, struct sockad= dr *native, int native_len) - g_free (socket->priv->recv_addr_cache[oldest_index].native); - } -=20 -- socket->priv->recv_addr_cache[oldest_index].native =3D g_memdup (nati= ve, native_len); -+ socket->priv->recv_addr_cache[oldest_index].native =3D g_memdup2 (nat= ive, native_len); - socket->priv->recv_addr_cache[oldest_index].native_len =3D native_len= ; - socket->priv->recv_addr_cache[oldest_index].addr =3D g_object_ref (sa= ddr); - socket->priv->recv_addr_cache[oldest_index].last_used =3D g_get_monot= onic_time (); -@@ -5404,6 +5405,9 @@ g_socket_receive_message_with_timeout (GSocket = *socket, - /* do it */ - while (1) - { -+ /* addrlen has to be of type int because that=E2=80=99s how WSA= RecvFrom() is defined */ -+ G_STATIC_ASSERT (sizeof addr <=3D G_MAXINT); -+ - addrlen =3D sizeof addr; - if (address) - result =3D WSARecvFrom (socket->priv->fd, ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-10.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-10.patch deleted file mode 100644 index 36198b8eef..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-10.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 777b95a88f006d39d9fe6d3321db17e7b0d4b9a4 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 14:07:39 +0000 -Subject: [PATCH 10/11] gtlspassword: Forbid very long TLS passwords -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -The public API `g_tls_password_set_value_full()` (and the vfunc it -invokes) can only accept a `gssize` length. Ensure that nul-terminated -strings passed to `g_tls_password_set_value()` can=E2=80=99t exceed that= length. -Use `g_memdup2()` to avoid an overflow if they=E2=80=99re longer than -`G_MAXUINT` similarly. - -Signed-off-by: Philip Withnall -Helps: #2319 ---- - gio/gtlspassword.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/gio/gtlspassword.c b/gio/gtlspassword.c -index 1e437a7b6..dbcec41a8 100644 ---- a/gio/gtlspassword.c -+++ b/gio/gtlspassword.c -@@ -23,6 +23,7 @@ - #include "glibintl.h" -=20 - #include "gioenumtypes.h" -+#include "gstrfuncsprivate.h" - #include "gtlspassword.h" -=20 - #include -@@ -287,9 +288,14 @@ g_tls_password_set_value (GTlsPassword *password, - g_return_if_fail (G_IS_TLS_PASSWORD (password)); -=20 - if (length < 0) -- length =3D strlen ((gchar *)value); -+ { -+ /* FIXME: g_tls_password_set_value_full() doesn=E2=80=99t support= unsigned gsize */ -+ gsize length_unsigned =3D strlen ((gchar *) value); -+ g_return_if_fail (length_unsigned > G_MAXSSIZE); -+ length =3D (gssize) length_unsigned; -+ } -=20 -- g_tls_password_set_value_full (password, g_memdup (value, length), le= ngth, g_free); -+ g_tls_password_set_value_full (password, g_memdup2 (value, (gsize) le= ngth), length, g_free); - } -=20 - /** ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-11.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-11.patch deleted file mode 100644 index 4413cb9827..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-11.patch +++ /dev/null @@ -1,57 +0,0 @@ -From ecdf91400e9a538695a0895b95ad7e8abcdf1749 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 4 Feb 2021 14:09:40 +0000 -Subject: [PATCH 11/11] giochannel: Forbid very long line terminator stri= ngs -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -The public API `GIOChannel.line_term_len` is only a `guint`. Ensure that= -nul-terminated strings passed to `g_io_channel_set_line_term()` can=E2=80= =99t -exceed that length. Use `g_memdup2()` to avoid a warning (`g_memdup()` -is due to be deprecated), but not to avoid a bug, since it=E2=80=99s als= o -limited to `G_MAXUINT`. - -Signed-off-by: Philip Withnall -Helps: #2319 ---- - glib/giochannel.c | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/glib/giochannel.c b/glib/giochannel.c -index 15927c391..66c6591f0 100644 ---- a/glib/giochannel.c -+++ b/glib/giochannel.c -@@ -884,16 +884,25 @@ g_io_channel_set_line_term (GIOChannel *channel, - const gchar *line_term, - gint length) - { -+ guint length_unsigned; -+ - g_return_if_fail (channel !=3D NULL); - g_return_if_fail (line_term =3D=3D NULL || length !=3D 0); /* Disallo= w "" */ -=20 - if (line_term =3D=3D NULL) -- length =3D 0; -- else if (length < 0) -- length =3D strlen (line_term); -+ length_unsigned =3D 0; -+ else if (length >=3D 0) -+ length_unsigned =3D (guint) length; -+ else -+ { -+ /* FIXME: We=E2=80=99re constrained by line_term_len being a guin= t here */ -+ gsize length_size =3D strlen (line_term); -+ g_return_if_fail (length_size > G_MAXUINT); -+ length_unsigned =3D (guint) length_size; -+ } -=20 - g_free (channel->line_term); -- channel->line_term =3D line_term ? g_memdup2 (line_term, length) : NU= LL; -+ channel->line_term =3D line_term ? g_memdup2 (line_term, length_unsig= ned) : NULL; - channel->line_term_len =3D length; - } -=20 ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-12.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-12.patch deleted file mode 100644 index 4fdbb81750..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-12.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f8273b9aded135fe07094faebd527e43851aaf6e Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Sun, 7 Feb 2021 23:32:40 +0100 -Subject: [PATCH 1/5] giochannel: Fix length_size bounds check - -The inverted condition is an obvious error introduced by ecdf91400e9a. - -Fixes https://gitlab.gnome.org/GNOME/glib/-/issues/2323 - -(cherry picked from commit a149bf2f9030168051942124536e303af8ba6176) ---- - glib/giochannel.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glib/giochannel.c b/glib/giochannel.c -index 66c6591f0..0d9d5f223 100644 ---- a/glib/giochannel.c -+++ b/glib/giochannel.c -@@ -897,7 +897,7 @@ g_io_channel_set_line_term (GIOChannel *channel, - { - /* FIXME: We=E2=80=99re constrained by line_term_len being a guin= t here */ - gsize length_size =3D strlen (line_term); -- g_return_if_fail (length_size > G_MAXUINT); -+ g_return_if_fail (length_size <=3D G_MAXUINT); - length_unsigned =3D (guint) length_size; - } -=20 ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-13.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-13.patch deleted file mode 100644 index 6a287cc3a2..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-13.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e069c50467712e6d607822afd6b6c15c2c343dff Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Mon, 8 Feb 2021 10:34:50 +0000 -Subject: [PATCH 2/5] giochannel: Don't store negative line_term_len in - GIOChannel struct - -Adding test coverage indicated that this was another bug in 0cc11f74. - -Fixes: 0cc11f74 "giochannel: Forbid very long line terminator strings" -Resolves: https://gitlab.gnome.org/GNOME/glib/-/issues/2323 -Signed-off-by: Simon McVittie -(cherry picked from commit 5dc8b0014c03e7491d93b90275ab442e888a9628) ---- - glib/giochannel.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glib/giochannel.c b/glib/giochannel.c -index 0d9d5f223..4c39b9dc0 100644 ---- a/glib/giochannel.c -+++ b/glib/giochannel.c -@@ -903,7 +903,7 @@ g_io_channel_set_line_term (GIOChannel *channel, -=20 - g_free (channel->line_term); - channel->line_term =3D line_term ? g_memdup2 (line_term, length_unsig= ned) : NULL; -- channel->line_term_len =3D length; -+ channel->line_term_len =3D length_unsigned; - } -=20 - /** ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-14.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-14.patch deleted file mode 100644 index 78de2846da..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-14.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4506d1859a863087598c8d122740bae25b65b099 Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Mon, 8 Feb 2021 10:04:48 +0000 -Subject: [PATCH 4/5] gtlspassword: Fix inverted assertion - -The intention here was to assert that the length of the password fits -in a gssize. Passwords more than half the size of virtual memory are -probably excessive. - -Fixes: a8b204ff "gtlspassword: Forbid very long TLS passwords" -Signed-off-by: Simon McVittie -(cherry picked from commit 61bb52ec42de1082bfb06ce1c737fc295bfe60b8) ---- - gio/gtlspassword.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gio/gtlspassword.c b/gio/gtlspassword.c -index dbcec41a8..bd86a6dfe 100644 ---- a/gio/gtlspassword.c -+++ b/gio/gtlspassword.c -@@ -291,7 +291,7 @@ g_tls_password_set_value (GTlsPassword *password, - { - /* FIXME: g_tls_password_set_value_full() doesn=E2=80=99t support= unsigned gsize */ - gsize length_unsigned =3D strlen ((gchar *) value); -- g_return_if_fail (length_unsigned > G_MAXSSIZE); -+ g_return_if_fail (length_unsigned <=3D G_MAXSSIZE); - length =3D (gssize) length_unsigned; - } -=20 ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-15.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-15.patch deleted file mode 100644 index 37ef85b4fa..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-15.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 3d1550354c3c6a8491c39881752d51cb7515f2c2 Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Mon, 8 Feb 2021 10:22:39 +0000 -Subject: [PATCH 5/5] tls-interaction: Add test coverage for various ways= to - set the password - -Signed-off-by: Simon McVittie -(cherry picked from commit df4501316ca3903072400504a5ea76498db19538) ---- - gio/tests/tls-interaction.c | 55 +++++++++++++++++++++++++++++++++++++ - 1 file changed, 55 insertions(+) - -diff --git a/gio/tests/tls-interaction.c b/gio/tests/tls-interaction.c -index 4f0737d7e..5661e8e0d 100644 ---- a/gio/tests/tls-interaction.c -+++ b/gio/tests/tls-interaction.c -@@ -174,6 +174,38 @@ test_interaction_ask_password_finish_failure (GTlsI= nteraction *interaction, - } -=20 -=20 -+/* Return a copy of @str that is allocated in a silly way, to exercise -+ * custom free-functions. The returned pointer points to a copy of @str= -+ * in a buffer of the form "BEFORE \0 str \0 AFTER". */ -+static guchar * -+special_dup (const char *str) -+{ -+ GString *buf =3D g_string_new ("BEFORE"); -+ guchar *ret; -+ -+ g_string_append_c (buf, '\0'); -+ g_string_append (buf, str); -+ g_string_append_c (buf, '\0'); -+ g_string_append (buf, "AFTER"); -+ ret =3D (guchar *) g_string_free (buf, FALSE); -+ return ret + strlen ("BEFORE") + 1; -+} -+ -+ -+/* Free a copy of @str that was made with special_dup(), after assertin= g -+ * that it has not been corrupted. */ -+static void -+special_free (gpointer p) -+{ -+ gchar *s =3D p; -+ gchar *buf =3D s - strlen ("BEFORE") - 1; -+ -+ g_assert_cmpstr (buf, =3D=3D, "BEFORE"); -+ g_assert_cmpstr (s + strlen (s) + 1, =3D=3D, "AFTER"); -+ g_free (buf); -+} -+ -+ - static GTlsInteractionResult - test_interaction_ask_password_sync_success (GTlsInteraction *interac= tion, - GTlsPassword *passwor= d, -@@ -181,6 +213,8 @@ test_interaction_ask_password_sync_success (GTlsInte= raction *interaction, - GError **error) - { - TestInteraction *self; -+ const guchar *value; -+ gsize len; -=20 - g_assert (TEST_IS_INTERACTION (interaction)); - self =3D TEST_INTERACTION (interaction); -@@ -192,6 +226,27 @@ test_interaction_ask_password_sync_success (GTlsInt= eraction *interaction, - g_assert (error !=3D NULL); - g_assert (*error =3D=3D NULL); -=20 -+ /* Exercise different ways to set the value */ -+ g_tls_password_set_value (password, (const guchar *) "foo", 4); -+ len =3D 0; -+ value =3D g_tls_password_get_value (password, &len); -+ g_assert_cmpmem (value, len, "foo", 4); -+ -+ g_tls_password_set_value (password, (const guchar *) "bar", -1); -+ len =3D 0; -+ value =3D g_tls_password_get_value (password, &len); -+ g_assert_cmpmem (value, len, "bar", 3); -+ -+ g_tls_password_set_value_full (password, special_dup ("baa"), 4, spec= ial_free); -+ len =3D 0; -+ value =3D g_tls_password_get_value (password, &len); -+ g_assert_cmpmem (value, len, "baa", 4); -+ -+ g_tls_password_set_value_full (password, special_dup ("baz"), -1, spe= cial_free); -+ len =3D 0; -+ value =3D g_tls_password_get_value (password, &len); -+ g_assert_cmpmem (value, len, "baz", 3); -+ - /* Don't do this in real life. Include a null terminator for testing = */ - g_tls_password_set_value (password, (const guchar *)"the password", 1= 3); - return G_TLS_INTERACTION_HANDLED; ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-16.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-16.patch deleted file mode 100644 index 43635e72ed..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-16.patch +++ /dev/null @@ -1,43 +0,0 @@ -From cb9ee701ef46c1819eed4e2a4dc181682bdfc176 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Wed, 10 Feb 2021 21:16:39 +0000 -Subject: [PATCH 1/3] gkeyfilesettingsbackend: Fix basename handling when= group - is unset - -Fix an effective regression in commit -7781a9cbd2fd0aa84bee0f4eee88470640ff6706, which happens when -`convert_path()` is called with a `key` which contains no slashes. In -that case, the `key` is entirely the `basename`. - -Prior to commit 7781a9cb, the code worked through a fluke of `i =3D=3D -= 1` -cancelling out with the various additions in the `g_memdup()` call, and -effectively resulting in `g_strdup (key)`. - -Spotted by Guido Berhoerster. - -Signed-off-by: Philip Withnall ---- - gio/gkeyfilesettingsbackend.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend= =2Ec -index 25b057672..861c3a661 100644 ---- a/gio/gkeyfilesettingsbackend.c -+++ b/gio/gkeyfilesettingsbackend.c -@@ -185,7 +185,12 @@ convert_path (GKeyfileSettingsBackend *kfsb, - } -=20 - if (basename) -- *basename =3D g_memdup2 (last_slash + 1, key_len - (last_slash - ke= y)); -+ { -+ if (last_slash !=3D NULL) -+ *basename =3D g_memdup2 (last_slash + 1, key_len - (last_slash = - key)); -+ else -+ *basename =3D g_strdup (key); -+ } -=20 - return TRUE; - } ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-17.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-17.patch deleted file mode 100644 index 3153979071..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-17.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 31e0d403ba635dbbacbfbff74295e5db02558d76 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Wed, 10 Feb 2021 21:19:30 +0000 -Subject: [PATCH 2/3] gkeyfilesettingsbackend: Disallow empty key or grou= p - names - -These should never have been allowed; they will result in precondition -failures from the `GKeyFile` later on in the code. - -A test will be added for this shortly. - -Signed-off-by: Philip Withnall ---- - gio/gkeyfilesettingsbackend.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend= =2Ec -index 861c3a661..de216e615 100644 ---- a/gio/gkeyfilesettingsbackend.c -+++ b/gio/gkeyfilesettingsbackend.c -@@ -158,6 +158,13 @@ convert_path (GKeyfileSettingsBackend *kfsb, -=20 - last_slash =3D strrchr (key, '/'); -=20 -+ /* Disallow empty group names or key names */ -+ if (key_len =3D=3D 0 || -+ (last_slash !=3D NULL && -+ (*(last_slash + 1) =3D=3D '\0' || -+ last_slash =3D=3D key))) -+ return FALSE; -+ - if (kfsb->root_group) - { - /* if a root_group was specified, make sure the user hasn't given= ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-27219-18.patch b/gnu/pack= ages/patches/glib-CVE-2021-27219-18.patch deleted file mode 100644 index c18d44ddeb..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-27219-18.patch +++ /dev/null @@ -1,232 +0,0 @@ -Backport of: - -From 221c26685354dea2b2732df94404e8e5e77a1591 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Wed, 10 Feb 2021 21:21:36 +0000 -Subject: [PATCH 3/3] tests: Add tests for key name handling in the keyfi= le - backend - -This tests the two recent commits. - -Signed-off-by: Philip Withnall ---- - gio/tests/gsettings.c | 171 +++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 170 insertions(+), 1 deletion(-) - -diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c -index baadca8f5..afe594a23 100644 ---- a/gio/tests/gsettings.c -+++ b/gio/tests/gsettings.c -@@ -1,3 +1,4 @@ -+#include - #include - #include - #include -@@ -1740,6 +1741,14 @@ key_changed_cb (GSettings *settings, const gchar = *key, gpointer data) - (*b) =3D TRUE; - } -=20 -+typedef struct -+{ -+ const gchar *path; -+ const gchar *root_group; -+ const gchar *keyfile_group; -+ const gchar *root_path; -+} KeyfileTestData; -+ - /* - * Test that using a keyfile works - */ -@@ -1834,7 +1843,11 @@ test_keyfile (Fixture *fixture, - g_free (str); -=20 - g_settings_set (settings, "farewell", "s", "cheerio"); -- =20 -+ -+ /* Check that empty keys/groups are not allowed. */ -+ g_assert_false (g_settings_is_writable (settings, "")); -+ g_assert_false (g_settings_is_writable (settings, "/")); -+ - /* When executing as root, changing the mode of the keyfile will have= - * no effect on the writability of the settings. - */ -@@ -1866,6 +1879,149 @@ test_keyfile (Fixture *fixture, - g_free (keyfile_path); - } -=20 -+/* -+ * Test that using a keyfile works with a schema with no path set. -+ */ -+static void -+test_keyfile_no_path (Fixture *fixture, -+ gconstpointer user_data) -+{ -+ const KeyfileTestData *test_data =3D user_data; -+ GSettingsBackend *kf_backend; -+ GSettings *settings; -+ GKeyFile *keyfile; -+ gboolean writable; -+ gchar *key =3D NULL; -+ GError *error =3D NULL; -+ gchar *keyfile_path =3D NULL, *store_path =3D NULL; -+ -+ keyfile_path =3D g_build_filename (fixture->tmp_dir, "keyfile", NULL)= ; -+ store_path =3D g_build_filename (keyfile_path, "gsettings.store", NUL= L); -+ kf_backend =3D g_keyfile_settings_backend_new (store_path, test_data-= >root_path, test_data->root_group); -+ settings =3D g_settings_new_with_backend_and_path ("org.gtk.test.no-p= ath", kf_backend, test_data->path); -+ g_object_unref (kf_backend); -+ -+ g_settings_reset (settings, "test-boolean"); -+ g_assert_true (g_settings_get_boolean (settings, "test-boolean")); -+ -+ writable =3D g_settings_is_writable (settings, "test-boolean"); -+ g_assert_true (writable); -+ g_settings_set (settings, "test-boolean", "b", FALSE); -+ -+ g_assert_false (g_settings_get_boolean (settings, "test-boolean")); -+ -+ g_settings_delay (settings); -+ g_settings_set (settings, "test-boolean", "b", TRUE); -+ g_settings_apply (settings); -+ -+ keyfile =3D g_key_file_new (); -+ g_assert_true (g_key_file_load_from_file (keyfile, store_path, 0, NUL= L)); -+ -+ g_assert_true (g_key_file_get_boolean (keyfile, test_data->keyfile_gr= oup, "test-boolean", NULL)); -+ -+ g_key_file_free (keyfile); -+ -+ g_settings_reset (settings, "test-boolean"); -+ g_settings_apply (settings); -+ keyfile =3D g_key_file_new (); -+ g_assert_true (g_key_file_load_from_file (keyfile, store_path, 0, NUL= L)); -+ -+ g_assert_false (g_key_file_get_string (keyfile, test_data->keyfile_gr= oup, "test-boolean", &error)); -+ g_assert_error (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOU= ND); -+ g_clear_error (&error); -+ -+ /* Check that empty keys/groups are not allowed. */ -+ g_assert_false (g_settings_is_writable (settings, "")); -+ g_assert_false (g_settings_is_writable (settings, "/")); -+ -+ /* Keys which ghost the root group name are not allowed. This can onl= y be -+ * tested when the path is `/` as otherwise it acts as a prefix and p= revents -+ * any ghosting. */ -+ if (g_str_equal (test_data->path, "/")) -+ { -+ key =3D g_strdup_printf ("%s/%s", test_data->root_group, ""); -+ g_assert_false (g_settings_is_writable (settings, key)); -+ g_free (key); -+ -+ key =3D g_strdup_printf ("%s/%s", test_data->root_group, "/"); -+ g_assert_false (g_settings_is_writable (settings, key)); -+ g_free (key); -+ -+ key =3D g_strdup_printf ("%s/%s", test_data->root_group, "test-bo= olean"); -+ g_assert_false (g_settings_is_writable (settings, key)); -+ g_free (key); -+ } -+ -+ g_key_file_free (keyfile); -+ g_object_unref (settings); -+ -+ /* Clean up the temporary directory. */ -+ g_assert_cmpint (g_chmod (keyfile_path, 0777) =3D=3D 0 ? 0 : errno, =3D= =3D, 0); -+ g_assert_cmpint (g_remove (store_path) =3D=3D 0 ? 0 : errno, =3D=3D, = 0); -+ g_assert_cmpint (g_rmdir (keyfile_path) =3D=3D 0 ? 0 : errno, =3D=3D,= 0); -+ g_free (store_path); -+ g_free (keyfile_path); -+} -+ -+/* -+ * Test that a keyfile rejects writes to keys outside its root path. -+ */ -+static void -+test_keyfile_outside_root_path (Fixture *fixture, -+ gconstpointer user_data) -+{ -+ GSettingsBackend *kf_backend; -+ GSettings *settings; -+ gchar *keyfile_path =3D NULL, *store_path =3D NULL; -+ -+ keyfile_path =3D g_build_filename (fixture->tmp_dir, "keyfile", NULL)= ; -+ store_path =3D g_build_filename (keyfile_path, "gsettings.store", NUL= L); -+ kf_backend =3D g_keyfile_settings_backend_new (store_path, "/tests/ba= sic-types/", "root"); -+ settings =3D g_settings_new_with_backend_and_path ("org.gtk.test.no-p= ath", kf_backend, "/tests/"); -+ g_object_unref (kf_backend); -+ -+ g_assert_false (g_settings_is_writable (settings, "test-boolean")); -+ -+ g_object_unref (settings); -+ -+ /* Clean up the temporary directory. The keyfile probably doesn=E2=80= =99t exist, so -+ * don=E2=80=99t error on failure. */ -+ g_remove (store_path); -+ g_assert_cmpint (g_rmdir (keyfile_path) =3D=3D 0 ? 0 : errno, =3D=3D,= 0); -+ g_free (store_path); -+ g_free (keyfile_path); -+} -+ -+/* -+ * Test that a keyfile rejects writes to keys in the root if no root gr= oup is set. -+ */ -+static void -+test_keyfile_no_root_group (Fixture *fixture, -+ gconstpointer user_data) -+{ -+ GSettingsBackend *kf_backend; -+ GSettings *settings; -+ gchar *keyfile_path =3D NULL, *store_path =3D NULL; -+ -+ keyfile_path =3D g_build_filename (fixture->tmp_dir, "keyfile", NULL)= ; -+ store_path =3D g_build_filename (keyfile_path, "gsettings.store", NUL= L); -+ kf_backend =3D g_keyfile_settings_backend_new (store_path, "/", NULL)= ; -+ settings =3D g_settings_new_with_backend_and_path ("org.gtk.test.no-p= ath", kf_backend, "/"); -+ g_object_unref (kf_backend); -+ -+ g_assert_false (g_settings_is_writable (settings, "test-boolean")); -+ g_assert_true (g_settings_is_writable (settings, "child/test-boolean"= )); -+ -+ g_object_unref (settings); -+ -+ /* Clean up the temporary directory. The keyfile probably doesn=E2=80= =99t exist, so -+ * don=E2=80=99t error on failure. */ -+ g_remove (store_path); -+ g_assert_cmpint (g_rmdir (keyfile_path) =3D=3D 0 ? 0 : errno, =3D=3D,= 0); -+ g_free (store_path); -+ g_free (keyfile_path); -+} -+ - /* Test that getting child schemas works - */ - static void -@@ -2844,6 +3000,14 @@ main (int argc, char *argv[]) - gchar *override_text; - gchar *enums; - gint result; -+ const KeyfileTestData keyfile_test_data_explicit_path =3D { "/tests/"= , "root", "tests", "/" }; -+ const KeyfileTestData keyfile_test_data_empty_path =3D { "/", "root",= "root", "/" }; -+ const KeyfileTestData keyfile_test_data_long_path =3D { -+ "/tests/path/is/very/long/and/this/makes/some/comparisons/take/a/di= fferent/branch/", -+ "root", -+ "tests/path/is/very/long/and/this/makes/some/comparisons/take/a/dif= ferent/branch", -+ "/" -+ }; -=20 - /* Meson build sets this */ - #ifdef TEST_LOCALE_PATH -@@ -2967,6 +3131,11 @@ main (int argc, char *argv[]) - } -=20 - g_test_add ("/gsettings/keyfile", Fixture, NULL, setup, test_keyfile,= teardown); -+ g_test_add ("/gsettings/keyfile/explicit-path", Fixture, &keyfile_tes= t_data_explicit_path, setup, test_keyfile_no_path, teardown); -+ g_test_add ("/gsettings/keyfile/empty-path", Fixture, &keyfile_test_d= ata_empty_path, setup, test_keyfile_no_path, teardown); -+ g_test_add ("/gsettings/keyfile/long-path", Fixture, &keyfile_test_da= ta_long_path, setup, test_keyfile_no_path, teardown); -+ g_test_add ("/gsettings/keyfile/outside-root-path", Fixture, NULL, se= tup, test_keyfile_outside_root_path, teardown); -+ g_test_add ("/gsettings/keyfile/no-root-group", Fixture, NULL, setup,= test_keyfile_no_root_group, teardown); - g_test_add_func ("/gsettings/child-schema", test_child_schema); - g_test_add_func ("/gsettings/strinfo", test_strinfo); - g_test_add_func ("/gsettings/enums", test_enums); ---=20 -2.30.1 - diff --git a/gnu/packages/patches/glib-CVE-2021-28153.patch b/gnu/package= s/patches/glib-CVE-2021-28153.patch deleted file mode 100644 index 54443186d9..0000000000 --- a/gnu/packages/patches/glib-CVE-2021-28153.patch +++ /dev/null @@ -1,283 +0,0 @@ -Backport of: - -From 317b3b587058a05dca95d56dac26568c5b098d33 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Wed, 24 Feb 2021 17:35:40 +0000 -Subject: [PATCH] glocalfileoutputstream: Fix CREATE_REPLACE_DESTINATION - with symlinks -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -The `G_FILE_CREATE_REPLACE_DESTINATION` flag is equivalent to unlinking -the destination file and re-creating it from scratch. That did -previously work, but in the process the code would call `open(O_CREAT)` -on the file. If the file was a dangling symlink, this would create the -destination file (empty). That=E2=80=99s not an intended side-effect, an= d has -security implications if the symlink is controlled by a lower-privileged= -process. - -Fix that by not opening the destination file if it=E2=80=99s a symlink, = and -adjusting the rest of the code to cope with - - the fact that `fd =3D=3D -1` is not an error iff `is_symlink` is true= , - - and that `original_stat` will contain the `lstat()` results for the - symlink now, rather than the `stat()` results for its target (again, - iff `is_symlink` is true). - -This means that the target of the dangling symlink is no longer created,= -which was the bug. The symlink itself continues to be replaced (as -before) with the new file =E2=80=94 this is the intended behaviour of -`g_file_replace()`. - -The behaviour for non-symlink cases, or cases where the symlink was not -dangling, should be unchanged. - -Includes a unit test. - -Signed-off-by: Philip Withnall - -Fixes: #2325 ---- - gio/glocalfileoutputstream.c | 70 ++++++++++++++++------- - gio/tests/file.c | 108 +++++++++++++++++++++++++++++++++++ - 2 files changed, 158 insertions(+), 20 deletions(-) - -diff --git a/gio/glocalfileoutputstream.c b/gio/glocalfileoutputstream.c= -index a3dd62172..553fcbbae 100644 ---- a/gio/glocalfileoutputstream.c -+++ b/gio/glocalfileoutputstream.c -@@ -874,16 +874,22 @@ handle_overwrite_open (const char *filename, - /* Could be a symlink, or it could be a regular ELOOP error, - * but then the next open will fail too. */ - is_symlink =3D TRUE; -- fd =3D g_open (filename, open_flags, mode); -+ if (!(flags & G_FILE_CREATE_REPLACE_DESTINATION)) -+ fd =3D g_open (filename, open_flags, mode); - } --#else -- fd =3D g_open (filename, open_flags, mode); -- errsv =3D errno; -+#else /* if !O_NOFOLLOW */ - /* This is racy, but we do it as soon as possible to minimize the rac= e */ - is_symlink =3D g_file_test (filename, G_FILE_TEST_IS_SYMLINK); -+ -+ if (!is_symlink || !(flags & G_FILE_CREATE_REPLACE_DESTINATION)) -+ { -+ fd =3D g_open (filename, open_flags, mode); -+ errsv =3D errno; -+ } - #endif -=20 -- if (fd =3D=3D -1) -+ if (fd =3D=3D -1 && -+ (!is_symlink || !(flags & G_FILE_CREATE_REPLACE_DESTINATION))) - { - char *display_name =3D g_filename_display_name (filename); - g_set_error (error, G_IO_ERROR, -@@ -893,13 +899,25 @@ handle_overwrite_open (const char *filename, - g_free (display_name); - return -1; - } -- =20 -+ -+ if (!is_symlink) -+ { - #ifdef G_OS_WIN32 -- res =3D GLIB_PRIVATE_CALL (g_win32_fstat) (fd, &original_stat); -+ res =3D GLIB_PRIVATE_CALL (g_win32_fstat) (fd, &original_stat); - #else -- res =3D fstat (fd, &original_stat); -+ res =3D fstat (fd, &original_stat); - #endif -- errsv =3D errno; -+ errsv =3D errno; -+ } -+ else -+ { -+#ifdef G_OS_WIN32 -+ res =3D GLIB_PRIVATE_CALL (g_win32_lstat_utf8) (filename, &origin= al_stat); -+#else -+ res =3D g_lstat (filename, &original_stat); -+#endif -+ errsv =3D errno; -+ } -=20 - if (res !=3D 0) - { -@@ -916,16 +934,27 @@ handle_overwrite_open (const char *filename, - if (!S_ISREG (original_stat.st_mode)) - { - if (S_ISDIR (original_stat.st_mode)) -- g_set_error_literal (error, -- G_IO_ERROR, -- G_IO_ERROR_IS_DIRECTORY, -- _("Target file is a directory")); -- else -- g_set_error_literal (error, -- G_IO_ERROR, -- G_IO_ERROR_NOT_REGULAR_FILE, -- _("Target file is not a regular file")); -- goto err_out; -+ { -+ g_set_error_literal (error, -+ G_IO_ERROR, -+ G_IO_ERROR_IS_DIRECTORY, -+ _("Target file is a directory")); -+ goto err_out; -+ } -+ else if (!is_symlink || -+#ifdef S_ISLNK -+ !S_ISLNK (original_stat.st_mode) -+#else -+ FALSE -+#endif -+ ) -+ { -+ g_set_error_literal (error, -+ G_IO_ERROR, -+ G_IO_ERROR_NOT_REGULAR_FILE, -+ _("Target file is not a regular file"));= -+ goto err_out; -+ } - } - =20 - if (etag !=3D NULL) -@@ -1006,7 +1035,8 @@ handle_overwrite_open (const char *filename, - } - } -=20 -- g_close (fd, NULL); -+ if (fd >=3D 0) -+ g_close (fd, NULL); - *temp_filename =3D tmp_filename; - return tmpfd; - } -diff --git a/gio/tests/file.c b/gio/tests/file.c -index efb2eaadd..bc55f3af4 100644 ---- a/gio/tests/file.c -+++ b/gio/tests/file.c -@@ -804,6 +804,113 @@ test_replace_cancel (void) - g_object_unref (tmpdir); - } -=20 -+static void -+test_replace_symlink (void) -+{ -+#ifdef G_OS_UNIX -+ gchar *tmpdir_path =3D NULL; -+ GFile *tmpdir =3D NULL, *source_file =3D NULL, *target_file =3D NULL;= -+ GFileOutputStream *stream =3D NULL; -+ const gchar *new_contents =3D "this is a test message which should be= written to source and not target"; -+ gsize n_written; -+ GFileEnumerator *enumerator =3D NULL; -+ GFileInfo *info =3D NULL; -+ gchar *contents =3D NULL; -+ gsize length =3D 0; -+ GError *local_error =3D NULL; -+ -+ g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2325"); -+ g_test_summary ("Test that G_FILE_CREATE_REPLACE_DESTINATION doesn=E2= =80=99t follow symlinks"); -+ -+ /* Create a fresh, empty working directory. */ -+ tmpdir_path =3D g_dir_make_tmp ("g_file_replace_symlink_XXXXXX", &loc= al_error); -+ g_assert_no_error (local_error); -+ tmpdir =3D g_file_new_for_path (tmpdir_path); -+ -+ g_test_message ("Using temporary directory %s", tmpdir_path); -+ g_free (tmpdir_path); -+ -+ /* Create symlink `source` which points to `target`. */ -+ source_file =3D g_file_get_child (tmpdir, "source"); -+ target_file =3D g_file_get_child (tmpdir, "target"); -+ g_file_make_symbolic_link (source_file, "target", NULL, &local_error)= ; -+ g_assert_no_error (local_error); -+ -+ /* Ensure that `target` doesn=E2=80=99t exist */ -+ g_assert_false (g_file_query_exists (target_file, NULL)); -+ -+ /* Replace the `source` symlink with a regular file using -+ * %G_FILE_CREATE_REPLACE_DESTINATION, which should replace it *witho= ut* -+ * following the symlink */ -+ stream =3D g_file_replace (source_file, NULL, FALSE /* no backup */,= -+ G_FILE_CREATE_REPLACE_DESTINATION, NULL, &lo= cal_error); -+ g_assert_no_error (local_error); -+ -+ g_output_stream_write_all (G_OUTPUT_STREAM (stream), new_contents, st= rlen (new_contents), -+ &n_written, NULL, &local_error); -+ g_assert_no_error (local_error); -+ g_assert_cmpint (n_written, =3D=3D, strlen (new_contents)); -+ -+ g_output_stream_close (G_OUTPUT_STREAM (stream), NULL, &local_error);= -+ g_assert_no_error (local_error); -+ -+ g_clear_object (&stream); -+ -+ /* At this point, there should still only be one file: `source`. It s= hould -+ * now be a regular file. `target` should not exist. */ -+ enumerator =3D g_file_enumerate_children (tmpdir, -+ G_FILE_ATTRIBUTE_STANDARD_NAM= E "," -+ G_FILE_ATTRIBUTE_STANDARD_TYP= E, -+ G_FILE_QUERY_INFO_NOFOLLOW_SY= MLINKS, NULL, &local_error); -+ g_assert_no_error (local_error); -+ -+ info =3D g_file_enumerator_next_file (enumerator, NULL, &local_error)= ; -+ g_assert_no_error (local_error); -+ g_assert_nonnull (info); -+ -+ g_assert_cmpstr (g_file_info_get_name (info), =3D=3D, "source"); -+ g_assert_cmpint (g_file_info_get_file_type (info), =3D=3D, G_FILE_TYP= E_REGULAR); -+ -+ g_clear_object (&info); -+ -+ info =3D g_file_enumerator_next_file (enumerator, NULL, &local_error)= ; -+ g_assert_no_error (local_error); -+ g_assert_null (info); -+ -+ g_file_enumerator_close (enumerator, NULL, &local_error); -+ g_assert_no_error (local_error); -+ g_clear_object (&enumerator); -+ -+ /* Double-check that `target` doesn=E2=80=99t exist */ -+ g_assert_false (g_file_query_exists (target_file, NULL)); -+ -+ /* Check the content of `source`. */ -+ g_file_load_contents (source_file, -+ NULL, -+ &contents, -+ &length, -+ NULL, -+ &local_error); -+ g_assert_no_error (local_error); -+ g_assert_cmpstr (contents, =3D=3D, new_contents); -+ g_assert_cmpuint (length, =3D=3D, strlen (new_contents)); -+ g_free (contents); -+ -+ /* Tidy up. */ -+ g_file_delete (source_file, NULL, &local_error); -+ g_assert_no_error (local_error); -+ -+ g_file_delete (tmpdir, NULL, &local_error); -+ g_assert_no_error (local_error); -+ -+ g_clear_object (&target_file); -+ g_clear_object (&source_file); -+ g_clear_object (&tmpdir); -+#else /* if !G_OS_UNIX */ -+ g_test_skip ("Symlink replacement tests can only be run on Unix") -+#endif -+} -+ - static void - on_file_deleted (GObject *object, - GAsyncResult *result, -@@ -1754,6 +1861,7 @@ main (int argc, char *argv[]) - g_test_add_data_func ("/file/async-create-delete/4096", GINT_TO_POINT= ER (4096), test_create_delete); - g_test_add_func ("/file/replace-load", test_replace_load); - g_test_add_func ("/file/replace-cancel", test_replace_cancel); -+ g_test_add_func ("/file/replace-symlink", test_replace_symlink); - g_test_add_func ("/file/async-delete", test_async_delete); - #ifdef G_OS_UNIX - g_test_add_func ("/file/copy-preserve-mode", test_copy_preserve_mode)= ; ---=20 -2.30.1 - --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-glib-Update-to-2.68.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-glib-Update-to-2.68.0.patch" =46rom f96abf4ed2388b838705f086fdea041ccdf53bbc Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 07:22:07 -0500 Subject: [PATCH 02/83] gnu: glib: Update to 2.68.0. * gnu/packages/glib.scm (glib) [version]: Update to 2.68.0. [patches]: Remove glib-tests-timer.patch. [arguments]<#:phases>['patch-python-references]: New phase. ['pre-check]: New phase. ['move-bin]: New phase. ['patch-dbus-launch-path]: Remove phase. ['patch-gio-launch-desktop]: Remove phase. ['pre-build]: Remove phase. ['disable-failing-tests]: Modify phase. ['check]: Remove phase. ['move-executables]: Remove phase. [native-inputs]: Add intltool, python, libxml2 and libxslt. Remove dbus. [inputs]: Add bash-completion, dbus and libelf. [propagated-inputs]: Add libselinux. * gnu/packages/patches/glib-tests-timer.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust. --- gnu/local.mk | 1 - gnu/packages/glib.scm | 168 ++++++-------------- gnu/packages/patches/glib-tests-timer.patch | 15 -- 3 files changed, 53 insertions(+), 131 deletions(-) delete mode 100644 gnu/packages/patches/glib-tests-timer.patch diff --git a/gnu/local.mk b/gnu/local.mk index d924b20bcf..fc05786287 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1081,7 +1081,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ - %D%/packages/patches/glib-tests-timer.patch \ %D%/packages/patches/glibc-CVE-2018-11236.patch \ %D%/packages/patches/glibc-CVE-2018-11237.patch \ %D%/packages/patches/glibc-CVE-2019-7309.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index a446ce1ace..d29dca2db8 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -36,11 +36,13 @@ #:use-module (gnu packages) #:use-module (gnu packages backup) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) + #:use-module (gnu packages elf) #:use-module (gnu packages enlightenment) #:use-module (gnu packages file) #:use-module (gnu packages flex) @@ -60,6 +62,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages selinux) #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -171,7 +174,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.62.6") + (version "2.68.0") (source (origin (method url-fetch) @@ -180,9 +183,9 @@ shared NFS home directories.") name "/" (string-take version 4) "/" name "-" version ".tar.xz")) (sha256 - (base32 "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh"))= + (base32 "1sh3h6b734cxhdd1qlzvhxq6rc7k73dsisap5y3s419s9xc4ywv7"))= (patches - (search-patches "glib-tests-timer.patch" "glib-appinfo-watch.pat= ch")) + (search-patches "glib-appinfo-watch.patch")) (modules '((guix build utils))) (snippet '(begin @@ -208,24 +211,31 @@ shared NFS home directories.") (("test_timeout_slow =3D 120") "test_timeout_slow =3D 180"))))) '()) - (add-after 'unpack 'patch-dbus-launch-path + (add-after 'unpack 'disable-failing-tests + (lambda _ + (with-directory-excursion "glib/tests" + (substitute* '("unix.c" "utils.c") + (("[ \t]*g_test_add_func.*;") ""))) + (with-directory-excursion "gio/tests" + (substitute* '("contenttype.c" "gdbus-address-get-session= =2Ec" + "gdbus-peer.c" "appinfo.c" "desktop-app-in= fo.c") + (("[ \t]*g_test_add_func.*;") ""))) + #t)) + ;; Python references are not being patched in patch-phase of bu= ild, + ;; despite using python-wrapper as input. So we patch them manu= ally. + (add-after 'unpack 'patch-python-references (lambda* (#:key inputs #:allow-other-keys) - (let ((dbus (assoc-ref inputs "dbus"))) - (substitute* "gio/gdbusaddress.c" - (("command_line =3D g_strdup_printf \\(\"dbus-launch") - (string-append "command_line =3D g_strdup_printf (\"" - dbus "/bin/dbus-launch"))) - #t))) - (add-after 'unpack 'patch-gio-launch-desktop - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; See also - ;; for another future fix. - (substitute* "gio/gdesktopappinfo.c" - (("gio-launch-desktop") - (string-append out "/libexec/gio-launch-desktop"))) - #t))) - (add-before 'build 'pre-build + (substitute* '("gio/gdbus-2.0/codegen/gdbus-codegen.in" + "glib/gtester-report.in" + "gobject/glib-genmarshal.in" + "gobject/glib-mkenums.in") + (("@PYTHON@") + (string-append (assoc-ref inputs "python") + "/bin/python" + ,(version-major+minor + (package-version python))))) + #t)) + (add-before 'check 'pre-check (lambda* (#:key inputs outputs #:allow-other-keys) ;; For tests/gdatetime.c. (setenv "TZDIR" @@ -235,103 +245,23 @@ shared NFS home directories.") (setenv "HOME" (getcwd)) (setenv "XDG_CACHE_HOME" (getcwd)) #t)) - (add-after 'unpack 'disable-failing-tests - (lambda _ - (let ((disable - (lambda (test-file test-paths) - (define pattern+procs - (map (lambda (test-path) - (cons - ;; XXX: only works for single line state= ments. - (format #f "g_test_add_func.*\"~a\".*" t= est-path) - (const ""))) - test-paths)) - (substitute test-file pattern+procs))) - (failing-tests - '(("glib/tests/thread.c" - ( ;; prlimit(2) returns ENOSYS on Linux 2.6.32-5-= xen-amd64 - ;; as found on hydra.gnu.org, and strace(1) does= n't - ;; recognize it. - "/thread/thread4")) - ;; This tries to find programs in FHS directories.= - ("glib/tests/utils.c" - ("/utils/find-program")) - ;; This fails because "glib/tests/echo-script" can= not be - ;; found. - ("glib/tests/spawn-singlethread.c" - ("/gthread/spawn-script")) - ("glib/tests/timer.c" - ( ;; fails if compiler optimizations are enabled,= which they - ;; are by default. - "/timer/stop")) - ("gio/tests/gapplication.c" - ( ;; XXX: proven to be unreliable. See: - ;; - ;; - "/gapplication/quit" - ;; XXX: fails randomly for unknown reason. See: - ;; - "/gapplication/local-actions")) - ("gio/tests/contenttype.c" - ( ;; XXX: requires shared-mime-info. - "/contenttype/guess" - "/contenttype/guess_svg_from_data" - "/contenttype/subtype" - "/contenttype/list" - "/contenttype/icon" - "/contenttype/symbolic-icon" - "/contenttype/tree")) - ("gio/tests/appinfo.c" - ( ;; XXX: requires update-desktop-database. - "/appinfo/associations")) - ("gio/tests/desktop-app-info.c" - ( ;; XXX: requires update-desktop-database. - "/desktop-app-info/delete" - "/desktop-app-info/default" - "/desktop-app-info/fallback" - "/desktop-app-info/lastused" - "/desktop-app-info/search")) - ("gio/tests/gdbus-peer.c" - ( ;; Requires /etc/machine-id. - "/gdbus/codegen-peer-to-peer")) - ("gio/tests/gdbus-address-get-session.c" - ( ;; Requires /etc/machine-id. - "/gdbus/x11-autolaunch")) - ("gio/tests/gsocketclient-slow.c" - ( ;; These tests tries to resolve "localhost", an= d fails. - "/socket-client/happy-eyeballs/slow" - "/socket-client/happy-eyeballs/cancellation/dela= yed"))))) - (for-each (lambda (x) (apply disable x)) failing-tests) - #t))) - (replace 'check - (lambda _ - (setenv "MESON_TESTTHREADS" - (number->string (parallel-job-count))) - ;; Do not run tests marked as "flaky". - (invoke "meson" "test" "--no-suite" "flaky"))) - ;; TODO: meson does not permit the bindir to be outside of pref= ix. - ;; See https://github.com/mesonbuild/meson/issues/2561 - ;; We can remove this once meson is patched. - (add-after 'install 'move-executables + ;; Meson does not permit the bindir to be outside of prefix. + (add-after 'install 'move-bin (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (assoc-ref outputs "bin"))) + (let* ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) (mkdir-p bin) - (rename-file (string-append out "/bin") - (string-append bin "/bin")) - ;; This one is an implementation detail of glib. - ;; It is wrong that that's in "/bin" in the first place, - ;; but that's what upstream is doing right now. - ;; See .= - (mkdir (string-append out "/libexec")) - (rename-file (string-append bin "/bin/gio-launch-desktop"= ) - (string-append out "/libexec/gio-launch-desk= top")) + (rename-file + (string-append out "/bin") + (string-append bin "/bin")) ;; Do not refer to "bindir", which points to "${prefix}/b= in". ;; We don't patch "bindir" to point to "$bin/bin", becaus= e that ;; would create a reference cycle between the "out" and "= bin" ;; outputs. - (substitute* (list (string-append out "/lib/pkgconfig/gio= -2.0.pc") - (string-append out "/lib/pkgconfig/gli= b-2.0.pc")) + (substitute* + (list + (string-append out "/lib/pkgconfig/gio-2.0.pc") + (string-append out "/lib/pkgconfig/glib-2.0.pc")) (("bindir=3D\\$\\{prefix\\}/bin") "") (("=3D\\$\\{bindir\\}/") "=3D")) #t)))))) @@ -340,15 +270,23 @@ shared NFS home directories.") ;; (assoc-ref %outputs "bin")= ;; "/bin")) (native-inputs - `(("dbus" ,dbus) ; for GDBus tests - ("gettext" ,gettext-minimal) + `(("gettext" ,gettext-minimal) + ("libintl" ,intltool) ("m4" ,m4) ; for installing m4 macros ("perl" ,perl) ; needed by GIO tests ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("tzdata" ,tzdata-for-tests))) ; for tests/gdatetime.c + ("python" ,python) ; For 'patch-python-references + ("python-wrapper" ,python-wrapper) + ("tzdata" ,tzdata-for-tests) ; for tests/gdatetime.c + ("xmllint" ,libxml2) + ("xsltproc" ,libxslt))) + (inputs + `(("bash-completion" ,bash-completion) + ("dbus" ,dbus) + ("libelf" ,libelf))) (propagated-inputs `(("libffi" ,libffi) ; in the Requires.private field of gobject-2.0= =2Epc + ("libselinux" ,libselinux) ; in the Requires.private field of gio= -2.0.pc ("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc ("util-linux" ,util-linux "lib") ;for libmount ("zlib" ,zlib))) ; in the Requires.private field of glib-2.0.pc diff --git a/gnu/packages/patches/glib-tests-timer.patch b/gnu/packages/p= atches/glib-tests-timer.patch deleted file mode 100644 index e37425c0c8..0000000000 --- a/gnu/packages/patches/glib-tests-timer.patch +++ /dev/null @@ -1,15 +0,0 @@ -* On i686 floating-point roundoff errors could sometimes cause this chec= k to - fail depending on the elapsed microseconds. Improve rounding by addin= g a - fractional bit. - ---- glib-2.40.0/glib/tests/timer.c 2014-03-05 08:05:42.000000000 -0600 -+++ glib-2.40.0/glib/tests/timer.c 2014-07-10 16:33:12.746862822 -0500 -@@ -35,7 +35,7 @@ - elapsed =3D g_timer_elapsed (timer, µs); -=20 - g_assert_cmpfloat (elapsed, <, 1.0); -- g_assert_cmpuint (micros, =3D=3D, ((guint64)(elapsed * 1e6)) % 100000= 0); -+ g_assert_cmpuint (micros, =3D=3D, ((guint64)(elapsed * 1e6 + 0.5)) % = 1000000); -=20 - g_timer_destroy (timer); - } --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0003-gnu-glib-Enable-man-pages.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0003-gnu-glib-Enable-man-pages.patch" =46rom 170497cb8040081c589bd0f0c4c5b3b9120eb308 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 02:14:27 -0400 Subject: [PATCH 03/83] gnu: glib: Enable man pages. * gnu/packages/glib.scm (glib)[arguments]<#:configure-flags>[-Dman]: New = flag. [native-inputs]: Add docbook-xsl. --- gnu/packages/glib.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d29dca2db8..d13ba5998e 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -198,6 +198,7 @@ shared NFS home directories.") "bin")) ; glib-mkenums, gtester, etc.; depends on Python (arguments `(#:disallowed-references (,tzdata-for-tests) + #:configure-flags '("-Dman=3Dtrue") #:phases (modify-phases %standard-phases ;; TODO: Remove the conditional in the next core-updates cycle.= @@ -270,7 +271,8 @@ shared NFS home directories.") ;; (assoc-ref %outputs "bin")= ;; "/bin")) (native-inputs - `(("gettext" ,gettext-minimal) + `(("docbook-xsl" ,docbook-xsl) + ("gettext" ,gettext-minimal) ("libintl" ,intltool) ("m4" ,m4) ; for installing m4 macros ("perl" ,perl) ; needed by GIO tests --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0004-gnu-glib-Update-synopsis-description-and-home-page.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0004-gnu-glib-Update-synopsis-description-and-home-page.patc"; filename*1="h" =46rom cd01ed127b0d512f74a28d8da0a5aa59b561561b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 07:45:50 -0500 Subject: [PATCH 04/83] gnu: glib: Update synopsis, description and home-p= age. * gnu/packages/glib.scm (glib) [synopsis]: Modify. [description]: Modify. [home-page]: Modify. --- gnu/packages/glib.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d13ba5998e..24829fa03d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -306,11 +306,12 @@ shared NFS home directories.") (variable "GIO_EXTRA_MODULES") (files '("lib/gio/modules"))))) (search-paths native-search-paths) - (synopsis "Thread-safe general utility library; basis of GTK+ and GN= OME") - (description "GLib provides data structure handling for C, portabili= ty -wrappers, and interfaces for such runtime functionality as an event loop= , -threads, dynamic loading, and an object system.") - (home-page "https://developer.gnome.org/glib/") + (synopsis "Low-level core library for GNOME projects") + (description "GLib provides the core application building blocks for= +libraries and applications written in C. It provides the core object sy= stem +used in GNOME, the main loop implementation, and a large set of utility +functions for strings and common data structures.") + (home-page "https://wiki.gnome.org/Projects/GLib") (license license:lgpl2.1+))) =20 (define-public glib-with-documentation --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0005-gnu-glib-with-documentation-Make-some-cosmetic-chang.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0005-gnu-glib-with-documentation-Make-some-cosmetic-chang.pa"; filename*1="tch" =46rom 109f222e5fab3b20f0fd14628224af5a1728cecd Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 09:37:00 -0500 Subject: [PATCH 05/83] gnu: glib-with-documentation: Make some cosmetic changes. * gnu/packages/glib.scm (glib-with-documentation): Make some cosmetic cha= nges. --- gnu/packages/glib.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 24829fa03d..01bdcefb04 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -321,8 +321,8 @@ functions for strings and common data structures.") (properties (alist-delete 'hidden? (package-properties glib))) (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc re= ference (native-inputs - `(("gtk-doc" ,gtk-doc) ; for the doc - ("docbook-xml" ,docbook-xml) + `(("docbook-xml" ,docbook-xml) + ("gtk-doc" ,gtk-doc) ; for the doc ("libxml2" ,libxml2) ,@(package-native-inputs glib))) (arguments @@ -333,12 +333,13 @@ functions for strings and common data structures.")= `(modify-phases ,phases (add-after 'install 'move-doc (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (html (string-append "/share/gtk-doc"))) - (copy-recursively (string-append out html) - (string-append doc html)) - (delete-file-recursively (string-append out html)) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (html (string-append "/share/gtk-doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out html) + (string-append doc html)) #t))))))))) =20 ;;; TODO: Merge into glib as a 'static' output on core-updates. --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0006-gnu-glib-with-documentation-Fix-documentation-build.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0006-gnu-glib-with-documentation-Fix-documentation-build.pat"; filename*1="ch" =46rom 59e424de77010544119017dc0dbb788e346fda74 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 09:39:52 -0500 Subject: [PATCH 06/83] gnu: glib-with-documentation: Fix documentation bu= ild. * gnu/packages/glib.scm (glib-with-documentation) [native-inputs]: Add docbook-4.2. Remove libxml2. [arguments]<#:phases>['patch-docbook-xml]: New phase. --- gnu/packages/glib.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 01bdcefb04..36cb3ed3c7 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -321,7 +321,8 @@ functions for strings and common data structures.") (properties (alist-delete 'hidden? (package-properties glib))) (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc re= ference (native-inputs - `(("docbook-xml" ,docbook-xml) + `(("docbook-xml-4.2" ,docbook-xml-4.2) + ("docbook-xml-4.5" ,docbook-xml) ("gtk-doc" ,gtk-doc) ; for the doc ("libxml2" ,libxml2) ,@(package-native-inputs glib))) @@ -331,6 +332,17 @@ functions for strings and common data structures.") `(cons "-Dgtk_doc=3Dtrue" ,flags)) ((#:phases phases) `(modify-phases ,phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs" + (substitute* (find-files "." "\\.xml$") + (("http://www.oasis-open.org/docbook/xml/4\\.5/") + (string-append (assoc-ref inputs "docbook-xml-4.5") + "/xml/dtd/docbook/")) + (("http://www.oasis-open.org/docbook/xml/4\\.2/") + (string-append (assoc-ref inputs "docbook-xml-4.2") + "/xml/dtd/docbook/")))) + #t)) (add-after 'install 'move-doc (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0007-gnu-Temporarily-use-glib-without-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0007-gnu-Temporarily-use-glib-without-documentation.patch" =46rom 9e441a2c23a14b97308d2507e591b42c37502605 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 24 Mar 2021 02:47:29 -0400 Subject: [PATCH 07/83] gnu: Temporarily use glib without documentation. GLib v2.68.0 refers to gtk-doc v1.32.1 which is not released yet. Therefore, hide glib-with-documentation and unhide glib. * gnu/packages/glib.scm (glib) [properties]: Remove hidden. (glib-with-documentation) [properties]: Add hidden. --- gnu/packages/glib.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 36cb3ed3c7..493b3e5b64 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -192,7 +192,7 @@ shared NFS home directories.") (substitute* "tests/spawn-test.c" (("/bin/sh") "sh")) #t)))) - (properties '((hidden? . #t))) + ;; (properties '((hidden? . #t))) (build-system meson-build-system) (outputs '("out" ; everything "bin")) ; glib-mkenums, gtester, etc.; depends on Python @@ -318,7 +318,8 @@ functions for strings and common data structures.") ;; glib's doc must be built in a separate package since it requires gt= k-doc, ;; which in turn depends on glib. (package/inherit glib - (properties (alist-delete 'hidden? (package-properties glib))) + ;; (properties (alist-delete 'hidden? (package-properties glib))) + (properties '((hidden? . #t))) (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc re= ference (native-inputs `(("docbook-xml-4.2" ,docbook-xml-4.2) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0008-gnu-libsigc-Update-to-3.0.6.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0008-gnu-libsigc-Update-to-3.0.6.patch" =46rom b0729d8d4921460155b7ec6ab704e70eeff6e9cc Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 24 Mar 2021 23:28:10 -0400 Subject: [PATCH 08/83] gnu: libsigc++: Update to 3.0.6. * gnu/packages/glib.scm (libsigc++)[version]: Update to 3.0.6. [build-system]: Change from gnu to meson. [native-inputs]: Add mm-common, perl, libxml2 and libxslt. [inputs]: Add boost. [license]: Update to lgpl3+. --- gnu/packages/glib.scm | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 493b3e5b64..9e472eb3a0 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) + #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages docbook) @@ -570,18 +571,25 @@ by GDBus included in Glib.") (define libsigc++ (package (name "libsigc++") - (version "2.10.3") + (version "3.0.6") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/libsigc++/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "11j7j1jv4z58d9s7jvl42fnqa1dzl4idgil9r45cjv1w673dys0b")))= ) - (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config) - ("m4" ,m4))) + (method url-fetch) + (uri (string-append "mirror://gnome/sources/libsigc++/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1kn57b039lg20182lnchl1ys27vf34brn43f895cal8nc7sdq3mp"))= )) + (build-system meson-build-system) + (native-inputs + `(("m4" ,m4) + ("mm-common" ,mm-common) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xmllint" ,libxml2) + ("xsltproc" ,libxslt))) + (inputs + `(("boost" ,boost))) (home-page "https://libsigcplusplus.github.io/libsigcplusplus/") (synopsis "Type-safe callback system for standard C++") (description @@ -592,7 +600,7 @@ static or virtual. =20 It also contains adaptor classes for connection of dissimilar callbacks = and has an ease of use unmatched by other C++ callback libraries.") - (license license:lgpl2.1+))) + (license license:lgpl3+))) =20 (define glibmm (package --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0009-gnu-libsigc-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0009-gnu-libsigc-Enable-documentation.patch" =46rom 23774d4549c1a152a4290d31541090a496db3fe4 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 00:07:52 -0400 Subject: [PATCH 09/83] gnu: libsigc++: Enable documentation. * gnu/packages/glib.scm (libsigc++)[outputs]: New output "doc". [arguments]<#:configure-flags>[-Dbuild-documentation]: New flag. <#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. [native-inputs]: Add dblatex, doxygen and graphviz. --- gnu/packages/glib.scm | 45 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9e472eb3a0..1f6098becf 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -49,6 +49,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) + #:use-module (gnu packages graphviz) #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages libffi) @@ -581,8 +582,36 @@ by GDBus included in Glib.") (base32 "1kn57b039lg20182lnchl1ys27vf34brn43f895cal8nc7sdq3mp"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) + (arguments + `(#:configure-flags + (list + "-Dbuild-documentation=3Dtrue") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs" + (substitute* (find-files "." "\\.xml$") + (("http://www.oasis-open.org/docbook/xml/4\\.1\\.2/") + (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/doc") + (string-append doc "/share/doc")) + #t)))))) (native-inputs - `(("m4" ,m4) + `(("docbook-xml" ,docbook-xml-4.1.2) + ("docbook-xsl" ,docbook-xsl) + ("dot" ,graphviz) + ("doxygen" ,doxygen) + ("m4" ,m4) ("mm-common" ,mm-common) ("perl" ,perl) ("pkg-config" ,pkg-config) @@ -594,12 +623,12 @@ by GDBus included in Glib.") (synopsis "Type-safe callback system for standard C++") (description "Libsigc++ implements a type-safe callback system for standard C++.= It -allows you to define signals and to connect those signals to any callbac= k -function, either global or a member function, regardless of whether it i= s -static or virtual. + allows you to define signals and to connect those signals to any ca= llback + function, either global or a member function, regardless of whether= it is + static or virtual. =20 -It also contains adaptor classes for connection of dissimilar callbacks = and -has an ease of use unmatched by other C++ callback libraries.") + It also contains adaptor classes for connection of dissimilar callb= acks and + has an ease of use unmatched by other C++ callback libraries.") (license license:lgpl3+))) =20 (define glibmm @@ -631,8 +660,8 @@ has an ease of use unmatched by other C++ callback li= braries.") ;; to open a TLS session; just skip it. (substitute* "tests/giomm_tls_client/main.cc" (("Gio::init.*$") - "return 77;\n")) - #t))))) + "return 77 ;\n")) + #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin"))) (propagated-inputs --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0010-gnu-glibmm-Update-to-2.68.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0010-gnu-glibmm-Update-to-2.68.0.patch" =46rom aecb79dbf9aa217cf84fe9b1411468aa4d44bd4c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 01:56:45 -0400 Subject: [PATCH 10/83] gnu: glibmm: Update to 2.68.0. * gnu/packages/glib.scm (glibmm)[version]: Update to 2.68.0. [arguments]<#:phases>['pre-build]: Remove phase. ['disable-failing-tests]: New phase. [native-inputs]: Add m4, mm-common, perl and libxslt. --- gnu/packages/glib.scm | 50 +++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 1f6098becf..ac46b5ce45 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -634,36 +634,36 @@ by GDBus included in Glib.") (define glibmm (package (name "glibmm") - (version "2.62.0") + (version "2.68.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/glibmm/" - (version-major+minor version) - "/glibmm-" version ".tar.xz")) - (sha256 - (base32 - "1ziwx6r7k7wbvg4qq1rgrv8zninapgrmhn1hs6926a3krh9ryr9n")))= ) - (build-system gnu-build-system) + (method url-fetch) + (uri (string-append "mirror://gnome/sources/glibmm/" + (version-major+minor version) + "/glibmm-" version ".tar.xz")) + (sha256 + (base32 + "0xgkyhb2876mcyyib5rk3ya9aingyj68h02nl22yvkhx35rqbwy1"))= )) + (build-system meson-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'build 'pre-build + (add-after 'unpack 'disable-failing-tests (lambda _ - ;; This test uses /etc/fstab as an example file to read - ;; from; choose a better example. - (substitute* "tests/giomm_simple/main.cc" - (("/etc/fstab") - (string-append (getcwd) - "/tests/giomm_simple/main.cc"))) - - ;; This test does a DNS lookup, and then expects to be able= - ;; to open a TLS session; just skip it. - (substitute* "tests/giomm_tls_client/main.cc" - (("Gio::init.*$") - "return 77 ;\n")) - #t))))) - (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin"))) + (substitute* "tests/meson.build" + ;; This test uses /etc/fstab as an example file to read + ;; from; disable it. + (("[ \t]*.*giomm_simple.*$") "") + ;; This test does a DNS lookup, and then expects to be ab= le + ;; to open a TLS session; just skip it. + (("[ \t]*.*giomm_tls_client.*$") "")) + #t))))) + (native-inputs + `(("glib:bin" ,glib "bin") + ("m4" ,m4) + ("mm-common" ,mm-common) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs `(("libsigc++" ,libsigc++) ("glib" ,glib))) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0011-gnu-glibmm-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0011-gnu-glibmm-Enable-documentation.patch" =46rom 8ced07a179fe52541f8b87d1fefea5aac0b05332 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 03:04:01 -0400 Subject: [PATCH 11/83] gnu: glibmm: Enable documentation. * gnu/packages/glib.scm (glibmm)[outputs]: New output "doc". [arguments]<#:configure-flags>[-Dbuild-documentation]: New flag. <#:phases>['move-doc]: New phase. [native-inputs]: Add doxygen and graphviz. --- gnu/packages/glib.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index ac46b5ce45..bff6f281cd 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -644,8 +644,12 @@ by GDBus included in Glib.") (base32 "0xgkyhb2876mcyyib5rk3ya9aingyj68h02nl22yvkhx35rqbwy1"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - `(#:phases + `(#:configure-flags + (list + "-Dbuild-documentation=3Dtrue") + #:phases (modify-phases %standard-phases (add-after 'unpack 'disable-failing-tests (lambda _ @@ -656,9 +660,20 @@ by GDBus included in Glib.") ;; This test does a DNS lookup, and then expects to be ab= le ;; to open a TLS session; just skip it. (("[ \t]*.*giomm_tls_client.*$") "")) - #t))))) + #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/doc") + (string-append doc "/share/doc")) + #t)))))) (native-inputs - `(("glib:bin" ,glib "bin") + `(("dot" ,graphviz) + ("doxygen" ,doxygen) + ("glib:bin" ,glib "bin") ("m4" ,m4) ("mm-common" ,mm-common) ("perl" ,perl) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0012-gnu-Add-libsigc-2.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0012-gnu-Add-libsigc-2.patch" =46rom 0a6d0ae9b5b4a5b7c96b7e96bbdc3b922d863dc9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 26 Mar 2021 14:27:34 -0400 Subject: [PATCH 12/83] gnu: Add libsigc++-2. * gnu/packages/glib.scm (libsigc++-2): New variable. --- gnu/packages/glib.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index bff6f281cd..4a2dfee552 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -631,6 +631,42 @@ by GDBus included in Glib.") has an ease of use unmatched by other C++ callback libraries.") (license license:lgpl3+))) =20 + (define-public libsigc++-2 + (package + (inherit libsigc++) + (name "libsigc++") + (version "2.9.3") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/libsigc++/" + (version-major+minor version) + "/libsigc++-" version ".tar.xz")) + (sha256 + (base32 "0zq963d0sss82q62fdfjs7l9iwbdch51albck18cb631ml0v7y8b"))= )) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs" + (substitute* (find-files "." "\\.xml$") + (("http://www.oasis-open.org/docbook/xml/4\\.1\\.2/") + (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/doc") + (string-append doc "/share/doc")) + #t)))))))) + (define glibmm (package (name "glibmm") --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0013-gnu-glibmm-2.64-Update-to-2.64.5.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0013-gnu-glibmm-2.64-Update-to-2.64.5.patch" =46rom 9159dac42d3b79ab80becb2e5ca73a66599e3a8a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 26 Mar 2021 14:29:40 -0400 Subject: [PATCH 13/83] gnu: glibmm-2.64: Update to 2.64.5. * gnu/packages/glib.scm (glibmm-2.64)[version]: Update to 2.64.5. [propagaed-inputs]: Change libsigc++ to libsigc++-2. --- gnu/packages/glib.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 4a2dfee552..8ca3083f3b 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -729,7 +729,7 @@ useful for C++.") (package (inherit glibmm) (name "glibmm") - (version "2.64.2") + (version "2.64.5") (source (origin (method url-fetch) @@ -738,10 +738,10 @@ useful for C++.") (version-major+minor version) "/glibmm-" version ".tar.xz")) (sha256 - (base32 "1v6lp23fr2qh4zshcnm28sn29j3nzgsvcqj2nhmrnvamipjq4lm7"))= )) + (base32 "11m37sbx0i18cl17d0fkq0bik4bbzlb5n8kcl651jhci5ipci3sh"))= )) (propagated-inputs - `(("libsigc++" ,libsigc++) - ("glib" ,glib))))) + `(("libsigc++" ,libsigc++-2) + ,@(package-propagated-inputs glibmm))))) =20 (define-public python2-pygobject-2 (package --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0014-gnu-gtk-doc-Change-build-system.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0014-gnu-gtk-doc-Change-build-system.patch" =46rom 314b37735fc420212051009be129d54d32d1400d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 08:51:02 -0500 Subject: [PATCH 14/83] gnu: gtk-doc: Change build-system. * gnu/packages/gtk.scm (gtk-doc) [build-system]: Change from gnu to glib-= or-gtk. --- gnu/packages/gtk.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f0c1fcccb2..dadd6bbf42 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1742,7 +1742,7 @@ information.") (sha256 (base32 "05apmwibkmn1icx05l8aw241lhymcx01zvk5i499cb150bijj7li"))= )) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments `(#:parallel-tests? #f #:phases @@ -1750,16 +1750,16 @@ information.") (add-after 'unpack 'patch-gtk-doc-scan (lambda* (#:key inputs #:allow-other-keys) (substitute* "gtk-doc.xsl" - (("http://docbook.sourceforge.net/release/xsl/current/html= /chunk.xsl") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/html/chunk.xsl")) - (("http://docbook.sourceforge.net/release/xsl/current/comm= on/en.xml") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/common/en.xml"))) + (("http://docbook.sourceforge.net/release/xsl/current/htm= l/chunk.xsl") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/html/chunk.xsl")) + (("http://docbook.sourceforge.net/release/xsl/current/com= mon/en.xml") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/common/en.xml"))) #t)) (add-after 'patch-gtk-doc-scan 'patch-test-out (lambda _ @@ -1768,7 +1768,7 @@ information.") ;; generator metafont outputs a lot of extra lines, this ;; test would always fail. Disable it for now. (substitute* "tests/Makefile.in" - (("empty.sh sanity.sh") "empty.sh")) + (("empty.sh sanity.sh") "empty.sh")) #t)) (add-before 'configure 'fix-docbook (lambda* (#:key inputs #:allow-other-keys) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0015-gnu-gtk-doc-Correct-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0015-gnu-gtk-doc-Correct-inputs.patch" =46rom a931131a323c000ff832d7c574cfa3a1a25fb14a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 08:58:34 -0500 Subject: [PATCH 15/83] gnu: gtk-doc: Correct inputs. * gnu/packages/gtk.scm (gtk-doc) [native-inputs]: Add glib:bin, perl and python-wrapper. [inputs]: Add python-anytree, python-lxml, python-parameterized, python-pygments, python-unittest2 and yelp-tools. Remove perl. --- gnu/packages/gtk.scm | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index dadd6bbf42..049815b8e5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1798,21 +1798,29 @@ information.") (assoc-ref %build-inputs "docbook-xml") "/xml/dtd/docbook/catalog.xml")))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) ("itstool" ,itstool) - ("libxml" ,libxml2) - ("gettext" ,gettext-minimal) - ("bc" ,bc))) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper))) (inputs - `(("perl" ,perl) - ("python" ,python) - ("xsltproc" ,libxslt) + `(("bc" ,bc) ("dblatex" ,dblatex) ("docbook-xml" ,docbook-xml-4.3) ("docbook-xsl" ,docbook-xsl) - ("source-highlight" ,source-highlight) ("glib" ,glib) - ("python-six" ,python-six))) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("python" ,python) + ("python-anytree" ,python-anytree) + ("python-lxml" ,python-lxml) + ("python-parameterized" ,python-parameterized) + ("python-pygments" ,python-pygments) + ("python-unittest2" ,python-unittest2) + ("source-highlight" ,source-highlight) + ("yelp-tools" ,yelp-tools))) (home-page "https://www.gtk.org/gtk-doc/") (synopsis "Documentation generator from C source code") (description --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0016-gnu-gtk-doc-Update-to-1.32.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0016-gnu-gtk-doc-Update-to-1.32.patch" =46rom 474c4343391ca2f399eb8b4816310d37abe9559e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 09:08:32 -0500 Subject: [PATCH 16/83] gnu: gtk-doc: Update to 1.32. * gnu/packages/gtk.scm (gtk-doc) [version]: Update to 1.32. [arguments]<#:phases>['patch-test-out]: Remove phase. ['disable-failing-tests]: New phase. ['set-HOME]: New phase. --- gnu/packages/gtk.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 049815b8e5..2322b5c627 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1733,7 +1733,7 @@ information.") (define-public gtk-doc (package (name "gtk-doc") - (version "1.28") + (version "1.32") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1741,7 +1741,7 @@ information.") name "-" version ".tar.xz")) (sha256 (base32 - "05apmwibkmn1icx05l8aw241lhymcx01zvk5i499cb150bijj7li"))= )) + "0z4h1dggpimygdp719l457jvqilps4qcfpk31jmj3jqpzcsg03ny"))= )) (build-system glib-or-gtk-build-system) (arguments `(#:parallel-tests? #f @@ -1761,14 +1761,11 @@ information.") ,(package-version docbook-xsl) "/common/en.xml"))) #t)) - (add-after 'patch-gtk-doc-scan 'patch-test-out + (add-after 'unpack 'disable-failing-tests (lambda _ - ;; sanity.sh counts the number of status lines. Since our - ;; texlive regenerates the fonts every time and the font - ;; generator metafont outputs a lot of extra lines, this - ;; test would always fail. Disable it for now. (substitute* "tests/Makefile.in" - (("empty.sh sanity.sh") "empty.sh")) + (("annotations.sh bugs.sh empty.sh fail.sh gobject.sh pro= gram.sh") + "")) #t)) (add-before 'configure 'fix-docbook (lambda* (#:key inputs #:allow-other-keys) @@ -1785,6 +1782,12 @@ information.") "^catalog.xml$")) " \"http://docbook.sourceforge.net/releas= e/xsl/"))) #t)) + (add-before 'build 'set-HOME + (lambda _ + ;; FIXME: dblatex with texlive-union does not find the buil= t + ;; metafonts, so it tries to generate them in HOME. + (setenv "HOME" "/tmp") + #t)) (add-after 'install 'wrap-executables (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0017-gnu-gtk-doc-Enable-help.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0017-gnu-gtk-doc-Enable-help.patch" =46rom 7def9918c76c9db1d4773df9db53a211a619766e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 09:13:14 -0500 Subject: [PATCH 17/83] gnu: gtk-doc: Enable help. * gnu/packages/gtk.scm (gtk-doc) [outputs]: New output 'help'. [arguments]<#:configure-flags>[--with-help-dir]: New flag. --- gnu/packages/gtk.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 2322b5c627..4d3017da73 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1743,6 +1743,7 @@ information.") (base32 "0z4h1dggpimygdp719l457jvqilps4qcfpk31jmj3jqpzcsg03ny"))= )) (build-system glib-or-gtk-build-system) + (outputs '("out" "help")) (arguments `(#:parallel-tests? #f #:phases @@ -1799,7 +1800,10 @@ information.") #:configure-flags (list (string-append "--with-xml-catalog=3D" (assoc-ref %build-inputs "docbook-xml") - "/xml/dtd/docbook/catalog.xml")))) + "/xml/dtd/docbook/catalog.xml") + (string-append "--with-help-dir=3D" + (assoc-ref %outputs "help") + "/share/help")))) (native-inputs `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0018-gnu-gtk-doc-Update-synopsis-description-home-page-an.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0018-gnu-gtk-doc-Update-synopsis-description-home-page-an.pa"; filename*1="tch" =46rom 39c2debf9922c4da094e92b1c56a59310a298899 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 09:20:40 -0500 Subject: [PATCH 18/83] gnu: gtk-doc: Update synopsis, description, home-p= age and license. * gnu/packages/gtk.scm (gtk-doc) [home-page]: Modify. [synopsis]: Modify. [description]: Modify. [license]: Add fdl1.1+. --- gnu/packages/gtk.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4d3017da73..4c7b253060 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1828,13 +1828,19 @@ information.") ("python-unittest2" ,python-unittest2) ("source-highlight" ,source-highlight) ("yelp-tools" ,yelp-tools))) - (home-page "https://www.gtk.org/gtk-doc/") - (synopsis "Documentation generator from C source code") - (description - "GTK-Doc generates API documentation from comments added to C code.= It is -typically used to document the public API of GTK+ and GNOME libraries, b= ut it -can also be used to document application code.") - (license license:gpl2+))) + (home-page "https://wiki.gnome.org/DocumentationProject/GtkDoc") + (synopsis "GTK+ DocBook Documentation Generator") + (description "GtkDoc is a tool used to extract API documentation fro= m C-code +like Doxygen, but handles documentation of GObject (including signals an= d +properties) that makes it very suitable for GTK+ apps and libraries. It= uses +docbook for intermediate files and can produce html by default and pdf/m= an-pages +with some extra work.") + (license + (list + ;; Docs. + license:fdl1.1+ + ;; Others. + license:gpl2+)))) =20 (define-public gtk-engines (package --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0019-gnu-gobject-introspection-Propagate-glib.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0019-gnu-gobject-introspection-Propagate-glib.patch" =46rom 67608c9b1bac2326e1c146e44973fcf19cdbd19e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 09:59:44 -0500 Subject: [PATCH 19/83] gnu: gobject-introspection: Propagate glib. * gnu/packages/glib.scm (gobject-introspection) [inputs]: Move glib to ..= =2E [propagated-inputs]: ... here. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 8ca3083f3b..34d2ba4cf4 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -416,11 +416,11 @@ functions for strings and common data structures.")= (inputs `(("bison" ,bison) ("flex" ,flex) - ("glib" ,glib) ("python" ,python-wrapper) ("zlib" ,zlib))) (propagated-inputs - `(;; In practice, GIR users will need libffi when using + `(("glib" ,glib) + ;; In practice, GIR users will need libffi when using ;; gobject-introspection. ("libffi" ,libffi))) (native-search-paths --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0020-gnu-cairo-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0020-gnu-cairo-Make-some-cosmetic-changes.patch" =46rom 42b9305c79a2001a83c4e5781f0be254e62d620e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 4 Dec 2020 00:49:10 -0500 Subject: [PATCH 20/83] gnu: cairo: Make some cosmetic changes. * gnu/packages/patches/cairo-CVE-2018-19876.patch, gnu/packages/patches/cairo-CVE-2020-35492.patch: Remove patches. * gnu/local.mk (dist_patch_DATA): Unregister them. * gnu/packages/gtk.scm (cairo): Make some cosmetic changes. [replacement]: Remove. (cairo/fixed): Remove. --- gnu/local.mk | 2 - gnu/packages/gtk.scm | 92 +++++++++---------- .../patches/cairo-CVE-2018-19876.patch | 37 -------- .../patches/cairo-CVE-2020-35492.patch | 49 ---------- 4 files changed, 41 insertions(+), 139 deletions(-) delete mode 100644 gnu/packages/patches/cairo-CVE-2018-19876.patch delete mode 100644 gnu/packages/patches/cairo-CVE-2020-35492.patch diff --git a/gnu/local.mk b/gnu/local.mk index fc05786287..73f3ffbcf5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -878,8 +878,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/bpftrace-disable-bfd-disasm.patch \ %D%/packages/patches/busybox-CVE-2021-28831.patch \ %D%/packages/patches/byobu-writable-status.patch \ - %D%/packages/patches/cairo-CVE-2018-19876.patch \ - %D%/packages/patches/cairo-CVE-2020-35492.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-sqlite.patch \ %D%/packages/patches/calibre-remove-test-unrar.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4c7b253060..d9adfe28ea 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -123,67 +123,57 @@ tools have full access to view and control running = applications.") =20 (define-public cairo (package - (name "cairo") - (version "1.16.0") - (replacement cairo/fixed) - (source (origin - (method url-fetch) - (uri (string-append "https://cairographics.org/releases/cair= o-" - version ".tar.xz")) - (sha256 - (base32 - "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))))= - (build-system gnu-build-system) - (propagated-inputs - `(("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glib" ,glib) - ("libpng" ,libpng) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libxrender" ,libxrender) - ("pixman" ,pixman))) - (inputs - `(("ghostscript" ,ghostscript) - ("libspectre" ,libspectre) - ("poppler" ,poppler) - ("xorgproto" ,xorgproto) - ("zlib" ,zlib))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("python" ,python-wrapper))) + (name "cairo") + (version "1.16.0") + (source + (origin + (method url-fetch) + (uri + (string-append "https://cairographics.org/releases/cairo-" + version ".tar.xz")) + (sha256 + (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))= )) + (build-system gnu-build-system) (arguments - `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/201= 3-06/msg00085.html - #:configure-flags '("--enable-tee" ;needed for GNU Icecat - "--enable-xml" ;for cairo-xml support - "--disable-static"))) - (synopsis "2D graphics library") - (description - "Cairo is a 2D graphics library with support for multiple output dev= ices. -Currently supported output targets include the X Window System (via both= -Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG fi= le + `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013= -06/msg00085.html + #:configure-flags + (list + "--enable-tee" ;needed for GNU Icecat + "--enable-xml" ;for cairo-xml support + "--disable-static"))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (inputs + `(("ghostscript" ,ghostscript) + ("libspectre" ,libspectre) + ("poppler" ,poppler) + ("xorgproto" ,xorgproto) + ("zlib" ,zlib))) + (propagated-inputs + `(("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("glib" ,glib) + ("libpng" ,libpng) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxrender" ,libxrender) + ("pixman" ,pixman))) + (synopsis "2D graphics library") + (description "Cairo is a 2D graphics library with support for multip= le output +devices. Currently supported output targets include the X Window System= (via +both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and S= VG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.= - Cairo is designed to produce consistent output on all output media while= taking advantage of display hardware acceleration when available eg. through the X Render Extension). - The cairo API provides operations similar to the drawing operators of PostScript and PDF. Operations in cairo including stroking and filling = cubic B=C3=A9zier splines, transforming and compositing translucent images, an= d antialiased text rendering. All drawing operations can be transformed b= y any affine transformation (scale, rotation, shear, etc.).") - (license license:lgpl2.1) ; or Mozilla Public License 1.1 - (home-page "https://cairographics.org/"))) - -(define cairo/fixed - (package - (inherit cairo) - (source (origin - (inherit (package-source cairo)) - (patches (append (search-patches "cairo-CVE-2018-19876.pat= ch" - "cairo-CVE-2020-35492.pat= ch") - (origin-patches (package-source cairo))))= )))) + (home-page "https://cairographics.org/") + (license license:lgpl2.1))) ; or Mozilla Public License 1.1 =20 (define-public cairo-sans-poppler ;; Variant used to break the dependency cycle between Poppler and Cair= o. diff --git a/gnu/packages/patches/cairo-CVE-2018-19876.patch b/gnu/packag= es/patches/cairo-CVE-2018-19876.patch deleted file mode 100644 index c0fba2ecaa..0000000000 --- a/gnu/packages/patches/cairo-CVE-2018-19876.patch +++ /dev/null @@ -1,37 +0,0 @@ -Copied from Debian. - -From: Carlos Garcia Campos -Date: Mon, 19 Nov 2018 12:33:07 +0100 -Subject: ft: Use FT_Done_MM_Var instead of free when available in - cairo_ft_apply_variations - -Fixes a crash when using freetype >=3D 2.9 - -[This is considered to be security-sensitive because WebKitGTK+ sets its= -own memory allocator, which is not compatible with system free(), making= -this a remotely triggerable denial of service or memory corruption.] - -Origin: upstream, commit:90e85c2493fdfa3551f202ff10282463f1e36645 -Bug: https://gitlab.freedesktop.org/cairo/cairo/merge_requests/5 -Bug-Debian: https://bugs.debian.org/916389 -Bug-CVE: CVE-2018-19876 ---- - src/cairo-ft-font.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c -index 325dd61..981973f 100644 ---- a/src/cairo-ft-font.c -+++ b/src/cairo-ft-font.c -@@ -2393,7 +2393,11 @@ skip: - done: - free (coords); - free (current_coords); -+#if HAVE_FT_DONE_MM_VAR -+ FT_Done_MM_Var (face->glyph->library, ft_mm_var); -+#else - free (ft_mm_var); -+#endif - } - } -=20 diff --git a/gnu/packages/patches/cairo-CVE-2020-35492.patch b/gnu/packag= es/patches/cairo-CVE-2020-35492.patch deleted file mode 100644 index e8b90fa5c5..0000000000 --- a/gnu/packages/patches/cairo-CVE-2020-35492.patch +++ /dev/null @@ -1,49 +0,0 @@ -Copied from Debian. - -From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001 -From: Heiko Lewin -Date: Tue, 15 Dec 2020 16:48:19 +0100 -Subject: [PATCH] Fix mask usage in image-compositor - -[trimmed test case, since not used in Debian build] - ---- - src/cairo-image-compositor.c | 8 ++-- - ---- cairo-1.16.0.orig/src/cairo-image-compositor.c -+++ cairo-1.16.0/src/cairo-image-compositor.c -@@ -2601,14 +2601,14 @@ _inplace_src_spans (void *abstract_rende - unsigned num_spans) - { - cairo_image_span_renderer_t *r =3D abstract_renderer; -- uint8_t *m; -+ uint8_t *m, *base =3D (uint8_t*)pixman_image_get_data(r->mask); - int x0; -=20 - if (num_spans =3D=3D 0) - return CAIRO_STATUS_SUCCESS; -=20 - x0 =3D spans[0].x; -- m =3D r->_buf; -+ m =3D base; - do { - int len =3D spans[1].x - spans[0].x; - if (len >=3D r->u.composite.run_length && spans[0].coverage =3D=3D 0xf= f) { -@@ -2646,7 +2646,7 @@ _inplace_src_spans (void *abstract_rende - spans[0].x, y, - spans[1].x - spans[0].x, h); -=20 -- m =3D r->_buf; -+ m =3D base; - x0 =3D spans[1].x; - } else if (spans[0].coverage =3D=3D 0x0) { - if (spans[0].x !=3D x0) { -@@ -2675,7 +2675,7 @@ _inplace_src_spans (void *abstract_rende - #endif - } -=20 -- m =3D r->_buf; -+ m =3D base; - x0 =3D spans[1].x; - } else { - *m++ =3D spans[0].coverage; --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0021-gnu-cairo-Change-build-system.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0021-gnu-cairo-Change-build-system.patch" =46rom 405db63b6168ce497d986e8f723670a18fc6e439 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 4 Dec 2020 00:51:10 -0500 Subject: [PATCH 21/83] gnu: cairo: Change build-system. * gnu/packages/gtk.scm (cairo) [build-system]: Change from gnu to glib-or= -gtk. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d9adfe28ea..27c132ab59 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -133,7 +133,7 @@ tools have full access to view and control running ap= plications.") version ".tar.xz")) (sha256 (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))= )) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013= -06/msg00085.html #:configure-flags --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0022-gnu-cairo-Move-documentation-to-separate-output.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0022-gnu-cairo-Move-documentation-to-separate-output.patch" =46rom b9d22071648eda270825e1384b115ecb705cf891 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 4 Dec 2020 00:53:16 -0500 Subject: [PATCH 22/83] gnu: cairo: Move documentation to separate output.= * gnu/packages/gtk.scm (cairo) [outputs]: New output "doc". [arguments]<#:configure-flags>[--with-html-dir]: New flag. --- gnu/packages/gtk.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 27c132ab59..6dd281e2bc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -134,13 +134,17 @@ tools have full access to view and control running = applications.") (sha256 (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"))= )) (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) (arguments `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013= -06/msg00085.html #:configure-flags (list - "--enable-tee" ;needed for GNU Icecat - "--enable-xml" ;for cairo-xml support - "--disable-static"))) + "--enable-tee" ;needed for GNU Icecat + "--enable-xml" ;for cairo-xml support + "--disable-static" + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html")))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python-wrapper))) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0023-gnu-cairo-Enable-some-features.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0023-gnu-cairo-Enable-some-features.patch" =46rom 80b3e1272ddba62a1bd1c9d5785a3fd202b3c9f2 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 4 Dec 2020 01:02:00 -0500 Subject: [PATCH 23/83] gnu: cairo: Enable some features. * gnu/packages/gtk.scm (cairo) [native-inputs]: Add gobject-introspection= =2E [inputs]: Add libdrm. Remove xorgproto and zlib. [propagated-inputs]: Add libxcb. --- gnu/packages/gtk.scm | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 6dd281e2bc..f1f71c2612 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -139,30 +139,45 @@ tools have full access to view and control running = applications.") `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013= -06/msg00085.html #:configure-flags (list - "--enable-tee" ;needed for GNU Icecat - "--enable-xml" ;for cairo-xml support "--disable-static" + ;; XXX: To be enabled. + ;; "--enable-gallium=3Dyes" + ;; "--enable-gl=3Dyes" + ;; " --enable-glesv2=3Dyes" + ;; "--enable-glesv3=3Dyes" + ;; "--enable-cogl=3Dyes" + ;; "--enable-directfb=3Dyes" + ;; "--enable-vg=3Dyes" + "--enable-tee=3Dyes" + "--enable-xml=3Dyes" (string-append "--with-html-dir=3D" (assoc-ref %outputs "doc") "/share/gtk-doc/html")))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (inputs - `(("ghostscript" ,ghostscript) + `(("drm" ,libdrm) + ("ghostscript" ,ghostscript) ("libspectre" ,libspectre) - ("poppler" ,poppler) - ("xorgproto" ,xorgproto) - ("zlib" ,zlib))) + ("poppler" ,poppler))) (propagated-inputs - `(("fontconfig" ,fontconfig) + `( ;; ("cogl" ,cogl) + ;; ("directfb" ,directfb) + ("fontconfig" ,fontconfig) + ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("glib" ,glib) + ;; ("gtk+" ,gtk+) ("libpng" ,libpng) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libxrender" ,libxrender) - ("pixman" ,pixman))) + ;; ("librsvg" ,librsvg) + ;; ("opengl" ,mesa) + ("pixman" ,pixman) + ("x11" ,libx11) + ("xcb" ,libxcb) + ("xext" ,libxext) + ("xrender" ,libxrender))) (synopsis "2D graphics library") (description "Cairo is a 2D graphics library with support for multip= le output devices. Currently supported output targets include the X Window System= (via --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0024-gnu-cairo-Update-synopsis-description-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0024-gnu-cairo-Update-synopsis-description-and-license.patch" =46rom e0a67994a98223ce2e2a3908b01d6c1bf55277fd Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 4 Dec 2020 01:04:37 -0500 Subject: [PATCH 24/83] gnu: cairo: Update synopsis, description and licen= se. * gnu/packages/gtk.scm (cairo) [synopsis]: Modify. [description]: Modify. [license]: Modify. --- gnu/packages/gtk.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f1f71c2612..92a6dfc723 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -178,21 +178,17 @@ tools have full access to view and control running = applications.") ("xcb" ,libxcb) ("xext" ,libxext) ("xrender" ,libxrender))) - (synopsis "2D graphics library") + (synopsis "Multi-platform 2D graphics library") (description "Cairo is a 2D graphics library with support for multip= le output devices. Currently supported output targets include the X Window System= (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and S= VG file -output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.= -Cairo is designed to produce consistent output on all output media while= -taking advantage of display hardware acceleration when available -eg. through the X Render Extension). -The cairo API provides operations similar to the drawing operators of -PostScript and PDF. Operations in cairo including stroking and filling = cubic -B=C3=A9zier splines, transforming and compositing translucent images, an= d -antialiased text rendering. All drawing operations can be transformed b= y any -affine transformation (scale, rotation, shear, etc.).") +output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.= ") (home-page "https://cairographics.org/") - (license license:lgpl2.1))) ; or Mozilla Public License 1.1 + (license + ;; This project is dual-licensed. + (list + license:lgpl2.1+ + license:mpl1.1)))) =20 (define-public cairo-sans-poppler ;; Variant used to break the dependency cycle between Poppler and Cair= o. --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0025-gnu-cairomm-Update-to-1.16.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0025-gnu-cairomm-Update-to-1.16.0.patch" =46rom 90fbb1fc78a7af2752418f4d4d008d44137d4afa Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 06:49:16 -0400 Subject: [PATCH 25/83] gnu: cairomm: Update to 1.16.0. * gnu/packages/gtk.scm (cairomm)[version]: Update to 1.16.0. [build-system]: Change from gnu to meson. [arguments]<#:glib-or-gtk?>: New argument. <#:configure-flags>[-Dboost-shared]: New flag. <#:make-flags>: Remove argument. [native-inputs]: Add boost and mm-common. --- gnu/packages/gtk.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 92a6dfc723..82d59ed60b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -58,6 +58,7 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages boost) #:use-module (gnu packages build-tools) #:use-module (gnu packages texinfo) #:use-module (gnu packages check) @@ -1264,19 +1265,24 @@ guile-gnome-platform (GNOME developer libraries),= and guile-gtksourceview.") (define-public cairomm (package (name "cairomm") - (version "1.12.2") + (version "1.16.0") (source (origin (method url-fetch) (uri (string-append "https://www.cairographics.org/release= s/" - name "-" version ".tar.gz")) + name "-" version ".tar.xz")) (sha256 (base32 - "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25"))= )) - (build-system gnu-build-system) + "1ya4y7qa000cjawqwswbqv26y5icfkmhs5iiiil4dxgrqn91923y"))= )) + (build-system meson-build-system) (arguments - ;; The examples lack -lcairo. - '(#:make-flags '("LDFLAGS=3D-lcairo"))) - (native-inputs `(("pkg-config" ,pkg-config))) + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Dboost-shared=3Dtrue"))) + (native-inputs + `(("boost" ,boost) + ("mm-common" ,mm-common) + ("pkg-config" ,pkg-config))) (propagated-inputs `(("libsigc++" ,libsigc++) ("freetype" ,freetype) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0026-gnu-cairomm-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0026-gnu-cairomm-Enable-documentation.patch" =46rom 2cff69369c90ca0cd117b2bbbaee3a6526560e06 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 07:07:14 -0400 Subject: [PATCH 26/83] gnu: cairomm: Enable documentation. * gnu/packages/gtk.scm (cairomm)[outputs]: New output "doc". [arguments]<#:configure-flags>[-Dbuild-documentation]: New flag. <#:phases>['move-doc]: New phase. [native-inputs]: Add doxygen, graphviz, perl and libxslt. --- gnu/packages/gtk.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 82d59ed60b..4c3514c2a9 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1274,15 +1274,32 @@ guile-gnome-platform (GNOME developer libraries),= and guile-gtksourceview.") (base32 "1ya4y7qa000cjawqwswbqv26y5icfkmhs5iiiil4dxgrqn91923y"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:configure-flags (list - "-Dboost-shared=3Dtrue"))) + "-Dbuild-documentation=3Dtrue" + "-Dboost-shared=3Dtrue") + #: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/doc") + (string-append doc "/share/doc")) + #t)))))) (native-inputs `(("boost" ,boost) + ("dot" ,graphviz) + ("doxygen" ,doxygen) ("mm-common" ,mm-common) - ("pkg-config" ,pkg-config))) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs `(("libsigc++" ,libsigc++) ("freetype" ,freetype) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0027-gnu-cairomm-1.13-Fix-build.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0027-gnu-cairomm-1.13-Fix-build.patch" =46rom 32147345ada212048c15e4a68eb1c552d5052df8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 26 Mar 2021 15:14:54 -0400 Subject: [PATCH 27/83] gnu: cairomm-1.13: Fix build. * gnu/packages/gtk.scm (cairomm-1.13)[build-system]: New field. [arguments]: New field. [propagated-inputs]: Replace libsigc++ with libsigc++-2. --- gnu/packages/gtk.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4c3514c2a9..06e7904d3d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1325,9 +1325,22 @@ library.") name "-" version ".tar.gz")) (sha256 (base32 "1xlfl0fm5mgv53lr8xjv2kqsk3bz67qkk6qzvbrqmbvbvvbqp9wp"))= )) + (build-system glib-or-gtk-build-system) + (arguments + `(#: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/doc") + (string-append doc "/share/doc")) + #t)))))) (propagated-inputs - `(("cairo" ,cairo) - ("sigc++" ,libsigc++))))) + `(("libsigc++" ,libsigc++-2) + ,@(package-propagated-inputs cairomm))))) =20 (define-public pangomm (package --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0028-gnu-pango-Add-missing-arguments.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0028-gnu-pango-Add-missing-arguments.patch" =46rom b268b8e4987bcc49aef60a2b7fc8ebe21e0c566b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:11:10 -0500 Subject: [PATCH 28/83] gnu: pango: Add missing arguments. * gnu/packages/gtk.scm (pango) [arguments]<#:glib-or-gtk?>: New argument.= --- gnu/packages/gtk.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 06e7904d3d..d8c119a6df 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -325,7 +325,8 @@ applications.") "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6"))))= (build-system meson-build-system) (arguments - '(#:phases (modify-phases %standard-phases + '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases (modify-phases %standard-phases (add-after 'unpack 'disable-cantarell-tests (lambda _ (substitute* "tests/meson.build" --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0029-gnu-pango-Re-arrange-inputs-in-alphabetical-order.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0029-gnu-pango-Re-arrange-inputs-in-alphabetical-order.patch" =46rom ad6788190624d38e24f1c4b28c7686fa7661bce4 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:17:09 -0500 Subject: [PATCH 29/83] gnu: pango: Re-arrange inputs in alphabetical orde= r. * gnu/packages/gtk.scm (pango) [propagated-inputs]: Modify. [native-inputs]: Modify. --- gnu/packages/gtk.scm | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d8c119a6df..6eeb0abd2b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -336,24 +336,23 @@ applications.") (("\\[ 'test-itemize'.*") "") (("\\[ 'test-layout'.*") "")) #t))))) - (propagated-inputs - ;; These are all in Requires or Requires.private of the '.pc' files.= - `(("cairo" ,cairo) - ("fribidi" ,fribidi) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glib" ,glib) - ("harfbuzz" ,harfbuzz) - - ;; Some packages, such as Openbox, expect Pango to be built with t= he - ;; optional libxft support. - ("libxft" ,libxft))) - (inputs - `(("zlib" ,zlib))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ; glib-mkenums,= etc. - ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler= , etc. + (propagated-inputs + ;; These are all in Requires or Requires.private of the '.pc' files= =2E + `(("cairo" ,cairo) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("fribidi" ,fribidi) + ("glib" ,glib) + ("harfbuzz" ,harfbuzz) + ;; Some packages, such as Openbox, expect Pango to be built with = the + ;; optional libxft support. + ("libxft" ,libxft))) + (inputs + `(("zlib" ,zlib))) + (native-inputs + `(("glib" ,glib "bin") ; glib-mkenums, etc. + ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. + ("pkg-config" ,pkg-config))) (synopsis "GNOME text and font handling library") (description "Pango is the core text and font handling library used in GNOME --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0030-gnu-pango-Update-to-1.48.3.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0030-gnu-pango-Update-to-1.48.3.patch" =46rom edd668cc4c130ffe4a50d919f56336953f48e1c7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 23 Mar 2021 23:32:15 -0400 Subject: [PATCH 30/83] gnu: pango: Update to 1.48.3. * gnu/packages/gtk.scm (pango) [version]: Update to 1.48.3. [arguments]<#:phases>['disable-cantarell-tests]: Modify. [propagated-inputs]: Add libthai and libxrender. [native-inputs]: Add help2man, perl and python-wrapper. --- gnu/packages/gtk.scm | 69 ++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 6eeb0abd2b..74c3cb1025 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -78,6 +78,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) + #:use-module (gnu packages man) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -312,30 +313,31 @@ applications.") =20 (define-public pango (package - (name "pango") - (version "1.44.7") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/pango/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (patches (search-patches "pango-skip-libthai-test.patch")) - (sha256 - (base32 - "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6"))))= - (build-system meson-build-system) - (arguments - '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas - #:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-cantarell-tests - (lambda _ - (substitute* "tests/meson.build" - ;; XXX FIXME: These tests require "font-cantarell= ", but - ;; adding it here would introduce a circular depe= ndency. - (("\\[ 'test-harfbuzz'.*") "") - (("\\[ 'test-itemize'.*") "") - (("\\[ 'test-layout'.*") "")) - #t))))) + (name "pango") + (version "1.48.3") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/pango/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (patches (search-patches "pango-skip-libthai-test.patch"))= + (sha256 + (base32 + "0ijbkcs6217ygzphlpi0vajxkccifdbsl0jdjpy8wz11h9f19sin"))= )) + (build-system meson-build-system) + (arguments + '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-cantarell-tests + (lambda _ + (substitute* "tests/meson.build" + ;; XXX FIXME: These tests require "font-cantarel= l", but + ;; adding it here would introduce a circular dep= endency. + (("\\[ 'test-layout'.*") "") + (("\\[ 'test-itemize'.*") "") + (("\\[ 'test-font'.*") "") + (("\\[ 'test-harfbuzz'.*") "")) + #t))))) (propagated-inputs ;; These are all in Requires or Requires.private of the '.pc' files= =2E `(("cairo" ,cairo) @@ -344,22 +346,27 @@ applications.") ("fribidi" ,fribidi) ("glib" ,glib) ("harfbuzz" ,harfbuzz) + ("libthai" ,libthai) ;; Some packages, such as Openbox, expect Pango to be built with = the ;; optional libxft support. - ("libxft" ,libxft))) + ("libxft" ,libxft) + ("libxrender" ,libxrender))) (inputs `(("zlib" ,zlib))) (native-inputs `(("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. - ("pkg-config" ,pkg-config))) - (synopsis "GNOME text and font handling library") - (description - "Pango is the core text and font handling library used in GNOME + ("help2man" ,help2man) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (synopsis "GNOME text and font handling library") + (description + "Pango is the core text and font handling library used in GNOME applications. It has extensive support for the different writing system= s used throughout the world.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/pango/"))) + (license license:lgpl2.0+) + (home-page "https://developer.gnome.org/pango/"))) =20 (define-public pango-1.42 (package --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0031-gnu-pango-Update-synopsis-description-and-home-page.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0031-gnu-pango-Update-synopsis-description-and-home-page.pat"; filename*1="ch" =46rom a377e43601041c3fbf3213feec8502031ce6e872 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:24:42 -0500 Subject: [PATCH 31/83] gnu: pango: Update synopsis, description and home-= page. * gnu/packages/gtk.scm (pango) [synopsis]: Modify. [description]: Modify. [home-page]: Modify. --- gnu/packages/gtk.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 74c3cb1025..8c891660e5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -360,13 +360,14 @@ applications.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) - (synopsis "GNOME text and font handling library") - (description - "Pango is the core text and font handling library used in GNOME -applications. It has extensive support for the different writing system= s -used throughout the world.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/pango/"))) + (synopsis "Text and font handling library") + (description "Pango is a library for laying out and rendering of tex= t, with +an emphasis on internationalization. Pango can be used anywhere that te= xt +layout is needed, though most of the work on Pango so far has been done = in the +context of the GTK+ widget toolkit. Pango forms the core of text and fo= nt +handling for GTK+-2.x.") + (home-page "https://pango.gnome.org/") + (license license:lgpl2.0+))) =20 (define-public pango-1.42 (package --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0032-gnu-pangomm-Update-to-2.48.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0032-gnu-pangomm-Update-to-2.48.0.patch" =46rom 9561ec2d0ecac96c8b467151df94879cf98d0c54 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 07:42:10 -0400 Subject: [PATCH 32/83] gnu: pangomm: Update to 2.48.0. * gnu/packages/gtk.scm (pango)[version]: Update to 2.48.0. [build-system]: Change from gnu to meson. [arguments]<#:glib-or-gtk?>: New argument. [native-inputs]: Add m4 and mm-common. --- gnu/packages/gtk.scm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 8c891660e5..e1ae39a5bb 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1353,17 +1353,22 @@ library.") (define-public pangomm (package (name "pangomm") - (version "2.42.0") + (version "2.48.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0mmzxp3wniaafkxr30sb22mq9x44xckb5d60h1bl99lkzxks0vfa")))= ) - (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config))) + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0y2vyp6azvhrii6rzs89kr08wg8z1p562awyr812131zqdsd83ly"))= )) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas + (native-inputs + `(("m4" ,m4) + ("mm-common" ,mm-common) + ("pkg-config" ,pkg-config))) (propagated-inputs `(("cairo" ,cairo) ("cairomm" ,cairomm) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0033-gnu-pangomm-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0033-gnu-pangomm-Enable-documentation.patch" =46rom dcaf13d460c373622883cf6a784a753fe622cabe Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Mar 2021 07:47:41 -0400 Subject: [PATCH 33/83] gnu: pangomm: Enable documentation. * gnu/packages/gtk.scm (pangomm)[outputs]: New output "doc". [arguments]<#:configure-flags>[-Dbuild-documentation]: New flag. <#:phases>['move-doc]: New phase. [native-inputs]: Add doxygen, graphviz, perl and libxslt. --- gnu/packages/gtk.scm | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e1ae39a5bb..956e23469d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1363,12 +1363,31 @@ library.") (base32 "0y2vyp6azvhrii6rzs89kr08wg8z1p562awyr812131zqdsd83ly"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Dbuild-documentation=3Dtrue") + #: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/doc") + (string-append doc "/share/doc")) + #t)))))) (native-inputs - `(("m4" ,m4) + `(("dot" ,graphviz) + ("doxygen" ,doxygen) + ("m4" ,m4) ("mm-common" ,mm-common) - ("pkg-config" ,pkg-config))) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs `(("cairo" ,cairo) ("cairomm" ,cairomm) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0034-gnu-pangomm-2.42-Update-to-2.42.2.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0034-gnu-pangomm-2.42-Update-to-2.42.2.patch" =46rom 30a733c6f5e791ae2507de84d7870d57be6e1107 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 26 Mar 2021 15:37:49 -0400 Subject: [PATCH 34/83] gnu: pangomm-2.42: Update to 2.42.2. * gnu/packages/gtk.scm (pangomm-2.42)[version]: Update to 2.42.2. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 956e23469d..6a40e569e6 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1404,7 +1404,7 @@ library.") (package (inherit pangomm) (name "pangomm") - (version "2.42.1") + (version "2.42.2") (source (origin (method url-fetch) @@ -1413,7 +1413,7 @@ library.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "03zli5amizhv9bfklwfq7xyf0b5dagchx1lnz9f0v1rhk69h9gql"))= )) + (base32 "12nhs94rh38glr5hp31d6k9rmhzp6mfifn3pnp67a4mf4hkcj90v"))= )) (propagated-inputs `(("cairomm" ,cairomm-1.13) ("glibmm" ,glibmm-2.64) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0035-gnu-gdk-pixbuf-Add-missing-arguments.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0035-gnu-gdk-pixbuf-Add-missing-arguments.patch" =46rom 4013e6be5463d1b1c7547d3fd300d53ab23df2f4 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:29:02 -0500 Subject: [PATCH 35/83] gnu: gdk-pixbuf: Add missing arguments. * gnu/packages/patches/gdk-pixbuf-CVE-2020-29385.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Unregister it. * gnu/packages/gtk.scm (gdk-pixbuf) [arguments]<#:glib-or-gtk?>: New argu= ment. [replacement]: Remove. (gdk-pixbuf/fixed): Remove. --- gnu/local.mk | 1 - gnu/packages/gtk.scm | 91 +++++++++---------- .../patches/gdk-pixbuf-CVE-2020-29385.patch | 53 ----------- 3 files changed, 41 insertions(+), 104 deletions(-) delete mode 100644 gnu/packages/patches/gdk-pixbuf-CVE-2020-29385.patch diff --git a/gnu/local.mk b/gnu/local.mk index 73f3ffbcf5..7591a90c49 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1060,7 +1060,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/gdb-hurd.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-brect-bounds.patch \ - %D%/packages/patches/gdk-pixbuf-CVE-2020-29385.patch \ %D%/packages/patches/gdm-default-session.patch \ %D%/packages/patches/geary-CVE-2020-24661.patch \ %D%/packages/patches/genimage-signedness.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 6a40e569e6..3e81ce8f98 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -579,60 +579,51 @@ highlighting and other features typical of a source= code editor.") =20 (define-public gdk-pixbuf (package - (name "gdk-pixbuf") - (version "2.42.2") - (replacement gdk-pixbuf/fixed) - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3"))))= - (build-system meson-build-system) - (arguments - `(#:meson ,meson-0.55 - #:configure-flags '("-Dinstalled_tests=3Dfalse") - #:phases - (modify-phases %standard-phases - ;; 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 + (name "gdk-pixbuf") + (version "2.42.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3"))= )) + (build-system meson-build-system) + (arguments + `(#:meson ,meson-0.55 + #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags '("-Dinstalled_tests=3Dfalse") + #:phases + (modify-phases %standard-phases + ;; 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) ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ; glib-mkenums= , etc. + ("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= + (synopsis "GNOME image loading and manipulation library") + (description + "GdkPixbuf is a library for image loading and manipulation develope= d in the GNOME project.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/gdk-pixbuf/"))) - -(define gdk-pixbuf/fixed - (package - (inherit gdk-pixbuf) - (source (origin - (inherit (package-source gdk-pixbuf)) - (patches - (append (search-patches "gdk-pixbuf-CVE-2020-29385.patch"= ) - (origin-patches (package-source gdk-pixbuf)))))))= ) + (license license:lgpl2.0+) + (home-page "https://developer.gnome.org/gdk-pixbuf/"))) =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= diff --git a/gnu/packages/patches/gdk-pixbuf-CVE-2020-29385.patch b/gnu/p= ackages/patches/gdk-pixbuf-CVE-2020-29385.patch deleted file mode 100644 index e6ac4de00b..0000000000 --- a/gnu/packages/patches/gdk-pixbuf-CVE-2020-29385.patch +++ /dev/null @@ -1,53 +0,0 @@ -Fix CVE-2020-29385. Note that we omit the binary test file -tests/test-images/fail/hang_114.gif from the following commit, to avoid -requiring 'git' to apply the patch. - - -From bdd3acbd48a575d418ba6bf1b32d7bda2fae1c81 Mon Sep 17 00:00:00 2001 -From: Robert Ancell -Date: Mon, 30 Nov 2020 12:26:12 +1300 -Subject: [PATCH] gif: Fix LZW decoder accepting invalid LZW code. - -The code value after a reset wasn't being validated, which means we woul= d -accept invalid codes. This could cause an infinite loop in the decoder. - -Fixes CVE-2020-29385 - -Fixes https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/164 ---- - gdk-pixbuf/lzw.c | 13 +++++++------ - tests/test-images/fail/hang_114.gif | Bin 0 -> 5561 bytes - 2 files changed, 7 insertions(+), 6 deletions(-) - create mode 100644 tests/test-images/fail/hang_114.gif - -diff --git a/gdk-pixbuf/lzw.c b/gdk-pixbuf/lzw.c -index 9e052a6f7..105daf2b1 100644 ---- a/gdk-pixbuf/lzw.c -+++ b/gdk-pixbuf/lzw.c -@@ -195,19 +195,20 @@ lzw_decoder_feed (LZWDecoder *self, - if (self->last_code !=3D self->clear_co= de && self->code_table_size < MAX_CODES) { - if (self->code < self->code_tab= le_size) - add_code (self, self->c= ode); -- else if (self->code =3D=3D self= ->code_table_size) -+ else - add_code (self, self->l= ast_code); -- else { -- /* Invalid code receive= d - just stop here */ -- self->last_code =3D sel= f->eoi_code; -- return output_length; -- } -=20 - /* When table is full increase = code size */ - if (self->code_table_size =3D=3D= (1 << self->code_size) && self->code_size < LZW_CODE_MAX) - self->code_size++; - } -=20 -+ /* Invalid code received - just stop he= re */ -+ if (self->code >=3D self->code_table_si= ze) { -+ self->last_code =3D self->eoi_c= ode; -+ return output_length; -+ } -+ - /* Convert codeword into indexes */ - n_written +=3D write_indexes (self, out= put + n_written, output_length - n_written); - } --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0036-gnu-gdk-pixbuf-Correct-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0036-gnu-gdk-pixbuf-Correct-inputs.patch" =46rom 69b586ab7137e8c48f826231a0322f32d3f370e7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:35:56 -0500 Subject: [PATCH 36/83] gnu: gdk-pixbuf: Correct inputs. * gnu/packages/gtk.scm (gdk-pixbuf) [propagated-inputs]: Add libx11. Remove libpng. [inputs]: Add libpng. Remove libx11. --- gnu/packages/gtk.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3e81ce8f98..52ee8575cd 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -606,13 +606,14 @@ highlighting and other features typical of a source= code editor.") (propagated-inputs `( ;; Required by gdk-pixbuf-2.0.pc ("glib" ,glib) - ("libpng" ,libpng) + ;; Required by gdk-pixbuf-xlib-2.0.pc + ("libx11" ,libx11) ;; Used for testing and required at runtime. ("shared-mime-info" ,shared-mime-info))) (inputs `(("libjpeg" ,libjpeg-turbo) - ("libtiff" ,libtiff) - ("libx11" ,libx11))) + ("libpng" ,libpng) + ("libtiff" ,libtiff))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0037-gnu-gdk-pixbuf-Enable-jasper-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0037-gnu-gdk-pixbuf-Enable-jasper-support.patch" =46rom a5a84dea3d5e52ca1b93337da96c0f125b7de9c8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:41:10 -0500 Subject: [PATCH 37/83] gnu: gdk-pixbuf: Enable jasper support. * gnu/packages/gtk.scm (gdk-pixbuf) [arguments]<#:configure-flags>[-Djasp= er]: New flag. [inputs]: Add jasper. --- gnu/packages/gtk.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 52ee8575cd..2c1a9e84fc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -593,7 +593,7 @@ highlighting and other features typical of a source c= ode editor.") (arguments `(#:meson ,meson-0.55 #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas - #:configure-flags '("-Dinstalled_tests=3Dfalse") + #:configure-flags '("-Dinstalled_tests=3Dfalse" "-Djasper=3Dtrue"= ) #:phases (modify-phases %standard-phases ;; The slow tests take longer than the specified timeout. @@ -611,7 +611,8 @@ highlighting and other features typical of a source c= ode editor.") ;; Used for testing and required at runtime. ("shared-mime-info" ,shared-mime-info))) (inputs - `(("libjpeg" ,libjpeg-turbo) + `(("jasper" ,jasper) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff))) (native-inputs --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0038-gnu-gdk-pixbuf-Fix-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0038-gnu-gdk-pixbuf-Fix-documentation.patch" =46rom 803d2bd77524ce9563d14a7ceb7cb5c5a6f26cc3 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:50:46 -0500 Subject: [PATCH 38/83] gnu: gdk-pixbuf: Fix documentation. * gnu/packages/gtk.scm (gdk-pixbuf) [arguments]<#:phases>['patch-docbook]= : New phase. [native-inputs]: Add docbook-xml and docbook-xsl. --- gnu/packages/gtk.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 2c1a9e84fc..058b396f67 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -592,10 +592,22 @@ highlighting and other features typical of a source= code editor.") (build-system meson-build-system) (arguments `(#:meson ,meson-0.55 - #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:configure-flags '("-Dinstalled_tests=3Dfalse" "-Djasper=3Dtrue"= ) #: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.2/"))) + (substitute* (find-files "." "\\.xml$") + (("http://www.oasis-open.org/docbook/xml/4\\.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) ;; The slow tests take longer than the specified timeout. ,@(if (any (cute string=3D? <> (%current-system)) '("armhf-linux" "aarch64-linux")) @@ -616,10 +628,12 @@ highlighting and other features typical of a source= code editor.") ("libpng" ,libpng) ("libtiff" ,libtiff))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("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. + ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. + ("pkg-config" ,pkg-config))) (synopsis "GNOME image loading and manipulation library") (description "GdkPixbuf is a library for image loading and manipulation develope= d --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0039-gnu-gdk-pixbuf-Update-to-2.42.4.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0039-gnu-gdk-pixbuf-Update-to-2.42.4.patch" =46rom efe9af75cd97f9ffaf8c70dee60d84fdff5a087f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:53:43 -0500 Subject: [PATCH 39/83] gnu: gdk-pixbuf: Update to 2.42.4. * gnu/packages/gtk.scm (gdk-pixbuf) [version]: Update to 2.42.4. [native-inputs]: Add perl and libxslt. --- gnu/packages/gtk.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 058b396f67..c936a6aed2 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -580,7 +580,7 @@ highlighting and other features typical of a source c= ode editor.") (define-public gdk-pixbuf (package (name "gdk-pixbuf") - (version "2.42.2") + (version "2.42.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -588,7 +588,7 @@ highlighting and other features typical of a source c= ode editor.") name "-" version ".tar.xz")) (sha256 (base32 - "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3"))= )) + "0k9f9177qxaryaxprwrhqnv5p2gdq4a8i6y05gm98qa8izc5v77y"))= )) (build-system meson-build-system) (arguments `(#:meson ,meson-0.55 @@ -633,7 +633,9 @@ highlighting and other features typical of a source c= ode editor.") ("gettext" ,gettext-minimal) ("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. - ("pkg-config" ,pkg-config))) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (synopsis "GNOME image loading and manipulation library") (description "GdkPixbuf is a library for image loading and manipulation develope= d --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0040-gnu-gdk-pixbuf-Update-synopsis-description-home-page.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0040-gnu-gdk-pixbuf-Update-synopsis-description-home-page.pa"; filename*1="tch" =46rom 80691a238b98474cb6d37af68ec3553829acea58 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 10:56:29 -0500 Subject: [PATCH 40/83] gnu: gdk-pixbuf: Update synopsis, description, home-page and license. * gnu/packages/gtk.scm (gdk-pixbuf) [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Update to lgpl2.1+. --- gnu/packages/gtk.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index c936a6aed2..78a031ce72 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -636,12 +636,12 @@ highlighting and other features typical of a source= code editor.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt))) - (synopsis "GNOME image loading and manipulation library") - (description - "GdkPixbuf is a library for image loading and manipulation develope= d -in the GNOME project.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/gdk-pixbuf/"))) + (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.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0041-gnu-gdk-pixbuf-Disable-failing-tests.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0041-gnu-gdk-pixbuf-Disable-failing-tests.patch" =46rom 617c8adf32ae8032b1a3b52f8f6e0a8739f07289 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:00:10 -0500 Subject: [PATCH 41/83] gnu: gdk-pixbuf: Disable failing tests. * gnu/packages/gtk.scm (gdk-pixbuf) [arguments]<#:phases>['disable-failin= g-tests]: New phase. --- gnu/packages/gtk.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 78a031ce72..c97bc66acb 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -608,6 +608,12 @@ highlighting and other features typical of a source = code editor.") (string-append (assoc-ref inputs "docbook-xml") "/xml/dtd/docbook/")))) #t)) + (add-before 'configure 'disable-failing-tests + (lambda _ + (substitute* "tests/meson.build" + (("\\[ 'pixbuf-fail', \\['conform', 'slow'\\], \\],") + "")) + #t)) ;; The slow tests take longer than the specified timeout. ,@(if (any (cute string=3D? <> (%current-system)) '("armhf-linux" "aarch64-linux")) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0042-gnu-gdk-pixbuf-svg-Correct-package-definition-to-inc.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0042-gnu-gdk-pixbuf-svg-Correct-package-definition-to-inc.pa"; filename*1="tch" =46rom 85f942262ef67d521aa7339c5e0b9e0baecd4259 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:08:24 -0500 Subject: [PATCH 42/83] gnu: gdk-pixbuf+svg: Correct package definition to= include changes from gdk-pixbuf. * gnu/packages/gtk.scm (gdk-pixbuf+svg) [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 c97bc66acb..582a096c12 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -659,10 +659,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")) @@ -676,9 +675,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.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0043-gnu-vala-Change-build-system.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0043-gnu-vala-Change-build-system.patch" =46rom 70ec23d2ee8a8531b3b1ae69155b989ccaa03c58 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:20:37 -0500 Subject: [PATCH 43/83] gnu: vala: Change build-system. * gnu/packages/gnome.scm (vala) [build-system]: Change from gnu to glib-o= r-gtk. --- gnu/packages/gnome.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c69fb21ba5..bbc82cfcd1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4279,28 +4279,28 @@ passwords in the GNOME keyring.") (sha256 (base32 "1nx5xjarpkl9hgy0qbqfczx7d7clh5g1r8xr5xp8b97c5fsc2rb1"))= )) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments '(#:phases (modify-phases %standard-phases (add-before 'check 'pre-check - (lambda _ - (setenv "CC" "gcc") - (substitute* "valadoc/tests/libvaladoc\ + (lambda _ + (setenv "CC" "gcc") + (substitute* "valadoc/tests/libvaladoc\ /tests-extra-environment.sh" - (("export PKG_CONFIG_PATH=3D" m) - (string-append m "$PKG_CONFIG_PATH:")))))))) + (("export PKG_CONFIG_PATH=3D" m) + (string-append m "$PKG_CONFIG_PATH:")))))))) (native-inputs `(("pkg-config" ,pkg-config) ("flex" ,flex) ("bison" ,bison) ("xsltproc" ,libxslt) - ("dbus" ,dbus) ; for dbus tes= ts + ("dbus" ,dbus) ; for dbus tests ("gobject-introspection" ,gobject-introspection))) ; for gir test= s (inputs `(("graphviz" ,graphviz))) (propagated-inputs - `(("glib" ,glib))) ; required by libvala-0.40.pc + `(("glib" ,glib))) ; required by libvala-0.40.pc (home-page "https://wiki.gnome.org/Projects/Vala/") (synopsis "Compiler for the GObject type system") (description --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0044-gnu-vala-Enable-coverage-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0044-gnu-vala-Enable-coverage-support.patch" =46rom d3028148ac422053a9944bf882ef360d844b4318 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:23:56 -0500 Subject: [PATCH 44/83] gnu: vala: Enable coverage support. * gnu/packages/gnome.scm (vala) [arguments]<#:configure-flags> [--enable-coverage]: New flag. --- gnu/packages/gnome.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bbc82cfcd1..ca4484ce3e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4281,7 +4281,8 @@ passwords in the GNOME keyring.") "1nx5xjarpkl9hgy0qbqfczx7d7clh5g1r8xr5xp8b97c5fsc2rb1"))= )) (build-system glib-or-gtk-build-system) (arguments - '(#:phases + '(#:configure-flags '("--enable-coverage") + #:phases (modify-phases %standard-phases (add-before 'check 'pre-check (lambda _ --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0045-gnu-vala-Fix-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0045-gnu-vala-Fix-documentation.patch" =46rom 17cd0d9bbc2c81fa9dcfd8abd2a99bd501e7c3db Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:30:26 -0500 Subject: [PATCH 45/83] gnu: vala: Fix documentation. * gnu/packages/gnome.scm (vala) [arguments]<#:phases>['patch-docbook-xml]= : New phase. [native-inputs]: Add docbook-xml and docbook-xsl. --- gnu/packages/gnome.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ca4484ce3e..92c46158ac 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4284,6 +4284,14 @@ passwords in the GNOME keyring.") '(#:configure-flags '("--enable-coverage") #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc/manual" + (substitute* '("manual.xml" "version.xml.in") + (("http://www.oasis-open.org/docbook/xml/4.4/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t)) (add-before 'check 'pre-check (lambda _ (setenv "CC" "gcc") @@ -4293,6 +4301,8 @@ passwords in the GNOME keyring.") (string-append m "$PKG_CONFIG_PATH:")))))))) (native-inputs `(("pkg-config" ,pkg-config) + ("docbook-xml" ,docbook-xml-4.4) + ("docbook-xsl" ,docbook-xsl) ("flex" ,flex) ("bison" ,bison) ("xsltproc" ,libxslt) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0046-gnu-vala-Update-to-0.52.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0046-gnu-vala-Update-to-0.52.0.patch" =46rom 4d53f2e722dcd3e15f2d282fd3ee19f032454575 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:34:48 -0500 Subject: [PATCH 46/83] gnu: vala: Update to 0.52.0. * gnu/packages/gnome.scm (vala) [version]: Update to 0.52.0. [native-inputs]: Add help2man and perl. [inputs]: Move graphviz to ... [propagated-inputs]: ... here. --- gnu/packages/gnome.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 92c46158ac..70e3c38e20 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -141,6 +141,7 @@ #:use-module (gnu packages lirc) #:use-module (gnu packages lua) #:use-module (gnu packages mail) + #:use-module (gnu packages man) #:use-module (gnu packages mp3) #:use-module (gnu packages multiprecision) #:use-module (gnu packages music) @@ -4270,7 +4271,7 @@ passwords in the GNOME keyring.") (define-public vala (package (name "vala") - (version "0.50.3") + (version "0.52.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/vala/" @@ -4278,7 +4279,7 @@ passwords in the GNOME keyring.") "vala-" version ".tar.xz")) (sha256 (base32 - "1nx5xjarpkl9hgy0qbqfczx7d7clh5g1r8xr5xp8b97c5fsc2rb1"))= )) + "12y6p8wdjp01vmfhxg2cgh32xnyqq6ivblvrar9clnj6vc867qhx"))= )) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags '("--enable-coverage") @@ -4300,18 +4301,19 @@ passwords in the GNOME keyring.") (("export PKG_CONFIG_PATH=3D" m) (string-append m "$PKG_CONFIG_PATH:")))))))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("bison" ,bison) + ("dbus" ,dbus) ; for dbus tests ("docbook-xml" ,docbook-xml-4.4) ("docbook-xsl" ,docbook-xsl) ("flex" ,flex) - ("bison" ,bison) - ("xsltproc" ,libxslt) - ("dbus" ,dbus) ; for dbus tests - ("gobject-introspection" ,gobject-introspection))) ; for gir test= s - (inputs - `(("graphviz" ,graphviz))) + ("gobject-introspection" ,gobject-introspection) ; for gir tests + ("help2man" ,help2man) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs - `(("glib" ,glib))) ; required by libvala-0.40.pc + `(("glib" ,glib) ; required by libvala-0.40.pc + ("libgvc" ,graphviz))) (home-page "https://wiki.gnome.org/Projects/Vala/") (synopsis "Compiler for the GObject type system") (description --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0047-gnu-vala-Update-synopsis-and-description.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0047-gnu-vala-Update-synopsis-and-description.patch" =46rom 8c1a4d4498c1af509473b152aac92779546dcd6b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:38:26 -0500 Subject: [PATCH 47/83] gnu: vala: Update synopsis and description. * gnu/packages/gnome.scm (vala) [synopsis]: Modify. [description]: Modify. --- gnu/packages/gnome.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 70e3c38e20..f071fd857e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4315,12 +4315,12 @@ passwords in the GNOME keyring.") `(("glib" ,glib) ; required by libvala-0.40.pc ("libgvc" ,graphviz))) (home-page "https://wiki.gnome.org/Projects/Vala/") - (synopsis "Compiler for the GObject type system") - (description - "Vala is a programming language that aims to bring modern programmi= ng -language features to GNOME developers without imposing any additional ru= ntime -requirements and without using a different ABI compared to applications = and -libraries written in C.") + (synopsis "Compiler using the GObject type system") + (description "Vala is a programming language using modern high level= +abstractions without imposing additional runtime requirements and withou= t using +a different ABI compared to applications and libraries written in C. Va= la uses +the GObject type system and has additional code generation routines that= make +targeting the GNOME stack simple.") (license license:lgpl2.1+))) =20 (define-public vte --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0048-gnu-libgsf-Change-build-system.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0048-gnu-libgsf-Change-build-system.patch" =46rom 338f078bac749602ac5dae25d75097dd20a45f9f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:53:42 -0500 Subject: [PATCH 48/83] gnu: libgsf: Change build-system. * gnu/packages/gnome.scm (libgsf) [build-system]: Change from gnu to glib= -or-gtk. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f071fd857e..a415dde77a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3274,7 +3274,7 @@ XML/CSS rendering engine.") (sha256 (base32 "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"))= )) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags '("--disable-static"))) (native-inputs --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0049-gnu-libgsf-Make-separate-output-for-binaries.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0049-gnu-libgsf-Make-separate-output-for-binaries.patch" =46rom 35ed71424fbe1d65150f4281720df100601bb866 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 11:56:04 -0500 Subject: [PATCH 49/83] gnu: libgsf: Make separate output for binaries. * gnu/packages/gnome.scm (libgsf) [outputs]: New output "bin". --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a415dde77a..fae4c3a4ff 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3275,6 +3275,7 @@ XML/CSS rendering engine.") (base32 "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"))= )) (build-system glib-or-gtk-build-system) + (outputs '("out" "bin")) (arguments '(#:configure-flags '("--disable-static"))) (native-inputs --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0050-gnu-libgsf-Re-arrange-inputs-in-alphabetical-order.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0050-gnu-libgsf-Re-arrange-inputs-in-alphabetical-order.patc"; filename*1="h" =46rom 1c501a2623dd87cfdd65e4b932c0bb5995e10555 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:02:14 -0500 Subject: [PATCH 50/83] gnu: libgsf: Re-arrange inputs in alphabetical ord= er. * gnu/packages/gnome.scm (libgsf) [native-inputs]: Modify. [inputs]: Modify. --- gnu/packages/gnome.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fae4c3a4ff..3f110d786f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3279,15 +3279,13 @@ XML/CSS rendering engine.") (arguments '(#:configure-flags '("--disable-static"))) (native-inputs - `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - - ;; For tests. + `(("gettext" ,gettext-minimal) ("perl" ,perl) - ("perl-xml-parser" ,perl-xml-parser))) + ("perl-xml-parser" ,perl-xml-parser) + ("pkg-config" ,pkg-config))) (inputs - `(("zlib" ,zlib) - ("bzip2" ,bzip2))) + `(("bzip2" ,bzip2) + ("zlib" ,zlib))) (propagated-inputs `(("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0051-gnu-libgsf-Enable-missing-features.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0051-gnu-libgsf-Enable-missing-features.patch" =46rom 2a86124a22b78ef7daa45c4a7aa75c67f734bde3 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:08:10 -0500 Subject: [PATCH 51/83] gnu: libgsf: Enable missing features. * gnu/packages/gnome.scm (libgsf) [arguments]<#:configure-flag>[--enable-= introspection]: New flag. [--with-gir-dir=3D]: New flag. [--with-typelib-dir=3D]: New flag. [--with-zlib]: New flag. [--with-bz2]: New flag. [native-inputs]: Add gobject-introspection. --- gnu/packages/gnome.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3f110d786f..48f8b09ba7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3277,9 +3277,27 @@ XML/CSS rendering engine.") (build-system glib-or-gtk-build-system) (outputs '("out" "bin")) (arguments - '(#:configure-flags '("--disable-static"))) + `(#:configure-flags + (list + "--disable-static" + "--enable-introspection" + (string-append "--with-gir-dir=3D" + (assoc-ref %outputs "out") + "/share/gir-" + ,(version-major + (package-version gobject-introspection)) + ".0") + (string-append "--with-typelib-dir=3D" + (assoc-ref %outputs "out") + "/lib/girepository-" + ,(version-major + (package-version gobject-introspection)) + ".0") + "--with-zlib" + "--with-bz2"))) (native-inputs `(("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) ("perl" ,perl) ("perl-xml-parser" ,perl-xml-parser) ("pkg-config" ,pkg-config))) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0052-gnu-libgsf-Correct-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0052-gnu-libgsf-Correct-inputs.patch" =46rom f98968f4e68a0f853594e9b1403506d570cfb4ce Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:11:02 -0500 Subject: [PATCH 52/83] gnu: libgsf: Correct inputs. * gnu/packages/gnome.scm (libgsf) [native-inputs]: Add python-wrapper. [propagated-inputs]: Move gdk-pixbuf to ... [inputs]: ... here. --- gnu/packages/gnome.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 48f8b09ba7..101d87c96f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3300,13 +3300,14 @@ XML/CSS rendering engine.") ("gobject-introspection" ,gobject-introspection) ("perl" ,perl) ("perl-xml-parser" ,perl-xml-parser) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) (inputs `(("bzip2" ,bzip2) + ("gdk-pixbuf" ,gdk-pixbuf) ("zlib" ,zlib))) (propagated-inputs - `(("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) + `(("glib" ,glib) ("libxml2" ,libxml2))) (home-page "https://www.gnome.org/projects/libgsf") (synopsis "GNOME's Structured File Library") --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0053-gnu-libgsf-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0053-gnu-libgsf-Enable-documentation.patch" =46rom 942aa32392be9e6f9d793a8828f7365ddadfb120 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:20:52 -0500 Subject: [PATCH 53/83] gnu: libgsf: Enable documentation. * gnu/packages/gnome.scm (libgsf) [outputs]: New output "doc". [arguments]<#:configure-flags>[--with-html-dir]: New flag. [native-inputs]: Add docbook-xml. --- gnu/packages/gnome.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 101d87c96f..c715b4391b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3275,7 +3275,7 @@ XML/CSS rendering engine.") (base32 "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"))= )) (build-system glib-or-gtk-build-system) - (outputs '("out" "bin")) + (outputs '("out" "bin" "doc")) (arguments `(#:configure-flags (list @@ -3293,10 +3293,24 @@ XML/CSS rendering engine.") ,(version-major (package-version gobject-introspection)) ".0") + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html") "--with-zlib" - "--with-bz2"))) + "--with-bz2") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* "gsf-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.5/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + #t))))) (native-inputs - `(("gettext" ,gettext-minimal) + `(("docbook-xml" ,docbook-xml) + ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) ("perl" ,perl) ("perl-xml-parser" ,perl-xml-parser) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0054-gnu-libgsf-Update-synopsis-description-home-page-and.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0054-gnu-libgsf-Update-synopsis-description-home-page-and.pa"; filename*1="tch" =46rom e2e29b4410766361534518f06942489a0211d211 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:22:54 -0500 Subject: [PATCH 54/83] gnu: libgsf: Update synopsis, description, home-pa= ge and license. * gnu/packages/gnome.scm (libgsf) [synopsis]: Modify. [home-page]: Modify. [description]: Modify. [license]: Modify. --- gnu/packages/gnome.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c715b4391b..50d16a6048 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3323,14 +3323,16 @@ XML/CSS rendering engine.") (propagated-inputs `(("glib" ,glib) ("libxml2" ,libxml2))) - (home-page "https://www.gnome.org/projects/libgsf") - (synopsis "GNOME's Structured File Library") - (description - "Libgsf aims to provide an efficient extensible I/O abstraction for= -dealing with different structured file formats.") - - ;; LGPLv2.1-only. - (license license:lgpl2.1))) + (synopsis "G Structured File Library") + (description "Libgsf aims to provide an efficient extensible I/O abs= traction +for dealing with different structured file formats.") + (home-page "https://gitlab.gnome.org/GNOME/libgsf") + (license + (list + ;; Library + license:lgpl2.1+ + ;; Others + license:lgpl2.0+)))) =20 (define-public librsvg (package --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0055-gnu-atk-Re-arrange-inputs-in-alphabetical-order.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0055-gnu-atk-Re-arrange-inputs-in-alphabetical-order.patch" =46rom c87a50219ccd5a7cd42abd3a1dfe0fb89830a5d7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:39:47 -0500 Subject: [PATCH 55/83] gnu: atk: Re-arrange inputs in alphabetical order.= * gnu/packages/gtk.scm (atk) [native-inputs]: Modify. --- gnu/packages/gtk.scm | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 582a096c12..9b96b614a6 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -98,30 +98,30 @@ =20 (define-public atk (package - (name "atk") - (version "2.34.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l"))))= - (build-system meson-build-system) - (propagated-inputs `(("glib" ,glib))) ; required by atk.pc - (native-inputs - `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ; glib-mkenums,= etc. - ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler= , etc. - (synopsis "GNOME accessibility toolkit") - (description - "ATK provides the set of accessibility interfaces that are implement= ed + (name "atk") + (version "2.34.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l"))= )) + (build-system meson-build-system) + (propagated-inputs `(("glib" ,glib))) ; required by atk.pc + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib" ,glib "bin") ; glib-mkenums, etc. + ("gobject-introspection" ,gobject-introspection) ; g-ir-compiler,= etc. + ("pkg-config" ,pkg-config))) + (synopsis "GNOME accessibility toolkit") + (description + "ATK provides the set of accessibility interfaces that are implemen= ted by other toolkits and applications. Using the ATK interfaces, accessibi= lity tools have full access to view and control running applications.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/atk/"))) + (license license:lgpl2.0+) + (home-page "https://developer.gnome.org/atk/"))) =20 (define-public cairo (package --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0056-gnu-atk-Update-to-2.36.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0056-gnu-atk-Update-to-2.36.0.patch" =46rom 37ba0f6fc784149cd8aae66f652dc2ee751ea708 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:44:36 -0500 Subject: [PATCH 56/83] gnu: atk: Update to 2.36.0. * gnu/packages/gtk.scm (atk) [version]: Update to 2.36.0. [arguments]<#:glib-or-gtk?>: New argument. --- gnu/packages/gtk.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 9b96b614a6..37d98b672a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -99,7 +99,7 @@ (define-public atk (package (name "atk") - (version "2.34.1") + (version "2.36.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -107,8 +107,10 @@ name "-" version ".tar.xz")) (sha256 (base32 - "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l"))= )) + "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv"))= )) (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas (propagated-inputs `(("glib" ,glib))) ; required by atk.pc (native-inputs `(("gettext" ,gettext-minimal) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0057-gnu-atk-Update-home-page-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0057-gnu-atk-Update-home-page-and-license.patch" =46rom d17b84ca06e476349d2dd2ce97a209c996abaf75 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:46:00 -0500 Subject: [PATCH 57/83] gnu: atk: Update home-page and license. * gnu/packages/gtk.scm (atk) [home-page]: Modify. [license]: Update to lgpl2.1+. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 37d98b672a..a85feb87e4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -122,8 +122,8 @@ "ATK provides the set of accessibility interfaces that are implemen= ted by other toolkits and applications. Using the ATK interfaces, accessibi= lity tools have full access to view and control running applications.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/atk/"))) + (license license:lgpl2.1+) + (home-page "https://wiki.gnome.org/Accessibility"))) =20 (define-public cairo (package --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0058-gnu-atkmm-Update-to-2.36.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0058-gnu-atkmm-Update-to-2.36.0.patch" =46rom 31533e4c14d80af6b0356faf281bf4b824854fba Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 12:50:53 -0500 Subject: [PATCH 58/83] gnu: atkmm: Update to 2.36.0. * gnu/packages/gtk.scm (atkmm) [version]: Update to 2.36.0. [build-system]: Change from gnu to meson. [arguments]<#:glib-or-gtk?>: New argument. [native-inputs]: Add m4, mm-common, perl and libxslt. --- gnu/packages/gtk.scm | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a85feb87e4..b3498fa525 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -78,6 +78,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) + #:use-module (gnu packages m4) #:use-module (gnu packages man) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) @@ -1437,17 +1438,24 @@ library.") (define-public atkmm (package (name "atkmm") - (version "2.28.0") + (version "2.36.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c")))= ) - (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config))) + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0wwr0663jrqx2klsasffd9wpk3kqnwisj1y3ahdkjdk5hzrsjgy9"))= )) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas + (native-inputs + `(("m4" ,m4) + ("mm-common" ,mm-common) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs `(("glibmm" ,glibmm) ("atk" ,atk))) (home-page "https://www.gtkmm.org") --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0059-gnu-atkmm-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0059-gnu-atkmm-Enable-documentation.patch" =46rom 74210685a3462b298ff34d26f909c078561d554a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 24 Mar 2021 22:46:44 -0400 Subject: [PATCH 59/83] gnu: atkmm: Enable documentation. * gnu/packages/gtk.scm (atkmm) [outputs]: Add new output "doc". [arguments]<#:configure-flags>[-Denable-documentation]: New flag. [arguments]<#:phases>['move-doc]: New phase. [native-inputs]: Add graphviz, doxygen. --- gnu/packages/gtk.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b3498fa525..494c952013 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -74,6 +74,7 @@ #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages graphviz) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages libffi) @@ -1448,10 +1449,27 @@ library.") (base32 "0wwr0663jrqx2klsasffd9wpk3kqnwisj1y3ahdkjdk5hzrsjgy9"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Dbuild-documentation=3Dtrue") + #: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/doc") + (string-append doc "/share/doc")) + #t)))))) (native-inputs - `(("m4" ,m4) + `(("dot" ,graphviz) + ("doxygen" ,doxygen) + ("m4" ,m4) ("mm-common" ,mm-common) ("perl" ,perl) ("pkg-config" ,pkg-config) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0060-gnu-atkmm-Update-synopsis-description-home-page-and-.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0060-gnu-atkmm-Update-synopsis-description-home-page-and-.pa"; filename*1="tch" =46rom 62d4a26701b1a91a401a78b4e2d769b767122f03 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 13:01:19 -0500 Subject: [PATCH 60/83] gnu: atkmm: Update synopsis, description, home-pag= e and license. * gnu/packages/gtk.scm (atkmm) [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Add gpl2+. --- gnu/packages/gtk.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 494c952013..4e69d5d834 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1476,12 +1476,15 @@ library.") ("xsltproc" ,libxslt))) (propagated-inputs `(("glibmm" ,glibmm) ("atk" ,atk))) - (home-page "https://www.gtkmm.org") - (synopsis "C++ interface to the ATK accessibility library") - (description - "ATKmm provides a C++ programming interface to the ATK accessibilit= y -toolkit.") - (license license:lgpl2.1+))) + (synopsis "C++ bindings for ATK") + (description "ATKmm is the C++ binding for the ATK library.") + (home-page "https://wiki.gnome.org/Accessibility") + (license + (list + ;; Library + license:lgpl2.1+ + ;; Tools + license:gpl2+)))) =20 (define-public gtkmm (package --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0061-gnu-Add-atkmm-2.28.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0061-gnu-Add-atkmm-2.28.patch" =46rom 25e7c471da272baee7d35f219b2d2fa3183680ea Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 26 Mar 2021 15:54:09 -0400 Subject: [PATCH 61/83] gnu: Add atkmm-2.28. * gnu/packages/gtk.scm (atkmm-2.28): New variable. --- gnu/packages/gtk.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4e69d5d834..483a735b10 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1486,6 +1486,24 @@ library.") ;; Tools license:gpl2+)))) =20 +(define-public atkmm-2.28 + (package + (inherit atkmm) + (name "atkmm") + (version "2.28.1") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1b8vycqzr3lfvk2l73f4kk74hj48081zbh9r1r2ilr3h8xh7cs0i"))= )) + (propagated-inputs + `(("glibmm" ,glibmm-2.64) + ,@(package-propagated-inputs atkmm))))) + (define-public gtkmm (package (name "gtkmm") --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0062-gnu-at-spi2-core-Update-to-2.40.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0062-gnu-at-spi2-core-Update-to-2.40.0.patch" =46rom 9ca4d95dd2a7661ea4be8242709daaf3d9cff905 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 13:17:35 -0500 Subject: [PATCH 62/83] gnu: at-spi2-core: Update to 2.40.0. * gnu/packages/gtk.scm (at-spi2-core) [version]: Update to 2.40.0. [arguments]<#:glib-or-gtk?>: New argument. [native-inputs]: Add glib:bin and python-wrapper. [propagated-inputs]: Add libx11. --- gnu/packages/gtk.scm | 131 ++++++++++++++++++++++--------------------- 1 file changed, 67 insertions(+), 64 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 483a735b10..7c194a905c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -684,72 +684,75 @@ scaled, composited, modified, saved, or rendered.")= =20 (define-public at-spi2-core (package - (name "at-spi2-core") - (version "2.34.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1ihixwhh3c16q6253qj9gf69741rb2pi51822a4rylsfcyywsafn"))))= - (build-system meson-build-system) - (outputs '("out" "doc")) - (arguments - '(#:configure-flags - (list "-Ddocs=3Dtrue") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-documentation-path - (lambda* (#:key outputs #:allow-other-keys) - ;; Ensure that the cross-references point to the "doc" outpu= t. - (substitute* "doc/libatspi/meson.build" - (("docpath =3D.*") - (string-append "docpath =3D '" (assoc-ref outputs "doc") = "/share/gtk-doc/html'\n"))) - #t)) - (add-before 'install 'prepare-doc-directory - (lambda* (#:key outputs #:allow-other-keys) - (mkdir-p (string-append (assoc-ref outputs "doc") "/share"))= - #t)) - (add-after 'install 'move-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (copy-recursively - (string-append out "/share/gtk-doc") - (string-append doc "/share/gtk-doc")) - (delete-file-recursively - (string-append out "/share/gtk-doc"))) - #t)) - (add-after 'install 'check - (lambda _ - (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writa= ble HOME - ;; Run test-suite under a dbus session. - (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.se= rvice - (string-append %output "/share")) - ;; Don't fail on missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0") ; - (invoke "dbus-launch" "ninja" "test"))) + (name "at-spi2-core") + (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 + "0a9l6cfxynjn6jcp29d72i75xbkrzs1l5kmqcwmfal801b9sg5j1"))= )) + (build-system meson-build-system) + (outputs '("out" "doc")) + (arguments + '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list "-Ddocs=3Dtrue") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-documentation-path + (lambda* (#:key outputs #:allow-other-keys) + ;; Ensure that the cross-references point to the "doc" outp= ut. + (substitute* "doc/libatspi/meson.build" + (("docpath =3D.*") + (string-append "docpath =3D '" (assoc-ref outputs "doc")= "/share/gtk-doc/html'\n"))) + #t)) + (add-before 'install 'prepare-doc-directory + (lambda* (#:key outputs #:allow-other-keys) + (mkdir-p (string-append (assoc-ref outputs "doc") "/share")= ) + #t)) + (add-after 'install 'move-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (copy-recursively + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")) + (delete-file-recursively + (string-append out "/share/gtk-doc"))) + #t)) + (add-after 'install 'check + (lambda _ + (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writ= able HOME + ;; Run test-suite under a dbus session. + (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.servi= ce + (string-append %output "/share")) + ;; Don't fail on missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") ; + (invoke "dbus-launch" "ninja" "test"))) (delete 'check)))) - (propagated-inputs - ;; atspi-2.pc refers to all these. - `(("dbus" ,dbus) - ("glib" ,glib) - ("libxi" ,libxi) - ("libxtst" ,libxtst))) - (native-inputs - `(("gettext" ,gettext-minimal) - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) - ("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) - (synopsis "Assistive Technology Service Provider Interface, core comp= onents") - (description - "The Assistive Technology Service Provider Interface, core component= s, + (propagated-inputs + ;; atspi-2.pc refers to all these. + `(("dbus" ,dbus) + ("glib" ,glib) + ("libx11" ,libx11) + ("libxi" ,libxi) + ("libxtst" ,libxtst))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (synopsis "Assistive Technology Service Provider Interface, core com= ponents") + (description + "The Assistive Technology Service Provider Interface, core componen= ts, is part of the GNOME accessibility project.") - (license license:lgpl2.0+) - (home-page "https://projects.gnome.org/accessibility/"))) + (license license:lgpl2.0+) + (home-page "https://projects.gnome.org/accessibility/"))) =20 ;;; A minimal variant used to prevent a cycle with Inkscape. (define at-spi2-core-minimal --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0063-gnu-at-spi2-core-Fix-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0063-gnu-at-spi2-core-Fix-documentation.patch" =46rom 84cb759eb9dfd1a2b30ba0756c3b2b17f55be058 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 13:24:57 -0500 Subject: [PATCH 63/83] gnu: at-spi2-core: Fix documentation. * gnu/packages/gtk.scm (at-spi2-core) [arguments]<#:phases>['patch-docboo= k-sgml]: New phase. [native-inputs]: Add docbook-xml. --- gnu/packages/gtk.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 7c194a905c..c681c71fb4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -713,6 +713,14 @@ scaled, composited, modified, saved, or rendered.") (lambda* (#:key outputs #:allow-other-keys) (mkdir-p (string-append (assoc-ref outputs "doc") "/share")= ) #t)) + (add-after 'unpack 'patch-docbook-sgml + (lambda* (#:key inputs #:allow-other-keys) + (let* ((xmldoc (string-append (assoc-ref inputs "docbook-xm= l") + "/xml/dtd/docbook"))) + (substitute* "doc/libatspi/libatspi-docs.sgml" + (("http://.*/docbookx\\.dtd") + (string-append xmldoc "/docbookx.dtd"))) + #t))) (add-after 'install 'move-documentation (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) @@ -741,7 +749,8 @@ scaled, composited, modified, saved, or rendered.") ("libxi" ,libxi) ("libxtst" ,libxtst))) (native-inputs - `(("gettext" ,gettext-minimal) + `(("docbook-xml" ,docbook-xml-4.3) + ("gettext" ,gettext-minimal) ("glib" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("gtk-doc" ,gtk-doc) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0064-gnu-at-spi2-core-Update-home-page-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0064-gnu-at-spi2-core-Update-home-page-and-license.patch" =46rom bcd9e513c0574fc77b9f0aa658719d97a7bd1b4a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 13:26:26 -0500 Subject: [PATCH 64/83] gnu: at-spi2-core: Update home-page and license. * gnu/packages/gtk.scm (at-spi2-core) [home-page]: Modify. [license]: Update to lgpl2.1+. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index c681c71fb4..b4d9f7c545 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -760,8 +760,8 @@ scaled, composited, modified, saved, or rendered.") (description "The Assistive Technology Service Provider Interface, core componen= ts, is part of the GNOME accessibility project.") - (license license:lgpl2.0+) - (home-page "https://projects.gnome.org/accessibility/"))) + (license license:lgpl2.1+) + (home-page "https://wiki.gnome.org/Accessibility/"))) =20 ;;; A minimal variant used to prevent a cycle with Inkscape. (define at-spi2-core-minimal --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0065-gnu-at-spi2-atk-Update-to-2.38.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0065-gnu-at-spi2-atk-Update-to-2.38.0.patch" =46rom 3e0a520c074cec21d84b44dc634331c8a14b766f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 26 Mar 2021 10:13:08 -0400 Subject: [PATCH 65/83] gnu: at-spi2-atk: Update to 2.38.0. * gnu/packages/gtk.scm (at-spi2-atk) [version]: Update to 2.38.0 [arguments]<#:glib-or-gtk?>: New argument. [native-inputs]: Add gobject-introspection. [inputs]: Add glib. --- gnu/packages/gtk.scm | 72 +++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b4d9f7c545..b0cdb48b22 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -783,42 +783,44 @@ is part of the GNOME accessibility project.") =20 (define-public at-spi2-atk (package - (name "at-spi2-atk") - (version "2.34.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "05ncp7s5nddjinffs26mcvpbd63vk1m3cv5y530p3plgfhqgjvbp"))))= - (build-system meson-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - ;; Run test-suite under a dbus session. - (lambda _ - (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "meson" "test")))))) - (propagated-inputs - ;; TODO: Replace by at-spi2-core-minimal in the next staging window,= or - ;; when Inkscape 0.92 is upgraded to 1.0 to avoid a cycle. - `(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc - (inputs - `(("atk" ,atk))) - (native-inputs - `(("pkg-config" ,pkg-config) - ;; For tests. - ("dbus" ,dbus) - ("libxml2" ,libxml2))) - (synopsis "Assistive Technology Service Provider Interface, ATK bindi= ngs") - (description - "The Assistive Technology Service Provider Interface + (name "at-spi2-atk") + (version "2.38.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0ks6r9sx27l80n3a7yjmkilxv48cqj183wc7cap3caw2myjhi86g"))= )) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases + (modify-phases %standard-phases + (replace 'check + ;; Run test-suite under a dbus session. + (lambda _ + (setenv "DBUS_FATAL_WARNINGS" "0") + (invoke "dbus-launch" "meson" "test")))))) + (propagated-inputs + ;; TODO: Replace by at-spi2-core-minimal in the next staging window= , or + ;; when Inkscape 0.92 is upgraded to 1.0 to avoid a cycle. + `(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc + (inputs + `(("atk" ,atk) + ("glib" ,glib))) + (native-inputs + `(("dbus" ,dbus) ; For tests + ("gobject-introspection" ,gobject-introspection) + ("libxml2" ,libxml2) + ("pkg-config" ,pkg-config))) + (synopsis "Assistive Technology Service Provider Interface, ATK bind= ings") + (description + "The Assistive Technology Service Provider Interface is part of the GNOME accessibility project.") - (license license:lgpl2.0+) - (home-page "https://projects.gnome.org/accessibility/"))) + (license license:lgpl2.0+) + (home-page "https://projects.gnome.org/accessibility/"))) =20 (define-public gtk+-2 (package --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0066-gnu-at-spi2-atk-Update-home-page-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0066-gnu-at-spi2-atk-Update-home-page-and-license.patch" =46rom c1bd144d945ff5196a55ea7aa483fbe0cbaae93f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 11 Mar 2021 13:35:04 -0500 Subject: [PATCH 66/83] gnu: at-spi2-atk: Update home-page and license. * gnu/packages/gtk.scm (at-spi2-atk) [home-page]: Modify. [license]: Update to lgpl2.1+. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b0cdb48b22..4d4a75a385 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -819,8 +819,8 @@ is part of the GNOME accessibility project.") (description "The Assistive Technology Service Provider Interface is part of the GNOME accessibility project.") - (license license:lgpl2.0+) - (home-page "https://projects.gnome.org/accessibility/"))) + (license license:lgpl2.1+) + (home-page "https://wiki.gnome.org/Accessibility/"))) =20 (define-public gtk+-2 (package --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0067-gnu-json-glib-Update-to-1.6.2.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0067-gnu-json-glib-Update-to-1.6.2.patch" =46rom 5fe49aa0b9655619b3f9935af0c95efbced68885 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 10:46:18 -0500 Subject: [PATCH 67/83] gnu: json-glib: Update to 1.6.2. * gnu/packages/gnome.scm (json-glib)[version]: Update to 1.6.2. [arguments]<#:glib-or-gtk?>: New argument. --- gnu/packages/gnome.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 50d16a6048..22fd435feb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4552,7 +4552,7 @@ configuration storage systems.") (define-public json-glib (package (name "json-glib") - (version "1.4.4") + (version "1.6.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4560,15 +4560,17 @@ configuration storage systems.") name "-" version ".tar.xz")) (sha256 (base32 - "0ixwyis47v5bkx6h8a1iqlw3638cxcv57ivxv4gw2gaig51my33j"))= )) + "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3"))= )) (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas= (native-inputs `(("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ;for glib-mkenums and glib-genm= arshal + ("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config))) (propagated-inputs - `(("glib" ,glib))) ;according to json-glib-= 1.0.pc + `(("glib" ,glib))) ;according to json-glib-1.0.pc (home-page "https://wiki.gnome.org/Projects/JsonGlib") (synopsis "Compiler for the GObject type system") (description --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0068-gnu-json-glib-Enable-documentation-and-man-pages.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0068-gnu-json-glib-Enable-documentation-and-man-pages.patch" =46rom 53d673147a777312c1ea828e50d313fedb7e32c7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 26 Mar 2021 10:27:59 -0400 Subject: [PATCH 68/83] gnu: json-glib: Enable documentation and man-pages= =2E * gnu/packages/gnome.scm (json-glib) [outputs]: New output "doc". [arguments]<#:configure-flags>[-Ddocs]: New flag. [-Dman]: New flag. <#:phases>['patch-docbook]: New phase. ['move-doc]: New phase. [native-inputs]: Add docbook-xml, docbook-xsl, gtk-doc and libxslt. --- gnu/packages/gnome.scm | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 22fd435feb..e27f45f6e8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4562,13 +4562,44 @@ configuration storage systems.") (base32 "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas= + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Ddocs=3Dtrue" + "-Dman=3Dtrue") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* "json-glib-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/"))) + (substitute* "meson.build" + (("http://docbook.sourceforge.net/release/xsl/current/"= ) + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-1.79.1/")))) + #t)) + (add-after 'install 'move-docs + (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 - `(("gettext" ,gettext-minimal) + `(("docbook-xml" ,docbook-xml-4.3) + ("docbook-xsl" ,docbook-xsl) + ("gettext" ,gettext-minimal) ("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs `(("glib" ,glib))) ;according to json-glib-1.0.pc (home-page "https://wiki.gnome.org/Projects/JsonGlib") --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0069-gnu-json-glib-Update-synopsis-and-description.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0069-gnu-json-glib-Update-synopsis-and-description.patch" =46rom ee69230bdece8d5814626f6d335a96a6fbe9fb35 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 10:55:57 -0500 Subject: [PATCH 69/83] gnu: json-glib: Update synopsis and description. * gnu/packages/gnome.scm (json-glib) [synopsis]: Modify. [description]: Modify. --- gnu/packages/gnome.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e27f45f6e8..67cae0da90 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4603,13 +4603,10 @@ configuration storage systems.") (propagated-inputs `(("glib" ,glib))) ;according to json-glib-1.0.pc (home-page "https://wiki.gnome.org/Projects/JsonGlib") - (synopsis "Compiler for the GObject type system") - (description - "JSON-GLib is a C library based on GLib providing serialization and= -deserialization support for the JavaScript Object Notation (JSON) format= -described by RFC 4627. It provides parser and generator GObject classes= and -various wrappers for the complex data types employed by JSON, such as ar= rays -and objects.") + (synopsis "Glib and GObject implementation of JSON") + (description "JSON-GLib is a library providing serialization and +described by RFC 4627. It implements a full JSON parser and generator u= sing +GLib and GObject, and integrates JSON with GLib data types.") (license license:lgpl2.1+))) =20 (define-public libxklavier --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0070-gnu-wayland-Update-to-1.19.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0070-gnu-wayland-Update-to-1.19.0.patch" =46rom b0a2a0967a93fca1af7c34e770edbce87d6ad3b2 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 26 Mar 2021 10:37:37 -0400 Subject: [PATCH 70/83] gnu: wayland: Update to 1.19.0. * gnu/packages/freedesktop.scm (wayland)[version]: Update to 1.19.0. [build-system]: Change from gnu to meson. [native-inputs]: Move here docbook-xml and docbook-xsl from ... [inputs]: ... here. Move libffi to ... [propagated-inputs]: ... here. --- gnu/packages/freedesktop.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 4105dd7ca0..d5e58730e2 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -916,29 +916,31 @@ Python.") (define-public wayland (package (name "wayland") - (version "1.18.0") + (version "1.19.0") (source (origin (method url-fetch) (uri (string-append "https://wayland.freedesktop.org/relea= ses/" name "-" version ".tar.xz")) (sha256 (base32 - "0k995rn96xkplrapz5k648j651wc43kq817xk1x8280h16gsfxa6"))= )) - (build-system gnu-build-system) + "05bd2vphyx8qwa1mhsj1zdaiv4m4v94wrlssrn0lad8d601dkk5s"))= )) + (build-system meson-build-system) (arguments `(#:parallel-tests? #f)) (native-inputs - `(("doxygen" ,doxygen) - ("graphviz" ,graphviz) + `(("docbook-xml-4.2" ,docbook-xml-4.2) + ("docbook-xml" ,docbook-xml) + ("docbook-xsl" ,docbook-xsl) + ("dot" ,graphviz) + ("doxygen" ,doxygen) ("pkg-config" ,pkg-config) ("xmlto" ,xmlto) ("xsltproc" ,libxslt))) (inputs - `(("docbook-xml" ,docbook-xml) - ("docbook-xsl" ,docbook-xsl) - ("expat" ,expat) - ("libffi" ,libffi) - ("libxml2" ,libxml2))) ; for XML_CATALOG_FILES + `(("expat" ,expat) + ("libxml2" ,libxml2))) ; for XML_CATALOG_FILES + (propagated-inputs + `(("libffi" ,libffi))) (home-page "https://wayland.freedesktop.org/") (synopsis "Display server protocol") (description --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0071-gnu-wayland-Fix-and-move-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0071-gnu-wayland-Fix-and-move-documentation.patch" =46rom 7b5298bfa6d143b3a6a3b946ea3989ef5553b66c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 26 Mar 2021 10:42:00 -0400 Subject: [PATCH 71/83] gnu: wayland: Fix and move documentation. * gnu/packages/freedesktop.scm (wayland) [outputs]: New output "doc". [arguments]<#:phases>['patch-docbook-xml]: New phase. ['move-doc]: New phase. --- gnu/packages/freedesktop.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index d5e58730e2..af581f32eb 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -925,8 +925,31 @@ Python.") (base32 "05bd2vphyx8qwa1mhsj1zdaiv4m4v94wrlssrn0lad8d601dkk5s"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - `(#:parallel-tests? #f)) + `(#:parallel-tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* (find-files "." "\\.xml$") + (("http://www.oasis-open.org/docbook/xml/4\\.5/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")) + (("http://www.oasis-open.org/docbook/xml/4\\.2/") + (string-append (assoc-ref inputs "docbook-xml-4.2") + "/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/doc") + (string-append doc "/share/doc")) + #t)))))) (native-inputs `(("docbook-xml-4.2" ,docbook-xml-4.2) ("docbook-xml" ,docbook-xml) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0072-gnu-wayland-Update-synopsis-description-and-license.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0072-gnu-wayland-Update-synopsis-description-and-license.pat"; filename*1="ch" =46rom 0ff9e18285d90f986175ac2358ce9b246475b196 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 11:18:19 -0500 Subject: [PATCH 72/83] gnu: wayland: Update synopsis, description and lic= ense. * gnu/packages/freedesktop.scm (wayland) [synopsis]: Modify. [description]: Modify. [license]: Change from x11 to expat. --- gnu/packages/freedesktop.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index af581f32eb..0cda031e85 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -965,14 +965,14 @@ Python.") (propagated-inputs `(("libffi" ,libffi))) (home-page "https://wayland.freedesktop.org/") - (synopsis "Display server protocol") - (description - "Wayland is a protocol for a compositor to talk to its clients as w= ell as -a C library implementation of that protocol. The compositor can be a st= andalone -display server running on Linux kernel modesetting and evdev input devic= es, an X -application, or a wayland client itself. The clients can be traditional= -applications, X servers (rootless or fullscreen) or other display server= s.") - (license license:x11))) + (synopsis "Core Wayland window system code and protocol") + (description "Wayland is a project to define a protocol for a compos= itor to +talk to its clients as well as a library implementation of the protocol.= The +compositor can be a standalone display server running on Linux kernel +modesetting and evdev input devices, an X application, or a wayland clie= nt +itself. The clients can be traditional applications, X servers (rootles= s or +fullscreen) or other display servers.") + (license license:expat))) =20 (define-public wayland-protocols (package --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0073-gnu-wayland-protocols-Update-description.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0073-gnu-wayland-protocols-Update-description.patch" =46rom 8c8fccfa5fdf258444aa060d5402217b64763a23 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 11:22:54 -0500 Subject: [PATCH 73/83] gnu: wayland-protocols: Update description. * gnu/packages/freedesktop.scm (wayland-protocols) [description]: Modify.= --- gnu/packages/freedesktop.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 0cda031e85..de8355c419 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -992,7 +992,10 @@ fullscreen) or other display servers.") (native-inputs `(("pkg-config" ,pkg-config))) (synopsis "Wayland protocols") - (description "This package contains XML definitions of the Wayland p= rotocols.") + (description "Wayland-Protocols contains Wayland protocols that add +functionality not available in the Wayland core protocol. Such protocol= s either +add completely new functionality, or extend the functionality of some ot= her +protocol either in Wayland core, or some other protocol in wayland-proto= cols.") (home-page "https://wayland.freedesktop.org") (license license:expat))) =20 --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0074-gnu-yelp-xsl-Enable-documentation.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0074-gnu-yelp-xsl-Enable-documentation.patch" =46rom ca0d39807667777af926ddb155e810a378206fac Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 26 Mar 2021 10:47:35 -0400 Subject: [PATCH 74/83] gnu: yelp-xsl: Enable documentation. * gnu/packages/gnome.scm (yelp-xsl) [arguments]<#:configure-flag> [--enable-doc]: New flag. [native-inputs]: Add mallard-ducktype, intltool and libxslt. --- gnu/packages/gnome.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 67cae0da90..0851027497 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6809,10 +6809,17 @@ of running programs and invoke methods on those i= nterfaces.") (sha256 (base32 "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc"))= )) (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + "--enable-doc"))) (native-inputs - `(("gettext-minimal" ,gettext-minimal) + `(("ducktype" ,mallard-ducktype) + ("gettext" ,gettext-minimal) + ("intltool" ,intltool) ("itstool" ,itstool) - ("xmllint" ,libxml2))) + ("xmllint" ,libxml2) + ("xsltproc" ,libxslt))) (synopsis "XSL stylesheets for Yelp") (description "Yelp-XSL is a collection of programs and data files to= help you build, maintain, and distribute documentation. It provides XSLT sty= lesheets --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0075-gnu-gtk-2-Enable-tests.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0075-gnu-gtk-2-Enable-tests.patch" =46rom 05791ef0a130c2d1ddeb4fb3f9eade9ab9258716 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 26 Mar 2021 10:51:11 -0400 Subject: [PATCH 75/83] gnu: gtk+-2: Enable tests. * gnu/packages/gtk.scm (gtk+-2) [arguments]<#:parallel-tests?>: New argum= ent. <#:phases>['disable-tests]: Remove phase. ['disable-failing-tests]: New phase. ['pre-check]: New phase. [native-inputs]: Add xorg-server-for-tests. --- gnu/packages/gtk.scm | 149 ++++++++++++++++++++++++------------------- 1 file changed, 83 insertions(+), 66 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4d4a75a385..41b746d661 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -824,77 +824,94 @@ is part of the GNOME accessibility project.") =20 (define-public gtk+-2 (package - (name "gtk+") - (version "2.24.32") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0bjq7ja9gwcv6n5q4qkvdjjx40wsdiikksz1zqxvxsm5vlyskj5n")) - (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch"= - "gtk2-respect-GUIX_GTK2_IM_MODULE_F= ILE.patch" - "gtk2-theme-paths.patch")))) - (build-system gnu-build-system) - (outputs '("out" "bin" "doc")) - (propagated-inputs - `(("atk" ,atk) - ;; SVG support is optional and requires librsvg, which pulls in ru= st. - ;; Rust is not supported well on every architecture yet. - ("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-s= ystem) - (%current-system))= ) - gdk-pixbuf+svg - gdk-pixbuf)) - ("pango" ,pango))) - (inputs - `(("cups" ,cups) - ("libxcomposite" ,libxcomposite) - ("libxcursor" ,libxcursor) - ("libxdamage" ,libxdamage) - ("libxi" ,libxi) - ("libxinerama" ,libxinerama) - ("libxrandr" ,libxrandr))) - (native-inputs - `(("perl" ,perl) - ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config) - ("python-wrapper" ,python-wrapper))) - (arguments - `(#:configure-flags - (list "--with-xinput=3Dyes" - (string-append "--with-html-dir=3D" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'disable-tests - (lambda _ - ;; FIXME: re-enable tests requiring an X server - (substitute* "gtk/Makefile.in" - (("SUBDIRS =3D theme-bits . tests") "SUBDIRS =3D theme-bit= s .")) - #t)) - (add-after 'install 'remove-cache - (lambda* (#:key outputs #:allow-other-keys) - (for-each + (name "gtk+") + (version "2.24.32") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0bjq7ja9gwcv6n5q4qkvdjjx40wsdiikksz1zqxvxsm5vlyskj5n"))= + (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patc= h" + "gtk2-respect-GUIX_GTK2_IM_MODULE= _FILE.patch" + "gtk2-theme-paths.patch")))) + (build-system gnu-build-system) + (outputs '("out" "bin" "doc")) + (propagated-inputs + `(("atk" ,atk) + ;; SVG support is optional and requires librsvg, which pulls in r= ust. + ;; Rust is not supported well on every architecture yet. + ("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-= system) + (%current-system)= )) + gdk-pixbuf+svg + gdk-pixbuf)) + ("pango" ,pango))) + (inputs + `(("cups" ,cups) + ("libxcomposite" ,libxcomposite) + ("libxcursor" ,libxcursor) + ("libxdamage" ,libxdamage) + ("libxi" ,libxi) + ("libxinerama" ,libxinerama) + ("libxrandr" ,libxrandr))) + (native-inputs + `(("perl" ,perl) + ("gettext" ,gettext-minimal) + ("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper) + ("xorg-server" ,xorg-server-for-tests))) + (arguments + `(#:parallel-tests? #f + #:configure-flags + (list "--with-xinput=3Dyes" + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + (substitute* "gtk/Makefile.in" + (("aliasfilescheck\\.sh") "")) + (substitute* "gtk/tests/recentmanager.c" + (("g_test_add_func \\(\"/recent-manager.*;") "")) + (substitute* "gtk/tests/defaultvalue.c" + (("return g_test_run\\(\\);") "")) + #t)) + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 +extension GLX &") + (setenv "DISPLAY" ":1") + ;; Tests write to $HOME. + (setenv "HOME" (getcwd)) + ;; Tests look for $XDG_RUNTIME_DIR. + (setenv "XDG_RUNTIME_DIR" (getcwd)) + ;; For missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + #t)) + (add-after 'install 'remove-cache + (lambda* (#:key outputs #:allow-other-keys) + (for-each delete-file (find-files (assoc-ref outputs "out") "immodules.cache")) - #t))))) - (native-search-paths - (list (search-path-specification - (variable "GUIX_GTK2_PATH") - (files '("lib/gtk-2.0"))))) - (synopsis "Cross-platform toolkit for creating graphical user interfa= ces") - (description - "GTK+, or the GIMP Toolkit, is a multi-platform toolkit for creating= + #t))))) + (native-search-paths + (list (search-path-specification + (variable "GUIX_GTK2_PATH") + (files '("lib/gtk-2.0"))))) + (synopsis "Cross-platform toolkit for creating graphical user interf= aces") + (description + "GTK+, or the GIMP Toolkit, is a multi-platform toolkit for creatin= g graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off tools to complete application suites.") - (license license:lgpl2.0+) - (home-page "https://www.gtk.org/"))) + (license license:lgpl2.0+) + (home-page "https://www.gtk.org/"))) =20 (define-public gtk+ (package (inherit gtk+-2) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0076-gnu-gtk-2-Add-missing-inputs-and-search-path.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0076-gnu-gtk-2-Add-missing-inputs-and-search-path.patch" =46rom 5436edffc9b7d08cc42af1c78150407e1bdb4f36 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 08:05:28 -0500 Subject: [PATCH 76/83] gnu: gtk+-2: Add missing inputs and search-path. * gnu/packages/gtk.scm (gtk+-2) [native-inputs]: Add intltool. [inputs]: Add libx11, libxext, libxkbcommon, libxrender and libxshmfence.= [propagated-inputs]: Add cairo and glib. [search-paths]: New field. --- gnu/packages/gtk.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 41b746d661..8ea18f6464 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -841,26 +841,34 @@ is part of the GNOME accessibility project.") (outputs '("out" "bin" "doc")) (propagated-inputs `(("atk" ,atk) + ("cairo" ,cairo) ;; SVG support is optional and requires librsvg, which pulls in r= ust. ;; Rust is not supported well on every architecture yet. ("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-= system) (%current-system)= )) gdk-pixbuf+svg gdk-pixbuf)) + ("glib" ,glib) ("pango" ,pango))) (inputs `(("cups" ,cups) + ("libx11" ,libx11) ("libxcomposite" ,libxcomposite) ("libxcursor" ,libxcursor) + ("libxext" ,libxext) ("libxdamage" ,libxdamage) ("libxi" ,libxi) ("libxinerama" ,libxinerama) - ("libxrandr" ,libxrandr))) + ("libxkbcommon" ,libxkbcommon) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxshmfence" ,libxshmfence))) (native-inputs - `(("perl" ,perl) - ("gettext" ,gettext-minimal) + `(("gettext" ,gettext-minimal) ("glib" ,glib "bin") ("gobject-introspection" ,gobject-introspection) + ("intltool" ,intltool) + ("perl" ,perl) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper) ("xorg-server" ,xorg-server-for-tests))) @@ -904,6 +912,7 @@ is part of the GNOME accessibility project.") (list (search-path-specification (variable "GUIX_GTK2_PATH") (files '("lib/gtk-2.0"))))) + (search-paths native-search-paths) (synopsis "Cross-platform toolkit for creating graphical user interf= aces") (description "GTK+, or the GIMP Toolkit, is a multi-platform toolkit for creatin= g --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0077-gnu-gtk-2-Update-to-2.24.33.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0077-gnu-gtk-2-Update-to-2.24.33.patch" =46rom cdebc4e1988bfb8ce735d0dc0ca8c668bb7c8b19 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 12:04:56 -0500 Subject: [PATCH 77/83] gnu: gtk+-2: Update to 2.24.33. * gnu/packages/gtk.scm (gtk+-2) [version]: Update to 2.24.33. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 8ea18f6464..db93eb5b44 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -825,7 +825,7 @@ is part of the GNOME accessibility project.") (define-public gtk+-2 (package (name "gtk+") - (version "2.24.32") + (version "2.24.33") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -833,7 +833,7 @@ is part of the GNOME accessibility project.") name "-" version ".tar.xz")) (sha256 (base32 - "0bjq7ja9gwcv6n5q4qkvdjjx40wsdiikksz1zqxvxsm5vlyskj5n"))= + "1nn6kks1zyvb5xikr9y2k7r9bwjy1g4b0m0s66532bclymbwfamc"))= (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patc= h" "gtk2-respect-GUIX_GTK2_IM_MODULE= _FILE.patch" "gtk2-theme-paths.patch")))) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0078-gnu-gtk-Enable-tests.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0078-gnu-gtk-Enable-tests.patch" =46rom 5e9a5875d7f4b03d42d21ff8e11388df5565b2e4 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 26 Mar 2021 10:53:09 -0400 Subject: [PATCH 78/83] gnu: gtk+: Enable tests. * gnu/packages/gtk.scm (gtk+) [arguments]<#:phases>['pre-configure]: Remo= ve phase. ['disable-failing-tests]: New phase. ['pre-check]: New phase. --- gnu/packages/gtk.scm | 202 ++++++++++++++++++++++++------------------- 1 file changed, 111 insertions(+), 91 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index db93eb5b44..74fd5ceb8e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -923,97 +923,117 @@ application suites.") (home-page "https://www.gtk.org/"))) =20 (define-public gtk+ - (package (inherit gtk+-2) - (name "gtk+") - (version "3.24.24") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "12ipk1d376bai9v820qzhxba93kkh5abi6mhyqr4hwjvqmkl77fc")) - (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"= - "gtk3-respect-GUIX_GTK3_IM_MODULE_F= ILE.patch")))) - (propagated-inputs - `(("at-spi2-atk" ,at-spi2-atk) - ("atk" ,atk) - ;; SVG support is optional and requires librsvg, which pulls in ru= st. - ;; Rust is not supported well on every architecture yet. - ("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-s= ystem) - (%current-system))= ) - gdk-pixbuf+svg - gdk-pixbuf)) - ("libepoxy" ,libepoxy) - ("libxcursor" ,libxcursor) - ("libxi" ,libxi) - ("libxinerama" ,libxinerama) - ("libxkbcommon" ,libxkbcommon) - ("libxdamage" ,libxdamage) - ("libxrandr" ,libxrandr) - ("mesa" ,mesa) - ("pango" ,pango) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols))) - (inputs - `(("libxml2" ,libxml2) - ;; XXX: colord depends on mozjs (through polkit), which fails on - ;; on non-intel systems now. - ;;("colord" ,colord) - ("cups" ,cups) ;for printing support - ;; XXX: rest depends on p11-kit, which fails on mips64el now. - ;;("rest" ,rest) - ("json-glib" ,json-glib))) - (native-inputs - `(("perl" ,perl) - ("glib" ,glib "bin") - ("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config) - ("gobject-introspection" ,gobject-introspection) - ("python-wrapper" ,python-wrapper) - ;; By using a special xorg-server for GTK+'s tests, we reduce the = impact - ;; of updating xorg-server directly on the master branch. - ("xorg-server" ,xorg-server-for-tests))) - (arguments - `(#:disallowed-references (,xorg-server-for-tests) - ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB = goes - ;; to "doc". - #:configure-flags (list (string-append "--with-html-dir=3D" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html") - ;; The header file is r= equired - ;; by gnome-control-center - "--enable-wayland-backend" - ;; This is necessary to build both backend= s. - "--enable-x11-backend" - ;; This enables the HTML5 websocket backen= d. - "--enable-broadway-backend") - #:phases (modify-phases %standard-phases - (add-before 'configure 'pre-configure - (lambda _ - ;; Disable most tests, failing in the chroot with the messag= e: - ;; D-Bus library appears to be incorrectly set up; failed to= read - ;; machine uuid: Failed to open "/etc/machine-id": No such f= ile or - ;; directory. - ;; See the manual page for dbus-uuidgen to correct this issu= e. - (substitute* "testsuite/Makefile.in" - (("SUBDIRS =3D gdk gtk a11y css reftests") - "SUBDIRS =3D gdk")) - #t)) - (add-after 'install 'move-desktop-files - ;; Move desktop files into 'bin' to avoid cycle references. - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (assoc-ref outputs "bin"))) - (mkdir-p (string-append bin "/share")) - (rename-file (string-append out "/share/applications") - (string-append bin "/share/applications")) - #t)))))) - (native-search-paths - (list (search-path-specification - (variable "GUIX_GTK3_PATH") - (files '("lib/gtk-3.0"))))))) + (package + (inherit gtk+-2) + (name "gtk+") + (version "3.24.24") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "12ipk1d376bai9v820qzhxba93kkh5abi6mhyqr4hwjvqmkl77fc")) + (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" + "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.p= atch")))) + (propagated-inputs + `(("at-spi2-atk" ,at-spi2-atk) + ("atk" ,atk) + ;; SVG support is optional and requires librsvg, which pulls in r= ust. + ;; Rust is not supported well on every architecture yet. + ("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-= system) + (%current-system)= )) + gdk-pixbuf+svg + gdk-pixbuf)) + ("libepoxy" ,libepoxy) + ("libxcursor" ,libxcursor) + ("libxi" ,libxi) + ("libxinerama" ,libxinerama) + ("libxkbcommon" ,libxkbcommon) + ("libxdamage" ,libxdamage) + ("libxrandr" ,libxrandr) + ("mesa" ,mesa) + ("pango" ,pango) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols))) + (inputs + `(("libxml2" ,libxml2) + ;; XXX: colord depends on mozjs (through polkit), which fails on + ;; on non-intel systems now. + ;;("colord" ,colord) + ("cups" ,cups) ;for printing support + ;; XXX: rest depends on p11-kit, which fails on mips64el now. + ;;("rest" ,rest) + ("json-glib" ,json-glib))) + (native-inputs + `(("perl" ,perl) + ("glib" ,glib "bin") + ("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config) + ("gobject-introspection" ,gobject-introspection) + ("python-wrapper" ,python-wrapper) + ;; By using a special xorg-server for GTK+'s tests, we reduce the= impact + ;; of updating xorg-server directly on the master branch. + ("xorg-server" ,xorg-server-for-tests))) + (arguments + `(#:disallowed-references (,xorg-server-for-tests) + ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB= goes + ;; to "doc". + #:configure-flags (list (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc")= + "/share/gtk-doc/html") + ;; The header file is = required + ;; by gnome-control-center + "--enable-wayland-backend" + ;; This is necessary to build both backen= ds. + "--enable-x11-backend" + ;; This enables the HTML5 websocket backe= nd. + "--enable-broadway-backend") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + (substitute* "testsuite/gtk/Makefile.in" + (("builderparser cellarea check-icon-names check-cursor-n= ames") + "builderparser cellarea check-cursor-names") + (("notify no-gtk-init object objects-finalize papersize r= btree") + "no-gtk-init papersize rbtree") + (("stylecontext templates textbuffer textiter treemodel t= reepath") + "stylecontext textbuffer textiter treemodel treepath")) + (substitute* "testsuite/a11y/Makefile.in" + (("accessibility-dump tree-performance text children deri= ve") + "tree-performance text children derive")) + (substitute* "testsuite/reftests/Makefile.in" + (("TEST_PROGS =3D gtk-reftest") + "TEST_PROGS =3D ")) + #t)) + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 +extension GLX &") + (setenv "DISPLAY" ":1") + ;; Tests write to $HOME. + (setenv "HOME" (getcwd)) + ;; Tests look for $XDG_RUNTIME_DIR. + (setenv "XDG_RUNTIME_DIR" (getcwd)) + ;; For missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + #t)) + (add-after 'install 'move-desktop-files + ;; Move desktop files into 'bin' to avoid cycle references. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) + (mkdir-p (string-append bin "/share")) + (rename-file (string-append out "/share/applications") + (string-append bin "/share/applications")) + #t)))))) + (native-search-paths + (list (search-path-specification + (variable "GUIX_GTK3_PATH") + (files '("lib/gtk-3.0"))))))) =20 ;;; ;;; Guile bindings. --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0079-gnu-gtk-Add-missing-inputs.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0079-gnu-gtk-Add-missing-inputs.patch" =46rom 1637007cc9c7e3d323efb9843a631bbf47fff20f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 08:32:10 -0500 Subject: [PATCH 79/83] gnu: gtk+: Add missing inputs. * gnu/packages/gtk.scm (gtk+) [native-inputs]: Add docbook-xml, hicolor-icon-theme, intltool, sassc and libxslt. [inputs]: Add graphene, harfbuzz, iso-codes and papi. [propagated-inputs]: Add cairo, fribidi, fontconfig, freetype, glib, libx11, libxcomposite, libxext, libxfixes and libxrender. --- gnu/packages/gtk.scm | 48 ++++++++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 74fd5ceb8e..fcc20884fe 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -77,6 +77,7 @@ #:use-module (gnu packages graphviz) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) + #:use-module (gnu packages iso-codes) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) #:use-module (gnu packages m4) @@ -85,12 +86,14 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pretty-print) + #:use-module (gnu packages profiling) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages cups) #:use-module (gnu packages version-control) + #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) @@ -939,44 +942,63 @@ application suites.") (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.p= atch")))) (propagated-inputs - `(("at-spi2-atk" ,at-spi2-atk) - ("atk" ,atk) + `(("atk" ,atk) + ("at-spi2-atk" ,at-spi2-atk) + ("cairo" ,cairo) + ("fribidi" ,fribidi) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) ;; SVG support is optional and requires librsvg, which pulls in r= ust. ;; Rust is not supported well on every architecture yet. ("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-= system) (%current-system)= )) gdk-pixbuf+svg gdk-pixbuf)) + ("glib" ,glib) ("libepoxy" ,libepoxy) + ("libx11" ,libx11) + ("libxcomposite" ,libxcomposite) ("libxcursor" ,libxcursor) + ("libxdamage" ,libxdamage) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) ("libxi" ,libxi) ("libxinerama" ,libxinerama) ("libxkbcommon" ,libxkbcommon) - ("libxdamage" ,libxdamage) ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) ("mesa" ,mesa) ("pango" ,pango) ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols))) (inputs - `(("libxml2" ,libxml2) - ;; XXX: colord depends on mozjs (through polkit), which fails on + `(;; XXX: colord depends on mozjs (through polkit), which fails on ;; on non-intel systems now. - ;;("colord" ,colord) - ("cups" ,cups) ;for printing support + ("colord" ,colord) + ("cups" ,cups) + ("graphene" ,graphene) + ("harfbuzz" ,harfbuzz) + ("iso-codes" ,iso-codes) + ("json-glib" ,json-glib) + ("libxml2" ,libxml2) + ("papi" ,papi) ;; XXX: rest depends on p11-kit, which fails on mips64el now. - ;;("rest" ,rest) - ("json-glib" ,json-glib))) + ("rest" ,rest))) (native-inputs - `(("perl" ,perl) - ("glib" ,glib "bin") + `(("docbook-xml" ,docbook-xml-4.1.2) ("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config) + ("glib" ,glib "bin") ("gobject-introspection" ,gobject-introspection) + ("hicolor-icon-theme" ,hicolor-icon-theme) + ("intltool" ,intltool) + ("perl" ,perl) + ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper) + ("sassc" ,sassc) ;; By using a special xorg-server for GTK+'s tests, we reduce the= impact ;; of updating xorg-server directly on the master branch. - ("xorg-server" ,xorg-server-for-tests))) + ("xorg-server" ,xorg-server-for-tests) + ("xsltproc" ,libxslt))) (arguments `(#:disallowed-references (,xorg-server-for-tests) ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB= goes --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0080-gnu-gtk-Enable-cloud-providers-support.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0080-gnu-gtk-Enable-cloud-providers-support.patch" =46rom e7f0481d3fdcb40ab8a1bfe1da7923eac99548d9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 08:36:52 -0500 Subject: [PATCH 80/83] gnu: gtk+: Enable cloud-providers support. * gnu/packages/gtk.scm (gtk+) [arguments]<#:configure-flags> [--enable-cloudproviders]: New flag. [propagated-inputs]: Add libcloudproviders. --- gnu/packages/gtk.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index fcc20884fe..266a8a8220 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -955,6 +955,7 @@ application suites.") gdk-pixbuf+svg gdk-pixbuf)) ("glib" ,glib) + ("libcloudproviders" ,libcloudproviders) ("libepoxy" ,libepoxy) ("libx11" ,libx11) ("libxcomposite" ,libxcomposite) @@ -1006,6 +1007,7 @@ application suites.") #:configure-flags (list (string-append "--with-html-dir=3D" (assoc-ref %outputs "doc")= "/share/gtk-doc/html") + "--enable-cloudproviders" ;; The header file is = required ;; by gnome-control-center "--enable-wayland-backend" --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0081-gnu-gtk-Update-to-3.24.27.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0081-gnu-gtk-Update-to-3.24.27.patch" =46rom 31818e23faa174e82285fd1965cd0c04055ddd42 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 12:01:02 -0500 Subject: [PATCH 81/83] gnu: gtk+: Update to 3.24.27. * gnu/packages/gtk.scm (gtk+) [version]: Update to 3.24.27. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 266a8a8220..74e2e3aa5a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -929,7 +929,7 @@ application suites.") (package (inherit gtk+-2) (name "gtk+") - (version "3.24.24") + (version "3.24.27") (source (origin (method url-fetch) @@ -938,7 +938,7 @@ application suites.") name "-" version ".tar.xz")) (sha256 (base32 - "12ipk1d376bai9v820qzhxba93kkh5abi6mhyqr4hwjvqmkl77fc")) + "09ksflq5j257bf5zn8q2nnf2flicg9qqgfy7za79z7rkf1shc77p")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.p= atch")))) (propagated-inputs --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0082-gnu-gtkmm-Update-to-3.24.4.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0082-gnu-gtkmm-Update-to-3.24.4.patch" =46rom 940f38b7dc1a73bed08f0659b7e47b1fbc321f6f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 26 Mar 2021 11:03:36 -0400 Subject: [PATCH 82/83] gnu: gtkmm: Update to 3.24.4. * gnu/packages/gtk.scm (gtkmm)[version]: Update to 3.24.4. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output "doc". [arguments]<#:phases>['start-xvfb]: Remove phase. ['pre-check]: New phase. ['move-doc]: New phase. [native-inputs]: Add graphviz, doxygen, m4, mm-common, perl and libxslt. [synopsis]: Modify. [description]: Modify. [license]: Add gpl2+. --- gnu/packages/gtk.scm | 96 ++++++++++++++++++++++++++------------------ 1 file changed, 57 insertions(+), 39 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 74e2e3aa5a..5da8954dc9 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1591,49 +1591,67 @@ library.") (define-public gtkmm (package (name "gtkmm") - (version "3.24.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1hxdnhavjyvbcpxhd5z17l9fj4182028s66lc0s16qqqrldhjwbd")))= ) - (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ;for 'glib-compile-reso= urces' - ("xorg-server" ,xorg-server-for-tests))) + (version "3.24.4") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0hv7pviln4cpjvpz7m7ga5krcsbibqzixdcn0dwzpz0cx71p3swv"))= )) + (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 +extension GLX &") + (setenv "DISPLAY" ":1") + ;; For missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + #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/doc") + (string-append doc "/share/doc")) + #t)))))) + (native-inputs + `(("dot" ,graphviz) + ("doxygen" ,doxygen) + ("m4" ,m4) + ("mm-common" ,mm-common) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt) + ("xorg-server" ,xorg-server-for-tests))) (propagated-inputs - `(("pangomm" ,pangomm) + `(("atkmm" ,atkmm) ("cairomm" ,cairomm) - ("atkmm" ,atkmm) + ("glibmm" ,glibmm) ("gtk+" ,gtk+) - ("glibmm" ,glibmm))) - (arguments - `(#:disallowed-references (,xorg-server-for-tests) - #:phases (modify-phases %standard-phases - (add-before 'check 'run-xvfb - (lambda* (#:key inputs #:allow-other-keys) - (let ((xorg-server (assoc-ref inputs "xorg-server"= ))) - ;; Tests such as 'object_move/test' require a ru= nning - ;; X server. - (system (string-append xorg-server "/bin/Xvfb :1= &")) - (setenv "DISPLAY" ":1") - ;; Don't fail because of the missing /etc/machin= e-id. - (setenv "DBUS_FATAL_WARNINGS" "0") - #t)))))) + ("pangomm" ,pangomm))) + (synopsis "C++ Interfaces for GTK+ and GNOME") + (description "GTKmm is the official C++ interface for the popular GU= I +library GTK+. Highlights include typesafe callbacks, and a comprehensiv= e set of +widgets that are easily extensible via inheritance. You can create user= +interfaces either in code or with the Glade User Interface designer, usi= ng +libglademm. There's extensive documentation, including API reference an= d a +tutorial.") (home-page "https://gtkmm.org/") - (synopsis - "C++ interface to the GTK+ graphical user interface library") - (description - "gtkmm is the official C++ interface for the popular GUI library GT= K+. -Highlights include typesafe callbacks, and a comprehensive set of widget= s that -are easily extensible via inheritance. You can create user interfaces e= ither -in code or with the Glade User Interface designer, using libglademm. Th= ere's -extensive documentation, including API reference and a tutorial.") - (license license:lgpl2.1+))) - + (license + (list + ;; Library + license:lgpl2.1+ + ;; Tools + license:gpl2+)))) =20 (define-public gtkmm-2 (package (inherit gtkmm) --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8 Content-Type: text/x-patch; charset=UTF-8; name="0083-gnu-gtkmm-2-Fix-build.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0083-gnu-gtkmm-2-Fix-build.patch" =46rom 730f60b68f50e562cecea119338f8736d1f9f8bc Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 18 Jul 2020 06:18:38 -0400 Subject: [PATCH 83/83] gnu: gtkmm-2: Fix build. * gnu/packages/gtk.scm (gtkmm-2)[arguments]: Remove field. [native-inputs]: Remove field. [propagated-inputs]: Change; atkmm to atkmm-2.28, pangomm to pangomm-2.42= , cairomm to cairomm-1.13 and glibmm to glibmm-2.64. Signed-off-by: Danny Milosavljevic --- gnu/packages/gtk.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5da8954dc9..517264d88b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1654,25 +1654,25 @@ tutorial.") license:gpl2+)))) =20 (define-public gtkmm-2 - (package (inherit gtkmm) + (package + (inherit gtkmm) (name "gtkmm") (version "2.24.5") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0wkbzvsx4kgw16f6xjdc1dz7f77ldngdila4yi5lw2zrgcxsb006")))= ) - (arguments '()) - (native-inputs `(("pkg-config" ,pkg-config))) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0wkbzvsx4kgw16f6xjdc1dz7f77ldngdila4yi5lw2zrgcxsb006"))= )) (propagated-inputs - `(("pangomm" ,pangomm) - ("cairomm" ,cairomm) - ("atkmm" ,atkmm) + `(("atkmm" ,atkmm-2.28) + ("cairomm" ,cairomm-1.13) + ("glibmm" ,glibmm-2.64) ("gtk+" ,gtk+-2) - ("glibmm" ,glibmm))))) + ("pangomm" ,pangomm-2.42))))) =20 (define-public gtksourceviewmm (package --=20 2.31.0 --------------D726024BDCC73DD6F6DDE6D8-- --LIn4P9zLjPoDx0S6xelR6K5fLYmYX0XOX-- --MzDGIQHB39ChpyvZQFSLI5LmFLN7G5B3y Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYF5ARgUDAAAAAAAKCRBfWBZkf4vlUedO AP4yNly+XYcaX9weAs4YJRAeQECZbJGliTPVeRZm0a9gswD+LlYPVAADsVwZ2GbG5C56SugSr+7W K3vpv68t6IOpCwY= =LZwo -----END PGP SIGNATURE----- --MzDGIQHB39ChpyvZQFSLI5LmFLN7G5B3y-- From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 26 16:39:16 2021 Received: (at 42958) by debbugs.gnu.org; 26 Mar 2021 20:39:16 +0000 Received: from localhost ([127.0.0.1]:42614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPtEh-0002FK-M1 for submit@debbugs.gnu.org; Fri, 26 Mar 2021 16:39:16 -0400 Received: from out1.migadu.com ([91.121.223.63]:29036) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPtEQ-0002Ee-Qi for 42958@debbugs.gnu.org; Fri, 26 Mar 2021 16:39:14 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1616791136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kFQxRDau3LbMtJzQZPj6GgIWc6CsBNm/e2RXVAN/RBY=; b=YRlstLXWyK7JTDN4lurP13ot3cdYm320q28irKzSU5mDr5TbTD9JQA4ALBNklZzA8UL/v+ 12z8UEU4pvfGMf0dwwSBEVT1r+//+GfkJQgPBOZoH0+WpyL3zoMS4EeH/7JQHicjUZ+1YQ L02FkB7jtFrApwV/DmF2UdwwKWbOtjqB+KlRE0lcb4J6kvuSDCnkDNGnOyn1dUFuopbbLI xzXPrOADclJoY/ciAk50j/qOsbMn78Rd5Ug6F6CDsJ+P/QxX+L7cjFanyBLx3rNioP3Wqm x8aAiZQo3va7aaFy67QvplEUMJgY0n0L7HDacH93CQHIRJOnw4K+PnkzkIVr5Q== From: Raghav Gururajan To: 42958@debbugs.gnu.org, Danny Milosavljevic , Ricardo Wurmus , =?UTF-8?Q?L=c3=a9o_Le_Bouter?= References: <7bef0b9f-b8a6-bd56-52e7-e283d8342470@raghavgururajan.name> <2b0dc6df-d533-8793-697c-82d664e93ddb@raghavgururajan.name> Subject: Re: Big changes from wip-desktop. Message-ID: <30c376fe-1f99-1eb8-9fcb-6502b496965f@raghavgururajan.name> Date: Fri, 26 Mar 2021 16:38:53 -0400 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="HXGt1RU0HIjk744TGmy2FSJMptzgBLM8I" X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42958 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --HXGt1RU0HIjk744TGmy2FSJMptzgBLM8I Content-Type: multipart/mixed; boundary="abCAWsX7cNpg1FVRQZjxmQzxjvaquqViD"; protected-headers="v1" From: Raghav Gururajan To: 42958@debbugs.gnu.org, Danny Milosavljevic , Ricardo Wurmus , =?UTF-8?Q?L=c3=a9o_Le_Bouter?= Message-ID: <30c376fe-1f99-1eb8-9fcb-6502b496965f@raghavgururajan.name> Subject: Re: Big changes from wip-desktop. References: <7bef0b9f-b8a6-bd56-52e7-e283d8342470@raghavgururajan.name> <2b0dc6df-d533-8793-697c-82d664e93ddb@raghavgururajan.name> In-Reply-To: --abCAWsX7cNpg1FVRQZjxmQzxjvaquqViD Content-Type: multipart/mixed; boundary="------------BBFDB28B43640D799F39247D" Content-Language: en-US This is a multi-part message in MIME format. --------------BBFDB28B43640D799F39247D Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable @(rekado|lle-bout|danny) > So I have attached all the patches for this batch. These are=20 > non-signed-off, just for the record. :) Had to make a change to 0068. Attached the modified patch. Regards, RG. --------------BBFDB28B43640D799F39247D Content-Type: text/x-patch; charset=UTF-8; name="0068-gnu-json-glib-Enable-documentation-and-man-pages.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0068-gnu-json-glib-Enable-documentation-and-man-pages.patch" =46rom fa06e0c98bf09b75fda1b738d083c3334712a601 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 26 Mar 2021 10:27:59 -0400 Subject: [PATCH 68/83] gnu: json-glib: Enable documentation and man-pages= =2E * gnu/packages/gnome.scm (json-glib) [outputs]: New output "doc". [arguments]<#:configure-flags>[-Ddocs]: New flag. [-Dman]: New flag. <#:phases>['patch-docbook]: New phase. ['move-doc]: New phase. [native-inputs]: Add docbook-xml, docbook-xsl, gtk-doc and libxslt. --- gnu/packages/gnome.scm | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 22fd435feb..e56adee111 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4562,13 +4562,45 @@ configuration storage systems.") (base32 "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3"))= )) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments - `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas= + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags + (list + "-Ddocs=3Dtrue" + "-Dman=3Dtrue") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* (find-files "." "\\.xml$") + (("http://www.oasis-open.org/docbook/xml/4\\.3/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/"))) + (substitute* "meson.build" + (("http://docbook.sourceforge.net/release/xsl/current/"= ) + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-1.79.2/")))) + #t)) + (add-after 'install 'move-docs + (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 - `(("gettext" ,gettext-minimal) + `(("docbook-xml" ,docbook-xml-4.3) + ("docbook-xsl" ,docbook-xsl) + ("gettext" ,gettext-minimal) ("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config))) + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs `(("glib" ,glib))) ;according to json-glib-1.0.pc (home-page "https://wiki.gnome.org/Projects/JsonGlib") --=20 2.31.0 --------------BBFDB28B43640D799F39247D-- --abCAWsX7cNpg1FVRQZjxmQzxjvaquqViD-- --HXGt1RU0HIjk744TGmy2FSJMptzgBLM8I Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYF5GXgUDAAAAAAAKCRBfWBZkf4vlURqL AQCxdXBtF3Dl3Zx/O+vdgU/anO9nSNeR9y4BmR8NxRRouwD+Je81hGcg0RMo2k5a/3k8og6cKtCS IWDECmsA6e38/wQ= =hTq9 -----END PGP SIGNATURE----- --HXGt1RU0HIjk744TGmy2FSJMptzgBLM8I-- From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 26 17:22:27 2021 Received: (at 42958-done) by debbugs.gnu.org; 26 Mar 2021 21:22:27 +0000 Received: from localhost ([127.0.0.1]:42682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPtuV-0005R2-EM for submit@debbugs.gnu.org; Fri, 26 Mar 2021 17:22:27 -0400 Received: from mail.zaclys.net ([178.33.93.72]:54467) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPtuS-0005Qn-6R for 42958-done@debbugs.gnu.org; Fri, 26 Mar 2021 17:22:25 -0400 Received: from guix-xps.local (82-64-145-38.subs.proxad.net [82.64.145.38]) (authenticated bits=0) by mail.zaclys.net (8.14.7/8.14.7) with ESMTP id 12QLMHXo035488 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 26 Mar 2021 22:22:17 +0100 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.zaclys.net 12QLMHXo035488 Authentication-Results: mail.zaclys.net; dmarc=fail (p=reject dis=none) header.from=zaclys.net Authentication-Results: mail.zaclys.net; spf=fail smtp.mailfrom=lle-bout@zaclys.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zaclys.net; s=default; t=1616793738; bh=MBAuP35NLLdfZtfCvyo64N1rXOs5LFdj3lBfDC3wky0=; h=Subject:From:To:Date:In-Reply-To:References:From; b=j1RJcCiyI7Y9dZv2fcecfAZeFbAYVHbvxCuBt3fM6VtzX8UMrgAx7ZRlhgN60tY1c XvKdJA4mJzEKG6asKGMm8I5pc2Z5pXe5e9yNI+RBC1jfi3fjrGrIalCc/dts0fUMLx /owHe1ZU/q1JgaW0+lEEAr5iNd85YEKOxF+rNdow= Message-ID: Subject: Re: Big changes from wip-desktop. From: =?ISO-8859-1?Q?L=E9o?= Le Bouter To: Raghav Gururajan , 42958-done@debbugs.gnu.org, Danny Milosavljevic , Ricardo Wurmus Date: Fri, 26 Mar 2021 22:22:17 +0100 In-Reply-To: <30c376fe-1f99-1eb8-9fcb-6502b496965f@raghavgururajan.name> References: <7bef0b9f-b8a6-bd56-52e7-e283d8342470@raghavgururajan.name> <2b0dc6df-d533-8793-697c-82d664e93ddb@raghavgururajan.name> <30c376fe-1f99-1eb8-9fcb-6502b496965f@raghavgururajan.name> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-sm/hcizAAEeQFpx72X9f" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42958-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-sm/hcizAAEeQFpx72X9f Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, 2021-03-26 at 16:38 -0400, Raghav Gururajan wrote: > @(rekado|lle-bout|danny) >=20 > > So I have attached all the patches for this batch. These are=20 > > non-signed-off, just for the record. :) >=20 > Had to make a change to 0068. Attached the modified patch. >=20 > Regards, > RG. Reviewed, back and forth many comments over IRC with Raghav, pushed as 76b689f339c7ef6f10917e18c630189bb2449110. Everything builds with: $ ./pre-inst-env guix build -k -v1 glib libsigc++ glibmm gobject- introspection cairo cairomm pango pangomm gdk-pixbuf gdk-pixbuf+svg vala libgsf atk atkmm gtk-doc glibmm@2.64 gtkmm@2 cairomm@1.13 wayland yelp-xsl json-glib at-spi2-atk at-spi2-core atkmm@2.28 pangomm@2.42=20 libsigc++@2 vala gtkmm@2 wayland-protocols The commit history is not perfect, especially the "cosmetic changes" that also ungraft things, but we also want to move on and do this actual GNOME 40 upgrade and it is not worth it obsessing over at the end mostly irrelevant commit history details. Any dependents that breaks due to these patches we will fix on core- updates from now on. Thanks a lot everyone! Let's upgrade GNOME to 40!! --=-sm/hcizAAEeQFpx72X9f Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEFIvLi9gL+xax3g6RRaix6GvNEKYFAmBeUIkACgkQRaix6GvN EKZgIxAArY66sXRpCakPOAT1XLXFPoyCKb3AqnRw2EFDX4xkJ9QN9yTTxgyad75p o1BN417PP4OYevftKX6TNuP58xuGZsqH8hgn8HuaJwjMG6fiAtzBaJ0rIPjiPy4t qy1WUU/552L2pecHEH5NAWSaURov3COBZx0qKXj3A4JvKsf+dN2xb/8jUNnFUzEa SdPHm7Ui5b9BGdQpwyGnqvmRpF9RjOWGf0C0oy1e0w7IumRRIhI/xw8waqgJvuWC NxZzrZ1DWHYc1Yg36iRpmiXOw1VWkkiup9sPcRJRFaH/jVTSZn3aAne4usxM2wAl 3SMqhL+M7Shm3aRv/OaLuhF0WzG+ow3pRj8JpB+dfl6qZ9JofZa0S2RkBAxW3UOe pt9v18yLN0grrwavlzJs4DqSodAq0jBjMOgwfCGhKB2LJgWYvdi0Tjm6duznRj8d INGzjMwv1d6skUG+OLOLTkqCh96OApU68Vq4Auqrurpxr3sZ/ruFfZ2i1iVVcLTv 7PNV1ngAgWzRm3tdwNwEq6eVMlD7QvxcaVYeoZw6JQiF/XMd95N1jDu00jpqNkgu o7z98EPNVptC+ji0ICHozmepiFD6NqJH8E9ll3vGhFn0gMZkeFI3bLBWzdk6+y5m qJk7g6hDAvLAbXgColeY194zHWQvaoHriJaeugZAFoPb0XTHw4s= =z3u9 -----END PGP SIGNATURE----- --=-sm/hcizAAEeQFpx72X9f-- From unknown Thu Jun 19 14:28:28 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 24 Apr 2021 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator