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
app-editors/scite: Version Bump to 4.2.1. #13464
Conversation
Actual enhancements and upstream bugfixes. Signed-off-by: Ervin Peters ervin.peters@ervnet.de Package-Manager: Portage-2.3.76, Repoman-2.3.16
Pull Request assignmentSubmitter: @dermoench42 app-editors/scite: Linked bugsNo bugs to link found. If your pull request references any of the Gentoo bug reports, please add appropriate GLEP 66 tags to the commit message and request reassignment. If you do not receive any reply to this pull request, please open or link a bug to attract the attention of maintainers. In order to force reassignment and/or bug reference scan, please append Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide |
app-editors/scite/scite-4.2.1.ebuild
Outdated
} | ||
|
||
pkg_postinst() { | ||
gnome2_icon_cache_update |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With EAPI-7 this is xdg_icon_cache_update
, the gnome
- one doesnt work anymore. Same for one below.
} | ||
|
||
src_install() { | ||
emake DESTDIR="${ED}" install |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Replace with default
, You could add a global DOCS=( ... )
array to install that README file below when calling default
here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not clear to me. The default implementation is:
src_install() {
if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
emake DESTDIR="${D}" install
fi
einstalldocs
}
which differs in DESTDIR Parameter.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, sure sure, it doesnt matter that much :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
however, it does not work on a prefixed enviroment.
scite/gtk/makefile:32 gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null)
will lead to double prefixing in the end. ( returns $EPREFIX/usr )
one option would be the default emake (DESTDIR="${D}"
)
another option would be emake DESTDIR="$D" prefix="$EPREFIX/usr"
(also needed for the compilation) (link errors on src_compile).
gnome2_icon_cache_update -> xdg_icon_cache_update Signed-off-by: Ervin Peters ervin.peters@ervnet.de Package-Manager: Portage-2.3.76, Repoman-2.3.16
} | ||
|
||
src_install() { | ||
emake DESTDIR="${ED}" install |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, sure sure, it doesnt matter that much :)
app-editors/scite/scite-4.2.1.ebuild
Outdated
die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5 | ||
($(clang-major-version))." | ||
|
||
elif tc-is-gcc; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One tab too many.
app-editors/scite/scite-4.2.1.ebuild
Outdated
x11-libs/gdk-pixbuf | ||
x11-libs/gtk+:3= | ||
x11-libs/pango | ||
lua? ( >=dev-lang/lua-5:= ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lost indentation here.
app-editors/scite/scite-4.2.1.ebuild
Outdated
|
||
EAPI=7 | ||
|
||
inherit gnome2-utils toolchain-funcs xdg-utils |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
gnome2-utils isnt used anymore, can be dropped. Few styling things, then it looks good to me!
Signed-off-by: Ervin Peters ervin.peters@ervnet.de Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Ervin Peters ervin.peters@ervnet.de Package-Manager: Portage-2.3.76, Repoman-2.3.16
Pull request CI reportReport generated at: 2019-10-31 02:58 UTC No issues found |
if ! use lua; then | ||
emake_pars+=" NO_LUA=1" | ||
fi | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why not an array?
# prepare make options
local emake_pars=("GTK3=1")
tc-is-clang && emake_pars+=("CLANG=1")
use !lua && emake_pars+=("NO_LUA=1")
emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars[@]}"
emake "${emake_pars[@]}"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why? kept from previous versions ;). But an array is more clean, sure. I'll change it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was waiting for this, but guess you will fix it in the next version bump? :)
Lets not keep this any longer then, thanks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
... scusi... lack of time. Since this was mainly cosmetic i wanted to fix the prefix thing, too. It will be done probably on the next release.
don't forget to rebase/squash commits (+force push) |
looks like you commited the version
which will lead do double prefix ! - the so, hopefully next bump... |
@xdch47 your comments were good, thanks. Didn't want to ignore them, but looked like nothing was happening here so I didn't dare to look away any longer. This PR would've been left to rot for months then ;) But yes, something to remember & fix for the next time... |
Actual enhancements and upstream bugfixes.
Signed-off-by: Ervin Peters ervin.peters@ervnet.de
Package-Manager: Portage-2.3.76, Repoman-2.3.16