1 |
commit: f65d9475ea526c2ea3ad8a8071a247c1d3c54bc8 |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 28 21:20:04 2014 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 28 21:20:04 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f65d9475 |
7 |
|
8 |
[kde-base/plasma-workspace] Update prison patch |
9 |
|
10 |
https://git.reviewboard.kde.org/r/118381/ |
11 |
|
12 |
Package-Manager: portage-2.2.10 |
13 |
|
14 |
--- |
15 |
...plasma-workspace-9999-cmake-enable-prison.patch | 51 +++++++++++++++------- |
16 |
1 file changed, 35 insertions(+), 16 deletions(-) |
17 |
|
18 |
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 |
19 |
index 48924a4..23d6e6f 100644 |
20 |
--- a/kde-base/plasma-workspace/files/plasma-workspace-9999-cmake-enable-prison.patch |
21 |
+++ b/kde-base/plasma-workspace/files/plasma-workspace-9999-cmake-enable-prison.patch |
22 |
@@ -1,14 +1,5 @@ |
23 |
-From e6e1db527e636649634db97846abd09862861134 Mon Sep 17 00:00:00 2001 |
24 |
-From: Johannes Huber <johu@g.o> |
25 |
-Date: Sun, 25 May 2014 17:29:16 +0200 |
26 |
-Subject: [PATCH] [klipper] Re-enable prison |
27 |
- |
28 |
---- |
29 |
- klipper/CMakeLists.txt | 24 ++++++++++++------------ |
30 |
- 1 file changed, 12 insertions(+), 12 deletions(-) |
31 |
- |
32 |
diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt |
33 |
-index c700f9e..7c66022 100644 |
34 |
+index 7a57b30b8b59a77c3d0702095dd72bb275d22e57..a46ac2def2faed4b0452c99cca6323da0adba348 100644 |
35 |
--- a/klipper/CMakeLists.txt |
36 |
+++ b/klipper/CMakeLists.txt |
37 |
@@ -16,15 +16,15 @@ set(libklipper_common_SRCS |
38 |
@@ -24,19 +15,19 @@ index c700f9e..7c66022 100644 |
39 |
-# if (PRISON_FOUND) |
40 |
-# include_directories(${PRISON_INCLUDE_DIR}) |
41 |
-# endif () |
42 |
-+find_package(Prison QUIET CONFIG) |
43 |
++find_package(Prison "1.2.0" QUIET CONFIG) |
44 |
+set_package_properties(Prison PROPERTIES DESCRIPTION "Prison library" |
45 |
+ URL "http://projects.kde.org/prison" |
46 |
+ TYPE OPTIONAL |
47 |
+ PURPOSE "Needed to create mobile barcodes from clipboard data" |
48 |
+ ) |
49 |
+if (PRISON_FOUND) |
50 |
-+ include_directories(${PRISON_INCLUDE_DIR}) |
51 |
++ include_directories(${PRISON_INCLUDE_DIR}) |
52 |
+endif () |
53 |
|
54 |
set(HAVE_PRISON ${PRISON_FOUND}) |
55 |
configure_file(config-klipper.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-klipper.h ) |
56 |
-@@ -43,9 +43,9 @@ target_link_libraries(kdeinit_klipper Qt5::X11Extras KF5::GlobalAccel KF5::Windo |
57 |
+@@ -52,9 +52,9 @@ target_link_libraries(kdeinit_klipper |
58 |
if (X11_Xfixes_FOUND) |
59 |
target_link_libraries(kdeinit_klipper ${X11_Xfixes_LIB}) |
60 |
endif () |
61 |
@@ -49,6 +40,34 @@ index c700f9e..7c66022 100644 |
62 |
|
63 |
install(TARGETS kdeinit_klipper ${INSTALL_TARGETS_DEFAULT_ARGS}) |
64 |
install(TARGETS klipper ${INSTALL_TARGETS_DEFAULT_ARGS}) |
65 |
--- |
66 |
-1.9.3 |
67 |
- |
68 |
+diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp |
69 |
+index 1ce578afb078b3b4e791e780975802082559bdf4..8847af324ff0c0c8e07d7e69ca473945cf001772 100644 |
70 |
+--- a/klipper/klipper.cpp |
71 |
++++ b/klipper/klipper.cpp |
72 |
+@@ -887,10 +887,12 @@ void Klipper::slotShowBarcode() |
73 |
+ using namespace prison; |
74 |
+ const HistoryStringItem* item = dynamic_cast<const HistoryStringItem*>(m_history->first()); |
75 |
+ |
76 |
+- KDialog dlg; |
77 |
++ QDialog dlg; |
78 |
+ dlg.setModal( true ); |
79 |
+- dlg.setCaption( i18n("Mobile Barcode") ); |
80 |
+- dlg.setButtons( KDialog::Ok ); |
81 |
++ dlg.setWindowTitle( i18n("Mobile Barcode") ); |
82 |
++ QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok, &dlg); |
83 |
++ buttons->button(QDialogButtonBox::Ok)->setShortcut(Qt::CTRL | Qt::Key_Return); |
84 |
++ connect(buttons, &QDialogButtonBox::accepted, &dlg, &QDialog::accept); |
85 |
+ |
86 |
+ QWidget* mw = new QWidget(&dlg); |
87 |
+ QHBoxLayout* layout = new QHBoxLayout(mw); |
88 |
+@@ -907,7 +909,9 @@ void Klipper::slotShowBarcode() |
89 |
+ layout->addWidget(datamatrix); |
90 |
+ |
91 |
+ mw->setFocus(); |
92 |
+- dlg.setMainWidget( mw ); |
93 |
++ QVBoxLayout *vBox = new QVBoxLayout(&dlg); |
94 |
++ vBox->addWidget(mw); |
95 |
++ vBox->addWidget(buttons); |
96 |
+ dlg.adjustSize(); |
97 |
+ |
98 |
+ dlg.exec(); |