From 8dbcfd6cb5da586b675b7aea4ce6d09b43f8b739 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 8 Oct 2020 16:47:01 +0200 Subject: [PATCH 01/12] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake --- common/build-style/cmake.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh index 136312ed7b4..0b393049f0d 100644 --- a/common/build-style/cmake.sh +++ b/common/build-style/cmake.sh @@ -54,7 +54,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) SET(wxWidgets_CONFIG_EXECUTABLE ${XBPS_WRAPPERDIR}/${wx_config:=wx-config}) _EOF - cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake" + cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake" fi cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr" cmake_args+=" -DCMAKE_BUILD_TYPE=Release" From 22a39d8d04458bcaf79f3f4b086c838cbb02c059 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 8 Oct 2020 20:40:31 +0200 Subject: [PATCH 02/12] New package: qt6-base-6.0.0 --- common/shlibs | 18 ++ srcpkgs/qt6-base-devel | 1 + srcpkgs/qt6-base-docs | 1 + srcpkgs/qt6-base/patches/musl-limits.patch | 20 +++ srcpkgs/qt6-base/template | 198 +++++++++++++++++++++ srcpkgs/qt6-concurrent | 1 + srcpkgs/qt6-core | 1 + srcpkgs/qt6-dbus | 1 + srcpkgs/qt6-gui | 1 + srcpkgs/qt6-network | 1 + srcpkgs/qt6-opengl-widgets | 1 + srcpkgs/qt6-plugin-mysql | 1 + srcpkgs/qt6-plugin-odbc | 1 + srcpkgs/qt6-plugin-pgsql | 1 + srcpkgs/qt6-plugin-sqlite | 1 + srcpkgs/qt6-printsupport | 1 + srcpkgs/qt6-sql | 1 + srcpkgs/qt6-test | 1 + srcpkgs/qt6-widgets | 1 + srcpkgs/qt6-xml | 1 + 20 files changed, 253 insertions(+) create mode 120000 srcpkgs/qt6-base-devel create mode 120000 srcpkgs/qt6-base-docs create mode 100644 srcpkgs/qt6-base/patches/musl-limits.patch create mode 100644 srcpkgs/qt6-base/template create mode 120000 srcpkgs/qt6-concurrent create mode 120000 srcpkgs/qt6-core create mode 120000 srcpkgs/qt6-dbus create mode 120000 srcpkgs/qt6-gui create mode 120000 srcpkgs/qt6-network create mode 120000 srcpkgs/qt6-opengl-widgets create mode 120000 srcpkgs/qt6-plugin-mysql create mode 120000 srcpkgs/qt6-plugin-odbc create mode 120000 srcpkgs/qt6-plugin-pgsql create mode 120000 srcpkgs/qt6-plugin-sqlite create mode 120000 srcpkgs/qt6-printsupport create mode 120000 srcpkgs/qt6-sql create mode 120000 srcpkgs/qt6-test create mode 120000 srcpkgs/qt6-widgets create mode 120000 srcpkgs/qt6-xml diff --git a/common/shlibs b/common/shlibs index 1b69c8455fc..34f47ab76cb 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2030,6 +2030,24 @@ 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.8 libfm-qt-0.16.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.0alpha_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 +libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0alpha_1 +libQt6WaylandClient.so.6 qt6-wayland-6.0.0alpha_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-docs b/srcpkgs/qt6-base-docs new file mode 120000 index 00000000000..8ddee598d5e --- /dev/null +++ b/srcpkgs/qt6-base-docs @@ -0,0 +1 @@ +qt6-base \ No newline at end of file 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..d5e11d42a07 --- /dev/null +++ b/srcpkgs/qt6-base/template @@ -0,0 +1,198 @@ +# Template file for 'qt6-base' +pkgname=qt6-base +version=6.0.0 +revision=1 +#archs="i686 x86_64" +wrksrc="qtbase-everywhere-src-${version}" +#create_wrksrc=yes +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_USE_CCACHE=ON + -GNinja" +make_cmd=ninja +hostmakedepends="perl pkg-config ninja" +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 libmysqlclient-devel + postgresql-libs-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=ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656 +python_version=3 + +# TODO: fix usage of ccache + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt6-base-devel" + configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true" +fi + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" + # XXX: This should be fixed properly in the build system, + # it alread + configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" +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-docs_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-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 From 0dbb390d04ca411b0189f8587d9c9494495d3807 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 8 Oct 2020 20:40:52 +0200 Subject: [PATCH 03/12] New package: qt6-wayland-6.0.0 --- common/shlibs | 4 ++-- srcpkgs/qt6-wayland-devel | 1 + srcpkgs/qt6-wayland/template | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) create mode 120000 srcpkgs/qt6-wayland-devel create mode 100644 srcpkgs/qt6-wayland/template diff --git a/common/shlibs b/common/shlibs index 34f47ab76cb..70678bfebda 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2046,8 +2046,8 @@ 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 -libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0alpha_1 -libQt6WaylandClient.so.6 qt6-wayland-6.0.0alpha_1 +libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1 +libQt6WaylandClient.so.6 qt6-wayland-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-wayland-devel b/srcpkgs/qt6-wayland-devel new file mode 120000 index 00000000000..c4dec18ea9a --- /dev/null +++ b/srcpkgs/qt6-wayland-devel @@ -0,0 +1 @@ +qt6-wayland \ No newline at end of file diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template new file mode 100644 index 00000000000..0a744febbe2 --- /dev/null +++ b/srcpkgs/qt6-wayland/template @@ -0,0 +1,35 @@ +# Template file for 'qt6-wayland' +pkgname=qt6-wayland +version=6.0.0 +revision=1 +wrksrc="qtwayland-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true + -DQT_USE_CCACHE=ON -GNinja" +make_cmd=ninja +hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja" +# XXX: Qml as optional dep +makedepends="qt6-base-devel wayland-devel libxkbcommon-devel + libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel" +short_desc="Cross-platform application and UI framework (QT6) - Wayland component" +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/qtwayland-everywhere-src-${version}.tar.xz" +checksum=fa3a3110d5a584213fa7f12ee1f6abc19d31907433925b9e2449dee8fba1c588 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt6-wayland-devel" +fi + +qt6-wayland-devel_package() { + depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/qt6/mkspecs + vmove "usr/lib/*.so" + vmove "usr/lib/*.prl" + } +} From 0d1c79e486ab48382f382f4efc3e4c4edc9a5aa2 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 9 Oct 2020 20:34:02 +0200 Subject: [PATCH 04/12] New package: qt6-declarative-6.0.0 --- common/shlibs | 11 +++++++++++ srcpkgs/qt6-declarative-devel | 1 + srcpkgs/qt6-declarative/template | 33 ++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 120000 srcpkgs/qt6-declarative-devel create mode 100644 srcpkgs/qt6-declarative/template diff --git a/common/shlibs b/common/shlibs index 70678bfebda..d792fb83c6a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2048,6 +2048,17 @@ libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1 libQt6Test.so.6 qt6-test-6.0.0_1 libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1 libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1 +libQt6Core5Compat.so.6 qt6-qt5compat-6.0.0_1 +libQt6Svg.so.6 qt6-svg-6.0.0_1 +libQt6SvgWidgets.so.6 qt6-svg-6.0.0_1 +libQt6Qml.so.6 qt6-declarative-6.0.0_1 +libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1 +libQt6QuickTest.so.6 qt6-declarative-6.0.0_1 +libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1 +libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1 +libQt6Quick.so.6 qt6-declarative-6.0.0_1 +libQt6QmlModels.so.6 qt6-declarative-6.0.0_1 +libQt6QuickParticles.so.6 qt6-declarative-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-declarative-devel b/srcpkgs/qt6-declarative-devel new file mode 120000 index 00000000000..fd03a4809f3 --- /dev/null +++ b/srcpkgs/qt6-declarative-devel @@ -0,0 +1 @@ +qt6-declarative \ No newline at end of file diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template new file mode 100644 index 00000000000..46e423b2ce7 --- /dev/null +++ b/srcpkgs/qt6-declarative/template @@ -0,0 +1,33 @@ +# Template file for 'qt6-declarative' +pkgname=qt6-declarative +version=6.0.0 +revision=1 +wrksrc="qtdeclarative-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_USE_CCACHE=ON -GNinja" +make_cmd=ninja +hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja" +makedepends="qt6-base-devel Vulkan-Headers" +short_desc="Cross-platform application and UI framework (QT6) - Declarative component" +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/qtdeclarative-everywhere-src-${version}.tar.xz" +checksum=8535fe31fa3e876b8f2d3954efcdca47b3813adf228c1640608fb9f4c7b2c1a6 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt6-declarative-devel" + configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true" +fi + +qt6-declarative-devel_package() { + depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/qt6/mkspecs + vmove "usr/lib/*.so" + vmove "usr/lib/*.prl" + } +} From 92adab2b78ac23e7d4a7662dba5bc96346558126 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 21 Dec 2020 14:58:17 +0100 Subject: [PATCH 05/12] New package: qt6-qt5compat-6.0.0 --- srcpkgs/qt6-qt5compat-devel | 1 + srcpkgs/qt6-qt5compat/template | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 120000 srcpkgs/qt6-qt5compat-devel create mode 100644 srcpkgs/qt6-qt5compat/template diff --git a/srcpkgs/qt6-qt5compat-devel b/srcpkgs/qt6-qt5compat-devel new file mode 120000 index 00000000000..f88da3a0fe5 --- /dev/null +++ b/srcpkgs/qt6-qt5compat-devel @@ -0,0 +1 @@ +qt6-qt5compat \ No newline at end of file diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template new file mode 100644 index 00000000000..3271557fb61 --- /dev/null +++ b/srcpkgs/qt6-qt5compat/template @@ -0,0 +1,28 @@ +# Template file for 'qt6-qt5compat' +pkgname=qt6-qt5compat +version=6.0.0 +revision=1 +wrksrc="qt5compat-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja" +make_cmd=ninja +hostmakedepends="qt6-base-devel ninja perl" +makedepends="qt6-base-devel" +short_desc="Cross-platform application and UI framework (QT6) - qt6-qt5compat component" +maintainer="John " +license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" +homepage="https://qt.io/" +distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz" +checksum=13b9d78aa698609d07376e3e9e9d1a82a96084236aba0642f8ac695c181ab25f + +qt6-qt5compat-devel_package() { + depends="${sourcepkg}>=${version}_${revision} qt6-base-devel" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/qt6/mkspecs + vmove "usr/lib/*.so" + vmove "usr/lib/*.prl" + } +} From 64664a171a49767824d08166eac827a1993462ac Mon Sep 17 00:00:00 2001 From: John Date: Mon, 21 Dec 2020 15:47:47 +0100 Subject: [PATCH 06/12] New package: qt6-tools-6.0.0 --- srcpkgs/qt6-tools-devel | 1 + srcpkgs/qt6-tools/template | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 120000 srcpkgs/qt6-tools-devel create mode 100644 srcpkgs/qt6-tools/template diff --git a/srcpkgs/qt6-tools-devel b/srcpkgs/qt6-tools-devel new file mode 120000 index 00000000000..d2de59aba45 --- /dev/null +++ b/srcpkgs/qt6-tools-devel @@ -0,0 +1 @@ +qt6-tools \ No newline at end of file diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template new file mode 100644 index 00000000000..be224b6fe75 --- /dev/null +++ b/srcpkgs/qt6-tools/template @@ -0,0 +1,33 @@ +# Template file for 'qt6-tools' +pkgname=qt6-tools +version=6.0.0 +revision=1 +wrksrc="qttools-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja" +make_cmd=ninja +hostmakedepends="qt6-base-devel ninja perl" +makedepends="qt6-base-devel" +short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component" +maintainer="John " +license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" +homepage="https://qt.io/" +distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz" +checksum=b6dc559db447bf394d09dfb238d5c09108f834139a183888179e855c6566bfae + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" + configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" +fi + +qt6-tools-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/qt6/mkspecs + vmove "usr/lib/*.so" + vmove "usr/lib/*.prl" + } +} From e4aeb125ef6c55fcaa39abec1d80f5b6dc95873f Mon Sep 17 00:00:00 2001 From: John Date: Mon, 21 Dec 2020 15:53:22 +0100 Subject: [PATCH 07/12] New package: qt6-svg-6.0.0 --- srcpkgs/qt6-svg-devel | 1 + srcpkgs/qt6-svg/template | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 120000 srcpkgs/qt6-svg-devel create mode 100644 srcpkgs/qt6-svg/template diff --git a/srcpkgs/qt6-svg-devel b/srcpkgs/qt6-svg-devel new file mode 120000 index 00000000000..69c493dbd79 --- /dev/null +++ b/srcpkgs/qt6-svg-devel @@ -0,0 +1 @@ +qt6-svg \ No newline at end of file diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template new file mode 100644 index 00000000000..6959b23856f --- /dev/null +++ b/srcpkgs/qt6-svg/template @@ -0,0 +1,28 @@ +# Template file for 'qt6-svg' +pkgname=qt6-svg +version=6.0.0 +revision=1 +wrksrc="qtsvg-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja" +make_cmd=ninja +hostmakedepends="ninja qt6-base-devel perl" +makedepends="qt6-base-devel" +short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component" +maintainer="John " +license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only" +homepage="https://qt.io/" +distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz" +checksum=9703c9a69e21ad373fb52d0107338da7ef0a46966f69107b0d879e9c366dd91b + +qt6-svg-devel_package() { + depends="${sourcepkg}>=${version}_${revision} qt6-base-devel" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/qt6/mkspecs + vmove "usr/lib/*.so" + vmove "usr/lib/*.prl" + } +} From e4f02184f0eee0da1ce8c3edc89bfc5116a54150 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 21 Dec 2020 16:02:02 +0100 Subject: [PATCH 08/12] New package: qt6-translations-6.0.0 --- srcpkgs/qt6-translations/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/qt6-translations/template diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template new file mode 100644 index 00000000000..b9b75a81988 --- /dev/null +++ b/srcpkgs/qt6-translations/template @@ -0,0 +1,16 @@ +# Template file for 'qt6-translations' +pkgname=qt6-translations +version=6.0.0 +revision=1 +wrksrc="qttranslations-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja" +make_cmd=ninja +hostmakedepends="ninja qt6-base-devel qt6-tools-devel perl" +makedepends="qt6-base-devel qt6-tools-devel" +short_desc="Cross-platform application and UI framework (QT6) - qt6-translations component" +maintainer="John " +license="GPL-3.0-only with Qt-GPL-exception-1.0" +homepage="https://qt.io/" +distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttranslations-everywhere-src-${version}.tar.xz" +checksum=ed6487425c17e88531e825c44820c1f47c9b7dc0918125e5d45ccc36fdc679d5 From 83b4a18acaa52d8b3635cd3c954dc985d2298506 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 22 Dec 2020 13:24:29 +0100 Subject: [PATCH 09/12] New package: qt6-shadertools-6.0.0 --- common/shlibs | 1 + srcpkgs/qt6-shadertools-devel | 1 + srcpkgs/qt6-shadertools/template | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+) create mode 120000 srcpkgs/qt6-shadertools-devel create mode 100644 srcpkgs/qt6-shadertools/template diff --git a/common/shlibs b/common/shlibs index d792fb83c6a..ebe8c35fad8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2059,6 +2059,7 @@ libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1 libQt6Quick.so.6 qt6-declarative-6.0.0_1 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1 +libQt6ShaderTools.so.6 qt6-shadertools-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-shadertools-devel b/srcpkgs/qt6-shadertools-devel new file mode 120000 index 00000000000..f1424d216cb --- /dev/null +++ b/srcpkgs/qt6-shadertools-devel @@ -0,0 +1 @@ +qt6-shadertools \ No newline at end of file diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template new file mode 100644 index 00000000000..056289d16b6 --- /dev/null +++ b/srcpkgs/qt6-shadertools/template @@ -0,0 +1,28 @@ +# Template file for 'qt6-shadertools' +pkgname=qt6-shadertools +version=6.0.0 +revision=1 +wrksrc="qtshadertools-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja" +make_cmd=ninja +hostmakedepends="ninja perl qt6-base-devel" +makedepends="qt6-base-devel" +short_desc="Cross-platform application and UI framework (QT6) - qt6-shadertools component" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://qt.io/" +distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz" +checksum=201b1376b65ef9f7fd19789781e0378ea813385217cd392c5c896699e6108e6c + +qt6-shadertools-devel_package() { + depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/qt6/mkspecs + vmove "usr/lib/*.so" + vmove "usr/lib/*.prl" + } +} From d26b18265dbcfdaca8cfc0ad0e9ae78843142fbb Mon Sep 17 00:00:00 2001 From: John Date: Tue, 22 Dec 2020 14:01:58 +0100 Subject: [PATCH 10/12] New package: qt6-quick3d-6.0.0 --- common/shlibs | 4 ++++ srcpkgs/qt6-quick3d-devel | 1 + srcpkgs/qt6-quick3d/template | 29 +++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 120000 srcpkgs/qt6-quick3d-devel create mode 100644 srcpkgs/qt6-quick3d/template diff --git a/common/shlibs b/common/shlibs index ebe8c35fad8..bbae4e917d8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2060,6 +2060,10 @@ libQt6Quick.so.6 qt6-declarative-6.0.0_1 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1 libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1 +libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1 +libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1 +libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1 +libQt6Quick3DAssetImport.so.6 qt6-quick3d-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-quick3d-devel b/srcpkgs/qt6-quick3d-devel new file mode 120000 index 00000000000..91ff6f03e47 --- /dev/null +++ b/srcpkgs/qt6-quick3d-devel @@ -0,0 +1 @@ +qt6-quick3d \ No newline at end of file diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template new file mode 100644 index 00000000000..fba3bc4f191 --- /dev/null +++ b/srcpkgs/qt6-quick3d/template @@ -0,0 +1,29 @@ +# Template file for 'qt6-quick3d' +pkgname=qt6-quick3d +version=6.0.0 +revision=1 +wrksrc="qtquick3d-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja" +make_cmd=ninja +hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel" +makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel + libassimp-devel" +short_desc="Cross-platform application and UI framework (QT6) - qt6-quick3d component" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://qt.io/" +distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz" +checksum=0a9a3e765c343b55511900b173f9591df88b0787f67b9ecfb8f25203bfdb0aa8 + +qt6-quick3d-devel_package() { + depends="${sourcepkg}>=${version}_${revision} qt6-base-devel" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/qt6/mkspecs + vmove "usr/lib/*.so" + vmove "usr/lib/*.prl" + } +} From bb21d57373902cd5458a1c23aa65a25e2ee7db5f Mon Sep 17 00:00:00 2001 From: John Date: Tue, 22 Dec 2020 14:09:47 +0100 Subject: [PATCH 11/12] New package: qt6-quickcontrols2-6.0.0 --- common/shlibs | 3 +++ srcpkgs/qt6-quickcontrols2-devel | 1 + srcpkgs/qt6-quickcontrols2/template | 28 ++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 120000 srcpkgs/qt6-quickcontrols2-devel create mode 100644 srcpkgs/qt6-quickcontrols2/template diff --git a/common/shlibs b/common/shlibs index bbae4e917d8..248bde64b92 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2064,6 +2064,9 @@ libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1 libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1 libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1 +libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1 +libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1 +libQt6QuickTemplates2.so.6 qt6-quickcontrols2-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-quickcontrols2-devel b/srcpkgs/qt6-quickcontrols2-devel new file mode 120000 index 00000000000..280bc162057 --- /dev/null +++ b/srcpkgs/qt6-quickcontrols2-devel @@ -0,0 +1 @@ +qt6-quickcontrols2 \ No newline at end of file diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template new file mode 100644 index 00000000000..b7577cd1ae6 --- /dev/null +++ b/srcpkgs/qt6-quickcontrols2/template @@ -0,0 +1,28 @@ +# Template file for 'qt6-quickcontrols2' +pkgname=qt6-quickcontrols2 +version=6.0.0 +revision=1 +wrksrc="qtquickcontrols2-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja" +make_cmd=ninja +hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel" +makedepends="qt6-base-devel qt6-declarative-devel" +short_desc="Cross-platform application and UI framework (QT6) - qt6-quickcontrols2 component" +maintainer="John " +license="GPL-2.0-or-later, LGPL-3.0-or-later" +homepage="https://qt.io/" +distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz" +checksum=03fd2dbf030bf859e8069144bb6a282517063589c9d4025293eb89bcc580253b + +qt6-quickcontrols2-devel_package() { + depends="${sourcepkg}>=${version}_${revision} qt6-base-devel" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/qt6/mkspecs + vmove "usr/lib/*.so" + vmove "usr/lib/*.prl" + } +} From 0577f93b67da172701d13032a5d36c70e5c425b2 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 22 Dec 2020 14:12:46 +0100 Subject: [PATCH 12/12] New package: qt6-quicktimeline-6.0.0 --- srcpkgs/qt6-quicktimeline/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/qt6-quicktimeline/template diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template new file mode 100644 index 00000000000..4b07d8f4ac2 --- /dev/null +++ b/srcpkgs/qt6-quicktimeline/template @@ -0,0 +1,16 @@ +# Template file for 'qt6-quicktimeline' +pkgname=qt6-quicktimeline +version=6.0.0 +revision=1 +wrksrc="qtquicktimeline-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja" +make_cmd=ninja +hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel" +makedepends="qt6-base-devel qt6-declarative-devel" +short_desc="Cross-platform application and UI framework (QT6) - qt6-quicktimeline component" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://qt.io/" +distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz" +checksum=7a71495c07a98279a852d518bc9ca0f07b49b495ceb65bfdd000c826ee156b0c