From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id iBwYG4vEbF/mRAAA0tVLHw (envelope-from ) for ; Thu, 24 Sep 2020 16:08:43 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id QLXaFovEbF9yDgAAB5/wlQ (envelope-from ) for ; Thu, 24 Sep 2020 16:08:43 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 22FE89406F7 for ; Thu, 24 Sep 2020 16:08:42 +0000 (UTC) Received: from localhost ([::1]:46564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLTnV-0005aN-0D for larch@yhetil.org; Thu, 24 Sep 2020 12:08:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLTHw-0006I9-N5 for guix-patches@gnu.org; Thu, 24 Sep 2020 11:36:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58052) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLTHu-0006yc-Nm for guix-patches@gnu.org; Thu, 24 Sep 2020 11:36:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kLTHu-00087D-LV for guix-patches@gnu.org; Thu, 24 Sep 2020 11:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42958] [PATCH core-updates 10/29] gnu: cairo: Update package definition. References: <20200820150914.9443-1-dannym@scratchpost.org> In-Reply-To: <20200820150914.9443-1-dannym@scratchpost.org> Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Sep 2020 15:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42958 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42958@debbugs.gnu.org Received: via spool by 42958-submit@debbugs.gnu.org id=B42958.160096171931110 (code B ref 42958); Thu, 24 Sep 2020 15:36:02 +0000 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) 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=disroot.org header.s=mail header.b=dGuuO44p; dmarc=fail reason="SPF not aligned (relaxed)" header.from=disroot.org (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.59 X-TUID: 06V2WBVmE7cs 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--