From 2b66bf795425c7fe906262e2fb0cdde7c4cbbe9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ch=C3=AD-Thanh=20Christopher=20Nguy=E1=BB=85n?= Date: Tue, 24 Mar 2009 14:48:34 +0000 Subject: net-im/qutecom: update pidgin dependency and add patch for gnutls, unbreak double cmake fix+workaround, update DESCRIPTION svn path=/sunrise/; revision=8136 --- net-im/qutecom/ChangeLog | 6 ++ net-im/qutecom/Manifest | 5 +- .../qutecom/files/qutecom_libpurple_gnutls.patch | 60 +++++++++++++++ net-im/qutecom/qutecom-2.2_rc3-r1.ebuild | 82 +++++++++++++++++++++ net-im/qutecom/qutecom-2.2_rc3.ebuild | 85 ---------------------- 5 files changed, 151 insertions(+), 87 deletions(-) create mode 100644 net-im/qutecom/files/qutecom_libpurple_gnutls.patch create mode 100644 net-im/qutecom/qutecom-2.2_rc3-r1.ebuild delete mode 100644 net-im/qutecom/qutecom-2.2_rc3.ebuild (limited to 'net-im/qutecom') diff --git a/net-im/qutecom/ChangeLog b/net-im/qutecom/ChangeLog index ecb8ec34c..8e5449c13 100644 --- a/net-im/qutecom/ChangeLog +++ b/net-im/qutecom/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 24 Mar 2009; Chi-Thanh Christopher Nguyen (chithead) + -qutecom-2.2_rc3.ebuild, + +qutecom-2.2_rc3-r1.ebuild, +files/qutecom_libpurple_gnutls.patch: + update pidgin dependency and add patch for gnutls, unbreak double cmake + fix+workaround, update DESCRIPTION + 05 Mar 2009; Mounir Lamouri (volkmar) qutecom-2.2_rc3.ebuild: Fixing build and QA diff --git a/net-im/qutecom/Manifest b/net-im/qutecom/Manifest index 9b702b571..177fe039b 100644 --- a/net-im/qutecom/Manifest +++ b/net-im/qutecom/Manifest @@ -1,6 +1,7 @@ +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.ebuild 2391 RMD160 24de2c57942223d55c106c650d4a03c2fbcb12c8 SHA1 f701b677d16c335b56fa0364e66fce4491eb2294 SHA256 efb874eb7e2ba851abd3974aad284561771e02776ca93f9d5668229dae709a2a -MISC ChangeLog 2925 RMD160 6939687e92b92746f073c53283c59bd96fb9f1a3 SHA1 d08695e3ac29b97cfe11f9554f355a8646f46839 SHA256 7d9dc9cf4c5023eba489d54961db90c63dafd99deb442bcb619f288383236efa +EBUILD qutecom-2.2_rc3-r1.ebuild 2271 RMD160 0a7b641c7ab6e0323b2812143109b477bb8f1585 SHA1 08328b77f6a59f94446472087b8a270f716e2004 SHA256 891a91cefe7c0a9d1a61be9d4b5a2d02da1f613ac29e14eed21d57b4aad918a9 +MISC ChangeLog 3215 RMD160 b799008938323b4f075038e4f3e8fbd59a2bbcc1 SHA1 d5f55d23d0134240996fbe0310df7354c28fc07c SHA256 39cdc9a75ba141052231deecff6ac2fab1575c130ee14279cb186472dcbfd82a 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 new file mode 100644 index 000000000..2bd0a7e21 --- /dev/null +++ b/net-im/qutecom/files/qutecom_libpurple_gnutls.patch @@ -0,0 +1,60 @@ + +# 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/qutecom-2.2_rc3-r1.ebuild b/net-im/qutecom/qutecom-2.2_rc3-r1.ebuild new file mode 100644 index 000000000..8099e034a --- /dev/null +++ b/net-im/qutecom/qutecom-2.2_rc3-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="alsa debug oss portaudio xv" + +DEPEND=">=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 ) + media-libs/speex + media-video/ffmpeg + net-im/pidgin[gnutls] + net-libs/gnutls + >=net-libs/libosip-3 + >=net-libs/libeXosip-3 + net-misc/curl + || ( x11-libs/libX11 virtual/x11 ) + || ( ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) =x11-libs/qt-4.3* ) + 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 + cd "${S}" +} + +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) \ + $(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_configure +} + +src_install() { + cmake-utils_src_install + + domenu wengophone/res/qutecom.desktop || die "domenu failed" + doicon wengophone/res/wengophone_64x64.png || die "doicon failed" + +} diff --git a/net-im/qutecom/qutecom-2.2_rc3.ebuild b/net-im/qutecom/qutecom-2.2_rc3.ebuild deleted file mode 100644 index 624604d43..000000000 --- a/net-im/qutecom/qutecom-2.2_rc3.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit cmake-utils eutils - -MY_P=${P/_rc/-RC} - -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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="alsa debug oss portaudio xv" - -DEPEND=">=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 ) - media-libs/speex - media-video/ffmpeg - net-im/pidgin - net-libs/gnutls - >=net-libs/libosip-3 - >=net-libs/libeXosip-3 - net-misc/curl - || ( x11-libs/libX11 virtual/x11 ) - || ( ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 ) =x11-libs/qt-4.3* ) - 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 - 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_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_configure -} - -src_install() { - cmake-utils_src_install - - domenu wengophone/res/qutecom.desktop || die "domenu failed" - doicon wengophone/res/wengophone_64x64.png || die "doicon failed" - - # workaround broken install scripts - cd "${WORKDIR}"/${PN}_build/release || die "cd failed" - insinto /usr/share/${PN} - doins -r {chat,css,config,lang,pics,sounds} || die "doins -r failed" -} -- cgit v1.2.3