Specialize profile.d adjustment

Change-Id: I71d7d23f057559133e18a3facf67f83f43a21c99

4 files changed, 13 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e820d17dcf21..d0ae8161fa93 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,7 +25,7 @@ _static_build=false
 _build_from_head=false
 _local_qt5_repo="/opt/dev/src/qtproject/qt5"
 
-pkgrel=12
+pkgrel=13
 # 1 or 2 at present
 _piver=""
 
@@ -248,6 +248,7 @@ fi
   local _libspkgdir="${_libsdir}/topkg"
   local _libspkgbuild="${_libsdir}/PKGBUILD"
   local _pkgprofiled=${_libspkgdir}/etc/profile.d
+  local _profiledfn=qpi${_piver}.sh
   rm -Rf ${_libspkgdir}
   mkdir -p ${_libspkgdir}
 
@@ -261,8 +262,8 @@ fi
 
   if ! ${_static_build}; then
     mkdir -p ${_pkgprofiled}
-    cp ${startdir}/qpi.sh ${_pkgprofiled} || exit 1
-    sed -i "s,localpiprefix,${_installprefix}," ${_pkgprofiled}/qpi.sh || exit 1
+    cp -L ${startdir}/${_profiledfn} ${_pkgprofiled} || exit 1
+    sed -i "s,localpiprefix,${_installprefix}," ${_pkgprofiled}/${_profiledfn} || exit 1
   fi
 
   cp ${_bindir}/qtbase/config.status ${_libspkgdir}/${_installprefix}
diff --git a/qpi1.sh b/qpi1.sh
new file mode 100644
index 000000000000..6a0ff925420c
--- /dev/null
+++ b/qpi1.sh
@@ -0,0 +1,5 @@
+export QT_WAYLAND_CLIENT_BUFFER_INTEGRATION=brcm
+#export QT_QPA_PLATFORM=wayland
+
+PATH="localpiprefix/bin:${PATH}"
+export PATH
diff --git a/qpi.sh b/qpi2.sh
index b652ae36fd9d..2be109b307ae 100644
--- a/qpi.sh
+++ b/qpi2.sh
@@ -1,9 +1,9 @@
-#proprietary
-#export QT_WAYLAND_CLIENT_BUFFER_INTEGRATION=brcm
 export QT_QPA_PLATFORM=wayland
 export QT_IM_MODULE=qtvirtualkeyboard
 export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
-export QT_WAYLAND_USE_XDG_SHELL=1
+
+#Still a little raw
+#export QT_WAYLAND_USE_XDG_SHELL=1
 
 # Required as of 5.7.0 beta/RC
 export QSG_RENDER_LOOP=basic
diff --git a/qpi3.sh b/qpi3.sh
new file mode 120000
index 000000000000..3e53fea82b3d
--- /dev/null
+++ b/qpi3.sh
@@ -0,0 +1 @@
+qpi2.sh
\ No newline at end of file