[gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/

["Johannes Huber" <johu@gentoo.org>]

commit:     4989f2d3f7bfd59914ba8ef24f605e60cefe2d63
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri May 30 06:09:55 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri May 30 06:09:55 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4989f2d3

[kde-base/plasma-workspace] Drop patch, applied upstream

Package-Manager: portage-2.2.10

---
 ...plasma-workspace-9999-cmake-enable-prison.patch | 73 ----------------------
 .../plasma-workspace/plasma-workspace-9999.ebuild  |  5 +-
 2 files changed, 1 insertion(+), 77 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
deleted file mode 100644
index 23d6e6f..0000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-9999-cmake-enable-prison.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt
-index 7a57b30b8b59a77c3d0702095dd72bb275d22e57..a46ac2def2faed4b0452c99cca6323da0adba348 100644
---- a/klipper/CMakeLists.txt
-+++ b/klipper/CMakeLists.txt
-@@ -16,15 +16,15 @@ 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)
--#     include_directories(${PRISON_INCLUDE_DIR})
--# endif ()
-+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})
-+endif ()
- 
- set(HAVE_PRISON ${PRISON_FOUND})
- configure_file(config-klipper.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-klipper.h )
-@@ -52,9 +52,9 @@ target_link_libraries(kdeinit_klipper
- 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})
-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();

diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index 9aa7ed8..cdd940c 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -93,10 +93,7 @@ DEPEND="${COMMON_DEPEND}
 	X? ( x11-proto/xproto )
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-startkde-script.patch"
-	"${FILESDIR}/${P}-cmake-enable-prison.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" )
 
 src_configure() {
 	local mycmakeargs=(