commit: f65d9475ea526c2ea3ad8a8071a247c1d3c54bc8 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Wed May 28 21:20:04 2014 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Wed May 28 21:20:04 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f65d9475
[kde-base/plasma-workspace] Update prison patch https://git.reviewboard.kde.org/r/118381/ Package-Manager: portage-2.2.10 --- ...plasma-workspace-9999-cmake-enable-prison.patch | 51 +++++++++++++++------- 1 file changed, 35 insertions(+), 16 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 index 48924a4..23d6e6f 100644 --- 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 @@ -1,14 +1,5 @@ -From e6e1db527e636649634db97846abd09862861134 Mon Sep 17 00:00:00 2001 -From: Johannes Huber <j...@gentoo.org> -Date: Sun, 25 May 2014 17:29:16 +0200 -Subject: [PATCH] [klipper] Re-enable prison - ---- - klipper/CMakeLists.txt | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt -index c700f9e..7c66022 100644 +index 7a57b30b8b59a77c3d0702095dd72bb275d22e57..a46ac2def2faed4b0452c99cca6323da0adba348 100644 --- a/klipper/CMakeLists.txt +++ b/klipper/CMakeLists.txt @@ -16,15 +16,15 @@ set(libklipper_common_SRCS @@ -24,19 +15,19 @@ index c700f9e..7c66022 100644 -# if (PRISON_FOUND) -# include_directories(${PRISON_INCLUDE_DIR}) -# endif () -+find_package(Prison QUIET CONFIG) ++find_package(Prison "1.2.0" 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) -+ include_directories(${PRISON_INCLUDE_DIR}) ++ include_directories(${PRISON_INCLUDE_DIR}) +endif () set(HAVE_PRISON ${PRISON_FOUND}) configure_file(config-klipper.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-klipper.h ) -@@ -43,9 +43,9 @@ target_link_libraries(kdeinit_klipper Qt5::X11Extras KF5::GlobalAccel KF5::Windo +@@ -52,9 +52,9 @@ target_link_libraries(kdeinit_klipper if (X11_Xfixes_FOUND) target_link_libraries(kdeinit_klipper ${X11_Xfixes_LIB}) endif () @@ -49,6 +40,34 @@ index c700f9e..7c66022 100644 install(TARGETS kdeinit_klipper ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS klipper ${INSTALL_TARGETS_DEFAULT_ARGS}) --- -1.9.3 - +diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp +index 1ce578afb078b3b4e791e780975802082559bdf4..8847af324ff0c0c8e07d7e69ca473945cf001772 100644 +--- a/klipper/klipper.cpp ++++ b/klipper/klipper.cpp +@@ -887,10 +887,12 @@ void Klipper::slotShowBarcode() + using namespace prison; + const HistoryStringItem* item = dynamic_cast<const HistoryStringItem*>(m_history->first()); + +- KDialog dlg; ++ QDialog dlg; + dlg.setModal( true ); +- dlg.setCaption( i18n("Mobile Barcode") ); +- dlg.setButtons( KDialog::Ok ); ++ dlg.setWindowTitle( i18n("Mobile Barcode") ); ++ QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok, &dlg); ++ buttons->button(QDialogButtonBox::Ok)->setShortcut(Qt::CTRL | Qt::Key_Return); ++ connect(buttons, &QDialogButtonBox::accepted, &dlg, &QDialog::accept); + + QWidget* mw = new QWidget(&dlg); + QHBoxLayout* layout = new QHBoxLayout(mw); +@@ -907,7 +909,9 @@ void Klipper::slotShowBarcode() + layout->addWidget(datamatrix); + + mw->setFocus(); +- dlg.setMainWidget( mw ); ++ QVBoxLayout *vBox = new QVBoxLayout(&dlg); ++ vBox->addWidget(mw); ++ vBox->addWidget(buttons); + dlg.adjustSize(); + + dlg.exec();
