kwin: update to 5.12.4

[Mark Davies <mark%ecs.vuw.ac.nz@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Fri Apr 13 00:22:34 2018 +1200
Changeset:	c753f248bd2a42c6ea1f70f3fce494c9b9678a21

Modified Files:
	kwin/Makefile
	kwin/PLIST
	kwin/distinfo
	kwin/hacks.mk

Log Message:
kwin: update to 5.12.4

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c753f248bd2a42c6ea1f70f3fce494c9b9678a21

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 kwin/Makefile |  4 ++--
 kwin/PLIST    | 30 ++++++++++++++++--------------
 kwin/distinfo |  8 ++++----
 kwin/hacks.mk |  8 --------
 4 files changed, 22 insertions(+), 28 deletions(-)

diffs:
diff --git a/kwin/Makefile b/kwin/Makefile
index fd20b45cc8..4c46dcdfc7 100644
--- a/kwin/Makefile
+++ b/kwin/Makefile
@@ -7,7 +7,7 @@ HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
 COMMENT=	KDE Window manager
 LICENSE=	gnu-gpl-v2 AND gnu-fdl-v1.2
 
-.include "../../wip/kde5/plasma.mk"
+.include "../../meta-pkgs/kde/plasma5.mk"
 
 BUILD_DEPENDS+=	kdoctools>=5.19.0:../../devel/kdoctools
 DEPENDS+=	kinit>=5.21.0:../../x11/kinit
@@ -26,7 +26,7 @@ SUBST_FILES.fix-moc+=	_KDE_build/CMakeFiles/kwin_autogen.dir/AutogenInfo.cmake
 SUBST_SED.fix-moc=	-e 's,;${PREFIX}/include;,;,g'
 
 SUBST_CLASSES+=		xdg
-SUBST_STAGE.xdg=	post-patch
+SUBST_STAGE.xdg=	pre-configure
 SUBST_MESSAGE.xdg=	Install via examples dir.
 SUBST_FILES.xdg=	data/CMakeLists.txt
 SUBST_FILES.xdg+=	kcmkwin/kwincompositing/CMakeLists.txt
diff --git a/kwin/PLIST b/kwin/PLIST
index 38a7198f2e..9455226ee0 100644
--- a/kwin/PLIST
+++ b/kwin/PLIST
@@ -66,6 +66,7 @@ qt5/plugins/kwin/effects/configs/kwin_mousemark_config.so
 qt5/plugins/kwin/effects/configs/kwin_presentwindows_config.so
 qt5/plugins/kwin/effects/configs/kwin_resize_config.so
 qt5/plugins/kwin/effects/configs/kwin_showfps_config.so
+qt5/plugins/kwin/effects/configs/kwin_slide_config.so
 qt5/plugins/kwin/effects/configs/kwin_thumbnailaside_config.so
 qt5/plugins/kwin/effects/configs/kwin_trackmouse_config.so
 qt5/plugins/kwin/effects/configs/kwin_windowgeometry_config.so
@@ -75,6 +76,7 @@ qt5/plugins/kwincompositing.so
 qt5/plugins/org.kde.kdecoration2/kwin5_aurorae.so
 qt5/plugins/org.kde.kglobalaccel5.platforms/KF5GlobalAccelPrivateKWin.so
 qt5/plugins/org.kde.kwin.platforms/KWinX11Platform.so
+qt5/plugins/org.kde.kwin.scenes/KWinSceneOpenGL.so
 qt5/plugins/org.kde.kwin.scenes/KWinSceneQPainter.so
 qt5/plugins/org.kde.kwin.scenes/KWinSceneXRender.so
 qt5/plugins/org.kde.kwin.waylandbackends/KWinWaylandVirtualBackend.so
@@ -93,7 +95,9 @@ qt5/qml/org/kde/kwin/decorations/plastik/qmldir
 qt5/qml/org/kde/kwin/private/kdecoration/libkdecorationprivatedeclarative.so
 qt5/qml/org/kde/kwin/private/kdecoration/qmldir
 share/config.kcfg/kwin.kcfg
+share/config.kcfg/kwin_colorcorrect.kcfg
 share/dbus-1/interfaces/org.kde.KWin.xml
+share/dbus-1/interfaces/org.kde.kwin.ColorCorrect.xml
 share/dbus-1/interfaces/org.kde.kwin.Compositing.xml
 share/dbus-1/interfaces/org.kde.kwin.Effects.xml
 share/doc/HTML/ca/kcontrol/desktop/index.cache.bz2
@@ -251,28 +255,25 @@ share/doc/HTML/pt_BR/kcontrol/windowbehaviour/index.cache.bz2
 share/doc/HTML/pt_BR/kcontrol/windowbehaviour/index.docbook
 share/doc/HTML/pt_BR/kcontrol/windowspecific/index.cache.bz2
 share/doc/HTML/pt_BR/kcontrol/windowspecific/index.docbook
+share/doc/HTML/ru/kcontrol/kwineffects/index.cache.bz2
+share/doc/HTML/ru/kcontrol/kwineffects/index.docbook
+share/doc/HTML/ru/kcontrol/kwinscreenedges/index.cache.bz2
+share/doc/HTML/ru/kcontrol/kwinscreenedges/index.docbook
+share/doc/HTML/ru/kcontrol/kwintabbox/index.cache.bz2
+share/doc/HTML/ru/kcontrol/kwintabbox/index.docbook
+share/doc/HTML/ru/kcontrol/windowbehaviour/index.cache.bz2
+share/doc/HTML/ru/kcontrol/windowbehaviour/index.docbook
 share/doc/HTML/sr/kcontrol/desktop/index.cache.bz2
 share/doc/HTML/sr/kcontrol/desktop/index.docbook
 share/doc/HTML/sr@latin/kcontrol/desktop/index.cache.bz2
 share/doc/HTML/sr@latin/kcontrol/desktop/index.docbook
-share/doc/HTML/sv/kcontrol/desktop/index.cache.bz2
-share/doc/HTML/sv/kcontrol/desktop/index.docbook
-share/doc/HTML/sv/kcontrol/kwindecoration/index.cache.bz2
-share/doc/HTML/sv/kcontrol/kwindecoration/index.docbook
-share/doc/HTML/sv/kcontrol/kwineffects/index.cache.bz2
-share/doc/HTML/sv/kcontrol/kwineffects/index.docbook
-share/doc/HTML/sv/kcontrol/kwinscreenedges/index.cache.bz2
-share/doc/HTML/sv/kcontrol/kwinscreenedges/index.docbook
-share/doc/HTML/sv/kcontrol/kwintabbox/index.cache.bz2
-share/doc/HTML/sv/kcontrol/kwintabbox/index.docbook
-share/doc/HTML/sv/kcontrol/windowbehaviour/index.cache.bz2
-share/doc/HTML/sv/kcontrol/windowbehaviour/index.docbook
-share/doc/HTML/sv/kcontrol/windowspecific/index.cache.bz2
-share/doc/HTML/sv/kcontrol/windowspecific/index.docbook
 share/doc/HTML/uk/kcontrol/desktop/index.cache.bz2
 share/doc/HTML/uk/kcontrol/desktop/index.docbook
+share/doc/HTML/uk/kcontrol/kwindecoration/button.png
+share/doc/HTML/uk/kcontrol/kwindecoration/decoration.png
 share/doc/HTML/uk/kcontrol/kwindecoration/index.cache.bz2
 share/doc/HTML/uk/kcontrol/kwindecoration/index.docbook
+share/doc/HTML/uk/kcontrol/kwindecoration/main.png
 share/doc/HTML/uk/kcontrol/kwineffects/index.cache.bz2
 share/doc/HTML/uk/kcontrol/kwineffects/index.docbook
 share/doc/HTML/uk/kcontrol/kwinscreenedges/index.cache.bz2
@@ -619,6 +620,7 @@ share/locale/et/LC_MESSAGES/kwin_clients.mo
 share/locale/et/LC_MESSAGES/kwin_effects.mo
 share/locale/et/LC_MESSAGES/kwin_scripting.mo
 share/locale/et/LC_MESSAGES/kwin_scripts.mo
+share/locale/eu/LC_MESSAGES/kcm-kwin-scripts.mo
 share/locale/eu/LC_MESSAGES/kcm_kwindesktop.mo
 share/locale/eu/LC_MESSAGES/kcm_kwintabbox.mo
 share/locale/eu/LC_MESSAGES/kcmkwincompositing.mo
diff --git a/kwin/distinfo b/kwin/distinfo
index 58c1916d24..738b8a2115 100644
--- a/kwin/distinfo
+++ b/kwin/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (kwin-5.11.5.tar.xz) = 5a45f36165e114983a6887d00bb6df63578889cd
-RMD160 (kwin-5.11.5.tar.xz) = 2b7b1ddbb63b5e24e779fc5baee7163ab1722c7c
-SHA512 (kwin-5.11.5.tar.xz) = fb1355a33998c5b5ddb0bac59d65862fecfa8bab8bda234bf60c75800f04fb7b96b8069d3fcdd5f2647c06ca7673ed6ef6b7fa49b160b57dcbcb65dc1a853cd2
-Size (kwin-5.11.5.tar.xz) = 4965516 bytes
+SHA1 (kwin-5.12.4.tar.xz) = 995489416de2b5776dea7177b0661de1dea94bf7
+RMD160 (kwin-5.12.4.tar.xz) = 3c3447d0d85d0ca7b6ea4c57dc9525a4805b8dcc
+SHA512 (kwin-5.12.4.tar.xz) = 6e2c2f2a582c40d7eb13b704498c47185ac267f62a84b59c357df8b1e6685c4e261ffde0b62a86ffd56cf100930720d74af9d7d0d1b28c354d3c4126007bd538
+Size (kwin-5.12.4.tar.xz) = 4986536 bytes
 SHA1 (patch-kcmkwin_kwincompositing_CMakeLists.txt) = 77cf05fc7f9e75b969c746bf2bd051020354b785
 SHA1 (patch-kcmkwin_kwindesktop_CMakeLists.txt) = ac855325440b14ea079a87b2ca1d79f69a7602d6
 SHA1 (patch-kcmkwin_kwinscreenedges_CMakeLists.txt) = 39972987c11dee5ebd701d41a2ab22d7ab063e1a
diff --git a/kwin/hacks.mk b/kwin/hacks.mk
index 25d554aac3..d92e98bf32 100644
--- a/kwin/hacks.mk
+++ b/kwin/hacks.mk
@@ -8,11 +8,3 @@ pre-configure:
 	mkdir ${BUILDLINK_DIR}/include/linux
 	cp ${FILESDIR}/input.h ${BUILDLINK_DIR}/include/linux/input.h
 .endif
-
-# $NetBSD: hacks.mk,v 1.1 2018/01/17 20:00:21 markd Exp $
-
-# linking -lQt5Widgets on NetBSD with gcc produces
-# ld: BFD (NetBSD Binutils nb1) 2.27 assertion fail
-# /usr/src/external/gpl3/binutils/lib/libbfd/../../dist/bfd/elflink.c:2694
-# unless -lexecinfo preceeds -lQt5Widgets
-BUILDLINK_TRANSFORM.NetBSD+=	l:Qt5Widgets:execinfo:Qt5Widgets