| 1 |
commit: 4989f2d3f7bfd59914ba8ef24f605e60cefe2d63 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 30 06:09:55 2014 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 30 06:09:55 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4989f2d3 |
| 7 |
|
| 8 |
[kde-base/plasma-workspace] Drop patch, applied upstream |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.10 |
| 11 |
|
| 12 |
--- |
| 13 |
...plasma-workspace-9999-cmake-enable-prison.patch | 73 ---------------------- |
| 14 |
.../plasma-workspace/plasma-workspace-9999.ebuild | 5 +- |
| 15 |
2 files changed, 1 insertion(+), 77 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
deleted file mode 100644 |
| 19 |
index 23d6e6f..0000000 |
| 20 |
--- a/kde-base/plasma-workspace/files/plasma-workspace-9999-cmake-enable-prison.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,73 +0,0 @@ |
| 23 |
-diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt |
| 24 |
-index 7a57b30b8b59a77c3d0702095dd72bb275d22e57..a46ac2def2faed4b0452c99cca6323da0adba348 100644 |
| 25 |
---- a/klipper/CMakeLists.txt |
| 26 |
-+++ b/klipper/CMakeLists.txt |
| 27 |
-@@ -16,15 +16,15 @@ set(libklipper_common_SRCS |
| 28 |
- clipcommandprocess.cpp |
| 29 |
- ) |
| 30 |
- |
| 31 |
--# find_package(Prison QUIET CONFIG) |
| 32 |
--# set_package_properties(Prison PROPERTIES DESCRIPTION "Prison library" |
| 33 |
--# URL "http://projects.kde.org/prison" |
| 34 |
--# TYPE OPTIONAL |
| 35 |
--# PURPOSE "Needed to create mobile barcodes from clipboard data" |
| 36 |
--# ) |
| 37 |
--# if (PRISON_FOUND) |
| 38 |
--# include_directories(${PRISON_INCLUDE_DIR}) |
| 39 |
--# endif () |
| 40 |
-+find_package(Prison "1.2.0" QUIET CONFIG) |
| 41 |
-+set_package_properties(Prison PROPERTIES DESCRIPTION "Prison library" |
| 42 |
-+ URL "http://projects.kde.org/prison" |
| 43 |
-+ TYPE OPTIONAL |
| 44 |
-+ PURPOSE "Needed to create mobile barcodes from clipboard data" |
| 45 |
-+ ) |
| 46 |
-+if (PRISON_FOUND) |
| 47 |
-+ include_directories(${PRISON_INCLUDE_DIR}) |
| 48 |
-+endif () |
| 49 |
- |
| 50 |
- set(HAVE_PRISON ${PRISON_FOUND}) |
| 51 |
- configure_file(config-klipper.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-klipper.h ) |
| 52 |
-@@ -52,9 +52,9 @@ target_link_libraries(kdeinit_klipper |
| 53 |
- if (X11_Xfixes_FOUND) |
| 54 |
- target_link_libraries(kdeinit_klipper ${X11_Xfixes_LIB}) |
| 55 |
- endif () |
| 56 |
--# if (PRISON_FOUND) |
| 57 |
--# target_link_libraries(kdeinit_klipper ${PRISON_LIBRARIES}) |
| 58 |
--# endif () |
| 59 |
-+if (PRISON_FOUND) |
| 60 |
-+ target_link_libraries(kdeinit_klipper ${PRISON_LIBRARIES}) |
| 61 |
-+endif () |
| 62 |
- |
| 63 |
- install(TARGETS kdeinit_klipper ${INSTALL_TARGETS_DEFAULT_ARGS}) |
| 64 |
- install(TARGETS klipper ${INSTALL_TARGETS_DEFAULT_ARGS}) |
| 65 |
-diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp |
| 66 |
-index 1ce578afb078b3b4e791e780975802082559bdf4..8847af324ff0c0c8e07d7e69ca473945cf001772 100644 |
| 67 |
---- a/klipper/klipper.cpp |
| 68 |
-+++ b/klipper/klipper.cpp |
| 69 |
-@@ -887,10 +887,12 @@ void Klipper::slotShowBarcode() |
| 70 |
- using namespace prison; |
| 71 |
- const HistoryStringItem* item = dynamic_cast<const HistoryStringItem*>(m_history->first()); |
| 72 |
- |
| 73 |
-- KDialog dlg; |
| 74 |
-+ QDialog dlg; |
| 75 |
- dlg.setModal( true ); |
| 76 |
-- dlg.setCaption( i18n("Mobile Barcode") ); |
| 77 |
-- dlg.setButtons( KDialog::Ok ); |
| 78 |
-+ dlg.setWindowTitle( i18n("Mobile Barcode") ); |
| 79 |
-+ QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok, &dlg); |
| 80 |
-+ buttons->button(QDialogButtonBox::Ok)->setShortcut(Qt::CTRL | Qt::Key_Return); |
| 81 |
-+ connect(buttons, &QDialogButtonBox::accepted, &dlg, &QDialog::accept); |
| 82 |
- |
| 83 |
- QWidget* mw = new QWidget(&dlg); |
| 84 |
- QHBoxLayout* layout = new QHBoxLayout(mw); |
| 85 |
-@@ -907,7 +909,9 @@ void Klipper::slotShowBarcode() |
| 86 |
- layout->addWidget(datamatrix); |
| 87 |
- |
| 88 |
- mw->setFocus(); |
| 89 |
-- dlg.setMainWidget( mw ); |
| 90 |
-+ QVBoxLayout *vBox = new QVBoxLayout(&dlg); |
| 91 |
-+ vBox->addWidget(mw); |
| 92 |
-+ vBox->addWidget(buttons); |
| 93 |
- dlg.adjustSize(); |
| 94 |
- |
| 95 |
- dlg.exec(); |
| 96 |
|
| 97 |
diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild |
| 98 |
index 9aa7ed8..cdd940c 100644 |
| 99 |
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild |
| 100 |
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild |
| 101 |
@@ -93,10 +93,7 @@ DEPEND="${COMMON_DEPEND} |
| 102 |
X? ( x11-proto/xproto ) |
| 103 |
" |
| 104 |
|
| 105 |
-PATCHES=( |
| 106 |
- "${FILESDIR}/${PN}-startkde-script.patch" |
| 107 |
- "${FILESDIR}/${P}-cmake-enable-prison.patch" |
| 108 |
-) |
| 109 |
+PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" ) |
| 110 |
|
| 111 |
src_configure() { |
| 112 |
local mycmakeargs=( |
Archives