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

x11-plugins/pidgin-telegram: New package #7777

Closed
wants to merge 1 commit into from

Conversation

ConiKost
Copy link
Contributor

@ConiKost ConiKost commented Apr 2, 2018

x11-plugins/pidgin-telegram: New package

Closes: https://bugs.gentoo.org/529908

@ConiKost ConiKost force-pushed the pidgin-telegram branch 2 times, most recently from abaeaa5 to 33d03e1 Compare April 2, 2018 21:12
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull Request assignment

Areas affected: ebuilds
Packages affected: x11-plugins/pidgin-telegram

x11-plugins/pidgin-telegram: @gentoo/proxy-maint (new package)

Bugs linked: 529908

In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

@gentoo-repo-qa-bot gentoo-repo-qa-bot added new package The PR is adding a new package. self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else) assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Apr 2, 2018
S="${WORKDIR}/telegram-purple"

src_prepare() {
# Remove '-Werror' to make it compile
Copy link
Member

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

Copy link
Contributor Author

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
Copy link
Member

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.

Copy link
Contributor Author

@ConiKost ConiKost Apr 7, 2018

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.

sed -i -e 's/-Werror //' "${werror_file}" || die
done

# Apply user patches
Copy link
Contributor

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

Copy link
Contributor Author

@ConiKost ConiKost Apr 28, 2018

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'
Copy link
Contributor

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
Copy link
Contributor

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
Copy link
Contributor

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'
Copy link
Contributor

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'
Copy link
Contributor

Choose a reason for hiding this comment

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

and again

@ConiKost ConiKost force-pushed the pidgin-telegram branch 2 times, most recently from 058db5b to 03ec8d5 Compare April 28, 2018 09:37
@ConiKost ConiKost force-pushed the pidgin-telegram branch 4 times, most recently from da77b25 to e254fd7 Compare May 11, 2018 16:06
<name>Proxy Maintainers</name>
</maintainer>
<longdescription>
Telegram-purple is a libpurple protocol plugin that adds support for the Telegram messenger.
Copy link
Member

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.

Copy link
Contributor Author

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>
Copy link
Member

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?

Copy link
Contributor Author

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"
Copy link
Member

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?

Copy link
Contributor Author

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"
Copy link
Member

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.

Copy link
Contributor Author

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 )
Copy link
Member

Choose a reason for hiding this comment

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

:=

Copy link
Contributor Author

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
Copy link
Member

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*'?

Copy link
Contributor Author

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
Copy link
Member

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.

Copy link
Contributor Author

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.

default

# Remove '-Werror' to make it compile
find -name 'Makefile*' -exec sed -i -e 's/-Werror //' {} \; || die
Copy link
Member

Choose a reason for hiding this comment

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

\;+, sed accepts multiple paths.

@mgorny
Copy link
Member

mgorny commented Jun 19, 2018

Since this is my only comment, I'll fix it locally and merge if it works fine.

Copy link
Member

@mgorny mgorny left a 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)
Copy link
Member

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

Copy link
Contributor Author

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}"
Copy link
Member

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added.

@ConiKost ConiKost force-pushed the pidgin-telegram branch 2 times, most recently from aa14d17 to 6bbf4e5 Compare June 19, 2018 21:42
nls? ( sys-devel/gettext )
webp? ( media-libs/libwebp:= )"

DEPEND="dev-util/pkgconfig
Copy link
Member

Choose a reason for hiding this comment

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

Now please run repoman.

Copy link
Contributor Author

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
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2018-06-20 08:36 UTC
Newest commit scanned: 2015f35
Status: ✅ good

Issues already there before the PR (double-check them):
https://qa-reports.gentoo.org/output/gentoo-ci/857e02a/output.html#app-emulation/buildah

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. new package The PR is adding a new package. self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else)
Projects
None yet
5 participants