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

addpkg(x11/qbittorrent{,-nox}): 4.6.4 #19991

Merged
merged 1 commit into from
May 4, 2024
Merged

Conversation

TomJo2000
Copy link
Member

@TomJo2000 TomJo2000 commented Apr 28, 2024

closes:

qbittorrent (even the headless -nox version) depends on qt5-qtbase, so it needs to be in the X11 Repo.

I'm forcing Cmake for the build.
Cmake has better upstream build instructions.
Builds fine with make as well, if that's preferable.


If there's an easy way to just build it twice I'd actually like to build it once with GUI and once without,
and split off qbittorrent-nox into a subpackage.
But I couldn't figure out a good way to do that.
And the request was for the headless one.

@TomJo2000 TomJo2000 added the packaging Issue related to building packages, not affecting end users directly label Apr 28, 2024
@TomJo2000 TomJo2000 self-assigned this Apr 28, 2024
@truboxl
Copy link
Contributor

truboxl commented May 2, 2024

Auto update is not working

INFO: Updating qbittorrent-nox [Current version: 4.6.4]
ERROR: No 'latest-release-tag' found (https://api.github.com/repos/qbittorrent/qBittorrent/releases/latest).
Try using 'newest-tag'.

@TomJo2000
Copy link
Member Author

Just rebased this PR to pull in #20018's new autoupdate dry-run.
Will fix that shortly, but I wanna just note quickly.

We probably don't want it to even try creating an issue from a failing dry-run, even though it can't.
https://github.com/termux/termux-packages/actions/runs/8943814926/job/24569340981?pr=19991#step:4:148

@TomJo2000 TomJo2000 force-pushed the qbittorrent branch 2 times, most recently from 2a4a27a to 2a0b7da Compare May 3, 2024 19:35
Copy link
Contributor

@truboxl truboxl left a comment

Choose a reason for hiding this comment

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

We probably don't want it to even try creating an issue from a failing dry-run, even though it can't

Ah. It should be fine since I purposely disabled permission to write issue. I leave it to others to fix it if they find it annoying.

@TomJo2000
Copy link
Member Author

By the way, I mentioned it above but I think it might have gotten lost.

Is there any easy way I could hook the build process to build qbittorrent twice - once with and once without GUI - so we can split off qbittorrent-nox into a subpackage?

@truboxl
Copy link
Contributor

truboxl commented May 4, 2024

termux_step_post_make_install() {

Can try something like this and then add a new subpackage with its own dependencies without depend on parent.
If it doesn't work can always split into 2 packages like vlc and vlc-qt.

@TomJo2000
Copy link
Member Author

TomJo2000 commented May 4, 2024

"Ol' reliable" is of course an option, but a subpackage feels more appropriate,
since the difference between the packages is literally just
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+='-DGUI=OFF'

@TomJo2000
Copy link
Member Author

Alright, that oughta do it.

@TomJo2000 TomJo2000 changed the title addpkg(x11/qbittorrent-nox): 4.6.4 addpkg(x11/qbittorrent{,-nox}): 4.6.4 May 4, 2024
@TomJo2000 TomJo2000 requested a review from truboxl May 4, 2024 01:48
@TomJo2000
Copy link
Member Author

TomJo2000 commented May 4, 2024

  • DEBs look as expected
  • autoupdate function is passing
  • subpackage is being built and packaged correctly
  • Works on device (Tested with a Fairphone 5, Android 13, AArch64)
  • Commits are squashed

I think we're good to merge, I'll wait for any last minute comments, otherwise I'll merge this in 8 to 10 hours after I get some sleep.

@TomJo2000 TomJo2000 removed the packaging Issue related to building packages, not affecting end users directly label May 4, 2024
@TomJo2000 TomJo2000 merged commit 50fd60f into termux:master May 4, 2024
@aicynide
Copy link
Contributor

aicynide commented May 5, 2024

I'll wait for any last minute comments, otherwise I'll merge this in 8 to 10 hours after I get some sleep.

LGTM

@TomJo2000 TomJo2000 deleted the qbittorrent branch May 5, 2024 22:58
bigbio2002 pushed a commit to bigbio2002/termux-packages that referenced this pull request May 13, 2024
Freed-Wu pushed a commit to Freed-Wu/termux-packages that referenced this pull request Jun 6, 2024
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