more wengophone fixes and updates

svn path=/trunk/; revision=629

7 files changed, 46 insertions, 275 deletions

diff --git a/net-voip/wengophone/ChangeLog b/net-voip/wengophone/ChangeLog
index ffc2a55..2324053 100644
--- a/net-voip/wengophone/ChangeLog
+++ b/net-voip/wengophone/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/skel.ChangeLog,v 1.2 2006/02/22 02:08:04 hd_brummy Exp $
 
+  16 Dec 2007; Chi-Thanh Christopher Nguyen <chithanh@cs.tu-berlin.de>
+  +files/wengophone-2.1-qt-4.3.diff, -wengophone-2.1.1.ebuild,
+  -wengophone-2.1.2.ebuild, -wengophone-2.1.2-r1.ebuild,
+  wengophone-2.1.2-r2.ebuild, +wengophone-2.1.99.2.ebuild:
+  Patch qt-4.3 issue when window is too wide, add new beta version, clean up
+  old versions
+
   15 Dec 2007; Chi-Thanh Christopher Nguyen <chithanh@cs.tu-berlin.de>
   +wengophone-2.1.2-r2.ebuild:
   Get rid of more internal libraries
diff --git a/net-voip/wengophone/Manifest b/net-voip/wengophone/Manifest
index 2aa08e8..a876732 100644
--- a/net-voip/wengophone/Manifest
+++ b/net-voip/wengophone/Manifest
@@ -1,12 +1,11 @@
 AUX alsa-plughw-default.patch 2214 RMD160 daacb3f4f45bd9146bf31585c960f60607e8a3fd SHA1 969a9d3caafb330247f11363bd6e37701616ab98 SHA256 139d31dea26637da8137336cced9586cd25e4f975a25b7831609c022bda62df6
 AUX phapi_newerffmpeg.diff 7081 RMD160 21ce47c355be6506ebb0f8ae6bdfa294dc7f9ab9 SHA1 aa699703e70425112d8e071032a16970f37ff860 SHA256 4ae8958c1b1d59746c5a5e2ad3e5cbdc4a5062f74590bcb80aa87d26bc3cf312
 AUX pixertool_newerffmpeg.diff 9432 RMD160 54f9c9fd1010bb55a6210b6ce05c8b73e905463b SHA1 08d0a1a8d38da6aa87c1e4a27841dd2b54c3b48e SHA256 d54bb22a3afbd6a49092a1e804bc6effe7d8419e0cba37a05e183df792f5f5e1
+AUX wengophone-2.1-qt-4.3.diff 830 RMD160 5c703fa6d3d8fe4d47335018c29fac734dfc334a SHA1 f8e05f4552c4d851d4168673a52c2e7e2e0fa75f SHA256 f2a3926f3334b3acb4020263de4a4272d7185209954879e1ae60c22aa0ed3f51
 AUX wengophone_externavcodec.diff 438 RMD160 cbd241bad583e63501a0647512cd0ecc99dcb6b8 SHA1 72f276cd5b3a7a98a46c596f15aa4a8fa271b6e1 SHA256 d66bd4e04e63d7a405e75f3bddba33521a77b6da39bda2ba2f06e3207e56e9f5
 DIST wengophone-2.1.1-v4l2-patches.tar.bz2 7889 RMD160 cd233c35be0a5a8168aee1f30d574235e049a450 SHA1 4feac585e56e7976361e55abd05163873c3109ca SHA256 18763293a8d3c36805eaa34a8fd28645929967164aed090c453230011d91f0d3
-DIST wengophone-2.1.1.tar.bz2 25726476 RMD160 17a1c694e3dd27581408bf23372c383e654202c2 SHA1 56e7314147e2de8b25606defc5ae3d674f7de090 SHA256 52338793c0b052e9a53f6f18bbca1ca3b735b53be9966ffcdf78ce0459a94891
 DIST wengophone-2.1.2-source.zip 48210044 RMD160 f9b2a106dcd27c228cca3305bead2c9738ac39c6 SHA1 53839c87efe322879fd416e0111ed70348587116 SHA256 ac9d254f8c4b0146fa4751f2328aab1765a0d27709e883eb46a9f297e155681e
-EBUILD wengophone-2.1.1.ebuild 3023 RMD160 2e7d05b2d085c0517ac7908d79f836ff61774322 SHA1 6b7057188f21519e0cbdf227ce564d6b70ec5d16 SHA256 e6b152f5ab702021c903ba34282e31201357c6ec439283372e5b75b26f03ecf7
-EBUILD wengophone-2.1.2-r1.ebuild 3191 RMD160 b7c81581e4b84bc3440df3e8c8f401bd4205b0a5 SHA1 1ed7cd6484a240e4e212b3d475d594d7016fb513 SHA256 901e93798825f346861a519d7d3c2c64deb812910b5a59a5107e26c354440b34
-EBUILD wengophone-2.1.2-r2.ebuild 2745 RMD160 28f02ea4c91f8bd87fb104100f36618c2a2f503c SHA1 d2ca37fa4ee877ed91e1313e0bffb9879d802b5f SHA256 2f5f4fc3850eff38e1f441d6f74d35f5ad640b8582fc5708428bf4778ec60c54
-EBUILD wengophone-2.1.2.ebuild 3097 RMD160 44573c16bd62993b623ffb0d9c867dfb1455c680 SHA1 29c6c47eb0466b08fd21ac2bf88832b6e7f76fbe SHA256 73701640a252452f7378021c793fadb25a25a752f002a09704e7e35163bbeb84
-MISC ChangeLog 970 RMD160 f319297177d607fc97eb0887e448f3ce872af9b0 SHA1 8bc86685a10e2ce1a745322bb7117b2615c9e537 SHA256 af195e515f9871166992a9b5dde4d459a16a6b2a0fc6572498e1796231448af5
+DIST wengophone-2.1.99.2-source.zip 48287963 RMD160 a5cdd1c58474b43eb1054e7554a412bafe9aa76c SHA1 5faaf5e2e03b0d2bd21aa00c8a3db34f25617c73 SHA256 f328465a2b15bd627463a17c8e689d70bc1f07a17e2e28b892f643ffdef45b24
+EBUILD wengophone-2.1.2-r2.ebuild 2792 RMD160 6b90cee3aa7d4f408db7c77603d921d626f49ca0 SHA1 4691787eee8980b185be6b75f8ed79569323f7ba SHA256 e32a8bf8dabbba470ef2b4049c1fa32cb9ad8f28d97504eb64b2bab333d0b596
+EBUILD wengophone-2.1.99.2.ebuild 2239 RMD160 b41f16995e8ff8dd1012bc75303b1e4a06213839 SHA1 573bf2c64341c55f78feb18db301468ea6f03c80 SHA256 dfbd74d04ec82b5c7e9df9764b5f3d1558361820a21f0d9280ca89802d1f4cd0
+MISC ChangeLog 1313 RMD160 aa4aaef482165a98530c9c053f6d98cd887e2dc3 SHA1 60e61005348c23cf6a910f09fe6abd77b77ec7f4 SHA256 81eeabb5daf027e17542660a229750035b4e279012bc0a24fc68ff7d12175e47
diff --git a/net-voip/wengophone/files/wengophone-2.1-qt-4.3.diff b/net-voip/wengophone/files/wengophone-2.1-qt-4.3.diff
new file mode 100644
index 0000000..cfc310c
--- /dev/null
+++ b/net-voip/wengophone/files/wengophone-2.1-qt-4.3.diff
@@ -0,0 +1,23 @@
+Index: /wengophone-ng/branches/wengophone-2.2/wengophone/src/presentation/qt/QtWengoStyle.h

+===================================================================

+--- /wengophone-ng/branches/wengophone-2.2/wengophone/src/presentation/qt/QtWengoStyle.h (revision 12904)

++++ /wengophone-ng/branches/wengophone-2.2/wengophone/src/presentation/qt/QtWengoStyle.h (revision 13153)

+@@ -25,8 +25,8 @@

+ #ifdef OS_MACOSX

+ 	#include <QtGui/QMacStyle>

+-	class SystemStyle : public QMacStyle { };

++	typedef QMacStyle BaseStyle;

+ #else

+-	#include <QtGui/QStyle>

+-	class SystemStyle : public QStyle { };

++	#include <QtGui/QCommonStyle>

++	typedef QCommonStyle BaseStyle;

+ #endif

+ 

+@@ -40,5 +40,5 @@

+  * @author Tanguy Krotoff

+  */

+-class QtWengoStyle : public SystemStyle {

++class QtWengoStyle : public BaseStyle {

+ public:

+ 

diff --git a/net-voip/wengophone/wengophone-2.1.2-r1.ebuild b/net-voip/wengophone/wengophone-2.1.2-r1.ebuild
deleted file mode 100644
index fc056c1..0000000
--- a/net-voip/wengophone/wengophone-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils toolchain-funcs
-
-MY_V4L2_PATCH_V="2.1.1"
-
-DESCRIPTION="Wengophone NG is a VoIP client featuring the SIP protcol"
-HOMEPAGE="http://dev.openwengo.com"
-SRC_URI="http://download.wengo.com/nightlybuilds/universal/sources/openwengo/${PV}/${P}-source.zip v4l2? ( http://nguyenchithanh.googlepages.com/${PN}-${MY_V4L2_PATCH_V}-v4l2-patches.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug oss portaudio v4l2 xv"
-
-RDEPEND=">=dev-libs/boost-1.34
-	dev-libs/glib
-	dev-libs/openssl
-	alsa? ( media-libs/alsa-lib )
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	portaudio? ( >=media-libs/portaudio-19_pre061121 )
-	media-video/ffmpeg
-	net-libs/gnutls
-	>=net-misc/curl-7.16.1
-	|| ( x11-libs/libX11 virtual/x11 )
-	>=x11-libs/qt-4.1
-	xv? ( x11-libs/libXv )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.4"
-
-S=${WORKDIR}/${P}-source
-
-src_unpack() {
-	unpack ${A}
-	cd ${S} || die
-
-	epatch ${FILESDIR}/phapi_newerffmpeg.diff
-	epatch ${FILESDIR}/pixertool_newerffmpeg.diff
-	epatch ${FILESDIR}/wengophone_externavcodec.diff
-	epatch ${FILESDIR}/alsa-plughw-default.patch
-
-	if use v4l2; then
-		cd ${S}/libs/owpixertool || die
-		epatch ${WORKDIR}/owpixertool-v4l2.patch
-		cd ${S}/libs/owwebcam || die
-		epatch ${WORKDIR}/owwebcam-v4l2.patch
-	fi
-}
-src_compile() {
-
-	local mycmakeflags
-
-	# the following are not automagic dependencies, because they do not
-	# change the way the software works and are linked statically
-
-	if ! has_version '>=media-libs/speex-1.1.12'; then
-		elog "speex 1.1.12 or later not installed, using internal speex"
-		mycmakeflags="${mycmakeflags} -DSPEEX_INTERNAL=ON"
-	fi
-
-	if ! has_version '>=net-libs/libosip-3.0.1'; then
-		elog "libosip 3.0.1 or later not installed, using internal libosip"
-		mycmakeflags="${mycmakeflags} -DOSIP2_INTERNAL=ON"
-	fi
-
-	if use debug; then
-		mycmakeflags="${mycmakeflags} -DCMAKE_BUILD_TYPE=Debug"
-	else
-		mycmakeflags="${mycmakeflags} -DCMAKE_BUILD_TYPE=Release"
-	fi
-
-	if use portaudio; then
-		mycmakeflags="${mycmakeflags} -DOWSOUND_PORTAUDIO_SUPPORT=ON"
-	else
-		mycmakeflags="${mycmakeflags} -DOWSOUND_PORTAUDIO_SUPPORT=OFF"
-	fi
-
-	if use alsa; then
-		mycmakeflags="${mycmakeflags} -DPHAPI_AUDIO_ALSA_SUPPORT=ON \
-			-DPORTAUDIO_ALSA_SUPPORT=ON"
-	else
-		mycmakeflags="${mycmakeflags} -DPHAPI_AUDIO_ALSA_SUPPORT=OFF \
-			-DPORTAUDIO_ALSA_SUPPORT=OFF"
-	fi
-
-	if use oss; then
-		mycmakeflags="${mycmakeflags} -DPHAPI_AUDIO_OSS_SUPPORT=ON \
-			-DPORTAUDIO_OSS_SUPPORT=ON"
-	else
-		mycmakeflags="${mycmakeflags} -DPHAPI_AUDIO_OSS_SUPPORT=OFF \
-			-DPORTAUDIO_OSS_SUPPORT=OFF"
-	fi
-
-	if use xv; then
-		mycmakeflags="${mycmakeflags} -DWENGOPHONE_XV_SUPPORT=ON"
-	else
-		mycmakeflags="${mycmakeflags} -DWENGOPHONE_XV_SUPPORT=OFF"
-	fi
-
-	cd ${S}/build
-	cmake -DCMAKE_INSTALL_PREFIX="/usr" ${mycmakeflags} \
-		.. || die "cmake failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	cd ${S}/build
-	emake DESTDIR=${D} install || die "install failed"
-	domenu ../wengophone/res/wengophone.desktop
-	doicon ../wengophone/res/wengophone_64x64.png
-}
-
-pkg_postinst() {
-	elog 'execute "qtwengophone" to start wengophone'
-}
diff --git a/net-voip/wengophone/wengophone-2.1.2-r2.ebuild b/net-voip/wengophone/wengophone-2.1.2-r2.ebuild
index 7d257cb..81d35ee 100644
--- a/net-voip/wengophone/wengophone-2.1.2-r2.ebuild
+++ b/net-voip/wengophone/wengophone-2.1.2-r2.ebuild
@@ -44,6 +44,7 @@ src_unpack() {
 	epatch ${FILESDIR}/pixertool_newerffmpeg.diff
 	epatch ${FILESDIR}/wengophone_externavcodec.diff
 	epatch ${FILESDIR}/alsa-plughw-default.patch
+	epatch ${FILESDIR}/wengophone-2.1-qt-4.3.diff
 
 	if use v4l2; then
 		cd ${S}/libs/owpixertool || die
diff --git a/net-voip/wengophone/wengophone-2.1.2.ebuild b/net-voip/wengophone/wengophone-2.1.2.ebuild
deleted file mode 100644
index dd46e08..0000000
--- a/net-voip/wengophone/wengophone-2.1.2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils toolchain-funcs
-
-MY_V4L2_PATCH_V="2.1.1"
-
-DESCRIPTION="Wengophone NG is a VoIP client featuring the SIP protcol"
-HOMEPAGE="http://dev.openwengo.com"
-SRC_URI="http://download.wengo.com/nightlybuilds/universal/sources/openwengo/${PV}/${P}-source.zip http://nguyenchithanh.googlepages.com/${PN}-${MY_V4L2_PATCH_V}-v4l2-patches.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug oss portaudio v4l2 xv"
-
-RDEPEND=">=dev-libs/boost-1.34
-	dev-libs/glib
-	dev-libs/openssl
-	alsa? ( media-libs/alsa-lib )
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-video/ffmpeg
-	net-libs/gnutls
-	|| ( x11-libs/libX11 virtual/x11 )
-	>=x11-libs/qt-4.1
-	xv? ( x11-libs/libXv )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.4"
-
-S=${WORKDIR}/${P}-source
-
-src_unpack() {
-	unpack ${A}
-	cd ${S} || die
-
-	epatch ${FILESDIR}/phapi_newerffmpeg.diff
-	epatch ${FILESDIR}/pixertool_newerffmpeg.diff
-	epatch ${FILESDIR}/wengophone_externavcodec.diff
-
-	if use v4l2; then
-		cd ${S}/libs/owpixertool || die
-		epatch ${WORKDIR}/owpixertool-v4l2.patch
-		cd ${S}/libs/owwebcam || die
-		epatch ${WORKDIR}/owwebcam-v4l2.patch
-	fi
-}
-src_compile() {
-
-	local mycmakeflags
-
-	if ! has_version '>=net-misc/curl-7.16.1'; then
-		elog "curl 7.16.1 or later not installed, using internal curl"
-		mycmakeflags="${mycmakeflags} -DCURL_INTERNAL=ON"
-	fi
-
-	if ! has_version '>=net-libs/libosip-3.0.1'; then
-		elog "libosip 3.0.1 or later not installed, using internal libosip"
-		mycmakeflags="${mycmakeflags} -DOSIP2_INTERNAL=ON"
-	fi
-
-	if ! has_version '>=media-libs/speex-1.1.12'; then
-		elog "speex 1.1.12 or later not installed, using internal speex"
-		mycmakeflags="${mycmakeflags} -DSPEEX_INTERNAL=ON"
-	fi
-
-	if use debug; then
-		mycmakeflags="${mycmakeflags} -DCMAKE_BUILD_TYPE=Debug"
-	else
-		mycmakeflags="${mycmakeflags} -DCMAKE_BUILD_TYPE=Release"
-	fi
-
-	if use portaudio; then
-		mycmakeflags="${mycmakeflags} -DOWSOUND_PORTAUDIO_SUPPORT=ON"
-	else
-		mycmakeflags="${mycmakeflags} -DOWSOUND_PORTAUDIO_SUPPORT=OFF"
-	fi
-
-	if use alsa; then
-		mycmakeflags="${mycmakeflags} -DPHAPI_AUDIO_ALSA_SUPPORT=ON \
-			-DPORTAUDIO_ALSA_SUPPORT=ON"
-	else
-		mycmakeflags="${mycmakeflags} -DPHAPI_AUDIO_ALSA_SUPPORT=OFF \
-			-DPORTAUDIO_ALSA_SUPPORT=OFF"
-	fi
-
-	if use oss; then
-		mycmakeflags="${mycmakeflags} -DPHAPI_AUDIO_OSS_SUPPORT=ON \
-			-DPORTAUDIO_OSS_SUPPORT=ON"
-	else
-		mycmakeflags="${mycmakeflags} -DPHAPI_AUDIO_OSS_SUPPORT=OFF \
-			-DPORTAUDIO_OSS_SUPPORT=OFF"
-	fi
-
-	if use xv; then
-		mycmakeflags="${mycmakeflags} -DWENGOPHONE_XV_SUPPORT=ON"
-	else
-		mycmakeflags="${mycmakeflags} -DWENGOPHONE_XV_SUPPORT=OFF"
-	fi
-
-	cd ${S}/build
-	cmake -DCMAKE_INSTALL_PREFIX="/usr" ${mycmakeflags} \
-		.. || die "cmake failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	cd ${S}/build
-	emake DESTDIR=${D} install || die "install failed"
-	domenu ../wengophone/res/wengophone.desktop
-	doicon ../wengophone/res/wengophone_64x64.png
-}
-
-pkg_postinst() {
-	elog 'execute "qtwengophone" to start wengophone'
-}
diff --git a/net-voip/wengophone/wengophone-2.1.1.ebuild b/net-voip/wengophone/wengophone-2.1.99.2.ebuild
index 2140f8b..6ceb490 100644
--- a/net-voip/wengophone/wengophone-2.1.1.ebuild
+++ b/net-voip/wengophone/wengophone-2.1.99.2.ebuild
@@ -6,12 +6,12 @@ inherit eutils toolchain-funcs
 
 DESCRIPTION="Wengophone NG is a VoIP client featuring the SIP protcol"
 HOMEPAGE="http://dev.openwengo.com"
-SRC_URI="http://download.wengo.com/nightlybuilds/universal/sources/openwengo/${PV}/${P}.tar.bz2 http://nguyenchithanh.googlepages.com/${P}-v4l2-patches.tar.bz2"
+SRC_URI="http://download.wengo.com/nightlybuilds/universal/sources/openwengo/${PV}/${P}-source.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug oss portaudio v4l2 xv"
+IUSE="alsa debug oss portaudio xv"
 
 RDEPEND=">=dev-libs/boost-1.34
 	dev-libs/glib
@@ -19,8 +19,12 @@ RDEPEND=">=dev-libs/boost-1.34
 	alsa? ( media-libs/alsa-lib )
 	media-libs/libsamplerate
 	media-libs/libsndfile
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	>=media-libs/speex-1.1.12
 	media-video/ffmpeg
 	net-libs/gnutls
+	>=net-libs/libosip-3
+	>=net-misc/curl-7.16.1
 	|| ( x11-libs/libX11 virtual/x11 )
 	>=x11-libs/qt-4.1
 	xv? ( x11-libs/libXv )"
@@ -28,40 +32,18 @@ RDEPEND=">=dev-libs/boost-1.34
 DEPEND="${RDEPEND}
 	>=dev-util/cmake-2.4.4"
 
+S=${WORKDIR}/${P}-source
+
 src_unpack() {
 	unpack ${A}
 	cd ${S} || die
-
-	epatch ${FILESDIR}/phapi_newerffmpeg.diff
-	epatch ${FILESDIR}/pixertool_newerffmpeg.diff
-	epatch ${FILESDIR}/wengophone_externavcodec.diff
-
-	if use v4l2; then
-		cd ${S}/libs/owpixertool || die
-		epatch ${WORKDIR}/owpixertool-v4l2.patch
-		cd ${S}/libs/owwebcam || die
-		epatch ${WORKDIR}/owwebcam-v4l2.patch
-	fi
+	epatch ${FILESDIR}/wengophone-2.1-qt-4.3.diff
 }
+
 src_compile() {
 
 	local mycmakeflags
 
-	if ! has_version '>=net-misc/curl-7.16.1'; then
-		elog "curl 7.16.1 or later not installed, using internal curl"
-		mycmakeflags="${mycmakeflags} -DCURL_INTERNAL=ON"
-	fi
-
-	if ! has_version '>=net-libs/libosip-3.0.1'; then
-		elog "libosip 3.0.1 or later not installed, using internal libosip"
-		mycmakeflags="${mycmakeflags} -DOSIP2_INTERNAL=ON"
-	fi
-
-	if ! has_version '>=media-libs/speex-1.1.12'; then
-		elog "speex 1.1.12 or later not installed, using internal speex"
-		mycmakeflags="${mycmakeflags} -DSPEEX_INTERNAL=ON"
-	fi
-
 	if use debug; then
 		mycmakeflags="${mycmakeflags} -DCMAKE_BUILD_TYPE=Debug"
 	else
@@ -108,7 +90,3 @@ src_install() {
 	domenu ../wengophone/res/wengophone.desktop
 	doicon ../wengophone/res/wengophone_64x64.png
 }
-
-pkg_postinst() {
-	elog 'execute "qtwengophone" to start wengophone'
-}