From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 372E1138A1F for ; Sun, 13 Apr 2014 08:57:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2B0FE09FE; Sun, 13 Apr 2014 08:57:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 41977E09FE for ; Sun, 13 Apr 2014 08:57:33 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 49CAF33FEE1 for ; Sun, 13 Apr 2014 08:57:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id E24E81818D for ; Sun, 13 Apr 2014 08:57:30 +0000 (UTC) From: "Alexey Shvetsov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" Message-ID: <1397379381.f1451c1f528b13c037cb4f849e4e4b3764fd7e7b.alexxy@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/solid/files/, kde-frameworks/solid/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/solid/files/solid-4.98.0-collision-kdelibs4-fix.patch kde-frameworks/solid/solid-4.98.0.ebuild X-VCS-Directories: kde-frameworks/solid/files/ kde-frameworks/solid/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: f1451c1f528b13c037cb4f849e4e4b3764fd7e7b X-VCS-Branch: master Date: Sun, 13 Apr 2014 08:57:30 +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-Archives-Salt: 3657e9c9-d9da-4694-a5cb-9ccdc7e45108 X-Archives-Hash: a5d63084e553427dbc779e260fb057a2 commit: f1451c1f528b13c037cb4f849e4e4b3764fd7e7b Author: Alexey Shvetsov gentoo org> AuthorDate: Sun Apr 13 08:56:21 2014 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Sun Apr 13 08:56:21 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f1451c1f [kde-frameworks/solid] Add upstream collision fix Package-Manager: portage-2.2.10 --- .../solid-4.98.0-collision-kdelibs4-fix.patch | 25 ++++++++++++++++++++++ kde-frameworks/solid/solid-4.98.0.ebuild | 4 ++++ 2 files changed, 29 insertions(+) diff --git a/kde-frameworks/solid/files/solid-4.98.0-collision-kdelibs4-fix.patch b/kde-frameworks/solid/files/solid-4.98.0-collision-kdelibs4-fix.patch new file mode 100644 index 0000000..7de6a16 --- /dev/null +++ b/kde-frameworks/solid/files/solid-4.98.0-collision-kdelibs4-fix.patch @@ -0,0 +1,25 @@ +commit da0aa13642dfc8d4dbaf1f0f5d223714077c1e50 +Author: Jonathan Riddell +Date: Tue Apr 1 15:42:47 2014 +0100 + + rename solid-hardware to solid-hardware5 to stop it clashing with the + equivalent binary from kde-runtime in kdelibs4 land + + REVIEW:117208 + +diff --git a/src/tools/solid-hardware/CMakeLists.txt b/src/tools/solid-hardware/CMakeLists.txt +index 7cb604e..dbda0d4 100644 +--- a/src/tools/solid-hardware/CMakeLists.txt ++++ b/src/tools/solid-hardware/CMakeLists.txt +@@ -1,7 +1,4 @@ +-add_executable(solid-hardware solid-hardware.cpp) +-ecm_mark_nongui_executable(solid-hardware) +-target_link_libraries(solid-hardware KF5::Solid) +-install(TARGETS solid-hardware ${INSTALL_TARGETS_DEFAULT_ARGS}) +- +- +- ++add_executable(solid-hardware5 solid-hardware.cpp) ++ecm_mark_nongui_executable(solid-hardware5) ++target_link_libraries(solid-hardware5 KF5::Solid) ++install(TARGETS solid-hardware5 ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/kde-frameworks/solid/solid-4.98.0.ebuild b/kde-frameworks/solid/solid-4.98.0.ebuild index 7d23db6..5069782 100644 --- a/kde-frameworks/solid/solid-4.98.0.ebuild +++ b/kde-frameworks/solid/solid-4.98.0.ebuild @@ -23,6 +23,10 @@ DEPEND="${RDEPEND} test? ( dev-qt/qtconcurrent:5 ) " +PATCHES=( + "${FILESDIR}/solid-4.98.0-collision-kdelibs4-fix.patch" +) + src_configure() { # HUpnp is currently disabled upstream due to # being buggy and unmaintained