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] gnome: update to 3.34 #14640

Closed
wants to merge 75 commits into from
Closed

[WIP] gnome: update to 3.34 #14640

wants to merge 75 commits into from

Conversation

Wychmire
Copy link
Contributor

@Wychmire Wychmire commented Sep 22, 2019

Working on updating the GNOME stuff.

Feel free to cancel the travis ci whenever (if possible) since I don't need to anything to build rn

@Hoshpak
Copy link
Member

Hoshpak commented Sep 22, 2019

gnome-tweaks: update to 3.33.90

this is an unstable development version, please only use stable releases.

@Wychmire
Copy link
Contributor Author

gnome-tweaks: update to 3.33.90

this is an unstable development version, please only use stable releases.

Whoops. Should be fixed now!

@Wychmire Wychmire marked this pull request as ready for review September 24, 2019 17:22
@Wychmire
Copy link
Contributor Author

@Gottox Gnome packages are pretty much maintained by you, mind taking a look at what I've done?

Also, if anyone has any ideas why the merge status thing says "This branch cannot be rebased due to conflicts" I'd love to hear them. As far as I can tell there aren't any conflicts and rebasing works fine on my end.

Copy link
Member

@Gottox Gottox left a comment

Choose a reason for hiding this comment

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

I've marked all unstable versions I found. Did you test the gnome update?

srcpkgs/atkmm/template Outdated Show resolved Hide resolved
srcpkgs/gcr/template Outdated Show resolved Hide resolved
@Wychmire
Copy link
Contributor Author

I've marked all unstable versions I found. Did you test the gnome update?

Not yet. I was testing #14656 which messed something up on my main computer. I've started building all the gnome stuff on a different computer which should work.

@Gottox
Copy link
Member

Gottox commented Sep 26, 2019

I'm doing a test build currently.

@Gottox
Copy link
Member

Gottox commented Sep 26, 2019

gobject-introspection needs this: Gottox@f583263

I'm not sure if build_helper is needed here at all.

@Wychmire
Copy link
Contributor Author

gobject-introspection needs this: Gottox@f583263

Made the marked changes.

Built and updated gnome 3.34 locally, everything seems to be working except the required packages for the gnome-apps and gnome-games-collection weren't built when I built the main gnome package. Gnome itself is working great.

Copy link
Member

@Johnnynator Johnnynator left a comment

Choose a reason for hiding this comment

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

diff --git a/common/shlibs b/common/shlibs
index fdacabce60..a1133f745e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -629,14 +629,13 @@ libedataserverui-1.2.so.2 evolution-data-server-3.28.0_1
 libebook-contacts-1.2.so.3 evolution-data-server-3.34.0_1
 libedata-book-1.2.so.26 evolution-data-server-3.34.0_1
 libebook-1.2.so.20 evolution-data-server-3.34.0_1
-libecal-1.2.so.19 evolution-data-server-3.18.0_1
 libecal-2.0.so.1 evolution-data-server-3.34.0_1
 libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
 libevolution-shell.so evolution-3.28.0_1
-libedata-cal-1.2.so.29 evolution-data-server-3.30.0_1
+libedata-cal-2.0.so.1 evolution-data-server-3.34.0_1
 libgdata.so.22 libgdata-0.17.9_1
 libpcap.so.1 libpcap-1.1.1_1
 libiptc.so.0 iptables-1.4.7_1

You did missed one shlib change of evolution-data-server and didn't remove a outdated one.

@Wychmire
Copy link
Contributor Author

Mutter fails to compile on x86_64-musl for me (didn't test anywhere else)

Should be fixed now, thanks for pointing that out!

@shizonic
Copy link
Contributor

Merge conflicts? Would appreciate a merge of gnome 3.34 ...

@Wychmire Thx for your work !!

@Wychmire
Copy link
Contributor Author

Wychmire commented Oct 14, 2019

I'm working on splitting up this PR into smaller pieces so it's easier to merge and hopefully I can figure where the conflict is, since Github won't tell me.

Some of the things are out of date (3.34.1 is already out) so while I rework it I'll be re-updating those applications. Hopefully it gets merged soon!

Keeping track off the individual PRs in issue #15450.

@Wychmire Wychmire closed this Oct 14, 2019
@Wychmire Wychmire deleted the gnome branch October 31, 2019 22:39
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 22, 2022
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

5 participants