net-im/qutecom: version bump

svn path=/sunrise/; revision=8628

5 files changed, 13 insertions, 113 deletions

diff --git a/net-im/qutecom/ChangeLog b/net-im/qutecom/ChangeLog
index 3d8f4847b..62badd3f1 100644
--- a/net-im/qutecom/ChangeLog
+++ b/net-im/qutecom/ChangeLog
@@ -3,6 +3,12 @@
 # $Header: $
 
   07 Jun 2009; Chi-Thanh Christopher Nguyen (chithead)
+  <chithanh@cs.tu-berlin.de> -qutecom-2.2_rc3-r1.ebuild,
+  +qutecom-2.2_p20090606.ebuild, -files/qutecom_libpurple_gnutls.patch,
+  -files/qutecom_wifo_phapi.patch:
+  version bump
+
+  07 Jun 2009; Chi-Thanh Christopher Nguyen (chithead)
   <chithanh@cs.tu-berlin.de> qutecom-2.2_rc3-r1.ebuild:
   depend on old version of ffmpeg
 
diff --git a/net-im/qutecom/Manifest b/net-im/qutecom/Manifest
index 6472af924..026ed88a8 100644
--- a/net-im/qutecom/Manifest
+++ b/net-im/qutecom/Manifest
@@ -1,7 +1,4 @@
-AUX qutecom_libpurple_gnutls.patch 1689 RMD160 b53feb582f9a2bab53359d5d3356ee37f888732d SHA1 96d8a9b942616a81e5ca40f1e9decc00ad5114bd SHA256 d55aaf2eabd98a3dffa0efc7b0dca7e8bad90219addcbcad4cc8a7072b1e31ec
-AUX qutecom_wifo_phapi.patch 597 RMD160 e059c264ec82ea5f8492001660fd80461ae95981 SHA1 0f1feb7cc284500397af7465bfca3f31fe48c5b7 SHA256 02679323227cc20c761d1060259ce6bdb3ab67543f83624e2ef6e159f75d2f43
-DIST qutecom-2.2-RC3.tar.gz 53402144 RMD160 7602d379ecefa3eb0a16bfc68a10acac7800fb7f SHA1 b92fe77ba31e58a9ab73de9d69ec2a594873e318 SHA256 51a8f54815e540bd5d5dfc471873bfc92af8b7d0bdf6f299136dacec72fefcf3
-DIST qutecom_googlebreakpad_64.patch 85647 RMD160 39879342bc60a49e773e2c0d52fb11ed1dafd86a SHA1 68c10d7dd25a8bed0153e7cabec0927507b2f3d4 SHA256 5160d1d4cdd41e82a8c471cc7f543e7ba3809d4075b660038b2d420963a9049f
-EBUILD qutecom-2.2_rc3-r1.ebuild 2234 RMD160 348606bb4baf884f9bec3704a4653b4bc9e0ad56 SHA1 7a4f81afab6c41f644547062e1d2cc06754ef385 SHA256 7a7f9bb85e12d0160c1d6414d04ec3dc5dea8598c35963e1a239c125dd038295
-MISC ChangeLog 3544 RMD160 f551a3f8dd8bb6f8f01e415ff666492efd8e8649 SHA1 4de80c6b2d115aa5fe59f485729104e126520a37 SHA256 e74d42e8731fe9610294226b7baca65e888de87e1fd73310de608dcd64f51baa
+DIST qutecom-2.2_p20090606.tar.lzma 35254248 RMD160 230ac4119da3cb66b5a0227177b3196c0dd097e3 SHA1 19cc8f4296bf04a7a753b41d604e81a26b55afc6 SHA256 757c2c980c330b5d1136c9029c3ad85a3ea83f0aa4d6b0bcc02a4393812d7f4b
+EBUILD qutecom-2.2_p20090606.ebuild 1350 RMD160 2b846a5c787a4c832c36c8f09c3555a18fa2429e SHA1 9697e8f650c513c7777bc79689e8b06ff89b6545 SHA256 753209944236661c26d19421f183f767673aba5f812a1fc6a44d3c21f350ba4e
+MISC ChangeLog 3779 RMD160 025113ecf2b4144eae7361656bf0fe5eb7836615 SHA1 b76dabf446e5bf62ece29469ce65ccb23010b737 SHA256 a41ea4179e4697886191d8d426276e5f0e9df143aff3fccde666a0b2b3bdd8db
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/net-im/qutecom/files/qutecom_libpurple_gnutls.patch b/net-im/qutecom/files/qutecom_libpurple_gnutls.patch
deleted file mode 100644
index 2bd0a7e21..000000000
--- a/net-im/qutecom/files/qutecom_libpurple_gnutls.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-
-# HG changeset patch
-# User ludovico.cavedon@gmail.com
-# Date 1237671131 25200
-# Node ID 2260663e58c478857668073be3b571e9fe96b375
-# Parent 2a9fda06d182b39f9ca5f2ddf9be102226114272
-Accept SSL certificate with wrong hostname
-
---- a/libs/imwrapper/src/purple/PurpleIMFactory.cpp	Sat Mar 21 14:27:28 2009 -0700
-+++ b/libs/imwrapper/src/purple/PurpleIMFactory.cpp	Sat Mar 21 14:32:11 2009 -0700
-@@ -140,6 +140,19 @@
- 	return closure->result;
- }
- 
-+static void* purple_wg_request_action(const char *title, const char *primary,
-+		const char *secondary, int default_action,
-+		PurpleAccount *account, const char *who,
-+		PurpleConversation *conv, void *user_data, size_t action_count,
-+		va_list actions) {
-+	const char *text = va_arg(actions, const char *);
-+	PurpleRequestActionCb callback = va_arg(actions, PurpleRequestActionCb);
-+
-+	LOG_WARN("requested action: %s: %s, %s. Default action: %s", title, primary, secondary, text);
-+	callback(user_data, 0);
-+        return NULL;
-+}
-+
- gpointer PurpleMainEventLoop(gpointer data) {
- 	if (gMainLoop) {
- 		LOG_FATAL("gMainLoop already created");
-@@ -170,6 +183,19 @@
- 	g_source_remove,
- 	purple_wg_input_add,
- 	g_source_remove
-+};
-+
-+static PurpleRequestUiOps request_wg_ops = {
-+	NULL,
-+	NULL,
-+	purple_wg_request_action,
-+	NULL,
-+	NULL,
-+	NULL,
-+	NULL,
-+	NULL,
-+	NULL,
-+	NULL
- };
- 
- bool PurpleIMFactory::equals(const IMAccount & imAccount, std::string login, EnumIMProtocol::IMProtocol protocol) {
-@@ -236,6 +262,8 @@
- 	purple_plugins_add_search_path("plugins");
- 	g_free(search_path);
- 
-+	purple_request_set_ui_ops(&request_wg_ops);
-+
- 	if (!purple_core_init("Wengo PURPLE")) {
- 		LOG_WARN("Initialization of the Purple core failed\n");
- 	}
-
diff --git a/net-im/qutecom/files/qutecom_wifo_phapi.patch b/net-im/qutecom/files/qutecom_wifo_phapi.patch
deleted file mode 100644
index b028542c3..000000000
--- a/net-im/qutecom/files/qutecom_wifo_phapi.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-The variable has been removed from latest libavcodec and is
-already unused in the internal version of ffmpeg.
-
-diff --git a/wifo/phapi/phcodec-avcodec-wrapper.c b/wifo/phapi/phcodec-avcodec-wrapper.c
---- a/wifo/phapi/phcodec-avcodec-wrapper.c
-+++ b/wifo/phapi/phcodec-avcodec-wrapper.c
-@@ -123,7 +123,6 @@
- 	encoder_t->context->dct_algo = FF_DCT_AUTO;
- 	encoder_t->context->idct_algo = FF_IDCT_AUTO;
- 	encoder_t->context->opaque = opaque;
--	encoder_t->context->rtp_mode = 1;
- 	encoder_t->context->rtp_payload_size = 1000;
- 	encoder_t->context->rtp_callback = phcodec_avcodec_video_rtp_callback;
- 
diff --git a/net-im/qutecom/qutecom-2.2_rc3-r1.ebuild b/net-im/qutecom/qutecom-2.2_p20090606.ebuild
index e7181895f..b0c51f49e 100644
--- a/net-im/qutecom/qutecom-2.2_rc3-r1.ebuild
+++ b/net-im/qutecom/qutecom-2.2_p20090606.ebuild
@@ -6,12 +6,9 @@ EAPI="2"
 
 inherit cmake-utils eutils
 
-MY_P=${P/_rc/-RC}
-
 DESCRIPTION="Multi-protocol instant messenger and VoIP client"
 HOMEPAGE="http://www.qutecom.com/"
-SRC_URI="http://www.qutecom.com/downloads/${MY_P}.tar.gz
-	http://omploader.org/vMTFvMg/qutecom_googlebreakpad_64.patch"
+SRC_URI="http://omploader.org/vMXNucg/${P}.tar.lzma"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,7 +23,7 @@ DEPEND=">=dev-libs/boost-1.34
 	media-libs/libsndfile
 	portaudio? ( media-libs/portaudio )
 	media-libs/speex
-	<media-video/ffmpeg-0.5
+	media-video/ffmpeg
 	net-im/pidgin[gnutls]
 	net-libs/gnutls
 	>=net-libs/libosip-3
@@ -38,31 +35,6 @@ DEPEND=">=dev-libs/boost-1.34
 	xv? ( x11-libs/libXv )"
 RDEPEND=${DEPEND}
 
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	# do not try to unpack googlebreakpad_64.patch
-	# TODO: the patch should be compressed, internal or external
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}_wifo_phapi.patch
-	epatch "${FILESDIR}"/${PN}_libpurple_gnutls.patch
-	epatch "${DISTDIR}"/${PN}_googlebreakpad_64.patch
-
-	# fix broken CMake conf file
-	sed -i -e \
-		"s/endif (PHAPI_CODEC_AMR_SUPPORT)/endif (PHAPI_CODEC_ILBC_SUPPORT)/" \
-		wengophone/src/presentation/qt/CMakeLists-install-linux.txt \
-		|| die "patching CMakeLists-install-linux.txt failed"
-	sed -i -e \
-		"/^if (PHAPI_CODEC_ILBC_SUPPORT)/i\
-		endif (PHAPI_CODEC_AMR_SUPPORT)" \
-		wengophone/src/presentation/qt/CMakeLists-install-linux.txt \
-		|| die "patching CMakeLists-install-linux.txt failed"
-}
-
 src_configure() {
 	local mycmakeargs="$(cmake-utils_use_enable portaudio PORTAUDIO_SUPPORT) \
 		$(cmake-utils_use_enable alsa PHAPI_AUDIO_ALSA_SUPPORT) \
@@ -76,8 +48,7 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
-
-	domenu wengophone/res/qutecom.desktop || die "domenu failed"
-	doicon wengophone/res/wengophone_64x64.png || die "doicon failed"
+	domenu wengophone/res/${PN}.desktop || die "domenu failed"
+	doicon wengophone/res/${PN}_64x64.png || die "doicon failed"
 
 }