commit: bd76d0815d200f350c016aa7ff52e58052dcaa18 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Fri Mar 18 23:27:23 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sun Mar 20 14:47:26 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=bd76d081
kde-plasma/plasma-workspace: Add rpath-, drop tests patch; missing DEPEND - Fixes bug 565810: https://bugs.gentoo.org/show_bug.cgi?id=565810 - Don't wait for the next time patch breaks and use forceoptional - iso-codes used for country names in digital-clock applet upstream commit fea67bd2ae7549e88952ac6dbcf90392d0ee1458 Package-Manager: portage-2.2.27 .../files/plasma-workspace-5.6.0-rpath.patch | 28 ++++++++++++++++++++++ .../files/plasma-workspace-tests-optional.patch | 11 --------- .../plasma-workspace-5.5.95.ebuild | 10 +++----- .../plasma-workspace-5.6.49.9999.ebuild | 8 +++---- .../plasma-workspace/plasma-workspace-9999.ebuild | 11 ++++----- 5 files changed, 39 insertions(+), 29 deletions(-) diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.0-rpath.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.0-rpath.patch new file mode 100644 index 0000000..464f278 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.6.0-rpath.patch @@ -0,0 +1,28 @@ +commit 829fb30934c455de5fc8d92512561d237c58fb35 +Author: Andreas Sturmlechner <andreas.sturmlech...@gmail.com> +Date: Mon Nov 23 21:34:24 2015 +0100 + + [phonon] Do not set RPATH + + REVIEW: 126210 + +diff --git a/phonon/platform_kde/CMakeLists.txt b/phonon/platform_kde/CMakeLists.txt +index 281425f..20ec8f9 100644 +--- a/phonon/platform_kde/CMakeLists.txt ++++ b/phonon/platform_kde/CMakeLists.txt +@@ -9,15 +9,6 @@ target_link_libraries(kde ${PHONON_LIBRARY} KF5::I18n KF5::KIOWidgets KF5::Notif + + kcoreaddons_desktop_to_json(kde phononbackend.desktop) + +-if(NOT WIN32) +- set_target_properties(kde PROPERTIES +- INSTALL_RPATH_USE_LINK_PATH TRUE +- SKIP_BUILD_RPATH TRUE +- BUILD_WITH_INSTALL_RPATH TRUE +- INSTALL_RPATH ${KDE_INSTALL_LIBDIR} +- ) +-endif() +- + install(TARGETS kde DESTINATION ${KDE_INSTALL_PLUGINDIR}/phonon_platform) + install(FILES phonon.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR}) + install(FILES phononbackend.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR}) diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-tests-optional.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-tests-optional.patch deleted file mode 100644 index 9ff1e38..0000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-tests-optional.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt 2015-01-21 00:23:54.096323752 +0100 -+++ b/CMakeLists.txt 2015-01-21 00:24:36.304654204 +0100 -@@ -7,7 +7,7 @@ - set(QT_MIN_VERSION "5.4.0") - set(KF5_MIN_VERSION "5.8.0") - set(INSTALL_SDDM_THEME TRUE) --find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Test Script Network) -+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Script Network) - find_package(ECM 1.8.0 REQUIRED NO_MODULE) - set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) - diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.5.95.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.5.95.ebuild index c7e8983..5e8930c 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.5.95.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.5.95.ebuild @@ -4,9 +4,8 @@ EAPI=6 -KDE_HANDBOOK="true" -KDE_PUNT_BOGUS_DEPS="true" -KDE_TEST="true" +KDE_HANDBOOK="forceoptional" +KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test" inherit kde5 multilib qmake-utils @@ -117,10 +116,7 @@ DEPEND="${COMMON_DEPEND} x11-proto/xproto " -PATCHES=( - "${FILESDIR}/${PN}-5.4-startkde-script.patch" - "${FILESDIR}/${PN}-tests-optional.patch" -) +PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" ) RESTRICT="test" diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild index 85a065b..648d32f 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.6.49.9999.ebuild @@ -4,9 +4,8 @@ EAPI=6 -KDE_HANDBOOK="true" -KDE_PUNT_BOGUS_DEPS="true" -KDE_TEST="true" +KDE_HANDBOOK="forceoptional" +KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test" inherit kde5 multilib qmake-utils @@ -96,6 +95,7 @@ RDEPEND="${COMMON_DEPEND} $(add_qt_dep qtgraphicaleffects) $(add_qt_dep qtpaths) $(add_qt_dep qtquickcontrols 'widgets') + app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop @@ -119,7 +119,7 @@ DEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" - "${FILESDIR}/${PN}-tests-optional.patch" + "${FILESDIR}/${PN}-5.6.0-rpath.patch" ) RESTRICT="test" diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index 85a065b..1a57acf 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -4,9 +4,8 @@ EAPI=6 -KDE_HANDBOOK="true" -KDE_PUNT_BOGUS_DEPS="true" -KDE_TEST="true" +KDE_HANDBOOK="forceoptional" +KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test" inherit kde5 multilib qmake-utils @@ -96,6 +95,7 @@ RDEPEND="${COMMON_DEPEND} $(add_qt_dep qtgraphicaleffects) $(add_qt_dep qtpaths) $(add_qt_dep qtquickcontrols 'widgets') + app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop @@ -117,10 +117,7 @@ DEPEND="${COMMON_DEPEND} x11-proto/xproto " -PATCHES=( - "${FILESDIR}/${PN}-5.4-startkde-script.patch" - "${FILESDIR}/${PN}-tests-optional.patch" -) +PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" ) RESTRICT="test"
