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
x11-plugins/pidgin-telegram: New package #7777
Conversation
abaeaa5
to
33d03e1
Compare
Pull Request assignment Areas affected: ebuilds x11-plugins/pidgin-telegram: @gentoo/proxy-maint (new package) Bugs linked: 529908 In order to force reassignment and/or bug reference scan, please append |
33d03e1
to
2b22bd5
Compare
S="${WORKDIR}/telegram-purple" | ||
|
||
src_prepare() { | ||
# Remove '-Werror' to make it compile |
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.
local WERROR_FILES=(
Makefile.mingw ... # the whole list of files
)
local f
for f in "${WERROR_FILES[@]}"; do
sed -i -e 's/-Werror //' "${f}" || die
done
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.
That are 3 lines more :P Anyway, I've changed it :)
emake DESTDIR="${D}" noicon_install | ||
|
||
# Install docs | ||
einstalldocs |
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.
Please get einstalldocs
out of this condition. Documentation installation shouldn't depend on the icons
USE flag.
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 am not sure, if this is really wrong? As I need to call noicon_install for USE="-icon", I am also calling einstalldocs. But if I use anyway USE="icon", I run default, which also calls einstalldocs? Or I am wrong? Anyway, I have put it outside of this block.
2b22bd5
to
1a6ce95
Compare
1a6ce95
to
6202ef8
Compare
sed -i -e 's/-Werror //' "${werror_file}" || die | ||
done | ||
|
||
# Apply user patches |
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.
Please stop using trivial comkments, we pointed that many times
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.
To be fair: This and the other eBuilds where created before you pointed out regarding the comments. So I hadn't updated it yet ;-) Fixed for this and the rest here.
I will look today through my other not yet updated eBuilds.
} | ||
|
||
src_configure() { | ||
# Run 'configure' |
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.
and here
} | ||
|
||
src_install() { | ||
# Set and install docs |
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.
and here
local DOCS=( "AUTHORS" "CHANGELOG.md" "HACKING.md" "HACKING.BUILD.md" "README.md" ) | ||
einstalldocs | ||
|
||
# Install icons depending on users choice |
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.
the same
|
||
# Install icons depending on users choice | ||
if ! use icons; then | ||
# Run 'make 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.
the same
# Run 'make install' | ||
emake DESTDIR="${D}" noicon_install | ||
else | ||
# Run 'default' |
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.
and again
058db5b
to
03ec8d5
Compare
da77b25
to
e254fd7
Compare
<name>Proxy Maintainers</name> | ||
</maintainer> | ||
<longdescription> | ||
Telegram-purple is a libpurple protocol plugin that adds support for the Telegram messenger. |
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.
It doesn't add anything to DESCRIPTION.
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.
Okok, added a better one.
</longdescription> | ||
<use> | ||
<flag name="gcrypt">Use dev-libs/libgcrypt instead of dev-libs/openssl.</flag> | ||
<flag name="icons">Install nice icons.</flag> |
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.
Is there a use case for installing it without 'nice icons'? What happens 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.
Okay, after looking through it, I tend to remove the no_icons variant and always install icons.
If not disabled, it installs default icons into /usr/share/pixmaps/
, which, according to the readme, pidgin will use.
|
||
DESCRIPTION="A libpurple protocol plugin that adds support for the Telegram messenger" | ||
HOMEPAGE="https://github.com/majn/telegram-purple" | ||
SRC_URI="https://github.com/majn/telegram-purple/releases/download/v${PV}/telegram-purple_${PV}.orig.tar.gz -> ${P}.tar.gz" |
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 do you rename 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.
Should I not? Ok, removed it.
HOMEPAGE="https://github.com/majn/telegram-purple" | ||
SRC_URI="https://github.com/majn/telegram-purple/releases/download/v${PV}/telegram-purple_${PV}.orig.tar.gz -> ${P}.tar.gz" | ||
|
||
LICENSE="GPL-2" |
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.
Incorrect, please read the copyright notices in files.
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.
Changed to GPL-2+
gcrypt? ( dev-libs/libgcrypt:0= ) | ||
!gcrypt? ( dev-libs/openssl:0= ) | ||
nls? ( sys-devel/gettext ) | ||
webp? ( media-libs/libwebp ) |
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.
:=
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.
Thanks, added.
local werror_file | ||
local WERROR_FILES=( "Makefile.mingw" "Makefile.tgl.mingw" "tgl/Makefile.in" "tgl/tl-parser/Makefile.in" ) | ||
for werror_file in "${WERROR_FILES[@]}"; do | ||
sed -i -e 's/-Werror //' "${werror_file}" || die |
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.
sed takes multiple files, so don't loop here. Also, wouldn't it be easier to just find -name 'Makefile*'
?
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.
Sounds good, changed to find with sed.
|
||
src_install() { | ||
if ! use icons; then | ||
emake DESTDIR="${D}" noicon_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.
I dare say moving the conditional into $(usex icons ...)
would be cleaner than conditionally using default.
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.
Since I removed noicon_install, this won't be needed anymore.
e254fd7
to
a0a023c
Compare
default | ||
|
||
# Remove '-Werror' to make it compile | ||
find -name 'Makefile*' -exec sed -i -e 's/-Werror //' {} \; || die |
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.
\;
→ +
, sed accepts multiple paths.
Since this is my only comment, I'll fix it locally and merge if it works fine. |
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.
Found more issues. Please fix them all then.
$(use_enable gcrypt) | ||
$(use_enable nls translation) | ||
$(use_enable webp libwebp) | ||
$(use_with zlib) |
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.
checking if zlib is wanted... yes
configure: WARNING: Sorry, yes does not exist, checking usual places
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.
Whoops, zlib
is not optional. Fixed.
webp? ( media-libs/libwebp:= ) | ||
zlib? ( sys-libs/zlib:= )" | ||
|
||
DEPEND="${RDEPEND}" |
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.
Missing DEPEND:
checking for x86_64-pc-linux-gnu-pkg-config... (cached) /usr/bin/pkg-config
checking pkg-config is at least version 0.9.0... yes
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.
Added.
aa14d17
to
6bbf4e5
Compare
nls? ( sys-devel/gettext ) | ||
webp? ( media-libs/libwebp:= )" | ||
|
||
DEPEND="dev-util/pkgconfig |
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.
Now please run repoman.
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.
Changed.
Closes: https://bugs.gentoo.org/529908 Package-Manager: Portage-2.3.40, Repoman-2.3.9
6bbf4e5
to
2015f35
Compare
Pull request CI report Report generated at: 2018-06-20 08:36 UTC Issues already there before the PR (double-check them): |
x11-plugins/pidgin-telegram: New package
Closes: https://bugs.gentoo.org/529908