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

2014-10-25 Thread Michael Palimaka 
commit: 50c986277686a3ccf4a71bdce793a91f93d2d498
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Sat Oct 25 16:32:11 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sat Oct 25 16:32:11 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=50c98627

[kde-base/plasma-workspace] Remove unused patch.

Package-Manager: portage-2.2.14

---
 .../files/plasma-workspace-5.0.2-qt54.patch| 82 --
 1 file changed, 82 deletions(-)

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-5.0.2-qt54.patch 
b/kde-base/plasma-workspace/files/plasma-workspace-5.0.2-qt54.patch
deleted file mode 100644
index 17d016e..000
--- a/kde-base/plasma-workspace/files/plasma-workspace-5.0.2-qt54.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From: Aleix Pol aleix...@kde.org
-Date: Fri, 01 Aug 2014 09:36:43 +
-Subject: Fix build in Qt 5.4
-X-Git-Url: 
http://quickgit.kde.org/?p=plasma-workspace.gita=commitdiffh=04cb7ba53ebf8959cb783f62f343795ca4baa69c

-Fix build in Qt 5.4
-
-See https://git.reviewboard.kde.org/r/119242/

-
-
 a/containmentactions/applauncher/launch.cpp
-+++ b/containmentactions/applauncher/launch.cpp
-@@ -54,7 +54,7 @@
- {
- foreach (KSycocaEntry::Ptr p, group-entries(true, false, true)) {
- if (p-isType(KST_KService)) {
--const KService::Ptr service = p;
-+const KService::Ptr service(static_castKService*(p.data()));
- QAction *action = new QAction(QIcon::fromTheme(service-icon()), 
service-genericName().isEmpty() ? service-name() : service-genericName(), 
this);
- connect(action, QAction::triggered, [action](){
- KService::Ptr service = 
KService::serviceByStorageId(action-data().toString());
-@@ -67,7 +67,7 @@
- m_actions  action;
- }
- } else if (p-isType(KST_KServiceGroup)) {
--const KServiceGroup::Ptr service = p;
-+const KServiceGroup::Ptr 
service(static_castKServiceGroup*(p.data()));
- if (service-childCount() == 0) {
- continue;
- }
-
-From: Kevin Funk kf...@kde.org
-Date: Wed, 06 Aug 2014 06:23:06 +
-Subject: Make compile with Qt 5.4
-X-Git-Url: 
http://quickgit.kde.org/?p=plasma-workspace.gita=commitdiffh=0686e449ac4cf611ac3aa2e0bbf37b79aa172582

-Make compile with Qt 5.4
-
-BUG: 337929

-
-
 a/dataengines/apps/appsource.cpp
-+++ b/dataengines/apps/appsource.cpp
-@@ -73,11 +73,11 @@
- QStringList entries;
- foreach (KSycocaEntry::Ptr p, m_group-entries(true, false, true)) {
- if (p-isType(KST_KService)) {
--const KService::Ptr service = p;
-+const KService::Ptr service(static_castKService*(p.data()));
- entries  service-storageId();
- } else if (p-isType(KST_KServiceGroup)) {
--const KServiceGroup::Ptr service = p;
--entries  service-entryPath();
-+const KServiceGroup::Ptr 
serviceGroup(static_castKServiceGroup*(p.data()));
-+entries  serviceGroup-entryPath();
- } else if (p-isType(KST_KServiceSeparator)) {
- entries  ---;
- } else {
-
 a/kioslave/applications/kio_applications.cpp
-+++ b/kioslave/applications/kio_applications.cpp
-@@ -155,7 +155,7 @@
- 
- foreach (const KSycocaEntry::Ptr e, grp-entries(true, true)) {
- if (e-isType(KST_KServiceGroup)) {
--KServiceGroup::Ptr g(e);
-+KServiceGroup::Ptr g(static_castKServiceGroup*(e.data()));
- QString groupCaption = g-caption();
- 
- kDebug()  ADDING SERVICE GROUP WITH PATH   g-relPath();
-@@ -177,7 +177,7 @@
- createDirEntry(entry, groupCaption, dirUrl.url(), 
inode/directory, g-icon());
- 
- } else {
--KService::Ptr service(e);
-+KService::Ptr service(static_castKService*(e.data()));
- 
- kDebug()  the entry name is  service-desktopEntryName()
-   with path  service-entryPath();
-

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

2014-09-19 Thread Johannes Huber 
commit: 5c72708dd5c2fc20fef298c050a54866ccb7523a
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Fri Sep 19 17:38:01 2014 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Fri Sep 19 17:38:20 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5c72708d

[kde-base/plasma-workspace] Add upstream patch, fixes build with Qt 5.4

Spotted by Franz Fellner alpine.art.de AT gmail.com, bug #523220.

Package-Manager: portage-2.2.13

---
 .../files/plasma-workspace-5.0.2-qt54.patch| 82 ++
 .../plasma-workspace/plasma-workspace-5.0.2.ebuild |  5 +-
 2 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-5.0.2-qt54.patch 
b/kde-base/plasma-workspace/files/plasma-workspace-5.0.2-qt54.patch
new file mode 100644
index 000..17d016e
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-5.0.2-qt54.patch
@@ -0,0 +1,82 @@
+From: Aleix Pol aleix...@kde.org
+Date: Fri, 01 Aug 2014 09:36:43 +
+Subject: Fix build in Qt 5.4
+X-Git-Url: 
http://quickgit.kde.org/?p=plasma-workspace.gita=commitdiffh=04cb7ba53ebf8959cb783f62f343795ca4baa69c
+---
+Fix build in Qt 5.4
+
+See https://git.reviewboard.kde.org/r/119242/
+---
+
+
+--- a/containmentactions/applauncher/launch.cpp
 b/containmentactions/applauncher/launch.cpp
+@@ -54,7 +54,7 @@
+ {
+ foreach (KSycocaEntry::Ptr p, group-entries(true, false, true)) {
+ if (p-isType(KST_KService)) {
+-const KService::Ptr service = p;
++const KService::Ptr service(static_castKService*(p.data()));
+ QAction *action = new QAction(QIcon::fromTheme(service-icon()), 
service-genericName().isEmpty() ? service-name() : service-genericName(), 
this);
+ connect(action, QAction::triggered, [action](){
+ KService::Ptr service = 
KService::serviceByStorageId(action-data().toString());
+@@ -67,7 +67,7 @@
+ m_actions  action;
+ }
+ } else if (p-isType(KST_KServiceGroup)) {
+-const KServiceGroup::Ptr service = p;
++const KServiceGroup::Ptr 
service(static_castKServiceGroup*(p.data()));
+ if (service-childCount() == 0) {
+ continue;
+ }
+
+From: Kevin Funk kf...@kde.org
+Date: Wed, 06 Aug 2014 06:23:06 +
+Subject: Make compile with Qt 5.4
+X-Git-Url: 
http://quickgit.kde.org/?p=plasma-workspace.gita=commitdiffh=0686e449ac4cf611ac3aa2e0bbf37b79aa172582
+---
+Make compile with Qt 5.4
+
+BUG: 337929
+---
+
+
+--- a/dataengines/apps/appsource.cpp
 b/dataengines/apps/appsource.cpp
+@@ -73,11 +73,11 @@
+ QStringList entries;
+ foreach (KSycocaEntry::Ptr p, m_group-entries(true, false, true)) {
+ if (p-isType(KST_KService)) {
+-const KService::Ptr service = p;
++const KService::Ptr service(static_castKService*(p.data()));
+ entries  service-storageId();
+ } else if (p-isType(KST_KServiceGroup)) {
+-const KServiceGroup::Ptr service = p;
+-entries  service-entryPath();
++const KServiceGroup::Ptr 
serviceGroup(static_castKServiceGroup*(p.data()));
++entries  serviceGroup-entryPath();
+ } else if (p-isType(KST_KServiceSeparator)) {
+ entries  ---;
+ } else {
+
+--- a/kioslave/applications/kio_applications.cpp
 b/kioslave/applications/kio_applications.cpp
+@@ -155,7 +155,7 @@
+ 
+ foreach (const KSycocaEntry::Ptr e, grp-entries(true, true)) {
+ if (e-isType(KST_KServiceGroup)) {
+-KServiceGroup::Ptr g(e);
++KServiceGroup::Ptr g(static_castKServiceGroup*(e.data()));
+ QString groupCaption = g-caption();
+ 
+ kDebug()  ADDING SERVICE GROUP WITH PATH   g-relPath();
+@@ -177,7 +177,7 @@
+ createDirEntry(entry, groupCaption, dirUrl.url(), 
inode/directory, g-icon());
+ 
+ } else {
+-KService::Ptr service(e);
++KService::Ptr service(static_castKService*(e.data()));
+ 
+ kDebug()  the entry name is  service-desktopEntryName()
+   with path  service-entryPath();
+

diff --git a/kde-base/plasma-workspace/plasma-workspace-5.0.2.ebuild 
b/kde-base/plasma-workspace/plasma-workspace-5.0.2.ebuild
index 0044ebd..507fea3 100644
--- a/kde-base/plasma-workspace/plasma-workspace-5.0.2.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-5.0.2.ebuild
@@ -99,7 +99,10 @@ DEPEND=${COMMON_DEPEND}
X? ( x11-proto/xproto )
 
 
-PATCHES=( ${FILESDIR}/${PN}-startkde-script.patch )
+PATCHES=(
+   ${FILESDIR}/${PN}-startkde-script.patch
+   ${FILESDIR}/${P}-qt54.patch
+)
 
 src_configure() {
local mycmakeargs=(

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

2014-05-30 Thread Johannes Huber 
commit: 4989f2d3f7bfd59914ba8ef24f605e60cefe2d63
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Fri May 30 06:09:55 2014 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Fri May 30 06:09:55 2014 +
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--cmake-enable-prison.patch | 73 --
 .../plasma-workspace/plasma-workspace-.ebuild  |  5 +-
 2 files changed, 1 insertion(+), 77 deletions(-)

diff --git 
a/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
 
b/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
deleted file mode 100644
index 23d6e6f..000
--- 
a/kde-base/plasma-workspace/files/plasma-workspace--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_castconst 
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-.ebuild 
b/kde-base/plasma-workspace/plasma-workspace-.ebuild
index 9aa7ed8..cdd940c 100644
--- a/kde-base/plasma-workspace/plasma-workspace-.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-.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=(

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

2014-05-28 Thread Johannes Huber 
commit: c956632e0b0b798755fb4a331bf1232540c627c0
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Wed May 28 14:42:16 2014 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Wed May 28 14:42:16 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c956632e

[kde-base/plasma-workspace] Enable startup/shutdown script support

Package-Manager: portage-2.2.10

---
 kde-base/plasma-workspace/files/agent-shutdown.sh  | 13 +++
 kde-base/plasma-workspace/files/agent-startup.sh   | 29 
 .../files/plasma-workspace-startkde-script.patch   | 40 ++
 .../plasma-workspace/plasma-workspace-.ebuild  | 26 --
 4 files changed, 105 insertions(+), 3 deletions(-)

diff --git a/kde-base/plasma-workspace/files/agent-shutdown.sh 
b/kde-base/plasma-workspace/files/agent-shutdown.sh
new file mode 100644
index 000..fff8056
--- /dev/null
+++ b/kde-base/plasma-workspace/files/agent-shutdown.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# This file is executed at plasma shutdown.
+# Uncomment the following lines to kill the agents
+# that were started at session startup.
+
+#if [ -n ${GPG_AGENT_INFO} ]; then
+#  kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) /dev/null 21
+#fi
+
+#if [ -n ${SSH_AGENT_PID} ]; then
+#  eval $(ssh-agent -s -k)
+#fi

diff --git a/kde-base/plasma-workspace/files/agent-startup.sh 
b/kde-base/plasma-workspace/files/agent-startup.sh
new file mode 100644
index 000..03e017a
--- /dev/null
+++ b/kde-base/plasma-workspace/files/agent-startup.sh
@@ -0,0 +1,29 @@
+# Agents startup file
+#
+# This file is sourced at plasma startup, so that
+# the environment variables set here are available
+# throughout the session.
+
+# Uncomment the following lines to start gpg-agent
+# and/or ssh-agent at plasma startup.
+# If you do so, do not forget to uncomment the respective
+# lines in PLASMADIR/shutdown/agent-shutdown.sh to
+# properly kill the agents when the session ends.
+
+#if [ -x /usr/bin/gpg-agent ]; then
+#  eval $(/usr/bin/gpg-agent --daemon)
+#fi 
+
+#if [ -x /usr/bin/ssh-agent ]; then
+#  eval $(/usr/bin/ssh-agent -s)
+#fi
+
+# Uncomment the following lines to start rxvt-unicode which has the ability to
+# run multiple terminals in one single process, thus starting up faster and 
+# saving resources.
+# The --opendisplay ensures that the daemon quits when the X server terminates,
+# therefore we don't need matching lines in agent-shutdown.sh.
+
+#if [ -x /usr/bin/urxvtd ]; then
+#  /usr/bin/urxvtd --opendisplay --fork --quiet
+#fi

diff --git 
a/kde-base/plasma-workspace/files/plasma-workspace-startkde-script.patch 
b/kde-base/plasma-workspace/files/plasma-workspace-startkde-script.patch
new file mode 100644
index 000..8fb3756
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-startkde-script.patch
@@ -0,0 +1,40 @@
+From 6c3f73efc0619020a0c17219b1f7e1e3cd49478f Mon Sep 17 00:00:00 2001
+From: Johannes Huber j...@gentoo.org
+Date: Wed, 28 May 2014 16:00:41 +0200
+Subject: [PATCH] [startkde] Gentoo FHS script support
+
+---
+ startkde/startkde.cmake | 10 ++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
+index f073b93..1c41364 100644
+--- a/startkde/startkde.cmake
 b/startkde/startkde.cmake
+@@ -206,6 +206,11 @@ for prefix in `echo $libpath | sed -n -e 
's,/lib[^/]*/,/env/,p'`; do
+   done
+ done
+ 
++# Gentoo part for FHS installs
++for file in @GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/*.sh; do
++  test -r ${file}  . ${file}
++done
++
+ # Set the path for Qt plugins provided by KDE
+ QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
+ # TODO: Do we really need this?
+@@ -411,6 +416,11 @@ for prefix in `echo $libpath | sed -n -e 
's,/lib[^/]*/,/shutdown/,p'`; do
+   done
+ done
+ 
++# Gentoo part for FHS installs
++for file in @GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/*.sh; do
++  test -r ${file}  . ${file}
++done
++
+ unset KDE_FULL_SESSION
+ xprop -root -remove KDE_FULL_SESSION
+ unset KDE_SESSION_VERSION
+-- 
+1.9.3
+

diff --git a/kde-base/plasma-workspace/plasma-workspace-.ebuild 
b/kde-base/plasma-workspace/plasma-workspace-.ebuild
index 2bc9036..9aa7ed8 100644
--- a/kde-base/plasma-workspace/plasma-workspace-.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-.ebuild
@@ -93,7 +93,10 @@ DEPEND=${COMMON_DEPEND}
X? ( x11-proto/xproto )
 
 
-PATCHES=( ${FILESDIR}/${P}-cmake-enable-prison.patch )
+PATCHES=(
+   ${FILESDIR}/${PN}-startkde-script.patch
+   ${FILESDIR}/${P}-cmake-enable-prison.patch
+)
 
 src_configure() {
local mycmakeargs=(
@@ -108,8 +111,25 @@ src_configure() {
 src_install() {
kde5_src_install
 
+   # startup and shutdown scripts
+   insinto /etc/plasma/startup
+   doins ${FILESDIR}/agent-startup.sh
+
+   insinto /etc/plasma/shutdown
+   doins ${FILESDIR}/agent-shutdown.sh
+
# x11

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

2014-05-28 Thread Johannes Huber 
commit: f65d9475ea526c2ea3ad8a8071a247c1d3c54bc8
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Wed May 28 21:20:04 2014 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Wed May 28 21:20:04 2014 +
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--cmake-enable-prison.patch | 51 +++---
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git 
a/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
 
b/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
index 48924a4..23d6e6f 100644
--- 
a/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
+++ 
b/kde-base/plasma-workspace/files/plasma-workspace--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_castconst 
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();

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

2014-05-26 Thread Johannes Huber 
commit: 6d33f76174ece6dae7c54421df65e7f10bf29abe
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Mon May 26 17:42:11 2014 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Mon May 26 17:43:12 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6d33f761

[kde-base/plasma-workspace] Update prison patch

Package-Manager: portage-2.2.10

---
 .../plasma-workspace--cmake-enable-prison.patch| 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git 
a/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
 
b/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
index dc18fd1..48924a4 100644
--- 
a/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
+++ 
b/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
@@ -1,17 +1,17 @@
-From faf9e0a0af6a2842b9f4ebf4cd901062cc006e04 Mon Sep 17 00:00:00 2001
+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 | 26 +-
- 1 file changed, 13 insertions(+), 13 deletions(-)
+ klipper/CMakeLists.txt | 24 
+ 1 file changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt
-index 57425da..20d88ca 100644
+index c700f9e..7c66022 100644
 --- a/klipper/CMakeLists.txt
 +++ b/klipper/CMakeLists.txt
-@@ -14,16 +14,16 @@ set(libklipper_common_SRCS
+@@ -16,15 +16,15 @@ set(libklipper_common_SRCS
  clipcommandprocess.cpp
  )
  
@@ -22,7 +22,6 @@ index 57425da..20d88ca 100644
 -#PURPOSE Needed to create mobile barcodes from 
clipboard data
 -#   )
 -# if (PRISON_FOUND)
--# add_definitions(-DHAVE_PRISON)
 -# include_directories(${PRISON_INCLUDE_DIR})
 -# endif ()
 +find_package(Prison QUIET CONFIG)
@@ -32,13 +31,12 @@ index 57425da..20d88ca 100644
 +   PURPOSE Needed to create mobile barcodes from 
clipboard data
 +  )
 +if (PRISON_FOUND)
-+ add_definitions(-DHAVE_PRISON)
 + include_directories(${PRISON_INCLUDE_DIR})
 +endif ()
  
- 
- kde4_add_app_icon(libklipper_common_SRCS 
${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/klipper.png)
-@@ -40,9 +40,9 @@ target_link_libraries(kdeinit_klipper Qt5::X11Extras 
KF5::GlobalAccel KF5::Windo
+ 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
  if (X11_Xfixes_FOUND)
target_link_libraries(kdeinit_klipper ${X11_Xfixes_LIB})
  endif ()

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

2014-05-25 Thread Johannes Huber 
commit: 5d1ea4d2f22709cfc4da33c2b6dd790c5ba5d271
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Sun May 25 15:48:48 2014 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Sun May 25 15:48:48 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5d1ea4d2

[kde-base/plasma-workspace] Add prison support

Package-Manager: portage-2.2.10

---
 ...plasma-workspace--cmake-enable-prison.patch | 56 ++
 kde-base/plasma-workspace/metadata.xml |  3 +-
 .../plasma-workspace/plasma-workspace-.ebuild  |  6 ++-
 3 files changed, 63 insertions(+), 2 deletions(-)

diff --git 
a/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
 
b/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
new file mode 100644
index 000..dc18fd1
--- /dev/null
+++ 
b/kde-base/plasma-workspace/files/plasma-workspace--cmake-enable-prison.patch
@@ -0,0 +1,56 @@
+From faf9e0a0af6a2842b9f4ebf4cd901062cc006e04 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 | 26 +-
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt
+index 57425da..20d88ca 100644
+--- a/klipper/CMakeLists.txt
 b/klipper/CMakeLists.txt
+@@ -14,16 +14,16 @@ 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)
+-# add_definitions(-DHAVE_PRISON)
+-# include_directories(${PRISON_INCLUDE_DIR})
+-# endif ()
++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)
++ add_definitions(-DHAVE_PRISON)
++ include_directories(${PRISON_INCLUDE_DIR})
++endif ()
+ 
+ 
+ kde4_add_app_icon(libklipper_common_SRCS 
${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/klipper.png)
+@@ -40,9 +40,9 @@ target_link_libraries(kdeinit_klipper Qt5::X11Extras 
KF5::GlobalAccel KF5::Windo
+ 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})
+-- 
+1.9.3
+

diff --git a/kde-base/plasma-workspace/metadata.xml 
b/kde-base/plasma-workspace/metadata.xml
index efbee28..14094dc 100644
--- a/kde-base/plasma-workspace/metadata.xml
+++ b/kde-base/plasma-workspace/metadata.xml
@@ -3,9 +3,10 @@
 pkgmetadata
herdkde/herd
use
+   flag name=jsonEnable JSON support via 
pkgdev-libs/qjson/pkg/flag
flag name=kdepimKDE PIM integration via 
pkgkde-base/kdepimlibs/pkg/flag
flag name=nepomukEnable Nepomuk based semantic desktop 
support (deprecated)/flag
-   flag name=jsonEnable JSON support via 
pkgdev-libs/qjson/pkg/flag
+   flag name=prisonEnable support for barcodes/QRcodes/flag
flag name=qalculateEnable Qalculate runner using 
pkgsci-libs/libqalculate/pkg/flag
/use
 /pkgmetadata

diff --git a/kde-base/plasma-workspace/plasma-workspace-.ebuild 
b/kde-base/plasma-workspace/plasma-workspace-.ebuild
index db8b2ff..2bc9036 100644
--- a/kde-base/plasma-workspace/plasma-workspace-.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION=KDE Plasma workspace
 KEYWORDS=
-IUSE=dbus X
+IUSE=dbus prison X
 
 COMMON_DEPEND=
$(add_kdebase_dep libksysguard)
@@ -59,6 +59,7 @@ COMMON_DEPEND=
sys-libs/zlib
x11-libs/libkscreen2:5
dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+   prison? ( media-libs/prison:5 )
X? (
dev-qt/qtx11extras:5
x11-libs/libICE
@@ -92,9 +93,12 @@ DEPEND=${COMMON_DEPEND}
X? ( x11-proto/xproto )
 
 
+PATCHES=( ${FILESDIR}/${P}-cmake-enable-prison.patch )
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+   $(cmake-utils_use_find_package prison)
$(cmake-utils_use_find_package X X11)
)

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

2014-05-24 Thread Johannes Huber 
commit: b9eb662968ec77f73441c3f4fbc2e4da26ab265b
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Sat May 24 22:47:21 2014 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Sat May 24 22:48:21 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b9eb6629

[kde-base/plasma-workspace] Drop obsolete patch, add missing RDEPEND

Package-Manager: portage-2.2.10

---
 .../plasma-workspace--missing-qttools.patch| 58 --
 .../plasma-workspace-4.96.0.ebuild |  6 +--
 .../plasma-workspace/plasma-workspace-.ebuild  |  4 +-
 3 files changed, 3 insertions(+), 65 deletions(-)

diff --git 
a/kde-base/plasma-workspace/files/plasma-workspace--missing-qttools.patch 
b/kde-base/plasma-workspace/files/plasma-workspace--missing-qttools.patch
deleted file mode 100644
index 3c80f21..000
--- 
a/kde-base/plasma-workspace/files/plasma-workspace--missing-qttools.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index 14ce47a..58c3a7a 100644
 a/startkde/startkde.cmake
-+++ b/startkde/startkde.cmake
-@@ -1,6 +1,6 @@
- #!/bin/sh
- #
--#  DEFAULT KDE STARTUP SCRIPT ( @KDE4WORKSPACE_VERSION@ )
-+#  DEFAULT KDE STARTUP SCRIPT ( @PLASMAWORKSPACE_VERSION@ )
- #
- 
- if test x$1 = x--failsafe; then
-@@ -17,17 +17,17 @@ trap 'echo GOT SIGHUP' HUP
- unset DYLD_FORCE_FLAT_NAMESPACE
- 
- # in case we have been started with full pathname spec without being in PATH
--bindir=`echo $0 | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
--if [ -n $bindir ]; then
--  qbindir=`qtpaths --binaries-dir`
--  qdbus=$qbindir/qdbus
--  case $PATH in
--$bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
--*) PATH=$bindir:$PATH; export PATH;;
--  esac
--else
-+#bindir=`echo $0 | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
-+#if [ -n $bindir ]; then
-+#  qbindir=`qtpaths --binaries-dir`
-+#  qdbus=$qbindir/qdbus
-+#  case $PATH in
-+#$bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-+#*) PATH=$bindir:$PATH; export PATH;;
-+#  esac
-+#else
-   qdbus=qdbus
--fi
-+#fi
- 
- # Check if a KDE session already is running and whether it's possible to 
connect to X
- kcheckrunning
-@@ -162,7 +162,7 @@ unset DESKTOP_LOCKED # Don't want it in the environment
- ksplash_pid=
- if test -z $dl; then
-   # languages as resolved by KLocale, for the splash screens use
--  # klocale_languages is assembled by kdostartupconfig4 calling KLocale
-+  # klocale_languages is assembled by kdostartupconfig5 calling KLocale
-   KLOCALE_LANGUAGES=$klocale_languages
-   export KLOCALE_LANGUAGES
-   # the splashscreen and progress indicator
-@@ -200,7 +200,7 @@ for prefix in `echo $libpath | sed -n -e 
's,/lib[^/]*/,/env/,p'`; do
- done
- 
- # Set the path for Qt plugins provided by KDE
--QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
-+QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`kf5-config --qt-plugins`
- # TODO: Do we really need this?
- QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
- export QT_PLUGIN_PATH

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild 
b/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
index 66ab734..f5b10a7 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
@@ -72,7 +72,8 @@ COMMON_DEPEND=
 
 RDEPEND=${COMMON_DEPEND}
$(add_kdebase_dep milou)
-   dev-qt/qtquickcontrols:5
+   dev-qt/qdbus:5
+   dev-qt/qtquickcontrols:5[widgets]
!kde-base/freespacenotifier:4
!kde-base/libkworkspace:4
!kde-base/libtaskmanager:4
@@ -90,9 +91,6 @@ DEPEND=${COMMON_DEPEND}
X? ( x11-proto/xproto )
 
 
-# Needed until bug 457024 is resolved
-PATCHES=( ${FILESDIR}/${PN}--missing-qttools.patch )
-
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package dbus dbusmenu-qt5)

diff --git a/kde-base/plasma-workspace/plasma-workspace-.ebuild 
b/kde-base/plasma-workspace/plasma-workspace-.ebuild
index 0ed1cfa..b90ecee 100644
--- a/kde-base/plasma-workspace/plasma-workspace-.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-.ebuild
@@ -72,6 +72,7 @@ COMMON_DEPEND=
 
 RDEPEND=${COMMON_DEPEND}
$(add_kdebase_dep milou)
+   dev-qt/qdbus:5
dev-qt/qtquickcontrols:5[widgets]
!kde-base/freespacenotifier:4
!kde-base/libkworkspace:4
@@ -90,9 +91,6 @@ DEPEND=${COMMON_DEPEND}
X? ( x11-proto/xproto )
 
 
-# Needed until bug 457024 is resolved
-PATCHES=( ${FILESDIR}/${P}-missing-qttools.patch )
-
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package dbus dbusmenu-qt5)

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

2014-05-03 Thread Johannes Huber 
commit: 70469b4fd204675196633e38b212b9a375dd1921
Author: Elias Probst mail AT eliasprobst DOT eu
AuthorDate: Sat May  3 12:59:52 2014 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Sat May  3 20:38:32 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=70469b4f

[kde-base/plasma-workspace] Update startkde patch

Package-Manager: portage-2.2.10

---
 .../files/plasma-workspace--missing-qttools.patch| 9 -
 1 file changed, 9 deletions(-)

diff --git 
a/kde-base/plasma-workspace/files/plasma-workspace--missing-qttools.patch 
b/kde-base/plasma-workspace/files/plasma-workspace--missing-qttools.patch
index 2a7c618..3c80f21 100644
--- 
a/kde-base/plasma-workspace/files/plasma-workspace--missing-qttools.patch
+++ 
b/kde-base/plasma-workspace/files/plasma-workspace--missing-qttools.patch
@@ -38,15 +38,6 @@ index 14ce47a..58c3a7a 100644
  
  # Check if a KDE session already is running and whether it's possible to 
connect to X
  kcheckrunning
-@@ -64,7 +64,7 @@ fi
- 
- mkdir -p $configDir
- 
--#This is basically setting defaults so we can use them with kstartupconfig4
-+#This is basically setting defaults so we can use them with kstartupconfig5
- cat $configDir/startupconfigkeys EOF
- kcminputrc Mouse cursorTheme 'Oxygen_White'
- kcminputrc Mouse cursorSize ''
 @@ -162,7 +162,7 @@ unset DESKTOP_LOCKED # Don't want it in the environment
  ksplash_pid=
  if test -z $dl; then

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

2014-04-24 Thread Johannes Huber 
commit: 200f7a41f6917553130817c96bd3188fc06eded1
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Thu Apr 24 22:44:15 2014 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Thu Apr 24 22:44:15 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=200f7a41

[kde-base/plasma-workspace] Re-enable plasma lock

Package-Manager: portage-2.2.10

---
 .../files/plasma-workspace-4.10.1-noplasmalock.patch  | 11 ---
 .../plasma-workspace/plasma-workspace-4.11.49..ebuild |  2 --
 2 files changed, 13 deletions(-)

diff --git 
a/kde-base/plasma-workspace/files/plasma-workspace-4.10.1-noplasmalock.patch 
b/kde-base/plasma-workspace/files/plasma-workspace-4.10.1-noplasmalock.patch
deleted file mode 100644
index 2380d20..000
--- a/kde-base/plasma-workspace/files/plasma-workspace-4.10.1-noplasmalock.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/plasma/screensaver/CMakeLists.txt 
b/plasma/screensaver/CMakeLists.txt
-index 514c856..9dcb5f4 100644
 a/plasma/screensaver/CMakeLists.txt
-+++ b/plasma/screensaver/CMakeLists.txt
-@@ -1,6 +1,3 @@
- add_subdirectory(containments)
--if(NOT WIN32)
--add_subdirectory(shell)
--endif(NOT WIN32)
- 
- 

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.11.49..ebuild 
b/kde-base/plasma-workspace/plasma-workspace-4.11.49..ebuild
index 68c6e30..d5d67ab 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.11.49..ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.11.49..ebuild
@@ -82,8 +82,6 @@ KMEXTRACTONLY=
ksysguard/
 
 
-PATCHES=( ${FILESDIR}/${PN}-4.10.1-noplasmalock.patch )
-
 pkg_setup() {
if use python ; then
python-single-r1_pkg_setup

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

2014-04-09 Thread Johannes Huber 
commit: cb76b81eec363e10c89819d34f5c3edd557d65ca
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Wed Apr  9 15:25:53 2014 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Wed Apr  9 15:25:53 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cb76b81e

[kde-base/plasma-workspace] Add patch to fix missing binary

The binary is provided by dev-qt/qttools:5, which is not packaged yet. When
bug #457024 is RESOLVED we can drop this patch.

Package-Manager: portage-2.2.10

---
 .../plasma-workspace--missing-qttools.patch| 57 ++
 .../plasma-workspace/plasma-workspace-.ebuild  |  3 ++
 2 files changed, 60 insertions(+)

diff --git 
a/kde-base/plasma-workspace/files/plasma-workspace--missing-qttools.patch 
b/kde-base/plasma-workspace/files/plasma-workspace--missing-qttools.patch
new file mode 100644
index 000..12886cd
--- /dev/null
+++ 
b/kde-base/plasma-workspace/files/plasma-workspace--missing-qttools.patch
@@ -0,0 +1,57 @@
+diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
+index e845603..e49dd5f 100644
+--- a/startkde/startkde.cmake
 b/startkde/startkde.cmake
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ #
+-#  DEFAULT KDE STARTUP SCRIPT ( @KDE4WORKSPACE_VERSION@ )
++#  DEFAULT KDE STARTUP SCRIPT ( @PLASMAWORKSPACE_VERSION@ )
+ #
+ 
+ if test x$1 = x--failsafe; then
+@@ -19,7 +19,7 @@ unset DYLD_FORCE_FLAT_NAMESPACE
+ # in case we have been started with full pathname spec without being in PATH
+ bindir=`echo $0 | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+ if [ -n $bindir ]; then
+-  qbindir=`qtpaths --binaries-dir`
++  qbindir=`kf5-config --qt-binaries`
+   qdbus=$qbindir/qdbus
+   case $PATH in
+ $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
+@@ -64,7 +64,7 @@ fi
+ 
+ mkdir -p $configDir
+ 
+-#This is basically setting defaults so we can use them with kstartupconfig4
++#This is basically setting defaults so we can use them with kstartupconfig5
+ cat $configDir/startupconfigkeys EOF
+ kcminputrc Mouse cursorTheme 'Oxygen_White'
+ kcminputrc Mouse cursorSize ''
+@@ -162,7 +162,7 @@ unset DESKTOP_LOCKED # Don't want it in the environment
+ ksplash_pid=
+ if test -z $dl; then
+   # languages as resolved by KLocale, for the splash screens use
+-  # klocale_languages is assembled by kdostartupconfig4 calling KLocale
++  # klocale_languages is assembled by kdostartupconfig5 calling KLocale
+   KLOCALE_LANGUAGES=$klocale_languages
+   export KLOCALE_LANGUAGES
+   # the splashscreen and progress indicator
+@@ -191,7 +191,7 @@ fi
+ # For anything else (that doesn't set env vars, or that needs a window 
manager),
+ # better use the Autostart folder.
+ 
+-libpath=`kde4-config --path lib | tr : '\n'`
++libpath=`kf5-config --path lib | tr : '\n'`
+ 
+ for prefix in `echo $libpath | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+   for file in $prefix*.sh; do
+@@ -200,7 +200,7 @@ for prefix in `echo $libpath | sed -n -e 
's,/lib[^/]*/,/env/,p'`; do
+ done
+ 
+ # Set the path for Qt plugins provided by KDE
+-QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
++QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`kf5-config --qt-plugins`
+ # TODO: Do we really need this?
+ QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
+ export QT_PLUGIN_PATH

diff --git a/kde-base/plasma-workspace/plasma-workspace-.ebuild 
b/kde-base/plasma-workspace/plasma-workspace-.ebuild
index d5e4026..ec14a37 100644
--- a/kde-base/plasma-workspace/plasma-workspace-.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-.ebuild
@@ -87,6 +87,9 @@ DEPEND=${COMMON_DEPEND}
X? ( x11-proto/xproto )
 
 
+# Needed until bug 457024 is resolved
+PATCHES=( ${FILESDIR}/${P}-missing-qttools.patch )
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package dbus dbusmenu-qt5)