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

Nephros' update for 4.4, rebased #75

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

mjtorn
Copy link

@mjtorn mjtorn commented Oct 19, 2023

As lame as it is to not have built the code, because of lacking spare time and not even having an SDK set up, there is evidence this could work:

I rebased that onto the latest master, and may even get around to building it, though that might take forever.

If you wouldn't mind giving it a shot and see if it can be merged, that would be great.

@Karry
Copy link
Contributor

Karry commented Oct 20, 2023

This is almost identical to what I did in my sfos branch: https://github.com/Karry/harbour-owncloud/commits/sfos ;-)

Binaries are available on chum repository: https://build.sailfishos.org/package/show/sailfishos:chum/harbour-owncloud

@mjtorn
Copy link
Author

mjtorn commented Oct 21, 2023

Hah, yes, I found a bit of time to play around with this and found your fork!

The SDK/IDE setup has issues for me. It just won't build for the correct targets, so I tried it out with the emulator by uninstalling everything but i486. Then I reinstalled the arm kit but the IDE won't build for anything but the emulator now.

Not gonna put another second of effort into this unless the kit selection fixes itself, especially not now that you gave me a link to the binaries. Thank you!

@fredldotme
Copy link
Owner

Have just looked into it (sorry for the delay), if you could resolve the conflicts I'd consider this ready for merge.

@nephros
Copy link

nephros commented Aug 21, 2024

Hi, I have rebased on latest master and fixed conflicts in https://github.com/nephros/harbour-owncloud/tree/update-4.4

These changes were authored some time ago so I don't remember the exact reasons for some of them.

Especially not sure about "disable sharing plugin" (5a5e3a0) - I guess that is/was broken?

Also "do not require exact version" (a73614c) is just for co-existence of my build with the released version of the daemon.

If you like all of these feel free to pull from that branch. Or cherry-pick.

@Karry same for you if it's useful, I'm confused who's the "official maintainer" of this currently.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants