diff --git a/common/shlibs b/common/shlibs index 1b284ac33ef..3ba44093b45 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1982,6 +1982,22 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1 libfm-qt.so.9 libfm-qt-0.17.0_1 libqtermwidget5.so.0 qtermwidget-0.6.0_1 +libQt6Core.so.6 qt6-core-6.0.0_1 +libQt6OpenGL.so.6 qt6-gui-6.0.0_1 +libQt6DBus.so.6 qt6-dbus-6.0.0_1 +libQt6PrintSupport.so.6 qt6-printsupport-6.0.0_1 +libQt6Concurrent.so.6 qt6-concurrent-6.0.0_1 +libQt6Widgets.so.6 qt6-widgets-6.0.0_1 +libQt6Network.so.6 qt6-network-6.0.0_1 +libQt6Sql.so.6 qt6-sql-6.0.0_1 +libQt6Xml.so.6 qt6-xml-6.0.0_1 +libQt6Gui.so.6 qt6-gui-6.0.0_1 +libQt6XcbQpa.so.6 qt6-gui-6.0.0_1 +libQt6EglFSDeviceIntegration.so.6 qt6-gui-6.0.0_1 +libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1 +libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1 +libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1 +libQt6Test.so.6 qt6-test-6.0.0_1 libnpth.so.0 npth-1.1_1 libnpupnp.so.4 libnpupnp-4.0.2_1 libglfw.so.3 glfw-3.0.4_1 diff --git a/srcpkgs/qt6-base-devel b/srcpkgs/qt6-base-devel new file mode 120000 index 00000000000..8ddee598d5e --- /dev/null +++ b/srcpkgs/qt6-base-devel @@ -0,0 +1 @@ +qt6-base \ No newline at end of file diff --git a/srcpkgs/qt6-base-doc b/srcpkgs/qt6-base-doc new file mode 120000 index 00000000000..8ddee598d5e --- /dev/null +++ b/srcpkgs/qt6-base-doc @@ -0,0 +1 @@ +qt6-base \ No newline at end of file diff --git a/srcpkgs/qt6-base/patches/add-the-D.patch b/srcpkgs/qt6-base/patches/add-the-D.patch new file mode 100644 index 00000000000..94d2fc03030 --- /dev/null +++ b/srcpkgs/qt6-base/patches/add-the-D.patch @@ -0,0 +1,15 @@ +--- cmake/FindWrapAtomic.cmake 2021-04-30 11:31:33.000000000 +0200 ++++ - 2021-05-06 15:56:49.553742705 +0200 +@@ -31,9 +31,9 @@ + check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC) + if(NOT HAVE_STDATOMIC) +- set(_req_libraries "${CMAKE_REQUIRE_LIBRARIES}") +- set(CMAKE_REQUIRE_LIBRARIES "atomic") ++ set(_req_libraries "${CMAKE_REQUIRED_LIBRARIES}") ++ set(CMAKE_REQUIRED_LIBRARIES "atomic") + check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC_WITH_LIB) +- set(CMAKE_REQUIRE_LIBRARIES "${_req_libraries}") ++ set(CMAKE_REQUIRED_LIBRARIES "${_req_libraries}") + endif() + + add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED) diff --git a/srcpkgs/qt6-base/patches/musl-limits.patch b/srcpkgs/qt6-base/patches/musl-limits.patch new file mode 100644 index 00000000000..54f96779b31 --- /dev/null +++ b/srcpkgs/qt6-base/patches/musl-limits.patch @@ -0,0 +1,20 @@ +--- qmake/library/ioutils.cpp 2020-09-24 17:55:53.000000000 +0200 ++++ - 2020-10-07 22:40:03.905629969 +0200 +@@ -40,6 +40,7 @@ + # include + # include + # include ++# include + # include + #endif + +--- src/corelib/io/qstorageinfo_unix.cpp 2020-09-24 17:55:53.000000000 +0200 ++++ - 2020-10-07 22:42:32.333434381 +0200 +@@ -58,6 +58,7 @@ + # include + # include + #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD) ++# include + # include + # include + # include diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template new file mode 100644 index 00000000000..c720e7f5167 --- /dev/null +++ b/srcpkgs/qt6-base/template @@ -0,0 +1,188 @@ +# Template file for 'qt6-base' +pkgname=qt6-base +version=6.1.0 +revision=1 +wrksrc="qtbase-everywhere-src-${version}" +build_style=cmake +configure_args="-DINSTALL_DATADIR=share/qt6 + -DINSTALL_ARCHDATADIR=lib/qt6 + -DINSTALL_BINDIR=lib/qt6/bin + -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs + -DINSTALL_INCLUDEDIR=include/qt6 + -DINSTALL_SYSCONFDIR=/etc/xdg + -DQT_FEATURE_openssl_linked=ON + -DQT_FEATURE_system_sqlite=ON + -DBUILD_WITH_PCH=OFF" +hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel" +makedepends="zlib-devel libzstd-devel dbus-devel + double-conversion-devel glib-devel libxcb-devel + xcb-util-image-devel xcb-util-keysyms-devel + xcb-util-renderutil-devel xcb-util-wm-devel + MesaLib-devel pcre2-devel icu-devel mtdev-devel harfbuzz-devel + libpng-devel tslib-devel libinput-devel gtk+3-devel + libmariadbclient-devel postgresql-libs-devel libatomic-devel + unixodbc-devel cups-devel libproxy-devel brotli-devel + sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader" +short_desc="Cross-platform application and UI framework (QT6)" +maintainer="John " +license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" +homepage="https://www.qt.io" +distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz" +checksum=f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4 +python_version=3 + +if [ "$CROSS_BUILD" ]; then + # QtSetup fails native builds if this is set + configure_args+=" -DQT_HOST_PATH=/usr + -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true" +fi + +qt6-gui_package() { + short_desc+=" - Gui" + pkg_install() { + vmove "usr/lib/libQt6Gui.so.*" + vmove "usr/lib/libQt6XcbQpa.so.*" + vmove "usr/lib/libQt6EglFSDeviceIntegration.so.*" + vmove "usr/lib/libQt6EglFsKmsGbmSupport.so.*" + vmove "usr/lib/libQt6EglFsKmsSupport.so.*" + vmove "usr/lib/libQt6OpenGL.so.*" + vmove usr/lib/qt6/plugins/generic + vmove usr/lib/qt6/plugins/platforms + vmove usr/lib/qt6/plugins/xcbglintegrations + vmove usr/lib/qt6/plugins/imageformats + vmove usr/lib/qt6/plugins/egldeviceintegrations + vmove usr/lib/qt6/plugins/platforminputcontexts + vmove usr/lib/qt6/plugins/platformthemes + } +} + +qt6-opengl-widgets_package() { + short_desc+=" - OpenGL Widgets" + pkg_install() { + vmove "usr/lib/libQt6OpenGLWidgets.so.*" + } +} + +qt6-dbus_package() { + short_desc+=" - DBus" + pkg_install() { + vmove "usr/lib/libQt6DBus.so.*" + } +} + +qt6-core_package() { + short_desc+=" - Core" + pkg_install() { + vmove "usr/lib/libQt6Core.so.*" + } +} + +qt6-printsupport_package() { + short_desc+=" - Print Support" + pkg_install() { + vmove "usr/lib/libQt6PrintSupport.so.*" + vmove usr/lib/qt6/plugins/printsupport + } +} + +qt6-concurrent_package() { + short_desc+=" - Concurrency" + pkg_install() { + vmove "usr/lib/libQt6Concurrent.so.*" + } +} + +qt6-widgets_package() { + short_desc+=" - Widgets" + pkg_install() { + vmove "usr/lib/libQt6Widgets.so.*" + } +} + +qt6-network_package() { + short_desc+=" - Network" + pkg_install() { + vmove "usr/lib/libQt6Network.so.*" + } +} + +qt6-sql_package() { + short_desc+=" - Sql" + pkg_install() { + vmove "usr/lib/libQt6Sql.so.*" + } +} + +qt6-test_package() { + short_desc+=" - Test" + pkg_install() { + vmove "usr/lib/libQt6Test.so*" + } +} + +qt6-xml_package() { + short_desc+=" - Xml" + pkg_install() { + vmove "usr/lib/libQt6Xml.so.*" + } +} + +qt6-base-doc_package() { + short_desc+=" - Documentation" + pkg_install() { + vmove usr/share/qt6/doc + } +} + + +qt6-plugin-odbc_package() { + short_desc+=" - ODBC plugin" + pkg_install() { + vmove usr/lib/qt6/plugins/sqldrivers/libqsqlodbc.so + } +} + +qt6-plugin-pgsql_package() { + short_desc+=" - PostgreSQL plugin" + pkg_install() { + vmove usr/lib/qt6/plugins/sqldrivers/libqsqlpsql.so + } +} + +qt6-plugin-mysql_package() { + short_desc+=" - MySQL plugin" + pkg_install() { + vmove usr/lib/qt6/plugins/sqldrivers/libqsqlmysql.so + } +} + +qt6-plugin-sqlite_package() { + short_desc+=" - SQLite plugin" + pkg_install() { + vmove usr/lib/qt6/plugins/sqldrivers/libqsqlite.so + } +} + +qt6-base-devel_package() { + short_desc+=" - Development files" + depends="qt6-base>=${version}_${revision} + qt6-gui>=${version}_${revision} + qt6-core>=${version}_${revision} + qt6-widgets>=${version}_${revision} + qt6-opengl-widgets>=${version}_${revision} + qt6-printsupport>=${version}_${revision} + qt6-concurrent>=${version}_${revision} + qt6-sql>=${version}_${revision} + qt6-test>=${version}_${revision} + qt6-network>=${version}_${revision} + qt6-xml>=${version}_${revision} + ${makedepends}" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/qt6/mkspecs + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + vmove "usr/lib/*.prl" + } +} diff --git a/srcpkgs/qt6-base/update b/srcpkgs/qt6-base/update new file mode 100644 index 00000000000..84455246522 --- /dev/null +++ b/srcpkgs/qt6-base/update @@ -0,0 +1 @@ +pkgname="${pkgname/6-/}-everywhere-src" diff --git a/srcpkgs/qt6-concurrent b/srcpkgs/qt6-concurrent new file mode 120000 index 00000000000..8ddee598d5e --- /dev/null +++ b/srcpkgs/qt6-concurrent @@ -0,0 +1 @@ +qt6-base \ No newline at end of file diff --git a/srcpkgs/qt6-core b/srcpkgs/qt6-core new file mode 120000 index 00000000000..8ddee598d5e --- /dev/null +++ b/srcpkgs/qt6-core @@ -0,0 +1 @@ +qt6-base \ No newline at end of file diff --git a/srcpkgs/qt6-dbus b/srcpkgs/qt6-dbus new file mode 120000 index 00000000000..8ddee598d5e --- /dev/null +++ b/srcpkgs/qt6-dbus @@ -0,0 +1 @@ +qt6-base \ No newline at end of file diff --git a/srcpkgs/qt6-gui b/srcpkgs/qt6-gui new file mode 120000 index 00000000000..8ddee598d5e --- /dev/null +++ b/srcpkgs/qt6-gui @@ -0,0 +1 @@ +qt6-base \ No newline at end of file diff --git a/srcpkgs/qt6-network b/srcpkgs/qt6-network new file mode 120000 index 00000000000..8ddee598d5e --- /dev/null +++ b/srcpkgs/qt6-network @@ -0,0 +1 @@ +qt6-base \ No newline at end of file diff --git a/srcpkgs/qt6-opengl-widgets b/srcpkgs/qt6-opengl-widgets new file mode 120000 index 00000000000..8ddee598d5e --- /dev/null +++ b/srcpkgs/qt6-opengl-widgets @@ -0,0 +1 @@ +qt6-base \ No newline at end of file diff --git a/srcpkgs/qt6-plugin-mysql b/srcpkgs/qt6-plugin-mysql new file mode 120000 index 00000000000..8ddee598d5e --- /dev/null +++ b/srcpkgs/qt6-plugin-mysql @@ -0,0 +1 @@ +qt6-base \ No newline at end of file diff --git a/srcpkgs/qt6-plugin-odbc b/srcpkgs/qt6-plugin-odbc new file mode 120000 index 00000000000..8ddee598d5e --- /dev/null +++ b/srcpkgs/qt6-plugin-odbc @@ -0,0 +1 @@ +qt6-base \ No newline at end of file diff --git a/srcpkgs/qt6-plugin-pgsql b/srcpkgs/qt6-plugin-pgsql new file mode 120000 index 00000000000..8ddee598d5e --- /dev/null +++ b/srcpkgs/qt6-plugin-pgsql @@ -0,0 +1 @@ +qt6-base \ No newline at end of file diff --git a/srcpkgs/qt6-plugin-sqlite b/srcpkgs/qt6-plugin-sqlite new file mode 120000 index 00000000000..8ddee598d5e --- /dev/null +++ b/srcpkgs/qt6-plugin-sqlite @@ -0,0 +1 @@ +qt6-base \ No newline at end of file diff --git a/srcpkgs/qt6-printsupport b/srcpkgs/qt6-printsupport new file mode 120000 index 00000000000..8ddee598d5e --- /dev/null +++ b/srcpkgs/qt6-printsupport @@ -0,0 +1 @@ +qt6-base \ No newline at end of file diff --git a/srcpkgs/qt6-sql b/srcpkgs/qt6-sql new file mode 120000 index 00000000000..8ddee598d5e --- /dev/null +++ b/srcpkgs/qt6-sql @@ -0,0 +1 @@ +qt6-base \ No newline at end of file diff --git a/srcpkgs/qt6-test b/srcpkgs/qt6-test new file mode 120000 index 00000000000..8ddee598d5e --- /dev/null +++ b/srcpkgs/qt6-test @@ -0,0 +1 @@ +qt6-base \ No newline at end of file diff --git a/srcpkgs/qt6-widgets b/srcpkgs/qt6-widgets new file mode 120000 index 00000000000..8ddee598d5e --- /dev/null +++ b/srcpkgs/qt6-widgets @@ -0,0 +1 @@ +qt6-base \ No newline at end of file diff --git a/srcpkgs/qt6-xml b/srcpkgs/qt6-xml new file mode 120000 index 00000000000..8ddee598d5e --- /dev/null +++ b/srcpkgs/qt6-xml @@ -0,0 +1 @@ +qt6-base \ No newline at end of file