From 944d4e3f03e7736ee4374f7fb9fdb98ac16263ba Mon Sep 17 00:00:00 2001 From: StefanCristian Date: Sat, 9 Dec 2017 04:07:48 +0200 Subject: Added patch for proxy autodetection on skypeforlinux 8.11.x.x version --- .../files/skypeforlinux-8.11-proxy.patch | 31 ++++++++++++++++++++++ .../skypeforlinux/skypeforlinux-8.11.0.4-r1.ebuild | 1 + 2 files changed, 32 insertions(+) create mode 100644 net-im/skypeforlinux/files/skypeforlinux-8.11-proxy.patch (limited to 'net-im') diff --git a/net-im/skypeforlinux/files/skypeforlinux-8.11-proxy.patch b/net-im/skypeforlinux/files/skypeforlinux-8.11-proxy.patch new file mode 100644 index 00000000..39208a3e --- /dev/null +++ b/net-im/skypeforlinux/files/skypeforlinux-8.11-proxy.patch @@ -0,0 +1,31 @@ +diff -burN usr.old/bin/skypeforlinux usr/bin/skypeforlinux +--- a/usr.old/bin/skypeforlinux 2017-12-09 03:43:34.598533060 +0200 ++++ b/usr/bin/skypeforlinux 2017-12-09 03:48:47.582759089 +0200 +@@ -3,10 +3,24 @@ + SCRIPT=$(readlink -f "$0") + USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..) + ++export HTTP_PROXY="${HTTP_PROXY:-}" ++export http_proxy="${http_proxy:-}" ++ ++PROXY_SERVICE="" ++[ -n "${HTTP_PROXY}" ] && { PROXY_SERVICE="${HTTP_PROXY}"; } ++[ -n "${http_proxy}" ] && { PROXY_SERVICE="${http_proxy}"; } ++ ++PROXY_SERVICE_ARGUMENT="" ++[ -n "${PROXY_SERVICE}" ] && { PROXY_SERVICE_ARGUMENT=" HTTP_PROXY=${PROXY_SERVICE} HTTPS_PROXY=${PROXY_SERVICE} http_proxy=${PROXY_SERVICE} https_proxy=${PROXY_SERVICE} "; } ++ + SKYPE_PATH=/opt/skypeforlinux/skypeforlinux +-SKYPE_LOGS="$HOME/.config/skypeforlinux/logs" ++SKYPE_LOGS="${HOME}/.config/skypeforlinux/logs" ++ ++if [[ ! -e "${SKYPE_LOGS}" ]] ; then ++ mkdir -p "${SKYPE_LOGS}" ++fi + +-mkdir -p $SKYPE_LOGS ++export ${PROXY_SERVICE_ARGUMENT} + +-nohup "$SKYPE_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$SKYPE_LOGS/skype-startup.log" 2>&1 & ++nohup "${SKYPE_PATH}" --executed-from="$(pwd)" --pid=$$ "$@" > "${SKYPE_LOGS}/skype-startup.log" 2>&1 & + diff --git a/net-im/skypeforlinux/skypeforlinux-8.11.0.4-r1.ebuild b/net-im/skypeforlinux/skypeforlinux-8.11.0.4-r1.ebuild index 21af07f5..abacf28d 100644 --- a/net-im/skypeforlinux/skypeforlinux-8.11.0.4-r1.ebuild +++ b/net-im/skypeforlinux/skypeforlinux-8.11.0.4-r1.ebuild @@ -66,6 +66,7 @@ src_prepare() { -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \ -e "/^OnlyShowIn=/d" \ -i usr/share/applications/skypeforlinux.desktop || die + epatch "${FILESDIR}"/"${PN}"-8.11-proxy.patch } src_install() { -- cgit v1.2.3