From patchwork Wed Jan 18 21:27:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 46281 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C73B527BBEB; Wed, 18 Jan 2023 21:28:56 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2760E27BBE9 for ; Wed, 18 Jan 2023 21:28:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIFyV-0006sl-RA; Wed, 18 Jan 2023 16:28:03 -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 1pIFyU-0006sK-3C for guix-patches@gnu.org; Wed, 18 Jan 2023 16:28:02 -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 1pIFyT-0008Lk-QR for guix-patches@gnu.org; Wed, 18 Jan 2023 16:28:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pIFyT-00052j-LL for guix-patches@gnu.org; Wed, 18 Jan 2023 16:28:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60939] [PATCH v2 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 21:28: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.167407727019355 (code B ref 60939); Wed, 18 Jan 2023 21:28:01 +0000 Received: (at 60939) by debbugs.gnu.org; 18 Jan 2023 21:27:50 +0000 Received: from localhost ([127.0.0.1]:41924 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIFyI-000526-1s for submit@debbugs.gnu.org; Wed, 18 Jan 2023 16:27:50 -0500 Received: from 4.mo560.mail-out.ovh.net ([87.98.172.75]:54597) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIFyF-00051v-1e for 60939@debbugs.gnu.org; Wed, 18 Jan 2023 16:27:48 -0500 Received: from director4.ghost.mail-out.ovh.net (unknown [10.109.143.146]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id C7B1D23B4B for <60939@debbugs.gnu.org>; Wed, 18 Jan 2023 21:27:44 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-2sdkm (unknown [10.110.171.191]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id E02C41FF02; Wed, 18 Jan 2023 21:27:42 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-6684bf9d7b-2sdkm with ESMTPSA id 8JsZO05kyGNB1C0AHxIKmQ (envelope-from ); Wed, 18 Jan 2023 21:27:42 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-103G005ca379544-fbd1-4878-a26e-d83f5bfe6ae2, B258F44DC4C1DFDA75C284F226407DB525AD202B) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Wed, 18 Jan 2023 22:27:34 +0100 Message-Id: <20230118212735.27131-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Ovh-Tracer-Id: 7228277404560122594 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedruddtkedgudegkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeefhedugefhjeefffeluefggfeuhfeuiedugedukeffvddvgfdtvefhgedvheeffeenucffohhmrghinheplhhisghrvghofhhfihgtvgdrohhrghdpshhkihgrrdhorhhgnecukfhppeduvdejrddtrddtrddupdefjedrheelrddugedvrddutdefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeitdelfeelseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtpdhmohguvgepshhmthhpohhuth 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 X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/libreoffice.scm (skia-for-libreoffice): New variable. --- gnu/packages/libreoffice.scm | 66 ++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index b959470d8f..372b18a24f 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,68 @@ (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 + (inherit libreoffice) + (name "skia-for-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))) From patchwork Wed Jan 18 21:27:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 46280 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6AEC027BBED; Wed, 18 Jan 2023 21:28:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C105827BBE9 for ; Wed, 18 Jan 2023 21:28:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIFyW-0006tB-T3; Wed, 18 Jan 2023 16:28:04 -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 1pIFyU-0006sS-HF for guix-patches@gnu.org; Wed, 18 Jan 2023 16:28:02 -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 1pIFyU-0008Lq-91 for guix-patches@gnu.org; Wed, 18 Jan 2023 16:28:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pIFyU-00052r-40 for guix-patches@gnu.org; Wed, 18 Jan 2023 16:28:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60939] [PATCH v2 2/2] gnu: libreoffice: Enable build with skia. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jan 2023 21:28:02 +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.167407727619373 (code B ref 60939); Wed, 18 Jan 2023 21:28:02 +0000 Received: (at 60939) by debbugs.gnu.org; 18 Jan 2023 21:27:56 +0000 Received: from localhost ([127.0.0.1]:41927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIFyO-00052P-Ge for submit@debbugs.gnu.org; Wed, 18 Jan 2023 16:27:56 -0500 Received: from 7.mo576.mail-out.ovh.net ([46.105.50.32]:43073) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIFyL-00052F-IV for 60939@debbugs.gnu.org; Wed, 18 Jan 2023 16:27:54 -0500 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.4.85]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id ACB0B21654 for <60939@debbugs.gnu.org>; Wed, 18 Jan 2023 21:27:50 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-rftrh (unknown [10.110.115.91]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id F413A1FE9B; Wed, 18 Jan 2023 21:27:47 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-6684bf9d7b-rftrh with ESMTPSA id nTTUL1NkyGNU0wUAJaxvQA (envelope-from ); Wed, 18 Jan 2023 21:27:47 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S003dbeb7c8c-cb83-4f7b-95e8-30a79e97ab1e, B258F44DC4C1DFDA75C284F226407DB525AD202B) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Wed, 18 Jan 2023 22:27:35 +0100 Message-Id: <20230118212735.27131-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230118212735.27131-1-ngraves@ngraves.fr> References: <20230118212735.27131-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 7229966255754633954 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedruddtkedgudegkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpfeejrdehledrudegvddruddtleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepiedtleefleesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht 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 X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/libreoffice.scm (libreoffice): Enable build with skia. --- gnu/packages/libreoffice.scm | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 372b18a24f..72cd17fa09 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -970,6 +970,34 @@ (define-public libreoffice (("/usr/bin/xdg-open") (search-input-file inputs "/bin/xdg-open"))) (setenv "CPPFLAGS" "-std=c++17"))) + (add-before 'configure 'include-built-skia + (lambda* (#:key inputs #:allow-other-keys) + (let* ((incdir (search-input-directory inputs "include/skia/")) + (outdir (string-drop-right + incdir + (string-length "include/skia/"))) + (libdir (string-append outdir "lib"))) + (substitute* "RepositoryExternal.mk" + ;; Delete options that trigger skia build. + (("-DSK_USER_CONFIG_HEADER=\"<\\$\\(BUILDDIR\\)\\/config_host\\/config_skia\\.h>\"") + "") + (("-DSKIA_DLL") + "") + ;; Include skia .h files. + (("\\$\\(call gb_UnpackedTarball_get_dir,skia\\)") + incdir) + ;; Use skia as an external library. + (("\\$\\(call gb_LinkTarget_use_libraries,\\$\\(1\\),skia\\)") + (string-append "$(call gb_LinkTarget_add_libs,$(1)," + "-L" libdir " -lskialo)"))) + ;; Delete skia library unpack and build steps. + (substitute* "external/skia/Module_skia.mk" + (("UnpackedTarball_skia") "") + (("Library_skia") "")) + ;; Symlink the library (used in make install). + (mkdir-p "instdir/program") + (symlink (search-input-file inputs "lib/libskialo.so") + "instdir/program/libskialo.so")))) (add-after 'install 'reset-zip-timestamps (lambda _ (for-each (lambda (file) @@ -1042,7 +1070,6 @@ (define (install-appdata app) "--without-java" ;; FIXME: Enable once the corresponding inputs are packaged. "--disable-coinmp" - "--disable-skia" ;; This could (Debian does this) be a separate output containing only ;; program/libfirebird_sdbclo.so, if there's a way to point to it. "--enable-firebird-sdbc" @@ -1138,6 +1165,7 @@ (define (install-appdata app) qrcodegen-cpp redland sane-backends + skia-for-libreoffice unixodbc unzip vigra