Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

freeoffice: 971 -> 973 #73704

Merged
merged 2 commits into from Nov 20, 2019
Merged

freeoffice: 971 -> 973 #73704

merged 2 commits into from Nov 20, 2019

Conversation

@romildo
Copy link
Contributor

romildo commented Nov 18, 2019

Motivation for this change

Update to version 973

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @danieldk

@dtzWill

This comment has been minimized.

Copy link
Contributor

dtzWill commented Nov 19, 2019

Something in the icons seems to have changed, so the bash scripting that copies and links them around needs some adjustments. Minor :).

@danieldk

This comment has been minimized.

Copy link
Member

danieldk commented Nov 19, 2019

It seems like the 96x96 application icons are not in the upstream tarball

$ find icons -name '*96*'
icons/pmd_96.png
icons/prd_oth_96.png
icons/prd_96.png
icons/pmd_mso_96.png
icons/pmd_oth_96.png
icons/tmd_96.png
icons/tmd_oth_96.png
icons/prd_mso_96.png
icons/tmd_mso_96.png

These are only the icons for the various MIME types.

@danieldk

This comment has been minimized.

Copy link
Member

danieldk commented Nov 19, 2019

BTW. I also asked about their replacement of existing tarballs, which leads to checksum mismatches of the current version:

This is a bit tricky for us. We have to version RPM and DEB packages, so we do the same for TGZ. And, since we send out e-mails with download links, we use .htaccess rewriting to always point them to the latest version. Could you host the TGZ packages yourselves? Then you are in control which version is delivered under which URL.

https://forum.softmaker.com/viewtopic.php?f=320&t=19327

@romildo

This comment has been minimized.

Copy link
Contributor Author

romildo commented Nov 19, 2019

Something in the icons seems to have changed, so the bash scripting that copies and links them around needs some adjustments. Minor :).

@danieldk Can you provide a fix for that?

@danieldk

This comment has been minimized.

Copy link
Member

danieldk commented Nov 19, 2019

Something in the icons seems to have changed, so the bash scripting that copies and links them around needs some adjustments. Minor :).

@danieldk Can you provide a fix for that?

As I mentioned, I don't think it the bash scripts, the 96x96 program icons do not seem to be in the upstream tarball. I am not sure how we could fix that, except for reporting this to SoftMaker.

Since there are still a lot of other icon sizes (32, 48, 64, 72, 128, 256, 512, 512), I guess one solution would be to not include the 96x96 application icons, what do you think?

@romildo

This comment has been minimized.

Copy link
Contributor Author

romildo commented Nov 19, 2019

Since there are still a lot of other icon sizes (32, 48, 64, 72, 128, 256, 512, 512), I guess one solution would be to not include the 96x96 application icons, what do you think?

Seems reasonable. I have pushed a commit that removes the resulting broken symbolic links.

@romildo romildo merged commit d9a6c04 into NixOS:master Nov 20, 2019
16 checks passed
16 checks passed
freeoffice on aarch64-linux No attempt
Details
freeoffice on x86_64-darwin No attempt
Details
freeoffice on x86_64-linux No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@romildo romildo deleted the romildo:upd.softmaker-office branch Nov 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.