* bug#58031: LibreOffice 7.3.5.2 is not reproducible
@ 2022-09-23 20:12 Ludovic Courtès
2022-11-25 22:39 ` Kaelyn via Bug reports for GNU Guix
0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2022-09-23 20:12 UTC (permalink / raw)
To: 58031
There’s a single file that differs:
--8<---------------cut here---------------start------------->8---
$ guix describe
Generation 228 Sep 12 2022 08:17:50 (current)
guix e3ed1d0
repository URL: https://git.savannah.gnu.org/git/guix.git
branch: master
commit: e3ed1d09f9d490eff6becd6e9cb85a4d36c48e85
$ guix challenge libreoffice
/gnu/store/652zk4gzcnwpq90lbzvr1gk5q2p3flf7-libreoffice-7.3.5.2 contents differ:
no local build for '/gnu/store/652zk4gzcnwpq90lbzvr1gk5q2p3flf7-libreoffice-7.3.5.2'
https://ci.guix.gnu.org/nar/lzip/652zk4gzcnwpq90lbzvr1gk5q2p3flf7-libreoffice-7.3.5.2: 1hp4dknx01s2lylf0bfagfvf04naaayrhyjbwa5l2iv0vqxdbcx8
https://bordeaux.guix.gnu.org/nar/lzip/652zk4gzcnwpq90lbzvr1gk5q2p3flf7-libreoffice-7.3.5.2: 10vraihz73428z453wj7546ic98bkv3mkdr5222lg6grrfc49rp3
differing file:
/lib/libreoffice/share/template/common/draw/bpmn.otg
1 store items were analyzed:
- 0 (0.0%) were identical
- 1 (100.0%) differed
- 0 (0.0%) were inconclusive
--8<---------------cut here---------------end--------------->8---
It’s apparently a zip file and the difference lies in mtimes:
--8<---------------cut here---------------start------------->8---
$ guix challenge libreoffice --diff=diffoscope
/gnu/store/652zk4gzcnwpq90lbzvr1gk5q2p3flf7-libreoffice-7.3.5.2 contents differ:
no local build for '/gnu/store/652zk4gzcnwpq90lbzvr1gk5q2p3flf7-libreoffice-7.3.5.2'
https://ci.guix.gnu.org/nar/lzip/652zk4gzcnwpq90lbzvr1gk5q2p3flf7-libreoffice-7.3.5.2: 1hp4dknx01s2lylf0bfagfvf04naaayrhyjbwa5l2iv0vqxdbcx8
https://bordeaux.guix.gnu.org/nar/lzip/652zk4gzcnwpq90lbzvr1gk5q2p3flf7-libreoffice-7.3.5.2: 10vraihz73428z453wj7546ic98bkv3mkdr5222lg6grrfc49rp3
bordeaux.guix.gnu.org 125.3MiB 10.5MiB/s 00:12 [##################] 100.0%--- /tmp/guix-directory.7C81ON
+++ /tmp/guix-directory.n0WtkB
│ --- /tmp/guix-directory.7C81ON/lib
├── +++ /tmp/guix-directory.n0WtkB/lib
│ │ --- /tmp/guix-directory.7C81ON/lib/libreoffice
│ ├── +++ /tmp/guix-directory.n0WtkB/lib/libreoffice
│ │ │ --- /tmp/guix-directory.7C81ON/lib/libreoffice/share
│ │ ├── +++ /tmp/guix-directory.n0WtkB/lib/libreoffice/share
│ │ │ │ --- /tmp/guix-directory.7C81ON/lib/libreoffice/share/template
│ │ │ ├── +++ /tmp/guix-directory.n0WtkB/lib/libreoffice/share/template
│ │ │ │ │ --- /tmp/guix-directory.7C81ON/lib/libreoffice/share/template/common
│ │ │ │ ├── +++ /tmp/guix-directory.n0WtkB/lib/libreoffice/share/template/common
│ │ │ │ │ │ --- /tmp/guix-directory.7C81ON/lib/libreoffice/share/template/common/draw
│ │ │ │ │ ├── +++ /tmp/guix-directory.n0WtkB/lib/libreoffice/share/template/common/draw
│ │ │ │ │ │ │ --- /tmp/guix-directory.7C81ON/lib/libreoffice/share/template/common/draw/bpmn.otg
│ │ │ │ │ │ ├── +++ /tmp/guix-directory.n0WtkB/lib/libreoffice/share/template/common/draw/bpmn.otg
│ │ │ │ │ │ │ ├── zipinfo {}
│ │ │ │ │ │ │ │ @@ -1,8 +1,8 @@
│ │ │ │ │ │ │ │ Zip file size: 36563 bytes, number of entries: 6
│ │ │ │ │ │ │ │ --rw-r--r-- 3.0 unx 52 b- stor 22-Aug-29 17:52 mimetype
│ │ │ │ │ │ │ │ --rw-r--r-- 3.0 unx 281529 t- defN 22-Aug-29 17:52 content.xml
│ │ │ │ │ │ │ │ --rw-r--r-- 3.0 unx 711 t- defN 22-Aug-29 17:52 META-INF/manifest.xml
│ │ │ │ │ │ │ │ --rw-r--r-- 3.0 unx 1096 t- defN 22-Aug-29 17:52 meta.xml
│ │ │ │ │ │ │ │ --rw-r--r-- 3.0 unx 25395 t- defN 22-Aug-29 17:52 styles.xml
│ │ │ │ │ │ │ │ --rw-r--r-- 3.0 unx 4680 b- defN 22-Aug-29 17:52 Thumbnails/thumbnail.png
│ │ │ │ │ │ │ │ +-rw-r--r-- 3.0 unx 52 b- stor 22-Aug-16 02:46 mimetype
│ │ │ │ │ │ │ │ +-rw-r--r-- 3.0 unx 281529 t- defN 22-Aug-16 02:46 content.xml
│ │ │ │ │ │ │ │ +-rw-r--r-- 3.0 unx 711 t- defN 22-Aug-16 02:46 META-INF/manifest.xml
│ │ │ │ │ │ │ │ +-rw-r--r-- 3.0 unx 1096 t- defN 22-Aug-16 02:46 meta.xml
│ │ │ │ │ │ │ │ +-rw-r--r-- 3.0 unx 25395 t- defN 22-Aug-16 02:46 styles.xml
│ │ │ │ │ │ │ │ +-rw-r--r-- 3.0 unx 4680 b- defN 22-Aug-16 02:46 Thumbnails/thumbnail.png
│ │ │ │ │ │ │ │ 6 files, 313463 bytes uncompressed, 35921 bytes compressed: 88.5%
1 store items were analyzed:
- 0 (0.0%) were identical
- 1 (100.0%) differed
- 0 (0.0%) were inconclusive
--8<---------------cut here---------------end--------------->8---
We could add a phase that resets timestamps in the zip file, or we could
tweak the build process that produces it.
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread* bug#58031: LibreOffice 7.3.5.2 is not reproducible
2022-09-23 20:12 bug#58031: LibreOffice 7.3.5.2 is not reproducible Ludovic Courtès
@ 2022-11-25 22:39 ` Kaelyn via Bug reports for GNU Guix
2022-11-26 22:12 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix
0 siblings, 1 reply; 3+ messages in thread
From: Kaelyn via Bug reports for GNU Guix @ 2022-11-25 22:39 UTC (permalink / raw)
To: 58031@debbugs.gnu.org
Hi,
From some local testing, it appears the timestamps in bpmn.otg can be addressed by adding "otg" to the list of file extensions the existing 'reset-zip-timestamps phase looks for:
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 8343f8ffc6..69319177db 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -1159,7 +1159,7 @@ (define-public libreoffice
(for-each (lambda (file)
(invoke "ziptime" file))
;; So many different extensions for .zip files.
- (find-files #$output "\\.(bau|dat|otp|ott|zip)$"))))
+ (find-files #$output "\\.(bau|dat|otg|otp|ott|zip)$"))))
(add-after 'install 'bin-and-desktop-install
;; Create 'soffice' and 'libreoffice' symlinks to the executable
;; script.
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-26 22:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-23 20:12 bug#58031: LibreOffice 7.3.5.2 is not reproducible Ludovic Courtès
2022-11-25 22:39 ` Kaelyn via Bug reports for GNU Guix
2022-11-26 22:12 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).