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

Allow build for qt6 #9

Merged
merged 1 commit into from
Aug 22, 2023
Merged

Allow build for qt6 #9

merged 1 commit into from
Aug 22, 2023

Conversation

neochapay
Copy link
Contributor

No description provided.

@jmlich jmlich mentioned this pull request Jul 12, 2023
52 tasks
@neochapay neochapay force-pushed the qt6 branch 9 times, most recently from cbced71 to 3702c7a Compare August 8, 2023 05:50
@Thaodan
Copy link

Thaodan commented Aug 9, 2023 via email

@neochapay
Copy link
Contributor Author

@Thaodan fixed

@neochapay neochapay force-pushed the qt6 branch 3 times, most recently from e7a5b32 to a9cc360 Compare August 11, 2023 12:58
@rainemak rainemak requested a review from spiiroin August 22, 2023 08:11
Copy link
Member

@rainemak rainemak left a comment

Choose a reason for hiding this comment

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

There's one build error in tests/tst_events/tst_events.cpp and server.pro build should be cleaned so that we'd have just timed service & binary and etc scripts.

@neochapay
Copy link
Contributor Author

@rainemak fixed

@rainemak
Copy link
Member

rainemak commented Aug 22, 2023

@rainemak fixed

I forgot to comment about the spec. Following files are currently referring to the %{name} i.e. to timed-qt5. One option is that you'd defined for example "%define service_name timed" at the beginning of the spec and refer to that instead.

File not found: <path>/installroot/etc/dbus-1/system.d/timed-qt5.conf
File not found: <path>/installroot/etc/timed-qt5.rc
File not found: <path>/installroot/usr/bin/timed-qt5
File not found: <path>/installroot/usr/lib/systemd/user/timed-qt5.service

Changes are needed to %install, %post, %preun, %postun, and %files sections (at least). Without testing complete build on %files section as far as I can see only remaining %{name} reference should be in %{_libdir}/lib%{name}.so.*

In addition to above, the setcapts-timed-qt5.sh is no yet renamed to setcaps-timed.sh. No need to duplicate that either, only change would be /usr/bin/timed change on setcap and fixing the echo line.

@neochapay
Copy link
Contributor Author

@rainemak fix again ^_^

@rainemak
Copy link
Member

@rainemak fix again ^_^

Thank you. I'll check again.

Copy link
Member

@rainemak rainemak left a comment

Choose a reason for hiding this comment

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

Please fix still %post, %preun, and %postun sections from the spec. There's also one error in the %install and timed.service symlinking.

Copy link
Member

@rainemak rainemak left a comment

Choose a reason for hiding this comment

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

Thanks! This is good, I'll merge now.

@rainemak rainemak merged commit 91282c7 into sailfishos:master Aug 22, 2023
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.

3 participants