media-gfx/cura (legacy versions) #1500
Conversation
|
|
||
| make_desktop_entry cura \ | ||
| Cura \ | ||
| /usr/share/pixmaps/cura.png \ |
There was a problem hiding this comment.
this should be changed to ${PN} as you call newicon() above and because make_desktop_entry() doesn't prepend EPREFIX
There was a problem hiding this comment.
This implements your suggestion from #1377. Reverting to the original.
There was a problem hiding this comment.
This implements your suggestion from #1377.
Nope, it does not.
My suggestion was:
It'd be much cleaner to do newicon ... ${PN}.png+${PN}.png
Your original ebuild didn't have newicon at all. In this ebuild you've just mixed all up. Either remove newicon and prepend EPREFIX or leave newicon and change this line to ${PN}
There was a problem hiding this comment.
Indeed. Looking over it again, I think I have a better grasp of it now. Hope you'd agree?
monsieurp
added
version bump
assigned
tomboy-64
force-pushed
the
cura-legacy
branch
2 times, most recently
from
e026a18
to
a66a16d
Compare
|
Re-added the notice "based on the original ebuild by AxS" in the commit message, which got lost somewhere along the way. |
| IUSE="" | ||
|
|
||
| RDEPEND="${PYTHON_DEPS} | ||
| dev-python/wxpython:3.0[${PYTHON_USEDEP}] |
There was a problem hiding this comment.
It has to have [opengl,${PYTHON_USEDEP}] otherwise it will not work
There was a problem hiding this comment.
Thanks. has been updated.
| echo ${PV} > "${ED}"usr/share/cura/version || die | ||
| cat > "${T}"/cura <<- CURAEOF || die | ||
| #!/bin/sh | ||
| PYTHONPATH="\$PYTHONPATH:${EROOT}usr/share/cura/" "${PYTHON}" "${EROOT}usr/share/cura/cura.py" "\$@" |
There was a problem hiding this comment.
referencing ROOT in src_* phases is invalid [0]. Straight '/' should suffice here. Optionally, you can move this to pkg_preinst and do it there.
[0] https://devmanual.gentoo.org/ebuild-writing/variables/index.html#root
gktrk
removed
the
assigned
|
@gentoo/proxy-maint |
|
So where are we here can you fix those stuff which gokturk told you? Thanks |
|
I will see it's getting done this weekend. |
based on the original ebuild by _AxS_ Package-Manager: portage-2.2.28
based on the original ebuild by _AxS_ Package-Manager: portage-2.2.28
based on the original ebuild by _AxS_ Package-Manager: portage-2.2.28
|
Thanks for the suggestions. I applied the changes and did brief runtests. Looks good to me now. |
| src_prepare() { | ||
| cat > "${T}"/cura <<- CURAEOF || die | ||
| #!/bin/sh | ||
| PYTHONPATH="\$PYTHONPATH:${EROOT}usr/share/cura/" "${PYTHON}" "${EROOT}usr/share/cura/cura.py" "\$@" |
There was a problem hiding this comment.
Referencing ROOT in src_* phases is forbidden. See: https://devmanual.gentoo.org/ebuild-writing/variables/index.html#root
Unless you want to support prefix, you can safely assume that ROOT is always /.
There was a problem hiding this comment.
I think s|${EROOT}|${EPREFIX}/|g is safe here
|
ping |
|
I said ping. |
|
|
||
| make_desktop_entry cura \ | ||
| Cura \ | ||
| "${EROOT}/usr/share/pixmaps/cura.png" \ |
There was a problem hiding this comment.
the / after ${EROOT} is not needed as the variable is guaranteed to end in a trailing slash.
|
Merged in 0a0d8e8...926306e. Thanks! |
Let's try this again, shall we?
@axs-gentoo
@Amynka
@gentoo/proxy-maint
I had to open a new pull-request due to rebases and forced pushes. Improvement suggestions from PRs 1377 and 1407 have been incorporated as I saw fit.