plasma-workspace: make sure QT bin dir is on path

[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:		Tue May 10 09:34:16 2016 +1200
Changeset:	d7f8bfd85d1ee3f63be066c852ea360885d112c4

Modified Files:
	plasma-workspace/Makefile
	plasma-workspace/distinfo
Added Files:
	plasma-workspace/patches/patch-startkde_startkde.cmake

Log Message:
plasma-workspace: make sure QT bin dir is on path

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

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

diffstat:
 plasma-workspace/Makefile                             |  5 +++++
 plasma-workspace/distinfo                             |  1 +
 .../patches/patch-startkde_startkde.cmake             | 19 +++++++++++++++++++
 3 files changed, 25 insertions(+)

diffs:
diff --git a/plasma-workspace/Makefile b/plasma-workspace/Makefile
index 9aeb25d..b74564e 100644
--- a/plasma-workspace/Makefile
+++ b/plasma-workspace/Makefile
@@ -28,6 +28,11 @@ SUBST_FILES.fix-moc+=	_KDE_build/runners/windows/CMakeFiles/krunner_windows_auto
 SUBST_FILES.fix-moc+=	_KDE_build/applets/notifications/lib/CMakeFiles/plasma_applet_notifications_automoc.dir/AutogenInfo.cmake
 SUBST_SED.fix-moc=	-e 's,;${PREFIX}/include;,;,g'
 
+SUBST_CLASSES+=		qtpath
+SUBST_FILES.qtpath=	startkde/startkde.cmake
+SUBST_VARS.qtpath=	QTDIR
+SUBST_STAGE.qtpath=	post-patch
+
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/xdg/autostart
 CONF_FILES+=	${PREFIX}/share/examples/kde-xdg/autostart/krunner.desktop \
 		${PKG_SYSCONFDIR}/xdg/autostart/krunner.desktop
diff --git a/plasma-workspace/distinfo b/plasma-workspace/distinfo
index 42b867a..ac83e83 100644
--- a/plasma-workspace/distinfo
+++ b/plasma-workspace/distinfo
@@ -9,5 +9,6 @@ SHA1 (patch-klipper_CMakeLists.txt) = 2f5f755a8056da155137da9dee6a9ffe531e2d79
 SHA1 (patch-krunner_CMakeLists.txt) = eb11603f00eefda5a67c8bcce85726099216f270
 SHA1 (patch-libtaskmanager_CMakeLists.txt) = f45c7eeb97b8950d2588099156a45590133387f4
 SHA1 (patch-shell_CMakeLists.txt) = 3054075aa6661716fff22bf80e0db05bfb425aa1
+SHA1 (patch-startkde_startkde.cmake) = 684129b87d920fd513c62c45527eb9dd1774c95b
 SHA1 (patch-wallpapers_image_CMakeLists.txt) = a62a155eed7cf69cada8d1e697a29b14e54ca683
 SHA1 (patch-xembed-sni-proxy_CMakeLists.txt) = 8158c958866ccd90858e76d40333e8719dda81a0
diff --git a/plasma-workspace/patches/patch-startkde_startkde.cmake b/plasma-workspace/patches/patch-startkde_startkde.cmake
new file mode 100644
index 0000000..4a1c7f0
--- /dev/null
+++ b/plasma-workspace/patches/patch-startkde_startkde.cmake
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Ensure QT bindir is on path
+
+--- startkde/startkde.cmake.orig	2016-04-19 11:20:13.000000000 +0000
++++ startkde/startkde.cmake
+@@ -17,6 +17,12 @@ trap 'echo GOT SIGHUP' HUP
+ # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
+ unset DYLD_FORCE_FLAT_NAMESPACE
+ 
++qtbindir=@QTDIR@/bin
++case $PATH in
++  $qtbindir|$qtbindir:*|*:$qtbindir|*:$qtbindir:*) ;;
++  *) PATH=$qtbindir:$PATH; export PATH;;
++esac
++
+ # 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