public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/
@ 2011-03-28  1:44 Theo Chatzimichos
  0 siblings, 0 replies; 6+ messages in thread
From: Theo Chatzimichos @ 2011-03-28  1:44 UTC (permalink / raw
  To: gentoo-commits

commit:     c925ef5ca6c3fef5fd5ce9aa7502e8d989a9cd7d
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 01:43:33 2011 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 01:44:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c925ef5c

[kde-base/plasma-workspace] Update the akonadi-optional patch

---
 ...a-workspace-4.6.0-optional_akonadi-server.patch |  139 +++++++++++++++++++-
 1 files changed, 132 insertions(+), 7 deletions(-)

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch
index de333bc..61dc5a6 100644
--- a/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch
+++ b/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch
@@ -1,16 +1,141 @@
-diff -r -u plasma-workspace-4.6.0-orig/plasma/generic/dataengines/CMakeLists.txt plasma-workspace-4.6.0/plasma/generic/dataengines/CMakeLists.txt
---- plasma-workspace-4.6.0-orig/plasma/generic/dataengines/CMakeLists.txt	2011-02-03 18:58:47.884000165 -0500
-+++ plasma-workspace-4.6.0/plasma/generic/dataengines/CMakeLists.txt	2011-02-03 19:24:21.511000165 -0500
-@@ -28,8 +28,10 @@
- macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several plasma dataengines")
+commit 5701ee97f896bf25de5dfbcc2699695794f25b34
+Author: Aaron Seigo <aseigo@kde.org>
+Date:   Fri Feb 4 15:48:30 2011 -0800
+
+    make akonadi optional
+    
+    based on a patch by Theo Chatzimichos, whose patch in turn was based
+    on one by Fabiano Engler via Gentoo
+    
+    REVIEW:100568
+
+diff --git a/plasma/generic/dataengines/CMakeLists.txt b/plasma/generic/dataengines/CMakeLists.txt
+index 4664a02..1278224 100644
+--- a/plasma/generic/dataengines/CMakeLists.txt
++++ b/plasma/generic/dataengines/CMakeLists.txt
+@@ -25,10 +25,15 @@ if (NEPOMUK_FOUND)
+ endif (NEPOMUK_FOUND)
+ 
+ macro_optional_find_package(KdepimLibs 4.5.60)
+-macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several plasma dataengines")
++macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several Plasma DataEngines")
++
++macro_optional_find_package(Akonadi)
++macro_log_feature(AKONADI_FOUND "Akonadi" "Akonadi libraries" "http://pim.kde.org/akonadi/" FALSE "" "Needed for event support in the calendar DataEngine")
  
  if(KDEPIMLIBS_FOUND)
 -   add_subdirectory(akonadi)
--   add_subdirectory(calendar)
 +   if(AKONADI_FOUND)
 +      add_subdirectory(akonadi)
-+      add_subdirectory(calendar)
 +   endif(AKONADI_FOUND)
+    add_subdirectory(calendar)
     add_subdirectory(rss)
  endif(KDEPIMLIBS_FOUND)
+diff --git a/plasma/generic/dataengines/calendar/CMakeLists.txt b/plasma/generic/dataengines/calendar/CMakeLists.txt
+index d3d76e6..a6abcdc 100644
+--- a/plasma/generic/dataengines/calendar/CMakeLists.txt
++++ b/plasma/generic/dataengines/calendar/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ project(calendar_engine)
+ 
+ find_package(KdepimLibs REQUIRED)
+-find_package(Akonadi REQUIRED)
+ find_package(Boost REQUIRED)
+ 
+ include_directories(
+@@ -14,14 +13,20 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
+ 
+ set(calendar_engine_srcs
+     calendarengine.cpp
+-    eventdatacontainer.cpp
+-# taken from kdepim/akonadi/kcal as long as it's not yet exported:
+-    akonadi/calendar.cpp
+-    akonadi/calendarmodel.cpp
+-    akonadi/calfilterproxymodel.cpp
+-    akonadi/utils.cpp
+ )
+ 
++if(AKONADI_FOUND)
++    ADD_DEFINITIONS(-DAKONADI_FOUND)
++    set(calendar_engine_srcs ${calendar_engine_srcs}
++        eventdatacontainer.cpp
++        # taken from kdepim/akonadi/kcal as long as it's not yet exported:
++        akonadi/calendar.cpp
++        akonadi/calendarmodel.cpp
++        akonadi/calfilterproxymodel.cpp
++        akonadi/utils.cpp
++    )
++endif(AKONADI_FOUND)
++
+ kde4_add_plugin(plasma_engine_calendar ${calendar_engine_srcs})
+ 
+ target_link_libraries(
+@@ -29,13 +34,19 @@ target_link_libraries(
+     ${KDEPIMLIBS_KHOLIDAYS_LIBRARY}
+     ${KDE4_KDECORE_LIBS}
+     ${KDE4_PLASMA_LIBS}
+-    ${KDE4_AKONADI_LIBS}
+     ${KDE4_KMIME_LIBS}
+     ${KDE4_KCALCORE_LIBS}
+     ${KDE4_KCALUTILS_LIBS}
+-    ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
+ )
+ 
++if(AKONADI_FOUND)
++    target_link_libraries(
++        plasma_engine_calendar
++        ${KDE4_AKONADI_LIBS}
++        ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
++    )
++endif(AKONADI_FOUND)
++
+ install(TARGETS plasma_engine_calendar DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES plasma-dataengine-calendar.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+ 
+diff --git a/plasma/generic/dataengines/calendar/calendarengine.cpp b/plasma/generic/dataengines/calendar/calendarengine.cpp
+index 0fdd65d..53f98c0 100644
+--- a/plasma/generic/dataengines/calendar/calendarengine.cpp
++++ b/plasma/generic/dataengines/calendar/calendarengine.cpp
+@@ -32,6 +32,7 @@
+ #include <KCalCore/Todo>
+ #include <KCalCore/Journal>
+ 
++#ifdef AKONADI_FOUND
+ #include <Akonadi/ChangeRecorder>
+ #include <Akonadi/Session>
+ #include <Akonadi/Collection>
+@@ -41,6 +42,7 @@
+ #include "akonadi/calendar.h"
+ #include "akonadi/calendarmodel.h"
+ #include "eventdatacontainer.h"
++#endif
+ 
+ CalendarEngine::CalendarEngine(QObject* parent, const QVariantList& args)
+               : Plasma::DataEngine(parent),
+@@ -74,9 +76,11 @@ bool CalendarEngine::sourceRequestEvent(const QString &request)
+         return holidayCalendarSourceRequest(requestKey, requestTokens, request);
+     }
+ 
++#ifdef AKONADI_FOUND
+     if (requestKey == "events" || requestKey == "eventsInMonth") {
+         return akonadiCalendarSourceRequest(requestKey, requestTokens, request);
+     }
++#endif
+ 
+     return false;
+ }
+@@ -272,6 +276,7 @@ bool CalendarEngine::holidayCalendarSourceRequest(const QString& key, const QStr
+     return false;
+ }
+ 
++#ifdef AKONADI_FOUND
+ bool CalendarEngine::akonadiCalendarSourceRequest(const QString& key, const QStringList& args, const QString& request)
+ {
+     // figure out what time range was requested from the source string
+@@ -339,5 +344,6 @@ void CalendarEngine::initAkonadiCalendar()
+     calendarModel->setCollectionFetchStrategy(Akonadi::EntityTreeModel::InvisibleCollectionFetch);
+     m_calendar = new CalendarSupport::Calendar(calendarModel, calendarModel, KSystemTimeZones::local());
+ }
++#endif
  
+ #include "calendarengine.moc"



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/
@ 2014-04-10 21:07 Johannes Huber
  0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2014-04-10 21:07 UTC (permalink / raw
  To: gentoo-commits

commit:     2be2d2103be832988088fa6af78547a87764a292
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 10 21:07:23 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Apr 10 21:07:23 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2be2d210

[kde-base/plasma-workspace] Rebased missing qttools patch

Package-Manager: portage-2.2.10

---
 .../plasma-workspace-9999-missing-qttools.patch    | 44 +++++++++++++---------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-9999-missing-qttools.patch b/kde-base/plasma-workspace/files/plasma-workspace-9999-missing-qttools.patch
index 12886cd..2a7c618 100644
--- a/kde-base/plasma-workspace/files/plasma-workspace-9999-missing-qttools.patch
+++ b/kde-base/plasma-workspace/files/plasma-workspace-9999-missing-qttools.patch
@@ -1,5 +1,5 @@
 diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index e845603..e49dd5f 100644
+index 14ce47a..58c3a7a 100644
 --- a/startkde/startkde.cmake
 +++ b/startkde/startkde.cmake
 @@ -1,6 +1,6 @@
@@ -10,15 +10,34 @@ index e845603..e49dd5f 100644
  #
  
  if test "x$1" = x--failsafe; then
-@@ -19,7 +19,7 @@ unset DYLD_FORCE_FLAT_NAMESPACE
+@@ -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
+-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:*) ;;
+-  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
 @@ -64,7 +64,7 @@ fi
  
  mkdir -p $configDir
@@ -37,15 +56,6 @@ index e845603..e49dd5f 100644
    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
  


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/
@ 2014-05-03 20:39 Johannes Huber
  0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2014-05-03 20:39 UTC (permalink / raw
  To: gentoo-commits

commit:     70469b4fd204675196633e38b212b9a375dd1921
Author:     Elias Probst <mail <AT> eliasprobst <DOT> eu>
AuthorDate: Sat May  3 12:59:52 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat May  3 20:38:32 2014 +0000
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-9999-missing-qttools.patch            | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-9999-missing-qttools.patch b/kde-base/plasma-workspace/files/plasma-workspace-9999-missing-qttools.patch
index 2a7c618..3c80f21 100644
--- a/kde-base/plasma-workspace/files/plasma-workspace-9999-missing-qttools.patch
+++ b/kde-base/plasma-workspace/files/plasma-workspace-9999-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


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/
@ 2014-05-26 17:43 Johannes Huber
  0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2014-05-26 17:43 UTC (permalink / raw
  To: gentoo-commits

commit:     6d33f76174ece6dae7c54421df65e7f10bf29abe
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon May 26 17:42:11 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon May 26 17:43:12 2014 +0000
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-9999-cmake-enable-prison.patch    | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 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 dc18fd1..48924a4 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,17 +1,17 @@
-From faf9e0a0af6a2842b9f4ebf4cd901062cc006e04 Mon Sep 17 00:00:00 2001
+From e6e1db527e636649634db97846abd09862861134 Mon Sep 17 00:00:00 2001
 From: Johannes Huber <johu@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 ()


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/
@ 2014-05-28 21:20 Johannes Huber
  0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2014-05-28 21:20 UTC (permalink / raw
  To: gentoo-commits

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 <johu@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();


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/
@ 2014-10-25 16:32 Michael Palimaka
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2014-10-25 16:32 UTC (permalink / raw
  To: gentoo-commits

commit:     50c986277686a3ccf4a71bdce793a91f93d2d498
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 25 16:32:11 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Oct 25 16:32:11 2014 +0000
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..0000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-5.0.2-qt54.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From: Aleix Pol <aleixpol@kde.org>
-Date: Fri, 01 Aug 2014 09:36:43 +0000
-Subject: Fix build in Qt 5.4
-X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=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_cast<KService*>(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_cast<KServiceGroup*>(p.data()));
-             if (service->childCount() == 0) {
-                 continue;
-             }
-
-From: Kevin Funk <kfunk@kde.org>
-Date: Wed, 06 Aug 2014 06:23:06 +0000
-Subject: Make compile with Qt 5.4
-X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=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_cast<KService*>(p.data()));
-             entries << service->storageId();
-         } else if (p->isType(KST_KServiceGroup)) {
--            const KServiceGroup::Ptr service = p;
--            entries << service->entryPath();
-+            const KServiceGroup::Ptr serviceGroup(static_cast<KServiceGroup*>(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_cast<KServiceGroup*>(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_cast<KService*>(e.data()));
- 
-             kDebug() << "the entry name is" << service->desktopEntryName()
-                      << "with path" << service->entryPath();
-


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-10-25 16:32 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-26 17:43 [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/ Johannes Huber
  -- strict thread matches above, loose matches on Subject: below --
2014-10-25 16:32 Michael Palimaka
2014-05-28 21:20 Johannes Huber
2014-05-03 20:39 Johannes Huber
2014-04-10 21:07 Johannes Huber
2011-03-28  1:44 Theo Chatzimichos

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox