Skip to content

libreoffice-fresh: 6.3.0.4 -> 6.3.2.1#68414

Closed
peterhoeg wants to merge 1 commit intoNixOS:masterfrom
peterhoeg:u/lo
Closed

libreoffice-fresh: 6.3.0.4 -> 6.3.2.1#68414
peterhoeg wants to merge 1 commit intoNixOS:masterfrom
peterhoeg:u/lo

Conversation

@peterhoeg
Copy link
Copy Markdown
Member

@peterhoeg peterhoeg commented Sep 10, 2019 •
edited
Loading

Motivation for this change

The main motivation was to drop gtk2/qt4 - the updated version was just a side-effect...

Support for both gtk2 and qt4 has been deprecated, so dump that.

Also add support for Qt5 and KDE.

Now, in an ideal world, the following should also happen, but I wanted to get some feedback on this first (and hopefully have this be part of .09):

  1. still hasn't been touched - we should at the very least dump gtk2/qt4 from there as well.
  2. when building the -kde variant, we should not build with gtk3 support at all (assuming that is possible)
  3. the expression for -still and -fresh are almost identical. They should be merged into a single function.

Known issues:

  1. If you build libreoffice-kde and run it with SAL_USE_VCLPLUGIN=gtk3 it works, but the icons are messed up.

Closes #57846

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 @7c6f434c

@peterhoeg peterhoeg requested a review from 7c6f434c September 10, 2019 12:07
@peterhoeg
Copy link
Copy Markdown
Member Author

peterhoeg commented Sep 10, 2019

@GrahamcOfBorg build libreoffice-still libreoffice-fresh libreoffice-kde

@lukateras lukateras mentioned this pull request Sep 10, 2019
Closed
@peterhoeg peterhoeg mentioned this pull request Sep 10, 2019
Closed
@jtojnar jtojnar mentioned this pull request Sep 10, 2019
Open
80 tasks
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Sep 10, 2019
@peterhoeg
Copy link
Copy Markdown
Member Author

peterhoeg commented Sep 10, 2019

@GrahamcOfBorg build libreoffice-still libreoffice-fresh libreoffice-kde

@lheckemann lheckemann added this to the 20.03 milestone Sep 10, 2019
@7c6f434c
Copy link
Copy Markdown
Member

7c6f434c commented Sep 10, 2019

Sigh. KDE integration apparently needs quite a bit of care… But oh well, everything is reasonable, it's just the amount of small things.

Re: Still: yes, probably, it would be nice to have the same there.

Re: KDE and GTK3 — our Qt5 depends on GTK3, even just qt5.qtbase. Is there any point to complicate things further if closure won't change?

Re: Still and Fresh — the idea is (or was by now?) to have a clean Fresh expression that changes when upstream changes something; and it doesn't need complicated version conditionals that will be left in place beyond the time of relevance; the Still expression gets overwritten by a copy of Fresh on minor version bumps and then typically only gets patchlevel bumps. But now the rate of upstream buildsystem changes is lower and a unified expression would not be full of kludges.

@peterhoeg
Copy link
Copy Markdown
Member Author

peterhoeg commented Sep 14, 2019

Re: Still: yes, probably, it would be nice to have the same there.

OK, I'll fix that first then.

Re: KDE and GTK3 — our Qt5 depends on GTK3, even just qt5.qtbase. Is there any point to complicate things further if closure won't change?

No there isn't. I'll clean it up.

Re: Still and Fresh — the idea is (or was by now?) to have a clean Fresh expression

Maybe we do this later?

@7c6f434c
Copy link
Copy Markdown
Member

7c6f434c commented Sep 14, 2019

Yes, I am of course fully OK with Still and Fresh continuing to be two snapshots corresponding to different minor versions.

mmilata
mmilata approved these changes Oct 30, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@mmilata mmilata left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After rebase to master and bump to 6.3.2.2 it seems to build and run fine. Feel free to use my changes: https://github.com/mmilata/nixpkgs/commits/lool6322

@mmilata
Copy link
Copy Markdown
Member

mmilata commented Oct 31, 2019

Also tried to build the -kde variant but it crashes when I do File->Open...: https://gist.github.com/mmilata/c2cd91600b6b415349da7ba85cf6b952

@mmilata
Copy link
Copy Markdown
Member

mmilata commented Dec 18, 2019

I've tried to unify the -fresh and -still expressions, please let me know what you think: #75850

@kennyballou kennyballou mentioned this pull request Jan 6, 2020
Closed
@disassembler disassembler modified the milestones: 20.03, 20.09 Feb 5, 2020
@mmilata mmilata mentioned this pull request Feb 17, 2020
Merged
10 tasks
@7c6f434c 7c6f434c closed this Feb 18, 2020
@peterhoeg peterhoeg mentioned this pull request Jun 3, 2020
Merged
10 tasks
@peterhoeg peterhoeg deleted the u/lo branch April 4, 2024 08:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

1 more reviewer

@mmilata mmilata mmilata approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

20.09

Development

Successfully merging this pull request may close these issues.

libreoffice 6.2 supports qt5/kde

5 participants

@peterhoeg @7c6f434c @mmilata @lheckemann @disassembler