From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id kJS4Ijs8yGO/FwAAbAwnHQ (envelope-from ) for ; Wed, 18 Jan 2023 19:36:43 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id sAEiIjs8yGNXiAAAG6o9tA (envelope-from ) for ; Wed, 18 Jan 2023 19:36:43 +0100 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 42EB13C5C7 for ; Wed, 18 Jan 2023 19:36:43 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIDII-0006LU-Na; Wed, 18 Jan 2023 13:36:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pIDI4-0006Fz-C4 for guix-patches@gnu.org; Wed, 18 Jan 2023 13:36:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pIDI2-0004j1-5M for guix-patches@gnu.org; Wed, 18 Jan 2023 13:36:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pIDI1-0000On-Sz for guix-patches@gnu.org; Wed, 18 Jan 2023 13:36:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60939] [PATCH 1/2] gnu: Add skia-for-libreoffice. References: <87pmbblmz5.fsf@ngraves.fr> In-Reply-To: <87pmbblmz5.fsf@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jan 2023 18:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60939 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60939@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 60939-submit@debbugs.gnu.org id=B60939.16740669151426 (code B ref 60939); Wed, 18 Jan 2023 18:36:01 +0000 Received: (at 60939) by debbugs.gnu.org; 18 Jan 2023 18:35:15 +0000 Received: from localhost ([127.0.0.1]:41813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIDHG-0000Mv-Ns for submit@debbugs.gnu.org; Wed, 18 Jan 2023 13:35:15 -0500 Received: from 9.mo561.mail-out.ovh.net ([87.98.184.141]:34651) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIDHC-0000Mi-VR for 60939@debbugs.gnu.org; Wed, 18 Jan 2023 13:35:12 -0500 Received: from director2.ghost.mail-out.ovh.net (unknown [10.109.146.166]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id CFFF523474 for <60939@debbugs.gnu.org>; Wed, 18 Jan 2023 18:35:07 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-zrj9m (unknown [10.110.103.233]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 37C021FF3C; Wed, 18 Jan 2023 18:35:06 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-6684bf9d7b-zrj9m with ESMTPSA id /rOCEto7yGM7YQEANs+jDg (envelope-from ); Wed, 18 Jan 2023 18:35:06 +0000 X-OVh-ClientIp: 81.67.140.142 Date: Wed, 18 Jan 2023 19:34:59 +0100 Message-Id: <20230118183500.20593-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 4313041070647861986 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedruddtkedguddugecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekffdvgfdtjedvtdduhffgvdehjedugeduledtieevuddukedvudevtefhteeiveenucffohhmrghinheplhhisghrvghofhhfihgtvgdrohhrghdpughotghumhgvnhhtfhhouhhnuggrthhiohhnrdhorhhgpdhskhhirgdrohhrghenucfkphepuddvjedrtddrtddruddpfeejrdehledrudegvddruddtvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepiedtleefleesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiuddpmhhouggvpehsmhhtphhouhht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1674067003; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=INyPyaldcESUyn5jVaNsul6ZfnzSklfiDX5e1HblXJg=; b=m0HHdHvlgBU/nu2wk6HxT6E3LmVMO6L8Zadjtal0/EnA8FR5IGRc7CkyNfebx8v/d5nZHK l0Wy1DdB7PgKtfcTBD6m6WNiOQwfWghfGD52UBMjVJMITVJPeMquwZ+SbwEJ8tTYR6B8n+ SY3HKQmtUOPzGkK9Cex7BOg23D/bS3b0frUVMRyY6nGvwMFV+qvUiPh49m97KndrdUNTa5 2zYyp9giba2BlwXI0t75zAEjV5OgjNCHl+msEqmwnxXci1+FqDCGGyHJpRveYa4Fvz6hFT T9VInFbOV3iwHybCCH80gWlxlR1qZpW45aRKfFvizsCMaGuyHH9xaBo2y+CzUg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1674067003; a=rsa-sha256; cv=none; b=fAdDNWZliUazhNqMsaW56bkiXiXd0GiIty/yMRgu60iPM5MgaGNGuFr+P9su0MN1UgyK5P 4MG71JohG0fDT8e6zkHGb84H6t3eAOJXst3cH404800TZTWg7LCUNSxykfwxP2OEVYKaTN HQQxbNcvQ2WEXIYcgO2teGBgenWtYeMvXW3hfnEOzMVPA/fPAM5qxG5nVjFhpMIFPaffNu I7tPRRdTfIFvyjeF5KYwu5cwj1yrgx+GlEOB7w8QL8Jwrey9U0fCt3Ryd4CMkSRTqVMge6 5aV4SLHq0q1Nt+el6zHm70zy5fZxmujdQeA/AKXg2cJBnswTLjfVUdK+1EZVQA== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -1.63 X-Spam-Score: -1.63 X-Migadu-Queue-Id: 42EB13C5C7 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-TUID: lWvuk/ZRGZuP * gnu/packages/libreoffice.scm (skia-for-libreoffice): New variable. --- gnu/packages/libreoffice.scm | 76 ++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index b959470d8f..36d7bc0c66 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -75,6 +75,7 @@ (define-module (gnu packages libreoffice) #:use-module (gnu packages image) #:use-module (gnu packages java) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages logging) #:use-module (gnu packages m4) #:use-module (gnu packages maths) @@ -1155,3 +1156,78 @@ (define (install-appdata app) '((release-monitoring-url . "https://www.libreoffice.org/download/download-libreoffice/"))) (license license:mpl2.0))) + +(define skia-tarball + (origin + (method url-fetch) + (uri "https://dev-www.libreoffice.org/src/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz") + (sha256 + (base32 "1navlqbm6ja78whj5p1jwnlg3fmnpqjwh00dmbm4n424gqjad560")))) + +(define-public skia-for-libreoffice + (package + (name "skia-for-libreoffice") + (version (package-version libreoffice)) + (source + (origin + (method url-fetch) + (uri + (string-append + "https://download.documentfoundation.org/libreoffice/src/" + (version-prefix version 3) "/libreoffice-" version ".tar.xz")) + (sha256 + (base32 "0fyvd4ydh72lmn005h190xa563d4h376pi1fx9lfr5i25qcbpg7z")))) + (build-system (package-build-system libreoffice)) + (arguments + (substitute-keyword-arguments (package-arguments libreoffice) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (delete 'include-built-skia) + (delete 'bin-and-desktop-install) + (add-after 'insert-external-tarballs 'insert-skia-tarball + (lambda _ + (copy-file + #$skia-tarball + (string-append + "external/tarballs/" + "skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz")))) + (replace 'build + (lambda _ (invoke "make" "Library_skia"))) + (replace 'install + (lambda _ + (with-directory-excursion "instdir/program" + (for-each + (lambda (lib) + (install-file lib (string-append #$output "/lib"))) + (find-files "." "\\.so$"))) + (define* (install-header header) + (let* ((inc (string-append #$output "/include/")) + (ridx (string-rindex header #\/)) + (dir (string-append inc (string-take header ridx)))) + (install-file header dir))) + (with-directory-excursion "workdir/UnpackedTarball" + (for-each install-header (find-files "skia" "\\.h"))))))) + ((#:configure-flags flags) + ;; Else needs llvm gold linker. + `(delete "--enable-lto" ,flags)) + ((#:validate-runpath? _ #f) #f))) + (native-inputs (modify-inputs + (append (package-native-inputs libreoffice) + ;; here because of configure step + (package-inputs libreoffice)) + (prepend clang-11) + ;; Avoid circular dependency. + (delete "skia-for-libreoffice"))) + (inputs (list expat fontconfig freetype harfbuzz mesa libwebp zlib)) + (home-page "https://skia.org/") + (synopsis "2D graphics library") + (description + "Skia is a 2D graphics library for drawing text, geometries, and images. +It supports: +@itemize +@item 3x3 matrices with perspective +@item antialiasing, transparency, filters +@item shaders, xfermodes, maskfilters, patheffects +@item subpixel text +@end itemize") + (license license:bsd-3))) -- 2.38.1