10 files changed, 117 insertions, 5 deletions
diff --git a/libraries/qt6/README.SLACKWARE b/libraries/qt6/README.SLACKWARE
index 4c3bc9a818..0c4a8679c3 100644
--- a/libraries/qt6/README.SLACKWARE
+++ b/libraries/qt6/README.SLACKWARE
@@ -19,6 +19,7 @@ Qt6 will compile with multiple optional dependencies, such as:
   (*)directfb
   (*)gn
   (*)interbase
+  libb2
   (*)litehtml
   (*)lttn-ust
   mold
diff --git a/libraries/qt6/desktop/assistant-qt6.desktop b/libraries/qt6/desktop/assistant-qt6.desktop
new file mode 100644
index 0000000000..32a48bd1cd
--- /dev/null
+++ b/libraries/qt6/desktop/assistant-qt6.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Qt6 Assistant
+Comment=Shows Qt6 documentation and examples
+Exec=/usr/lib@LIBDIR@/qt6/bin/assistant
+Icon=assistant-qt6
+Terminal=false
+Type=Application
+Categories=Qt;Development;Documentation;
diff --git a/libraries/qt6/desktop/designer-qt6.desktop b/libraries/qt6/desktop/designer-qt6.desktop
new file mode 100644
index 0000000000..3287bad25f
--- /dev/null
+++ b/libraries/qt6/desktop/designer-qt6.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Qt6 Designer
+GenericName=Interface Designer
+Comment=Design GUIs for Qt6 applications
+Exec=/usr/lib@LIBDIR@/qt6/bin/designer
+Icon=designer-qt6
+MimeType=application/x-designer;
+Terminal=false
+Type=Application
+Categories=Qt;Development;
diff --git a/libraries/qt6/desktop/linguist-qt6.desktop b/libraries/qt6/desktop/linguist-qt6.desktop
new file mode 100644
index 0000000000..837a24cf77
--- /dev/null
+++ b/libraries/qt6/desktop/linguist-qt6.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt6 Linguist
+Comment=Add translations to Qt6 applications
+Exec=/usr/lib@LIBDIR@/qt6/bin/linguist
+Icon=linguist-qt6
+MimeType=text/vnd.trolltech.linguist;application/x-linguist;
+Terminal=false
+Type=Application
+Categories=Qt;Development;
diff --git a/libraries/qt6/desktop/qdbusviewer-qt6.desktop b/libraries/qt6/desktop/qdbusviewer-qt6.desktop
new file mode 100644
index 0000000000..7ec65d117b
--- /dev/null
+++ b/libraries/qt6/desktop/qdbusviewer-qt6.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt6 QDbusViewer 
+GenericName=Qt6 D-Bus Debugger
+Comment=Debug D-Bus applications
+Exec=/usr/lib@LIBDIR@/qt6/bin/qdbusviewer
+Icon=qdbusviewer-qt6
+Terminal=false
+Type=Application
+Categories=Qt;Development;Debugger;
diff --git a/libraries/qt6/doinst.sh b/libraries/qt6/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/libraries/qt6/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/libraries/qt6/profile.d/qt6.csh b/libraries/qt6/profile.d/qt6.csh
new file mode 100644
index 0000000000..7764724e0d
--- /dev/null
+++ b/libraries/qt6/profile.d/qt6.csh
@@ -0,0 +1,17 @@
+#!/bin/csh
+# Environment path variables for the Qt package:
+if ( ! $?QT6DIR ) then
+    # It's best to use the generic directory to avoid
+    # compiling in a version-containing path:
+    if ( -d /usr/lib@LIBDIRSUFFIX@/qt6 ) then
+        setenv QT6DIR /usr/lib@LIBDIRSUFFIX@/qt6
+    else
+        # Find the newest Qt directory and set $QT6DIR to that:
+        foreach qtd ( /usr/lib@LIBDIRSUFFIX@/qt6-* )
+            if ( -d $qtd ) then
+                setenv QT6DIR $qtd
+            endif
+        end
+    endif
+endif
+set path = ( $path $QT6DIR/bin )
diff --git a/libraries/qt6/profile.d/qt6.sh b/libraries/qt6/profile.d/qt6.sh
new file mode 100644
index 0000000000..70ccbc2faf
--- /dev/null
+++ b/libraries/qt6/profile.d/qt6.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# Environment variables for the Qt package.
+#
+# It's best to use the generic directory to avoid
+# compiling in a version-containing path:
+if [ -d /usr/lib@LIBDIRSUFFIX@/qt6 ]; then
+  QT6DIR=/usr/lib@LIBDIRSUFFIX@/qt6
+else
+  # Find the newest Qt directory and set $QT6DIR to that:
+  for qtd in /usr/lib@LIBDIRSUFFIX@/qt6-* ; do
+    if [ -d $qtd ]; then
+      QT6DIR=$qtd
+    fi
+  done
+fi
+PATH="$PATH:$QT6DIR/bin"
+export QT6DIR
diff --git a/libraries/qt6/qt6.SlackBuild b/libraries/qt6/qt6.SlackBuild
index 4e27d2e820..52e39a7501 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
diff --git a/libraries/qt6/qt6.info b/libraries/qt6/qt6.info
index f6b6c40bb7..f582e159d1 100644
--- a/libraries/qt6/qt6.info
+++ b/libraries/qt6/qt6.info
@@ -1,11 +1,11 @@
 PRGNAM="qt6"
-VERSION="6.3.2"
+VERSION="6.4.0"
 HOMEPAGE="https://qt.io"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.qt.io/official_releases/qt/6.3/6.3.2/single/qt-everywhere-src-6.3.2.tar.xz \
+DOWNLOAD_x86_64="https://download.qt.io/official_releases/qt/6.4/6.4.0/single/qt-everywhere-src-6.4.0.tar.xz \
                  https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_130-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
-MD5SUM_x86_64="bc928a9897698ec397b11c3dbff40e53 \
+MD5SUM_x86_64="b45c32495e87cffa4739b24b5d062c50 \
                1eb94ba35df4aa217cf485086215182a"
 REQUIRES="double-conversion html5lib md4c nodejs p7zip"
 MAINTAINER="Steven Voges"