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

New package: onionshare-{cli, dekstop}-2.4 #34599

Closed
wants to merge 8 commits into from

Conversation

DragonGhost7
Copy link
Contributor

Testing the changes

  • I tested the changes in this PR: YES

New package

Local build testing

  • I built this PR locally for my native architecture, x86_64
  • I built this PR locally for these architectures (if supported. mark crossbuilds):
    • aarch64
    • armv7l
    • x86_64-musl

Copy link
Member

@paper42 paper42 left a comment

Choose a reason for hiding this comment

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

I previously removed an older version of this package (#32416) because it didn't work, updating to a newer version was complicated and in the end required Flask1 which we don't have. Did something change?

Also, please rebase on top of master, so the CI can run.

Comment on lines 19 to 27
do_build() {
cd cli
python3 setup.py build ${make_build_args}
}

do_install() {
cd cli
python3 setup.py install --prefix=/usr --root=${DESTDIR} ${make_install_args}
}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
do_build() {
cd cli
python3 setup.py build ${make_build_args}
}
do_install() {
cd cli
python3 setup.py install --prefix=/usr --root=${DESTDIR} ${make_install_args}
}
build_wrksrc=cli

srcpkgs/python3-Flask-SocketIO/template Outdated Show resolved Hide resolved
srcpkgs/python3-bidict/template Outdated Show resolved Hide resolved
srcpkgs/python3-bidict/template Outdated Show resolved Hide resolved
srcpkgs/python3-bidict/template Outdated Show resolved Hide resolved
srcpkgs/python3-bidict/template Outdated Show resolved Hide resolved
@DragonGhost7
Copy link
Contributor Author

Hi, i know that onionshare was remove before, for reasons of not working, but since then several version came by, and merge onionshare/onionshare#1399 fixes issue of having Flask2 installed on your system from package manager. The package now works, with no issues (that i found at least)

@DragonGhost7 DragonGhost7 force-pushed the onionshare branch 2 times, most recently from 49ca91d to 82fe12b Compare December 19, 2021 22:02
srcpkgs/python3-bidict/template Outdated Show resolved Hide resolved
srcpkgs/python3-cepa/template Outdated Show resolved Hide resolved
maintainer="DragonGhost7 <darkiridiumghost@gmail.com>"
license="MPL-2.0"
homepage="https://github.com/jab/bidict"
distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
Copy link
Member

Choose a reason for hiding this comment

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

please don't use $homepage in $distfiles

srcpkgs/python3-Flask-SocketIO/template Outdated Show resolved Hide resolved
srcpkgs/onionshare-desktop/template Outdated Show resolved Hide resolved
license="GPL-3.0-or-later"
homepage="https://onionshare.org/"
changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
Copy link
Member

Choose a reason for hiding this comment

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

onionshare-cli and onionshare-desktop have the same distfiles, so they should either be built in the same template or have a comment on top to remind people updating this package to keep the versions synchronized between both templates.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah i think best would be to make onionshare-desktop a subpackage of onionshare, managinf the 2 will be much easier

Copy link
Contributor Author

Choose a reason for hiding this comment

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

but they have separate builds, and installs, so might be complicated

srcpkgs/python3-engineio/template Outdated Show resolved Hide resolved
wrksrc="python-engineio-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools python3-Sphinx"
makedepends="${depends}"
Copy link
Member

Choose a reason for hiding this comment

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

$depends is not defined here and you probably don't want the dependencies in makedepends

changelog="https://raw.githubusercontent.com/micahflee/onionshare/develop/CHANGELOG.md"
distfiles="https://github.com/micahflee/onionshare/archive/v${version}.tar.gz"
checksum=9d82744ec930a280cf036e5e7dfab817a37866e927e5a72bdd3e13bd9b9c7b4a

Copy link
Member

Choose a reason for hiding this comment

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

remove this blank line and fix the xlint warning

@DragonGhost7
Copy link
Contributor Author

Ok so, in the end dividing them into sub packages is really not trivial, nor useful, because onionshare-cli and onionshare-desktop have different tests, and installing onionshare-desktop becomes really hard. What is the problem with x86_64-musl, i am not sure, but the i686 and x86_64 fail for an absolutely unknown reason, i will have to try to replicate that more. on my machine it works, even from a tty.

@Chocimier Chocimier added the new-package This PR adds a new package label Dec 28, 2021
@github-actions
Copy link

Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.

@github-actions github-actions bot added the Stale label Jun 19, 2022
@github-actions github-actions bot closed this Jul 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
new-package This PR adds a new package Stale
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants