From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3B76C138334 for ; Sun, 10 Mar 2019 02:19:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EAE35E07D7; Sun, 10 Mar 2019 02:19:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A8C31E07D7 for ; Sun, 10 Mar 2019 02:19:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 584F4335C9C for ; Sun, 10 Mar 2019 02:19:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 31A6F54B for ; Sun, 10 Mar 2019 02:19:31 +0000 (UTC) From: "Andrey Utkin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrey Utkin" Message-ID: <1552184305.d1ffc1ff3349eabd0f7ee13a6fe77407cb284cc1.andrey_utkin@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/spectrum2/files/spectrum2-2.0.9-remove_debug_cflags.patch net-im/spectrum2/spectrum2-2.0.10.ebuild X-VCS-Directories: net-im/spectrum2/files/ net-im/spectrum2/ X-VCS-Committer: andrey_utkin X-VCS-Committer-Name: Andrey Utkin X-VCS-Revision: d1ffc1ff3349eabd0f7ee13a6fe77407cb284cc1 X-VCS-Branch: master Date: Sun, 10 Mar 2019 02:19:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 10256c29-4f17-4431-9257-6a401cda0a24 X-Archives-Hash: afef4adb6a2a435835bf68aab014efb1 commit: d1ffc1ff3349eabd0f7ee13a6fe77407cb284cc1 Author: Andrey Utkin gentoo org> AuthorDate: Mon Mar 4 19:21:14 2019 +0000 Commit: Andrey Utkin gentoo org> CommitDate: Sun Mar 10 02:18:25 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ffc1ff net-im/spectrum2: drop broken 'debug' USE flag Switching to Debug CMake configuration leads to an odd effect. Users can just supply extra CFLAGS for better debugging info, which is exactly what Debug CMake configuration does. No revbump since this is a build failure issue. Successful installations don't need a rebuild. Bug: https://bugs.gentoo.org/674498 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Andrey Utkin gentoo.org> .../files/spectrum2-2.0.9-remove_debug_cflags.patch | 13 ------------- net-im/spectrum2/spectrum2-2.0.10.ebuild | 10 +--------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/net-im/spectrum2/files/spectrum2-2.0.9-remove_debug_cflags.patch b/net-im/spectrum2/files/spectrum2-2.0.9-remove_debug_cflags.patch deleted file mode 100644 index 19e3b83d230..00000000000 --- a/net-im/spectrum2/files/spectrum2-2.0.9-remove_debug_cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt 2018-09-17 09:46:40.000000000 +0200 -+++ b/CMakeLists.txt 2018-09-20 21:04:29.000000000 +0200 -@@ -384,10 +384,6 @@ - endif() - - if(CMAKE_BUILD_TYPE MATCHES Debug) -- if (CMAKE_COMPILER_IS_GNUCXX) -- ADD_DEFINITIONS(-O0) -- ADD_DEFINITIONS(-ggdb) -- endif() - ADD_DEFINITIONS(-DDEBUG) - message("Debug : yes") - else(CMAKE_BUILD_TYPE MATCHES Debug) diff --git a/net-im/spectrum2/spectrum2-2.0.10.ebuild b/net-im/spectrum2/spectrum2-2.0.10.ebuild index ddc335eca68..317a25b2ab5 100644 --- a/net-im/spectrum2/spectrum2-2.0.10.ebuild +++ b/net-im/spectrum2/spectrum2-2.0.10.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.ta LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64" -IUSE="debug doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp" +IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp" REQUIRED_USE="|| ( mysql postgres sqlite )" RDEPEND=" @@ -59,8 +59,6 @@ DEPEND=" ) " -PATCHES=( "${FILESDIR}/${PN}-2.0.9-remove_debug_cflags.patch" ) - # Tests are currently restricted, as they do completly fail RESTRICT="test" @@ -75,16 +73,10 @@ src_prepare() { # Respect users LDFLAGS sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die - # Respect users CFLAGS, when compiling for debug mode - # Since Spectrum2 searches for a qt4 compiled libcommuni, - # it must be patched, to find the qt5 compiled libcommuni, - # See: https://github.com/SpectrumIM/spectrum2/pull/253 cmake-utils_src_prepare } src_configure() { - use debug && CMAKE_BUILD_TYPE="Debug" - local mycmakeargs=( -DENABLE_DOCS="$(usex doc)" -DENABLE_FROTZ="$(usex frotz)"