From 364f3358367acfcd15d6492879112d646480e49c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org> Date: Thu, 12 Jan 2023 23:10:50 +0000 Subject: [PATCH] libreoffice: backport libreoffice fresh to aramo --- .../DATA/libreoffice/debian-rules_7.3.patch | 22 +++++++++++++ helpers/make-libreoffice | 31 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 helpers/DATA/libreoffice/debian-rules_7.3.patch create mode 100644 helpers/make-libreoffice diff --git a/helpers/DATA/libreoffice/debian-rules_7.3.patch b/helpers/DATA/libreoffice/debian-rules_7.3.patch new file mode 100644 index 00000000..f1261b54 --- /dev/null +++ b/helpers/DATA/libreoffice/debian-rules_7.3.patch @@ -0,0 +1,22 @@ +--- a/debian/rules 2022-01-26 09:57:22.000000000 -0600 ++++ b/debian/rules 2022-02-04 09:48:40.142753566 -0600 +@@ -667,8 +667,8 @@ + BULLSEYE_BACKPORT=y + ENABLE_LTO=n + endif +- +-ifeq "$(DEB_VENDOR)" "Ubuntu" ++ifeq ("$(DEB_VENDOR)",$(filter "$(DEB_VENDOR)","Ubuntu" "Trisquel")) ++ ifeq "$(DEB_VENDOR)" "Ubuntu" + # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . + # Note: these are for Ubuntu use ONLY. For your own distribution, + # please get your own set of keys. +@@ -679,7 +679,7 @@ + GOOGLEAPI_CLIENTID_UBUNTU := 424119844901-gee57209rkbo1rgula4i0arilvgv3lsf.apps.googleusercontent.com + GOOGLEAPI_CLIENTSECRET_UBUNTU := 3h1DknIrVsq2wEhIuADVxQ3E + CONFIGURE_FLAGS += --with-gdrive-client-id=$(GOOGLEAPI_CLIENTID_UBUNTU) --with-gdrive-client-secret=$(GOOGLEAPI_CLIENTSECRET_UBUNTU) +- ++ endif + # lp#1034560: MIR troubles make it easier to use internal jfreereport + SYSTEM_STUFF := $(filter-out jfreereport npapi-headers, $(SYSTEM_STUFF)) + SYSTEM_STUFF := $(filter-out libzmf libstaroffice, $(SYSTEM_STUFF)) diff --git a/helpers/make-libreoffice b/helpers/make-libreoffice new file mode 100644 index 00000000..e401dda8 --- /dev/null +++ b/helpers/make-libreoffice @@ -0,0 +1,31 @@ +#!/bin/sh +# +# Copyright (C) 2023 Luis Guzmán <ark@switnet.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# + +VERSION=0 +EXTERNAL='deb-src http://ppa.launchpad.net/libreoffice/ppa/ubuntu $UPSTREAM main' +REPOKEY="83FBA1751378B444" +BACKPORT=true + +. ./config + +patch -p1 < $DATA/debian-rules_7.3.patch + +changelog "Backport libreoffice fresh into Trisquel" + +compile -- GitLab