From b587846898cb8b5e48d5407646a0abdc601ea7d8 Mon Sep 17 00:00:00 2001
From: John McQuah <jquah@mx.sdf.org>
Date: Tue, 17 Jan 2023 06:51:44 -0500
Subject: [PATCH] libreoffice-bin: modify footprint to avoid filesystem
 conflicts

---
 REPO                       | 8 ++++----
 libreoffice-bin/.signature | 4 ++--
 libreoffice-bin/Pkgfile    | 7 ++-----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/REPO b/REPO
index 5b156ad..d5dabfb 100644
--- a/REPO
+++ b/REPO
@@ -183,8 +183,8 @@ f:62b29c353146c16655ad788c14677762:sundials/sundials-fix-cmake-targets.patch
 f:5d5d948027c591547dd0e979a225d62f:sundials/.signature
 f:c65b00832be395eb095ee3b6e5f950e6:sundials/Pkgfile
 f:f86b14e4d133448fc0b537dba6acc349:sundials/.footprint
-f:511a0f16d6d7566a5e5fe1fd13d2c71e:recode/.signature
-f:9accd9e4a1f48b349001c2013c198236:recode/Pkgfile
+f:64d07166044736c1441c35fd1593d32a:recode/.signature
+f:9c9acfdacfab57a3975741d4ccb89606:recode/Pkgfile
 f:b474503451fadd19511c8b53ff47fc46:recode/.footprint
 f:39680318d83f51fa90fd16fa4ed05154:zathura-pdf-poppler/.signature
 f:13d8d971c19328457beb3c9af2788a94:zathura-pdf-poppler/Pkgfile
@@ -239,8 +239,8 @@ f:69f0af978af475763423ee7333e0a6d4:wezterm/wezterm.lua
 f:26b47749281fadfec410db73b389c21a:wezterm/.signature
 f:46efa506b93ddffbd1c480c041518ae9:wezterm/Pkgfile
 f:1d592352de4fc7bf9f9be410dfaa5619:wezterm/.footprint
-f:55381d1d6f80a381e9e47ec2cf0b79e9:libreoffice-bin/.signature
-f:ccd7a983319442415eddeb346d4f628e:libreoffice-bin/Pkgfile
+f:4b06d9d29abae0b8dfee28e1b1908b45:libreoffice-bin/.signature
+f:17794c25de94b545d6d2eab541a3868d:libreoffice-bin/Pkgfile
 f:7c2f0221d7323b83887c3b272c0b774d:libreoffice-bin/.footprint
 f:6d00fd89381a70485b2d777c863d50e3:qrupdate/r33-complex-real.patch
 f:bfe7fbd983f027324d35232f9ee3957a:qrupdate/.signature
diff --git a/libreoffice-bin/.signature b/libreoffice-bin/.signature
index b922837..4c48fcb 100644
--- a/libreoffice-bin/.signature
+++ b/libreoffice-bin/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/jmq.pub
-RWTTPlFarK9CxKFy0pVt7Vicq/O6Ezb8E1i1oARrHhnEBfdUrp2J9W1J97GrYAlUYqqO1FsvW15lS5LxQ0xRHqZ+4LBzu85Otww=
-SHA256 (Pkgfile) = e52c5744f29055ecbba1d054548c1477e978f7bd4bb8c84f0d7e66ae4945fe6c
+RWTTPlFarK9CxJazRXDK+/zKL6wVM/NOKo4k6N0jQnRK7zVrNruUhaAaV842rcjumQ5+jSzo0Bl+reZ6R4hSXRlnrJd0veMf6AQ=
+SHA256 (Pkgfile) = eb5e55a2fc206d777c383544683ec11907c09d13b5624db8b13855b5d6c46387
 SHA256 (.footprint) = c5a02eaa54dec581ca93b2031b90513b508aef0b6efaeb05254961c03cfda75a
 SHA256 (LibreOffice_7.3.7_Linux_x86-64_rpm.tar.gz) = 9dbe8dbb66e43c7ac4a767fe27c724e818e689703de57cacd10d7a3fe3d90e41
diff --git a/libreoffice-bin/Pkgfile b/libreoffice-bin/Pkgfile
index 665fde1..77cfd1f 100644
--- a/libreoffice-bin/Pkgfile
+++ b/libreoffice-bin/Pkgfile
@@ -33,10 +33,6 @@ build() {
   mv "$PKG/opt" "$PKG/usr/lib"
   find "$PKG" -type d -perm 700 -exec chmod 755 {} +
 
-  mkdir -p "$PKG/usr/bin" && cd "$PKG/usr/bin"
-  rm -f libreoffice7.3
-  ln -sf ../lib/libreoffice7.3/program/soffice soffice
-  ln -sf ../lib/libreoffice7.3/program/soffice libreoffice
   rm -f "$PKG"/usr/share/applications/*.desktop
   cd "$PKG"/usr/share/applications
   for APP in ../../lib/libreoffice7.3/share/xdg/*.desktop; do
@@ -45,6 +41,7 @@ build() {
 
   # clean up junk files
   rm -rf "$PKG"/usr/lib/libreoffice7.3/readmes
-  find "$PKG" \( -name "README*" -o -name "LICENSE*" -o -name "NOTICE*" -o -name "COPYING*" \) -exec rm {} +
+  find "$PKG" \( -name "README*" -o -name "LICENSE*" -o -name "NOTICE*" \
+              -o -name "COPYING*" \) -exec rm {} +
   find "$PKG" -name "wininst*.exe" -exec rm {} +
 }