libreoffice: update rules patch for v25.8.2

This commit is contained in:
Luis Guzmán 2025-10-11 02:03:11 -06:00
parent a12c2b558e
commit aa996a1e4a
2 changed files with 11 additions and 10 deletions

View file

@ -1,17 +1,18 @@
--- 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
-
diff --git a/debian/rules b/debian/rules
index 06de6171..b930f423 100755
--- a/debian/rules
+++ b/debian/rules
@@ -824,7 +824,8 @@ endif
# for t64
BUILD_DEPS += , dpkg-dev (>= 1.22.5) [$(filter-out i386,$(OOO_32BIT_ARCHS))]
-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 @@
@@ -835,7 +835,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)

View file

@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (C) 2023 Luis Guzmán <ark@switnet.org>
# Copyright (C) 2025 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
@ -19,7 +19,7 @@
VERSION=4
EXTERNAL='deb-src http://ppa.launchpad.net/libreoffice/ppa/ubuntu $UPSTREAM main'
REPOKEY="83FBA1751378B444"
REPOKEY="73AEE920AD55F5A0"
BACKPORT=true
. ./config