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.

Sign up for GitHub

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

Jump to bottom

net-im/telegram-desktop-bin: fix Icon in .desktop file #10212

Closed
wants to merge 1 commit into from
Closed

net-im/telegram-desktop-bin: fix Icon in .desktop file #10212

wants to merge 1 commit into from

Conversation

henning-schild
Copy link
Contributor

Closes: https://bugs.gentoo.org/667784
Signed-off-by: Henning Schild henning@hennsch.de

@gentoo-bot
Copy link

Copyright policy change

Please note that on 2018-09-15 Trustees have approved new Gentoo copyright policy. All contributions made to Gentoo need to follow this policy. If you include the Signed-off-by line in your commit message, you indicate that you have read the policy and agree to its terms. For more detailed explanation, please see the new Gentoo copyright policy explained article.

Pull Request assignment

Areas affected: ebuilds
Packages affected: net-im/telegram-desktop-bin

net-im/telegram-desktop-bin: @henning-schild, @NP-Hardass, @gentoo/proxy-maint

Linked bugs

Bugs linked: 667784

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

Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide

@gentoo-bot gentoo-bot added 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 Oct 24, 2018
puleglot
puleglot reviewed Oct 24, 2018
View reviewed changes
net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.3-r1.ebuild Outdated
S="${WORKDIR}/Telegram"

src_prepare() {
sed -i -e 's/^Icon=telegram$/Icon=telegram-desktop/' "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
Copy link
Contributor

Choose a reason for hiding this comment

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

|| die is missing here

mgorny
mgorny requested changes Oct 26, 2018
View reviewed changes
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.

Also feel free to remove -r0 in the same commit since it's a minor change.

net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.3-r1.ebuild Outdated
S="${WORKDIR}/Telegram"

src_prepare() {
sed -i -e 's/^Icon=telegram$/Icon=telegram-desktop/' "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop || die
Copy link
Member

Choose a reason for hiding this comment

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

I guess I'm being weird and all but why are you altering upstream .desktop file instead of fixing the install phase below to install the icon with correct name?

@henning-schild henning-schild force-pushed the henning/staging3 branch 2 times, most recently from 0dda3d9 to 42ca59e Compare October 26, 2018 12:36
@henning-schild
net-im/telegram-desktop-bin: fix icon file names
7a72255 
Closes: https://bugs.gentoo.org/667784
Signed-off-by: Henning Schild <henning@hennsch.de>
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2018-10-26 12:56 UTC
Newest commit scanned: 7a72255
Status: ✅ good

No issues found

@mgorny
Copy link
Member

mgorny commented Oct 26, 2018

Thanks.

@henning-schild
Copy link
Contributor Author

Mhh, looks like you merged the original PR and not the updated one

@mgorny
Copy link
Member

mgorny commented Oct 26, 2018

Thanks for noticing. I'll fix that.

@mgorny mgorny reopened this Oct 26, 2018
@henning-schild
Copy link
Contributor Author

Looks like we need a -r2 now, for people that synched inbetween. But let us hope noone did ;)

@henning-schild henning-schild mentioned this pull request Oct 26, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@puleglot puleglot puleglot left review comments

@mgorny mgorny mgorny approved these changes

Assignees
No one assigned
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else)
Projects
None yet
Milestone
No milestone
5 participants
@henning-schild @gentoo-bot @gentoo-repo-qa-bot @mgorny @puleglot