Unverified Commit 1c47df26 authored by Thomas Tuegel's avatar Thomas Tuegel Committed by GitHub
Browse files

Merge pull request #84542 from petabyteboy/feature/plasma-5-18 

plasma5: 5.17.5 -> 5.18.5
parents d38821a9 24ebfb1e

pkgs/desktops/plasma-5/fetch.sh

+1 −1
Original line number Diff line number Diff line 
WGET_ARGS=( https://download.kde.org/stable/plasma/5.17.5/ )
 
WGET_ARGS=( https://download.kde.org/stable/plasma/5.18.5/ )

pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch→pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch

+21 −0
Original line number Diff line number Diff line 
diff --git a/src/gtkconfigkcmodule.cpp b/src/gtkconfigkcmodule.cpp

index 7b82d50..96831d8 100644

--- a/src/gtkconfigkcmodule.cpp

+++ b/src/gtkconfigkcmodule.cpp

@@ -91,6 +91,16 @@ GTKConfigKCModule::GTKConfigKCModule(QWidget* parent, const QVariantList& args )

     iconsProxyModel->sort(0);

     ui->cb_icon->setModel(iconsProxyModel);

     ui->cb_icon_fallback->setModel(iconsProxyModel);

+

diff --git a/kded/gtkconfig.cpp b/kded/gtkconfig.cpp

index 5303636..199c4d5 100644

--- a/kded/gtkconfig.cpp

+++ b/kded/gtkconfig.cpp

@@ -41,6 +41,16 @@ GtkConfig::GtkConfig(QObject *parent, const QVariantList&) :

     kdeglobalsConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kdeglobals")))),

     kwinConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kwinrc"))))

 {

+    // Add GSETTINGS_SCHEMAS_PATH to the front of XDG_DATA_DIRS.

+    // Normally this would be done by wrapGAppsHook, but this plugin

+    // (shared object) cannot be wrapped.
@@ -16,6 +15,7 @@ index 7b82d50..96831d8 100644 
+    }

+    xdgdata.push_front(QByteArray(GSETTINGS_SCHEMAS_PATH));

+    qputenv("XDG_DATA_DIRS", xdgdata);

     

     m_tempGtk2Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/gtkrc-2.0";

     m_tempGtk3Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/.config/gtk-3.0/settings.ini";
 
+

     QDBusConnection dbus = QDBusConnection::sessionBus();

     dbus.registerService(QStringLiteral("org.kde.GtkConfig"));

     dbus.registerObject(QStringLiteral("/GtkConfig"), this, QDBusConnection::ExportScriptableSlots);

pkgs/desktops/plasma-5/kde-gtk-config/default.nix

+5 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  mkDerivation,

  extra-cmake-modules, wrapGAppsHook,

  glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio,

  knewstuff, gsettings-desktop-schemas

  knewstuff, gsettings-desktop-schemas, xsettingsd

}:



mkDerivation {
@@ -11,14 +11,16 @@ mkDerivation { 
  dontWrapGApps = true;  # There is nothing to wrap

  buildInputs = [

    ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes

    knewstuff gsettings-desktop-schemas

    knewstuff gsettings-desktop-schemas xsettingsd

  ];

  patches = [ ./patches/follow-symlinks.patch ./patches/gsettings.patch ];

  cmakeFlags = [

    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"

    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"

    "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/"

  ];

  # The gtkconfig KDED module will crash the daemon if the GSettings schemas

  # aren't found.

  patches = [ ./0001-gsettings-schemas-path.patch ];

  preConfigure = ''

    NIX_CFLAGS_COMPILE+=" -DGSETTINGS_SCHEMAS_PATH=\"$GSETTINGS_SCHEMAS_PATH\""

  '';

pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
From 33b25c2e3c7a002c7f726cd79fc4bab22b1299be Mon Sep 17 00:00:00 2001

From: Thomas Tuegel <ttuegel@gmail.com>

Date: Tue, 27 Oct 2015 18:07:54 -0500

Subject: [PATCH] follow symlinks



---

 src/appearancegtk2.cpp  | 2 +-

 src/iconthemesmodel.cpp | 2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)



Index: kde-gtk-config-5.12.4/src/appearancegtk2.cpp

===================================================================

--- kde-gtk-config-5.12.4.orig/src/appearancegtk2.cpp

+++ kde-gtk-config-5.12.4/src/appearancegtk2.cpp

@@ -69,7 +69,7 @@ QString AppearanceGTK2::themesGtkrcFile(

     QStringList themes=installedThemes();

     themes=themes.filter(QRegExp("/"+themeName+"/?$"));

     if(themes.size()==1) {

-        QDirIterator it(themes.first(), QDirIterator::Subdirectories);

+        QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);

         while(it.hasNext()) {

             it.next();

             if(it.fileName()=="gtkrc") {

Index: kde-gtk-config-5.12.4/src/iconthemesmodel.cpp

===================================================================

--- kde-gtk-config-5.12.4.orig/src/iconthemesmodel.cpp

+++ kde-gtk-config-5.12.4/src/iconthemesmodel.cpp

@@ -47,7 +47,7 @@ QList<QDir> IconThemesModel::installedTh

 

     foreach(const QString& dir, dirs) {

         QDir userIconsDir(dir);

-        QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);

+        QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs);

         while(it.hasNext()) {

             QString currentPath = it.next();

             QDir dir(currentPath);

Index: kde-gtk-config-5.12.4/src/cursorthemesmodel.cpp

===================================================================

--- kde-gtk-config-5.12.4.orig/src/cursorthemesmodel.cpp

+++ kde-gtk-config-5.12.4/src/cursorthemesmodel.cpp

@@ -47,7 +47,7 @@ QList<QDir> CursorThemesModel::installed

 

     foreach(const QString& dir, dirs) {

         QDir userIconsDir(dir);

-        QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);

+        QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs);

         while(it.hasNext()) {

             QString currentPath = it.next();

             QDir dir(currentPath);

pkgs/desktops/plasma-5/kde-gtk-config/patches/series

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
follow-symlinks.patch

gsettings.patch