Stefan Champailler authored Aug 17, 2018 and Nate Graham committed Aug 17, 2018

Summary:
The rationale of that change is that at some other place in the KInfoCenter, the buttons are aligned to the right (for example in the IEEE 1394 device info, see the "Generate 1394 Bus Reset" button), so I think it's better if everything is aligned the same way.

Before:
{F6186087}

After:
{F6186086}

Test Plan: Run the updated KInfoCenter. Go in the Network Information / Network Interfaces module and check that the update button is in the lower right corner instead of the left corner. The rest of the functionality is unchanged.

Reviewers: ngraham

Reviewed By: ngraham

Subscribers: abetts, broulik, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D14737

BUG: 396977
FIXED-IN: 5.12.7

GIT_SILENT

Isaac True authored Jun 27, 2018 and Christoph Feck committed Jun 27, 2018

This patch fixes the issue of processor numbers not being sorted in human-readable order.

It overloads the < operator on the SolDevice class to implement sorting by process number and sorting by storage volume names (as they
should go, e.g.: sda, sda1, sda2...).

BUG: 380355

Reviewed by: cfeck, davidedmundson

Differential Revision: https://phabricator.kde.org/D7155

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

https://msdn.microsoft.com/en-us/library/windows/desktop/aa365233(v=vs.85).aspx reads:

'The Server Message Block (SMB) Protocol is ...'

Differential Revision: https://phabricator.kde.org/D13240

proofread
bump date + realeaseinfo
kde -> plasma
add energy + fileindexer+wayland
group subitems to Device / Network / Graphical items

Differential Revision: https://phabricator.kde.org/D11864

(cherry picked from commit 5d247348)

backport to stable 5.12 lts

Summary:
1) Avoid showing the window of the second instance by creating
   KDBusService object before creating the window object.
2) Activate the window on the second start.

Reviewers: #plasma, mart

Reviewed By: #plasma, mart

Subscribers: mart, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D12760

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Summary:
Currently DRI information retrieval is attempted via /proc/dri, which
was removed from the linux kernel in v3.12 (2013). This information
includes the kernel driver in use as well as card identification sourced
from pci.ids database.

This adds support for retrieving this information in the same vein via
/dev and /sys for modern kernels.

Test Plan: kcmshell5 opengl should correctly display kernel driver.

Reviewers: #plasma, alexeymin

Reviewed By: alexeymin

Subscribers: alexeymin, wbauer, plasma-devel, #plasma

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D12476

GIT_SILENT

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Lindsay Roberts authored Apr 22, 2018 and David Edmundson committed Apr 24, 2018

Summary:
Under certain contexts (tested with Mesa 18.0.1 + AMDGPU) eglMakeCurrent()
fails with EGL_BAD_ACCESS. At this point the KCM gives up on EGL info
retrieval. This seems to be caused - correctly or otherwise - by a dangling
glX context. Explictly setting no glX context current at cleanup fixes the
issue.

Test Plan: kcmshell5 opengl should correctly display EGL information.

Reviewers: #plasma, davidedmundson, graesslin

Reviewed By: #plasma, davidedmundson, graesslin

Subscribers: plasma-devel, #plasma

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D12455

Summary:
Under certain contexts (tested with Mesa 18.0.1 + AMDGPU) eglMakeCurrent()
fails with EGL_BAD_ACCESS. At this point the KCM gives up on EGL info
retrieval. This seems to be caused - correctly or otherwise - by a dangling
glX context. Explictly setting no glX context current at cleanup fixes the
issue.

Test Plan: kcmshell5 opengl should correctly display EGL information.

Reviewers: #plasma, davidedmundson, graesslin

Reviewed By: #plasma, davidedmundson, graesslin

Subscribers: plasma-devel, #plasma

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D12455

Summary:
Removing the requirement of 3.2 version just fixes it for my AMD RX560 on amdgpu opensource driver, which only has 2.1 version.

Test Plan: Run kinfocenter, choose Graphical information - OpenGL tab. It should open without errors.

Reviewers: #plasma, graesslin, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D12003

proofread
bump date + realeaseinfo
kde -> plasma
add energy + fileindexer+wayland
group subitems to Device / Network / Graphical items

Differential Revision: https://phabricator.kde.org/D11864