diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /kde-plasma/kwin/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'kde-plasma/kwin/files')
-rw-r--r-- | kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch | 38 | ||||
-rw-r--r-- | kde-plasma/kwin/files/kwin-gstreamer-optional.patch | 15 |
2 files changed, 53 insertions, 0 deletions
diff --git a/kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch b/kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch new file mode 100644 index 000000000000..61c07feaee35 --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch @@ -0,0 +1,38 @@ +commit 8efef12eeb377e9087551e333d65631968c80e5f +Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sat Jun 10 17:00:25 2017 +0200 + + Fix build with future glibc (major/minor macros), BSD compatible + + Summary: + Also adding sys/types.h which is not implicitly included from all over. + + Thanks-to: [ade] in #kde-devel + + See also: + https://sourceware.org/ml/libc-alpha/2015-11/msg00452.html + https://git.reviewboard.kde.org/r/127662/ + + Reviewers: #plasma + + Subscribers: plasma-devel, kwin, #kwin, adridg + + Tags: #kwin + + Differential Revision: https://phabricator.kde.org/D6175 + +diff --git a/logind.cpp b/logind.cpp +index fee0f2ff4..bb84af4f9 100644 +--- a/logind.cpp ++++ b/logind.cpp +@@ -29,6 +29,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. + #include <QDBusMetaType> + + #include <sys/stat.h> ++#include <sys/types.h> ++#ifndef major ++#include <sys/sysmacros.h> ++#endif + #include <unistd.h> + #include "utils.h" + diff --git a/kde-plasma/kwin/files/kwin-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-gstreamer-optional.patch new file mode 100644 index 000000000000..d9ace476f956 --- /dev/null +++ b/kde-plasma/kwin/files/kwin-gstreamer-optional.patch @@ -0,0 +1,15 @@ +Disable the effect video button if gstreamer is missing. + +diff --git a/kcmkwin/kwincompositing/qml/Effect.qml b/kcmkwin/kwincompositing/qml/Effect.qml +index fcd5e8a..2331da2 100644 +--- a/kcmkwin/kwincompositing/qml/Effect.qml ++++ b/kcmkwin/kwincompositing/qml/Effect.qml +@@ -144,7 +144,7 @@ Rectangle { + + Button { + id: videoButton +- visible: model.VideoRole.toString() !== "" ++ visible: false + iconName: "video" + onClicked: videoItem.showHide() + } |