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

[WIP] Cinnamon 4.8 #28035

Merged
merged 15 commits into from
Jan 24, 2021
Merged

[WIP] Cinnamon 4.8 #28035

merged 15 commits into from
Jan 24, 2021

Conversation

ericonr
Copy link
Member

@ericonr ericonr commented Jan 19, 2021

Closes #26965

Have the results of the proposed changes been tested?

  • I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
  • I generally don't use the affected packages but briefly tested this PR

@mobinmob I have yet to search for new releases, but if you know of any I'm missing, please let me know.

@mobinmob
Copy link
Contributor

Closes #26965

Have the results of the proposed changes been tested?

* [ ]  I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

* [ ]  I generally don't use the affected packages but briefly tested this PR

@mobinmob I have yet to search for new releases, but if you know of any I'm missing, please let me know.

Thank you for taking over the cinnamon update! I am swamped with work (unexpectedly) today.

@ericonr
Copy link
Member Author

ericonr commented Jan 19, 2021

I'm seeing if I can fix #10650 before merging.

@ericonr
Copy link
Member Author

ericonr commented Jan 20, 2021

Depends on linuxmint/cinnamon-screensaver#363

@ericonr
Copy link
Member Author

ericonr commented Jan 20, 2021

@sgn I will add a comment explaining that, thanks. IMO the libdir hook should also be fixed (in a different PR)

ericonr and others added 15 commits January 21, 2021 00:58
The libdir changes to use /usr/lib{32,64} instead of /usr/lib broke
cross builds for some packages that use gir, due to issues with copying
over symlinks. Since we haven't managed to track down the root cause for
the installation path, a symlink is a clean enough temporary fix. This
follows the style of the 00-libdir hooks.

Since pre-install runs for the main package and then each subpackage, it
should use PKGDESTDIR (not DESTDIR), which also enables a subpackage
that installs files during pkg_install to work cleanly.

As far as I can see, the previous hook was quite flawed. Since it was a
pre-install hook, the check for a directory would happen *before*
package installation (so nothing would happen). The only reason it did
anything was because it also ran as a step before a subpackage's
pkg_install (most GIR packages have a -devel subpackage), but used
DESTDIR instead of PKGDESTDIR, so it checked and affected the contents
of the main package. Then when the subpackage's pkg_install ran, the
files would have already been copied to the correct folders.

Closes void-linux#27437
Includes changes by @ndowens.

Closes: void-linux#26965 [via git-merge-pr]
Include changes by @ndowens.

Also by ericonr:
- fix names in .desktop file to differentiate between them
- fix homepage.
@ericonr ericonr merged commit 38ec09b into void-linux:master Jan 24, 2021
@ericonr ericonr deleted the cinna branch January 24, 2021 21:14
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 25, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants