From 29e4d18d8827a14a042176ef43eca380980b4e97 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 24 Jul 2012 08:18:57 +0000 Subject: Picked upstream patch to disable multiwindow mode. Thanks to Ulya Fokanova who noticed the problem. (Portage version: 2.2.0_alpha116_p10/cvs/Linux x86_64) --- net-im/skypetab-ng/ChangeLog | 11 ++++-- .../files/skypetab-ng-0.5.0-fix-multiwindows.patch | 23 ++++++++++++ net-im/skypetab-ng/skypetab-ng-0.4.11.ebuild | 38 -------------------- net-im/skypetab-ng/skypetab-ng-0.5.0-r1.ebuild | 42 ++++++++++++++++++++++ 4 files changed, 74 insertions(+), 40 deletions(-) create mode 100644 net-im/skypetab-ng/files/skypetab-ng-0.5.0-fix-multiwindows.patch delete mode 100644 net-im/skypetab-ng/skypetab-ng-0.4.11.ebuild create mode 100644 net-im/skypetab-ng/skypetab-ng-0.5.0-r1.ebuild (limited to 'net-im') diff --git a/net-im/skypetab-ng/ChangeLog b/net-im/skypetab-ng/ChangeLog index aea954a0ff4b..62d472c7c9bf 100644 --- a/net-im/skypetab-ng/ChangeLog +++ b/net-im/skypetab-ng/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-im/skypetab-ng # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skypetab-ng/ChangeLog,v 1.6 2012/06/26 20:03:54 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skypetab-ng/ChangeLog,v 1.7 2012/07/24 08:18:57 slyfox Exp $ + +*skypetab-ng-0.5.0-r1 (24 Jul 2012) + + 24 Jul 2012; Sergei Trofimovich + +files/skypetab-ng-0.5.0-fix-multiwindows.patch, +skypetab-ng-0.5.0-r1.ebuild, + -skypetab-ng-0.4.11.ebuild: + Picked upstream patch to disable multiwindow mode. Thanks to Ulya Fokanova who + noticed the problem. *skypetab-ng-0.5.0 (26 Jun 2012) @@ -41,4 +49,3 @@ +skypetab-ng-0.4.9_pre20111124.ebuild, +skypetab-ng-9999.ebuild: Initial version. An LD_PRELOAD library to make your skype single-windowed application. Handly for tiled WM users. - diff --git a/net-im/skypetab-ng/files/skypetab-ng-0.5.0-fix-multiwindows.patch b/net-im/skypetab-ng/files/skypetab-ng-0.5.0-fix-multiwindows.patch new file mode 100644 index 000000000000..7edf056ccbe8 --- /dev/null +++ b/net-im/skypetab-ng/files/skypetab-ng-0.5.0-fix-multiwindows.patch @@ -0,0 +1,23 @@ +From ea02a30f76d771a70e5efc9dcb251c93f869784e Mon Sep 17 00:00:00 2001 +From: Nikita Tsukanov +Date: Fri, 15 Jun 2012 16:38:27 +0400 +Subject: [PATCH] Fix 1 > 0 + +--- + skypetab-ng | 2 +- +# skypetab-ng.src.rpm | Bin 28866 -> 28851 bytes + 2 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/skypetab-ng b/skypetab-ng +index 1cc6d6b..c53dbf8 100755 +--- a/skypetab-ng ++++ b/skypetab-ng +@@ -5,7 +5,7 @@ then + find|grep config.xml|while read line; + do + sed -i "s/.UseUniqueConversationsWindow.*//" $line +- sed -i "s//\n 1<\/UseUniqueConversationsWindow>/" $line ++ sed -i "s//\n 0<\/UseUniqueConversationsWindow>/" $line + cat $line + done + fi diff --git a/net-im/skypetab-ng/skypetab-ng-0.4.11.ebuild b/net-im/skypetab-ng/skypetab-ng-0.4.11.ebuild deleted file mode 100644 index 84231a937fe8..000000000000 --- a/net-im/skypetab-ng/skypetab-ng-0.4.11.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skypetab-ng/skypetab-ng-0.4.11.ebuild,v 1.1 2012/06/09 14:28:03 slyfox Exp $ - -EAPI=4 - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://github.com/kekekeks/skypetab-ng.git" - UNPACKER_ECLASS="git-2" - LIVE_EBUILD=yes -else - UNPACKER_ECLASS="vcs-snapshot" -fi - -inherit qt4-r2 multilib ${UNPACKER_ECLASS} - -if [[ -z ${LIVE_EBUILD} ]]; then - KEYWORDS="-* ~x86 ~amd64" - SRC_URI="http://github.com/kekekeks/${PN}/tarball/v${PV} -> ${P}.tar.gz" -fi - -DESCRIPTION="An LD_PRELOAD wrapper that adds tabs to Skype for Linux" -HOMEPAGE="http://github.com/kekekeks/skypetab-ng" -LICENSE="LGPL-3" -SLOT="0" -IUSE="" - -DEPEND=" - x11-libs/qt-gui - amd64? ( app-emulation/emul-linux-x86-qtlibs ) -" -RDEPEND="${DEPEND} - net-im/skype[-qt-static] -" - -pkg_setup() { - use amd64 && multilib_toolchain_setup x86 -} diff --git a/net-im/skypetab-ng/skypetab-ng-0.5.0-r1.ebuild b/net-im/skypetab-ng/skypetab-ng-0.5.0-r1.ebuild new file mode 100644 index 000000000000..fb71489cbbe2 --- /dev/null +++ b/net-im/skypetab-ng/skypetab-ng-0.5.0-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/skypetab-ng/skypetab-ng-0.5.0-r1.ebuild,v 1.1 2012/07/24 08:18:57 slyfox Exp $ + +EAPI=4 + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="git://github.com/kekekeks/skypetab-ng.git" + UNPACKER_ECLASS="git-2" + LIVE_EBUILD=yes +else + UNPACKER_ECLASS="vcs-snapshot" +fi + +inherit eutils qt4-r2 multilib ${UNPACKER_ECLASS} + +if [[ -z ${LIVE_EBUILD} ]]; then + KEYWORDS="-* ~x86 ~amd64" + SRC_URI="http://github.com/kekekeks/${PN}/tarball/v${PV}-fixed -> ${P}.tar.gz" +fi + +DESCRIPTION="An LD_PRELOAD wrapper that adds tabs to Skype for Linux" +HOMEPAGE="http://github.com/kekekeks/skypetab-ng" +LICENSE="LGPL-3" +SLOT="0" +IUSE="" + +DEPEND=" + x11-libs/qt-gui + amd64? ( app-emulation/emul-linux-x86-qtlibs ) +" +RDEPEND="${DEPEND} + net-im/skype[-qt-static] +" + +src_prepare() { + epatch "${FILESDIR}"/${P}-fix-multiwindows.patch +} + +pkg_setup() { + use amd64 && multilib_toolchain_setup x86 +} -- cgit v1.2.3-65-gdbad