1 files changed, 34 insertions, 2 deletions
diff --git a/libraries/qt6/qt6.SlackBuild b/libraries/qt6/qt6.SlackBuild
index 4e27d2e820a15..52e39a7501ee3 100644
--- a/libraries/qt6/qt6.SlackBuild
+++ b/libraries/qt6/qt6.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=qt6
 SRCNAM=qt-everywhere-src
-VERSION=${VERSION:-6.3.2}
+VERSION=${VERSION:-6.4.0}
 BSCLANG=libclang-release_130-based-linux-Ubuntu20.04-gcc9.3-x86_64
 CCACHE=${CCACHE:-OFF}
 EXAMPLES=${EXAMPLES:-OFF}
@@ -124,7 +124,7 @@ cd build
 cd ..
 
 mv $PKG/usr/phrasebooks $PKG/usr/share/$PRGNAM/
-mv $PKG/usr/resources $PKG/usr/share/$PRGNAM/
+# mv $PKG/usr/resources $PKG/usr/share/$PRGNAM/
 
 if [ "$EXAMPLES" = "ON" ]; then
   find -L $PKG/usr/doc/$PRGNAM-$VERSION/examples \
@@ -136,6 +136,37 @@ fi
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+for i in $CWD/desktop/*.desktop; do
+  install -D -m 0644 $i $PKG/usr/share/applications/$(basename $i)
+done
+sed -i "s|@LIBDIR@|$LIBDIRSUFFIX|" $PKG/usr/share/applications/*
+
+# Install symlinks to the Qt6 binaries in the $PATH (avoid the ones already ending in "6"):
+mkdir -p $PKG/usr/bin
+for FILE in $PKG/usr/lib${LIBDIRSUFFIX}/qt6/bin/* ; do
+  if ! [[ $FILE =~ 6$ ]]; then
+    ln -s ../lib${LIBDIRSUFFIX}/qt6/bin/$(basename $FILE) $PKG/usr/bin/$(basename $FILE)-qt6
+  fi
+done
+
+install -D -m 0644 qttools/src/assistant/assistant/images/assistant-128.png \
+  $PKG/usr/share/icons/hicolor/128x128/apps/assistant-qt6.png
+install -D -m 0644 qttools/src/designer/src/designer/images/designer.png \
+  $PKG/usr/share/icons/hicolor/128x128/apps/designer-qt6.png
+install -D -m 0644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
+  $PKG/usr/share/icons/hicolor/128x128/apps/qdbusviewer-qt6.png
+for i in 16 32 48 64 128; do
+  install -D -m 0644 qttools/src/linguist/linguist/images/icons/linguist-${i}-32.png \
+    $PKG/usr/share/icons/hicolor/${i}x${i}/apps/linguist-qt6.png
+done
+
+mkdir -p $PKG/etc/profile.d
+sed -e "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" $CWD/profile.d/$PRGNAM.sh \
+  > $PKG/etc/profile.d/$PRGNAM.sh
+sed -e "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" $CWD/profile.d/$PRGNAM.csh \
+  > $PKG/etc/profile.d/$PRGNAM.csh
+chmod 0755 $PKG/etc/profile.d/*
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   .QT-ENTERPRISE-LICENSE-AGREEMENT LICENSE.* README.md \
@@ -144,6 +175,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE