pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

update the qt6 packages to version 6.0.1

Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By:	nros
Date:		Fri Feb 5 13:23:58 2021 +0000
Changeset:	bb454595efaa9f1c5350345cd93871eed327ab98

Modified Files:
	qt6-qtbase/Makefile
	qt6-qtbase/PLIST
	qt6-qtbase/distinfo
	qt6-qtbase/patches/patch-src_gui_configure.cmake
	qt6-qtsvg/distinfo
	qt6/Makefile.common

Log Message:
update the qt6 packages to version 6.0.1

changes from release notes:
about 200 bug fixes.

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

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

diffstat:
 qt6-qtbase/Makefile                              |  3 +++
 qt6-qtbase/PLIST                                 |  5 ++++-
 qt6-qtbase/distinfo                              | 10 +++++-----
 qt6-qtbase/patches/patch-src_gui_configure.cmake | 17 ++++++-----------
 qt6-qtsvg/distinfo                               |  8 ++++----
 qt6/Makefile.common                              |  2 +-
 6 files changed, 23 insertions(+), 22 deletions(-)

diffs:
diff --git a/qt6-qtbase/Makefile b/qt6-qtbase/Makefile
index ae8e36d98e..613f43ae55 100644
--- a/qt6-qtbase/Makefile
+++ b/qt6-qtbase/Makefile
@@ -48,6 +48,8 @@ CONFIGURE_ENV+=		MAKEFLAGS=-j${MAKE_JOBS}
 .  endif
 .endif
 
+USE_TOOLS+=		bash:run
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} != "Darwin"
@@ -115,6 +117,7 @@ LDFLAGS.FreeBSD+=		-lutil
 REPLACE_PERL+=		bin/fixqt4headers.pl
 REPLACE_PERL+=		bin/syncqt.pl
 REPLACE_PERL+=		mkspecs/features/data/unix/findclasslist.pl
+REPLACE_BASH+=		util/android/android_emulator_launcher.sh
 
 PTHREAD_OPTS+=		require
 UNLIMIT_RESOURCES=	datasize
diff --git a/qt6-qtbase/PLIST b/qt6-qtbase/PLIST
index 5efb30ec7a..b6c06c6e6c 100644
--- a/qt6-qtbase/PLIST
+++ b/qt6-qtbase/PLIST
@@ -2634,6 +2634,7 @@ qt6/lib/cmake/Qt6/Qt6ConfigVersion.cmake
 qt6/lib/cmake/Qt6/Qt6Dependencies.cmake
 qt6/lib/cmake/Qt6/Qt6Targets.cmake
 qt6/lib/cmake/Qt6/Qt6VersionlessTargets.cmake
+qt6/lib/cmake/Qt6/QtAndroidHelpers.cmake
 qt6/lib/cmake/Qt6/QtAppHelpers.cmake
 qt6/lib/cmake/Qt6/QtAutogenHelpers.cmake
 qt6/lib/cmake/Qt6/QtBuild.cmake
@@ -2704,7 +2705,6 @@ qt6/lib/cmake/Qt6/QtWrapperScriptHelpers.cmake
 qt6/lib/cmake/Qt6/QtWriteArgsFile.cmake
 qt6/lib/cmake/Qt6/qt.toolchain.cmake
 qt6/lib/cmake/Qt6BuildInternals/Qt6BuildInternalsConfig.cmake
-qt6/lib/cmake/Qt6BuildInternals/QtBuildInternalsAndroid.cmake
 qt6/lib/cmake/Qt6BuildInternals/QtBuildInternalsExtra.cmake
 qt6/lib/cmake/Qt6BuildInternals/QtStandaloneTestTemplateProject/CMakeLists.txt
 qt6/lib/cmake/Qt6BuildInternals/StandaloneTests/QtBaseTestsConfig.cmake
@@ -3099,6 +3099,9 @@ qt6/lib/metatypes/qt6core_qobject_release_metatypes.json
 qt6/lib/metatypes/qt6core_release_metatypes.json
 qt6/lib/metatypes/qt6gui_release_metatypes.json
 qt6/lib/metatypes/qt6widgets_release_metatypes.json
+qt6/libexec/android_cmakelist_patcher.sh
+qt6/libexec/android_emulator_launcher.sh
+qt6/libexec/ensure_pro_file.cmake
 qt6/libexec/syncqt.pl
 qt6/mkspecs/aix-g++-64/qmake.conf
 qt6/mkspecs/aix-g++-64/qplatformdefs.h
diff --git a/qt6-qtbase/distinfo b/qt6-qtbase/distinfo
index 38546d9d59..128cb83091 100644
--- a/qt6-qtbase/distinfo
+++ b/qt6-qtbase/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (qtbase-everywhere-src-6.0.0.tar.xz) = 01b05dba35f5ed230ae402fde71ac1b5ff3c999b
-RMD160 (qtbase-everywhere-src-6.0.0.tar.xz) = d1eef5f53909afecdf30be9d5a468085938dd626
-SHA512 (qtbase-everywhere-src-6.0.0.tar.xz) = 0b32e38394c25577ab7746d36b8b96bdae9491395cd471887f56a62be6de533393056e9bc8c5219a7791e238bde3cdcc32f1f59b2d015fdc16260edf866fdafb
-Size (qtbase-everywhere-src-6.0.0.tar.xz) = 46234820 bytes
+SHA1 (qtbase-everywhere-src-6.0.1.tar.xz) = 1cd91a1696b8e4b59483a271aa7f9fde22a95ecb
+RMD160 (qtbase-everywhere-src-6.0.1.tar.xz) = 2b3a5bc8834c3330ac4194eaaaedb327faeb9c3d
+SHA512 (qtbase-everywhere-src-6.0.1.tar.xz) = 69a24162239f19e8eb889d51662c6cea3869ad7e53a889fe16c35083840fde8c90053b0f943129c82066364eea0ec94eb86d91d3293ef874e100476dad10a998
+Size (qtbase-everywhere-src-6.0.1.tar.xz) = 46262020 bytes
 SHA1 (patch-cmake_QtBuild.cmake) = 9e51c025686de3b1a383056eb6c61b0884349b57
 SHA1 (patch-cmake_QtPlatformSupport.cmake) = 597c57d1acd2798e2f8393c6fd391721c2f54f41
 SHA1 (patch-configure) = f5019131cc4e6cd4e35242cc7b598fbf8f5f766b
@@ -21,7 +21,7 @@ SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 9919194e9f6b47f1f311b8f8223a
 SHA1 (patch-src_corelib_thread_qmutex__p.h) = 093089b8a37baa3071257c99bbde5f6295bd2eec
 SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 9dffdbfc81bc7d3259020cd32b4039b7be6ee2bd
 SHA1 (patch-src_gui_CMakeLists.txt) = 927c4fe13b26a0800d2b08299b01b1fed3b6c51f
-SHA1 (patch-src_gui_configure.cmake) = 64c5ab4e9e3c6c8384ae0ac2d94a7ad96138de42
+SHA1 (patch-src_gui_configure.cmake) = 11cdf5ba1b0628a3b6efebd8293658f1e7fc45fd
 SHA1 (patch-src_gui_kernel_qopenglcontext__platform.h) = 13f6c1c91f1ad3ca5a5090fd21d01f8e0c887251
 SHA1 (patch-src_gui_kernel_qplatformopenglcontext.h) = adbdbb18e2a6699454c042d4b1232a56eb35d1ab
 SHA1 (patch-src_gui_platform_unix_qunixnativeinterface.cpp) = 7bc8bd78c6c6f4ec70526f2efaff2551acb3697a
diff --git a/qt6-qtbase/patches/patch-src_gui_configure.cmake b/qt6-qtbase/patches/patch-src_gui_configure.cmake
index ad1e89a2d7..5dad15e959 100644
--- a/qt6-qtbase/patches/patch-src_gui_configure.cmake
+++ b/qt6-qtbase/patches/patch-src_gui_configure.cmake
@@ -5,7 +5,7 @@ $NetBSD$
   on other platforms than linux
 * Fix use of system libmd4c
 
---- src/gui/configure.cmake.orig	2020-12-04 10:14:27.000000000 +0000
+--- src/gui/configure.cmake.orig	2021-01-26 18:29:22.000000000 +0000
 +++ src/gui/configure.cmake
 @@ -41,6 +41,7 @@ qt_find_package(gbm PROVIDED_TARGETS gbm
  qt_find_package(WrapSystemHarfbuzz 2.6.0 PROVIDED_TARGETS WrapSystemHarfbuzz::WrapSystemHarfbuzz MODULE_NAME gui QMAKE_LIB harfbuzz)
@@ -15,7 +15,7 @@ $NetBSD$
  qt_find_package(WrapSystemPNG PROVIDED_TARGETS WrapSystemPNG::WrapSystemPNG MODULE_NAME gui QMAKE_LIB libpng)
  if(QT_FEATURE_system_zlib)
      qt_add_qmake_lib_dependency(libpng zlib)
-@@ -53,82 +54,82 @@ qt_find_package(Vulkan PROVIDED_TARGETS 
+@@ -53,78 +54,78 @@ qt_find_package(Vulkan PROVIDED_TARGETS 
  if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
      qt_find_package(Wayland PROVIDED_TARGETS Wayland::Server MODULE_NAME gui QMAKE_LIB wayland_server)
  endif()
@@ -37,15 +37,10 @@ $NetBSD$
  endif()
  qt_add_qmake_lib_dependency(xcb_icccm xcb)
 -if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
-+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
-     qt_find_package(XCB 0.3.9 COMPONENTS UTIL PROVIDED_TARGETS XCB::UTIL MODULE_NAME gui QMAKE_LIB xcb_util)
- endif()
- qt_add_qmake_lib_dependency(xcb_util xcb)
--if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
 +if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
      qt_find_package(XCB 0.3.9 COMPONENTS IMAGE PROVIDED_TARGETS XCB::IMAGE MODULE_NAME gui QMAKE_LIB xcb_image)
  endif()
- qt_add_qmake_lib_dependency(xcb_image xcb_shm xcb_util xcb)
+ qt_add_qmake_lib_dependency(xcb_image xcb_shm xcb)
 -if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
 +if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
      qt_find_package(XCB 0.3.9 COMPONENTS KEYSYMS PROVIDED_TARGETS XCB::KEYSYMS MODULE_NAME gui QMAKE_LIB xcb_keysyms)
@@ -67,7 +62,7 @@ $NetBSD$
  endif()
  qt_add_qmake_lib_dependency(xcb_shape xcb)
 -if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
-+if((X11_PLATFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
++if((X11_PLARFORM) OR QT_FIND_ALL_PACKAGES_ALWAYS)
      qt_find_package(XCB COMPONENTS SHM PROVIDED_TARGETS XCB::SHM MODULE_NAME gui QMAKE_LIB xcb_shm)
  endif()
  qt_add_qmake_lib_dependency(xcb_shm xcb)
@@ -119,7 +114,7 @@ $NetBSD$
      qt_find_package(XRender 0.6 PROVIDED_TARGETS PkgConfig::XRender MODULE_NAME gui QMAKE_LIB xrender)
  endif()
  qt_add_qmake_lib_dependency(xrender xlib)
-@@ -897,7 +898,7 @@ qt_feature("xcb-glx-plugin" PRIVATE
+@@ -891,7 +892,7 @@ qt_feature("xcb-glx-plugin" PRIVATE
      CONDITION QT_FEATURE_xcb_xlib AND QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2
      EMIT_IF QT_FEATURE_xcb
  )
@@ -128,7 +123,7 @@ $NetBSD$
      LABEL "  XCB GLX"
      CONDITION XCB_GLX_FOUND
      EMIT_IF QT_FEATURE_xcb AND QT_FEATURE_xcb_glx_plugin
-@@ -963,7 +964,7 @@ qt_feature("textmarkdownreader" PUBLIC
+@@ -957,7 +958,7 @@ qt_feature("textmarkdownreader" PUBLIC
  qt_feature("system-textmarkdownreader" PUBLIC
      SECTION "Kernel"
      LABEL "  Using system libmd4c"
diff --git a/qt6-qtsvg/distinfo b/qt6-qtsvg/distinfo
index b514670911..7a326089ba 100644
--- a/qt6-qtsvg/distinfo
+++ b/qt6-qtsvg/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (qtsvg-everywhere-src-6.0.0.tar.xz) = f5ce0a091072ddfd48fe923f33aa258c5f728cf9
-RMD160 (qtsvg-everywhere-src-6.0.0.tar.xz) = 16fc3ab0c3816ccd459879e2f8caa95c9f69e451
-SHA512 (qtsvg-everywhere-src-6.0.0.tar.xz) = 0ab31f746bb5503059a5779d7f084ada59c7a4c7d391b44e7c5ae8b38f4e762d7a67b128efb4877a1953c8896380f00336e0d918e005ea3862cbd5479a6ac86c
-Size (qtsvg-everywhere-src-6.0.0.tar.xz) = 1652364 bytes
+SHA1 (qtsvg-everywhere-src-6.0.1.tar.xz) = d344f50645561868c16d450301da7ca78c9246aa
+RMD160 (qtsvg-everywhere-src-6.0.1.tar.xz) = bd5dcc02860b5aa761424dd68afa0ea252b36c3c
+SHA512 (qtsvg-everywhere-src-6.0.1.tar.xz) = 2c132bb8aaaa50a935c9d4cbeee0a73ae19c69671398cfe69f411a31172cef36172649943fcb507135f9abdecb188ada1ba25aa0c09654b9842e1a17fa5d4db6
+Size (qtsvg-everywhere-src-6.0.1.tar.xz) = 1652556 bytes
diff --git a/qt6/Makefile.common b/qt6/Makefile.common
index 06cf6eec25..1fe0763771 100644
--- a/qt6/Makefile.common
+++ b/qt6/Makefile.common
@@ -2,7 +2,7 @@
 # used by x11/qt5-qtbase/Makefile.common
 # used by inputmethod/qt5-uim/Makefile
 
-QTVERSION=	6.0.0
+QTVERSION=	6.0.1
 
 .include "../../mk/bsd.prefs.mk"
Home | Main Index | Thread Index | Old Index