commit: 5d1ea4d2f22709cfc4da33c2b6dd790c5ba5d271 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Sun May 25 15:48:48 2014 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Sun May 25 15:48:48 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5d1ea4d2
[kde-base/plasma-workspace] Add prison support Package-Manager: portage-2.2.10 --- ...plasma-workspace-9999-cmake-enable-prison.patch | 56 ++++++++++++++++++++++ kde-base/plasma-workspace/metadata.xml | 3 +- .../plasma-workspace/plasma-workspace-9999.ebuild | 6 ++- 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/kde-base/plasma-workspace/files/plasma-workspace-9999-cmake-enable-prison.patch b/kde-base/plasma-workspace/files/plasma-workspace-9999-cmake-enable-prison.patch new file mode 100644 index 0000000..dc18fd1 --- /dev/null +++ b/kde-base/plasma-workspace/files/plasma-workspace-9999-cmake-enable-prison.patch @@ -0,0 +1,56 @@ +From faf9e0a0af6a2842b9f4ebf4cd901062cc006e04 Mon Sep 17 00:00:00 2001 +From: Johannes Huber <[email protected]> +Date: Sun, 25 May 2014 17:29:16 +0200 +Subject: [PATCH] [klipper] Re-enable prison + +--- + klipper/CMakeLists.txt | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt +index 57425da..20d88ca 100644 +--- a/klipper/CMakeLists.txt ++++ b/klipper/CMakeLists.txt +@@ -14,16 +14,16 @@ set(libklipper_common_SRCS + clipcommandprocess.cpp + ) + +-# find_package(Prison QUIET CONFIG) +-# set_package_properties(Prison PROPERTIES DESCRIPTION "Prison library" +-# URL "http://projects.kde.org/prison"; +-# TYPE OPTIONAL +-# PURPOSE "Needed to create mobile barcodes from clipboard data" +-# ) +-# if (PRISON_FOUND) +-# add_definitions(-DHAVE_PRISON) +-# include_directories(${PRISON_INCLUDE_DIR}) +-# endif () ++find_package(Prison QUIET CONFIG) ++set_package_properties(Prison PROPERTIES DESCRIPTION "Prison library" ++ URL "http://projects.kde.org/prison"; ++ TYPE OPTIONAL ++ PURPOSE "Needed to create mobile barcodes from clipboard data" ++ ) ++if (PRISON_FOUND) ++ add_definitions(-DHAVE_PRISON) ++ include_directories(${PRISON_INCLUDE_DIR}) ++endif () + + + kde4_add_app_icon(libklipper_common_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/klipper.png") +@@ -40,9 +40,9 @@ target_link_libraries(kdeinit_klipper Qt5::X11Extras KF5::GlobalAccel KF5::Windo + if (X11_Xfixes_FOUND) + target_link_libraries(kdeinit_klipper ${X11_Xfixes_LIB}) + endif () +-# if (PRISON_FOUND) +-# target_link_libraries(kdeinit_klipper ${PRISON_LIBRARIES}) +-# endif () ++if (PRISON_FOUND) ++ target_link_libraries(kdeinit_klipper ${PRISON_LIBRARIES}) ++endif () + + install(TARGETS kdeinit_klipper ${INSTALL_TARGETS_DEFAULT_ARGS}) + install(TARGETS klipper ${INSTALL_TARGETS_DEFAULT_ARGS}) +-- +1.9.3 + diff --git a/kde-base/plasma-workspace/metadata.xml b/kde-base/plasma-workspace/metadata.xml index efbee28..14094dc 100644 --- a/kde-base/plasma-workspace/metadata.xml +++ b/kde-base/plasma-workspace/metadata.xml @@ -3,9 +3,10 @@ <pkgmetadata> <herd>kde</herd> <use> + <flag name="json">Enable JSON support via <pkg>dev-libs/qjson</pkg></flag> <flag name="kdepim">KDE PIM integration via <pkg>kde-base/kdepimlibs</pkg></flag> <flag name="nepomuk">Enable Nepomuk based semantic desktop support (deprecated)</flag> - <flag name="json">Enable JSON support via <pkg>dev-libs/qjson</pkg></flag> + <flag name="prison">Enable support for barcodes/QRcodes</flag> <flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag> </use> </pkgmetadata> diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild index db8b2ff..2bc9036 100644 --- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild @@ -9,7 +9,7 @@ inherit kde5 DESCRIPTION="KDE Plasma workspace" KEYWORDS="" -IUSE="dbus X" +IUSE="dbus prison X" COMMON_DEPEND=" $(add_kdebase_dep libksysguard) @@ -59,6 +59,7 @@ COMMON_DEPEND=" sys-libs/zlib x11-libs/libkscreen2:5 dbus? ( dev-libs/libdbusmenu-qt[qt5] ) + prison? ( media-libs/prison:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libICE @@ -92,9 +93,12 @@ DEPEND="${COMMON_DEPEND} X? ( x11-proto/xproto ) " +PATCHES=( "${FILESDIR}/${P}-cmake-enable-prison.patch" ) + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package dbus dbusmenu-qt5) + $(cmake-utils_use_find_package prison) $(cmake-utils_use_find_package X X11) )
