diff --git a/plasma-workspace-5.4.2-prison-qt5.patch b/plasma-workspace-5.4.2-prison-qt5.patch new file mode 100644 index 0000000..cfe2d23 --- /dev/null +++ b/plasma-workspace-5.4.2-prison-qt5.patch @@ -0,0 +1,71 @@ +diff -up plasma-workspace-5.4.2/klipper/clipboardjob.cpp.prison-qt5 plasma-workspace-5.4.2/klipper/clipboardjob.cpp +--- plasma-workspace-5.4.2/klipper/clipboardjob.cpp.prison-qt5 2015-10-01 04:56:51.000000000 -0500 ++++ plasma-workspace-5.4.2/klipper/clipboardjob.cpp 2015-10-20 12:28:13.427524814 -0500 +@@ -28,10 +28,10 @@ along with this program. If not, see + + #ifdef HAVE_PRISON +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + #endif + + const static QString s_iconKey = QStringLiteral("icon"); +diff -up plasma-workspace-5.4.2/klipper/CMakeLists.txt.prison-qt5 plasma-workspace-5.4.2/klipper/CMakeLists.txt +--- plasma-workspace-5.4.2/klipper/CMakeLists.txt.prison-qt5 2015-10-01 04:56:51.000000000 -0500 ++++ plasma-workspace-5.4.2/klipper/CMakeLists.txt 2015-10-20 12:29:19.011990523 -0500 +@@ -19,14 +19,14 @@ set(libklipper_common_SRCS + clipcommandprocess.cpp + ) + +-find_package(KF5Prison "1.2.0" QUIET CONFIG) +-set_package_properties(KF5Prison PROPERTIES DESCRIPTION "Prison library" ++find_package(Prison-qt5 QUIET CONFIG) ++set_package_properties(Prison-qt5 PROPERTIES DESCRIPTION "Prison library" + URL "http://projects.kde.org/prison" + TYPE OPTIONAL + PURPOSE "Needed to create mobile barcodes from clipboard data (no stable release currently)" + ) + +-set(HAVE_PRISON ${KF5Prison_FOUND}) ++set(HAVE_PRISON ${PRISON_FOUND}) + configure_file(config-klipper.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-klipper.h ) + + kde4_add_app_icon(libklipper_common_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/klipper.png") +@@ -58,7 +58,7 @@ if (X11_FOUND) + target_link_libraries(kdeinit_klipper XCB::XCB Qt5::X11Extras) + endif() + if (HAVE_PRISON) +- target_link_libraries(kdeinit_klipper KF5::Prison) ++ target_link_libraries(kdeinit_klipper ${PRISON_LIBRARIES}) + endif () + + install(TARGETS kdeinit_klipper ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) +@@ -93,7 +93,7 @@ if (X11_FOUND) + target_link_libraries(plasma_engine_clipboard XCB::XCB Qt5::X11Extras) + endif() + if (HAVE_PRISON) +- target_link_libraries(plasma_engine_clipboard KF5::Prison) ++ target_link_libraries(plasma_engine_clipboard ${PRISON_LIBRARIES}) + endif () + install(TARGETS plasma_engine_clipboard DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/dataengine) + install(FILES plasma-dataengine-clipboard.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) +diff -up plasma-workspace-5.4.2/klipper/klipper.cpp.prison-qt5 plasma-workspace-5.4.2/klipper/klipper.cpp +--- plasma-workspace-5.4.2/klipper/klipper.cpp.prison-qt5 2015-10-01 04:56:51.000000000 -0500 ++++ plasma-workspace-5.4.2/klipper/klipper.cpp 2015-10-20 12:28:13.429524828 -0500 +@@ -50,8 +50,8 @@ + #include "klipperpopup.h" + + #ifdef HAVE_PRISON +-#include +-#include ++#include ++#include + #endif + + #include diff --git a/plasma-workspace.spec b/plasma-workspace.spec index bd9970c..14ffd00 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -7,7 +7,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.4.2 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: https://projects.kde.org/projects/kde/workspace/plasma-workspace @@ -33,6 +33,7 @@ Patch10: plasma-workspace-5.3.0-konsole-in-contextmenu.patch Patch11: plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch # remove stuff we don't want or need, plus a minor bit of customization --rex Patch12: startkde.patch +Patch13: plasma-workspace-5.4.2-prison-qt5.patch ## upstreamable Patches Patch1: kde-runtime-4.9.0-installdbgsymbols.patch @@ -80,6 +81,7 @@ BuildRequires: libraw1394-devel %endif BuildRequires: gpsd-devel BuildRequires: libqalculate-devel +BuildRequires: prison-qt5-devel BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtx11extras-devel @@ -336,6 +338,7 @@ sed -i -e "s|@DEFAULT_LOOKANDFEEL@|%{?default_lookandfeel}%{!?default_lookandfee shell/packageplugins/lookandfeel/lookandfeel.cpp %endif %patch12 -p1 -b .startkde +%patch13 -p1 -b .prison-qt5 %build @@ -535,6 +538,9 @@ fi %changelog +* Tue Oct 20 2015 Rex Dieter 5.4.2-7 +- klipper: prison (qrcode) support + * Wed Oct 14 2015 Rex Dieter 5.4.2-6 - rev startkde.patch drop dbus launch (kde#352251)