From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 yDRYFC88yGP+FAEAbAwnHQ (envelope-from ) for ; Wed, 18 Jan 2023 19:36:31 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 8PWRFC88yGP1VwAA9RJhRA (envelope-from ) for ; Wed, 18 Jan 2023 19:36:31 +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 CADDB3C722 for ; Wed, 18 Jan 2023 19:36:30 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIDIM-0006MQ-D8; Wed, 18 Jan 2023 13:36:22 -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-0006G0-C5 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-0004j4-EO 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 1pIDI2-0000Ou-9b for guix-patches@gnu.org; Wed, 18 Jan 2023 13:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60939] [PATCH 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 18:36: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.16740669201451 (code B ref 60939); Wed, 18 Jan 2023 18:36:02 +0000 Received: (at 60939) by debbugs.gnu.org; 18 Jan 2023 18:35:20 +0000 Received: from localhost ([127.0.0.1]:41816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIDHM-0000NJ-7r for submit@debbugs.gnu.org; Wed, 18 Jan 2023 13:35:20 -0500 Received: from 6.mo582.mail-out.ovh.net ([87.98.177.69]:58599) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIDHJ-0000N5-Tc for 60939@debbugs.gnu.org; Wed, 18 Jan 2023 13:35:18 -0500 Received: from director9.ghost.mail-out.ovh.net (unknown [10.108.16.222]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id C78AD24B5E for <60939@debbugs.gnu.org>; Wed, 18 Jan 2023 18:35:16 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-gms5h (unknown [10.110.208.172]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 8749D1FEE7; Wed, 18 Jan 2023 18:35:15 +0000 (UTC) Received: from ngraves.fr ([37.59.142.99]) by ghost-submission-6684bf9d7b-gms5h with ESMTPSA id TrQ4JuM7yGN0fi0AtvJ+Aw (envelope-from ); Wed, 18 Jan 2023 18:35:15 +0000 X-OVh-ClientIp: 81.67.140.142 Date: Wed, 18 Jan 2023 19:35:00 +0100 Message-Id: <20230118183500.20593-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230118183500.20593-1-ngraves@ngraves.fr> References: <20230118183500.20593-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 4315574344162599650 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedruddtkedguddufecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeduvddtfedvudelvdekveekieektdffieekfeetveehvdevkeeufffgffeigeehjeenucffohhmrghinhepughotghumhgvnhhtfhhouhhnuggrthhiohhnrdhorhhgnecukfhppeduvdejrddtrddtrddupdefjedrheelrddugedvrdelleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepiedtleefleesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvddpmhhouggvpehsmhhtphhouhht 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=1674066990; 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=sh1prVX1ImUPHR/o/AJPgHe3dypYLXIusPd0SX02Mqk=; b=JNl2vZcQyf/k3G1bkdBmw/3alRkELAaf8NSEA/VD5qhWgapBzydus+USCbBANNMiox8p1d p/r2AMPtEtuJEynOrGihP/jb/95Uy+HC0tMJfTqznspUMXf9fn4VI24JVfLz+hqbrYkfoA C1NL07ivRD+NzxhgE9pbwUzrUs/JCtJIWGd4LDGrz610+3kuD5QFkiXHuL59ULp/xQK6zn d+Fs7s84gFaBdjBl3kMvz9ALf4peNamskPqA9tNO8tg8inVHhp7iYbuXMEJePHPsTH/lSy yJdPYi3m50kfeSPzNqcO2JPxdXEVaNK1Hz6hGcRsPS1UJ9vdPdCQUsRRa6MVTQ== 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=1674066990; a=rsa-sha256; cv=none; b=VfDHJNKVt5O1+9+M8mI48mU/HIjb0mz4QE2VXq1Yu6hO1CbfnHaoJKWtKQuXENKfJVJW9B cutpQ2Mic2AaA5ah50DirhdKflGyEjowDlBN/6ySXFOv7vCr9rLV1EvhCR98H1HOQzR6YR hwtoUZQXLq77BgSX2ecJr1CoXnGMjJhiA9M5ymIGJgNhAd4rz7bRaEnLs25IpcR0pMfrQk md+1YDlwgwPp4DmcMoe0lrKEp2O0xLtl3qRT1sq/tO1lEzgYj1ANxaIQ1MWr+G9mhnC+BY e1Sn0gnlFgYOOYHwOUWg46XkNc5Vk9mPJGyc0bfqgnyKWJBn76i2LPtJK6Z/bw== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -1.63 X-Spam-Score: -1.63 X-Migadu-Queue-Id: CADDB3C722 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: Jrbwd0bVCmxI * gnu/packages/libreoffice.scm (libreoffice): Enable build with skia. * gnu/packages/patches/skia-libreoffice.patch --- gnu/packages/libreoffice.scm | 28 +++++++++++++++++++-- gnu/packages/patches/skia-libreoffice.patch | 27 ++++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/skia-libreoffice.patch diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 36d7bc0c66..d92529d8b5 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -925,7 +925,8 @@ (define-public libreoffice "https://download.documentfoundation.org/libreoffice/src/" (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 - (base32 "0fyvd4ydh72lmn005h190xa563d4h376pi1fx9lfr5i25qcbpg7z")))) + (base32 "0fyvd4ydh72lmn005h190xa563d4h376pi1fx9lfr5i25qcbpg7z")) + (patches (search-patches "skia-libreoffice.patch")))) (build-system glib-or-gtk-build-system) (arguments (list @@ -970,6 +971,29 @@ (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" + ;; 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 +1066,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 +1161,7 @@ (define (install-appdata app) qrcodegen-cpp redland sane-backends + skia-for-libreoffice unixodbc unzip vigra diff --git a/gnu/packages/patches/skia-libreoffice.patch b/gnu/packages/patches/skia-libreoffice.patch new file mode 100644 index 0000000000..1818b8f5d8 --- /dev/null +++ b/gnu/packages/patches/skia-libreoffice.patch @@ -0,0 +1,27 @@ +From ea381d2468523a1e7b78a0bcf10cf5af0484bd5b Mon Sep 17 00:00:00 2001 +From: Nicolas Graves +Date: Tue, 17 Jan 2023 10:49:56 +0100 +Subject: [PATCH] RepositoryExternal: delete build of skia. + +--- + RepositoryExternal.mk | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk +index ccc92790341e..6f2ea1599f12 100644 +--- a/RepositoryExternal.mk ++++ b/RepositoryExternal.mk +@@ -136,10 +136,6 @@ $(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + ) + $(call gb_LinkTarget_use_libraries,$(1),skia) +-$(call gb_LinkTarget_add_defs,$(1),\ +- -DSK_USER_CONFIG_HEADER="<$(BUILDDIR)/config_host/config_skia.h>" \ +- -DSKIA_DLL \ +-) + endef + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo,\ + skia \ +-- +2.38.1 + -- 2.38.1