From a1eb008944f33235b41f527f0e717bd0201ec7a6 Mon Sep 17 00:00:00 2001 From: Mounir Lamouri Date: Thu, 5 Mar 2009 21:20:02 +0000 Subject: [PATCH] net-im/qutecom: Fixing build and QA svn path=/sunrise/; revision=8020 --- net-im/qutecom/ChangeLog | 4 ++++ net-im/qutecom/Manifest | 4 ++-- net-im/qutecom/qutecom-2.2_rc3.ebuild | 29 ++++++++++++++++++++------- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/net-im/qutecom/ChangeLog b/net-im/qutecom/ChangeLog index 6654bb698..ecb8ec34c 100644 --- a/net-im/qutecom/ChangeLog +++ b/net-im/qutecom/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 05 Mar 2009; Mounir Lamouri (volkmar) + qutecom-2.2_rc3.ebuild: + Fixing build and QA + 19 Jan 2009; Thomas Sachau (Tommy[D]) qutecom-2.2_rc3.ebuild: Add suggested RDEPEND=${DEPEND} diff --git a/net-im/qutecom/Manifest b/net-im/qutecom/Manifest index b9498c388..9b702b571 100644 --- a/net-im/qutecom/Manifest +++ b/net-im/qutecom/Manifest @@ -1,6 +1,6 @@ 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.ebuild 1787 RMD160 eae4bae50f1fe3139a29f22ad46f6167f8d03341 SHA1 837ab9e05f14ffee6d08f8e4553e381c967214b5 SHA256 487677887ffe8dd96c7add4e275edeb7f8e8d5fa6970a691938e5b0f68640baf -MISC ChangeLog 2809 RMD160 50721896f6f2b5c467f6371731ce19508b0db0e7 SHA1 4531e3e33b0e723ba84a49a71840b9ac097f6183 SHA256 766f937a0ce84640cdf22e45b39b12077287b40339795752da73880cce039dc5 +EBUILD qutecom-2.2_rc3.ebuild 2391 RMD160 24de2c57942223d55c106c650d4a03c2fbcb12c8 SHA1 f701b677d16c335b56fa0364e66fce4491eb2294 SHA256 efb874eb7e2ba851abd3974aad284561771e02776ca93f9d5668229dae709a2a +MISC ChangeLog 2925 RMD160 6939687e92b92746f073c53283c59bd96fb9f1a3 SHA1 d08695e3ac29b97cfe11f9554f355a8646f46839 SHA256 7d9dc9cf4c5023eba489d54961db90c63dafd99deb442bcb619f288383236efa MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/net-im/qutecom/qutecom-2.2_rc3.ebuild b/net-im/qutecom/qutecom-2.2_rc3.ebuild index 37ac7c459..624604d43 100644 --- a/net-im/qutecom/qutecom-2.2_rc3.ebuild +++ b/net-im/qutecom/qutecom-2.2_rc3.ebuild @@ -2,13 +2,13 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="1" +EAPI="2" inherit cmake-utils eutils MY_P=${P/_rc/-RC} -DESCRIPTION="An open source softphone" +DESCRIPTION="VoIP client featuring the SIP protocol" HOMEPAGE="http://www.qutecom.com/" SRC_URI="http://www.qutecom.com/downloads/${MY_P}.tar.gz http://omploader.org/vMTFvMg/qutecom_googlebreakpad_64.patch" @@ -39,22 +39,37 @@ RDEPEND=${DEPEND} S=${WORKDIR}/${MY_P} src_unpack() { - unpack ${A} + # do not try to unpack googlebreakpad_64.patch + # TODO: the patch should be compressed, internal or external + unpack ${MY_P}.tar.gz cd "${S}" +} + +src_prepare() { epatch "${FILESDIR}"/${PN}_wifo_phapi.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_compile() { - EXTRA_ECONF=" \ - $(cmake-utils_use_enable portaudio PORTAUDIO_SUPPORT) \ +src_configure() { + local mycmakeargs="$(cmake-utils_use_enable portaudio PORTAUDIO_SUPPORT) \ $(cmake-utils_use_enable alsa PHAPI_AUDIO_ALSA_SUPPORT) \ $(cmake-utils_use_enable oss PHAPI_AUDIO_OSS_SUPPORT) \ $(cmake-utils_use_enable xv WENGOPHONE_XV_SUPPORT) \ -DLIBPURPLE_INTERNAL=OFF \ -DPORTAUDIO_INTERNAL=OFF " - cmake-utils_src_compile + cmake-utils_src_configure } src_install() { -- 2.43.2