ponce

qt6 diff

Jan 31st, 2023 (edited)
1,827
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 3.35 KB | None | 0 0
  1. diff -Naur qt6.orig/README qt6/README
  2. --- qt6.orig/README     2022-08-27 17:57:06.135909605 +0200
  3. +++ qt6/README  2023-01-31 18:49:06.666436000 +0100
  4. @@ -31,3 +31,9 @@
  5.  Qt6 will autodetect and build against multiple external programs and
  6.  libraries. To see a list of optional dependencies, please consult
  7.  README.SLACKWARE
  8. +
  9. +Qt6 can take substantial time to build and ninja automatically uses
  10. +all of your cpus power to speed up this process: if for some reason
  11. +this ends up trashing the machine on which you are building it you
  12. +can export the environment variable CMAKE_BUILD_PARALLEL_LEVEL to
  13. +set an appropriate number of parallel jobs.
  14. diff -Naur qt6.orig/qt6.SlackBuild qt6/qt6.SlackBuild
  15. --- qt6.orig/qt6.SlackBuild     2022-11-05 15:20:04.532778378 +0100
  16. +++ qt6/qt6.SlackBuild  2023-01-31 18:29:33.023436000 +0100
  17. @@ -2,7 +2,7 @@
  18.  
  19.  # Slackware build script for qt6
  20.  
  21. -# Copyright 2022 Steven Voges <Oregon, USA>
  22. +# Copyright 2022-2023 Steven Voges <Oregon, USA>
  23.  # All rights reserved.
  24.  #
  25.  # Redistribution and use of this script, with or without modification, is
  26. @@ -26,7 +26,7 @@
  27.  
  28.  PRGNAM=qt6
  29.  SRCNAM=qt-everywhere-src
  30. -VERSION=${VERSION:-6.4.0}
  31. +VERSION=${VERSION:-6.4.2}
  32.  BSCLANG=libclang-release_130-based-linux-Ubuntu20.04-gcc9.3-x86_64
  33.  CCACHE=${CCACHE:-OFF}
  34.  EXAMPLES=${EXAMPLES:-OFF}
  35. @@ -119,12 +119,16 @@
  36.      -DQT_BUILD_EXAMPLES=$EXAMPLES \
  37.      -DQT_USE_CCACHE=$CCACHE \
  38.      -DCMAKE_BUILD_TYPE=Release ..
  39. -  cmake --build . --parallel
  40. +  cmake --build .
  41.    DESTDIR=$PKG cmake --install . --strip
  42.  cd ..
  43.  
  44. -mv $PKG/usr/phrasebooks $PKG/usr/share/$PRGNAM/
  45. -# mv $PKG/usr/resources $PKG/usr/share/$PRGNAM/
  46. +if [ -d "$PKG/usr/phrasebooks" ]; then
  47. +  mv $PKG/usr/phrasebooks $PKG/usr/share/$PRGNAM/
  48. +fi
  49. +if [ -d "$PKG/usr/resources" ]; then
  50. +  mv $PKG/usr/resources $PKG/usr/share/$PRGNAM/
  51. +fi
  52.  
  53.  if [ "$EXAMPLES" = "ON" ]; then
  54.    find -L $PKG/usr/doc/$PRGNAM-$VERSION/examples \
  55. @@ -141,10 +145,10 @@
  56.  done
  57.  sed -i "s|@LIBDIR@|$LIBDIRSUFFIX|" $PKG/usr/share/applications/*
  58.  
  59. -# Install symlinks to the Qt6 binaries in the $PATH (avoid the ones already ending in "6"):
  60. +# Install symlinks to the Qt6 binaries in the $PATH (avoid the ones already ending in "6" or "cmake"):
  61.  mkdir -p $PKG/usr/bin
  62.  for FILE in $PKG/usr/lib${LIBDIRSUFFIX}/qt6/bin/* ; do
  63. -  if ! [[ $FILE =~ 6$ ]]; then
  64. +  if ! [[ $FILE =~ (6$|cmake$) ]]; then
  65.      ln -s ../lib${LIBDIRSUFFIX}/qt6/bin/$(basename $FILE) $PKG/usr/bin/$(basename $FILE)-qt6
  66.    fi
  67.  done
  68. diff -Naur qt6.orig/qt6.info qt6/qt6.info
  69. --- qt6.orig/qt6.info   2022-11-05 15:20:04.533778428 +0100
  70. +++ qt6/qt6.info        2023-01-26 04:50:46.000000000 +0100
  71. @@ -1,11 +1,11 @@
  72.  PRGNAM="qt6"
  73. -VERSION="6.4.0"
  74. +VERSION="6.4.2"
  75.  HOMEPAGE="https://qt.io"
  76.  DOWNLOAD="UNSUPPORTED"
  77.  MD5SUM=""
  78. -DOWNLOAD_x86_64="https://download.qt.io/official_releases/qt/6.4/6.4.0/single/qt-everywhere-src-6.4.0.tar.xz \
  79. +DOWNLOAD_x86_64="https://download.qt.io/official_releases/qt/6.4/6.4.2/single/qt-everywhere-src-6.4.2.tar.xz \
  80.                   https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_130-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
  81. -MD5SUM_x86_64="b45c32495e87cffa4739b24b5d062c50 \
  82. +MD5SUM_x86_64="15e2530292b65a2b3dc23fc03f140796 \
  83.                 1eb94ba35df4aa217cf485086215182a"
  84.  REQUIRES="double-conversion html5lib md4c nodejs p7zip"
  85.  MAINTAINER="Steven Voges"
Advertisement