From: "Alexey Shvetsov" <alexxy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/solid/files/, kde-frameworks/solid/
Date: Sun, 13 Apr 2014 08:57:30 +0000 (UTC) [thread overview]
Message-ID: <1397379381.f1451c1f528b13c037cb4f849e4e4b3764fd7e7b.alexxy@gentoo> (raw)
commit: f1451c1f528b13c037cb4f849e4e4b3764fd7e7b
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 13 08:56:21 2014 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> 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 <jr@jriddell.org>
+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
reply other threads:[~2014-04-13 8:57 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1397379381.f1451c1f528b13c037cb4f849e4e4b3764fd7e7b.alexxy@gentoo \
--to=alexxy@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox