From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 282CF138334 for ; Thu, 4 Oct 2018 20:51:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2533BE0920; Thu, 4 Oct 2018 20:51:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DA51CE0920 for ; Thu, 4 Oct 2018 20:51:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 67AC0335C07 for ; Thu, 4 Oct 2018 20:51:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B9BB42C6 for ; Thu, 4 Oct 2018 20:51:18 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1538686230.056380a0e76e08e1bd2e5973219ff46a95b83ea5.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop-bin/files/, net-im/telegram-desktop-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/telegram-desktop-bin/files/fonts.conf net-im/telegram-desktop-bin/files/telegram-desktop-bin-r2 net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.0-r1.ebuild X-VCS-Directories: net-im/telegram-desktop-bin/files/ net-im/telegram-desktop-bin/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 056380a0e76e08e1bd2e5973219ff46a95b83ea5 X-VCS-Branch: master Date: Thu, 4 Oct 2018 20:51:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fba22fed-e0ab-49d5-ab7f-7aa9f3270b8c X-Archives-Hash: a6bb74cbc06c57aaf843e2d7ca74bf96 commit: 056380a0e76e08e1bd2e5973219ff46a95b83ea5 Author: Henning Schild hennsch de> AuthorDate: Wed Oct 3 17:43:28 2018 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Thu Oct 4 20:50:30 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=056380a0 net-im/telegram-desktop-bin: work around fontconfig issues This commit makes telegram-desktop-bin bring its own fontconfig file for the old version of fontconfig it has built in. It also allows to fall back to the "old way" by removing the file from /etc/. Signed-off-by: Henning Schild hennsch.de> Signed-off-by: Mikle Kolyada gentoo.org> Closes: https://bugs.gentoo.org/664872 Closes: https://github.com/gentoo/gentoo/pull/10055 net-im/telegram-desktop-bin/files/fonts.conf | 60 +++++++++++++++++ .../files/telegram-desktop-bin-r2 | 15 +++++ .../telegram-desktop-bin-1.4.0-r1.ebuild | 75 ++++++++++++++++++++++ 3 files changed, 150 insertions(+) diff --git a/net-im/telegram-desktop-bin/files/fonts.conf b/net-im/telegram-desktop-bin/files/fonts.conf new file mode 100644 index 00000000000..d3ddc32d777 --- /dev/null +++ b/net-im/telegram-desktop-bin/files/fonts.conf @@ -0,0 +1,60 @@ + + + + + /usr/share/fonts + /usr/local/share/fonts + fonts + + + mono + + + monospace + + + + + sans serif + + + sans-serif + + + + + sans + + + sans-serif + + + /var/cache/fontconfig + fontconfig + ~/.fontconfig + + + true + + + false + + + true + + + hintslight + + + lcddefault + + + rgb + + + diff --git a/net-im/telegram-desktop-bin/files/telegram-desktop-bin-r2 b/net-im/telegram-desktop-bin/files/telegram-desktop-bin-r2 new file mode 100644 index 00000000000..a8b0e3e6d99 --- /dev/null +++ b/net-im/telegram-desktop-bin/files/telegram-desktop-bin-r2 @@ -0,0 +1,15 @@ +#!/bin/sh +# this wrapper disables the auto-updater of telegram-desktop +# This program is licensed under the same license as telegram-desktop + +# telegram-desktop fails to set RestartCommand with the session manager +# exclude it from session management to prevent restarts without the argument +unset SESSION_MANAGER + +# telegram-desktop expects old fontconfig configuration files +# this is a workaround to try and deal with that +[ -e /etc/telegram-desktop-bin/fonts.conf ] && \ + [ -z $( printenv FONTCONFIG_FILE ) ] && \ + export FONTCONFIG_FILE=/etc/telegram-desktop-bin/fonts.conf + +exec /usr/lib/telegram-desktop-bin/Telegram -externalupdater $@ diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.0-r1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.0-r1.ebuild new file mode 100644 index 00000000000..c709f83a671 --- /dev/null +++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.4.0-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit desktop gnome2-utils xdg + +DESCRIPTION="Official desktop client for Telegram (binary package)" +HOMEPAGE="https://desktop.telegram.org" +SRC_URI=" + https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz + amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz ) + x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.${PV}.tar.xz ) +" + +LICENSE="telegram" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" + +QA_PREBUILT="usr/lib/${PN}/Telegram" + +RDEPEND=" + dev-libs/glib:2 + dev-libs/gobject-introspection + >=sys-apps/dbus-1.4.20 + x11-libs/libX11 + >=x11-libs/libxcb-1.10[xkb] + >=media-libs/fontconfig-2.13 +" + +S="${WORKDIR}/Telegram" + +src_install() { + exeinto /usr/lib/${PN} + doexe "Telegram" + newbin "${FILESDIR}"/${PN}-r2 "telegram-desktop" + + local icon_size + for icon_size in 16 32 48 64 128 256 512; do + newicon -s "${icon_size}" \ + "${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \ + telegram-desktop.png + done + + dodir /etc/${PN} + insinto /etc/${PN}/ + doins ${FILESDIR}/fonts.conf + + domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop +} + +pkg_preinst() { + xdg_pkg_preinst +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_icon_cache_update + einfo + einfo "Previous versions of ${PN} have created " + einfo "\"~/.local/share/applications/telegram.desktop\". These files" + einfo "conflict with the one shipped by portage and should be removed" + einfo "from all homedirs. (https://bugs.gentoo.org/618662)" + einfo + einfo "This versions fixes fontconfig issues that have been reported" + einfo "by several users. However, the fix might have side-effects on" + einfo "non-latin fonts. If you have font issues with this version just" + einfo "delete \"/etc/${PN}/fonts.conf\" and leave a comment here" + einfo "https://bugs.gentoo.org/664872" +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_icon_cache_update +}