From cf70835dde57be94a7d4a6cba1a2281492206d8e Mon Sep 17 00:00:00 2001 From: John Date: Thu, 8 Oct 2020 16:47:01 +0200 Subject: [PATCH 01/20] 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 9d1a1a7a1941..0fb985631ba1 100644 --- a/common/build-style/cmake.sh +++ b/common/build-style/cmake.sh @@ -49,7 +49,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) _EOF - cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake" + cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${build_wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake" fi cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr" cmake_args+=" -DCMAKE_BUILD_TYPE=None" From e39a33f1231f2224029ca54aa356c69e7a1e9228 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 8 Oct 2020 20:40:31 +0200 Subject: [PATCH 02/20] New package: qt6-base-6.1.0 --- common/shlibs | 16 ++ srcpkgs/qt6-base-devel | 1 + srcpkgs/qt6-base-doc | 1 + srcpkgs/qt6-base/patches/add-the-D.patch | 15 ++ srcpkgs/qt6-base/patches/musl-limits.patch | 20 +++ srcpkgs/qt6-base/template | 188 +++++++++++++++++++++ srcpkgs/qt6-base/update | 1 + 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 + 22 files changed, 257 insertions(+) create mode 120000 srcpkgs/qt6-base-devel create mode 120000 srcpkgs/qt6-base-doc create mode 100644 srcpkgs/qt6-base/patches/add-the-D.patch create mode 100644 srcpkgs/qt6-base/patches/musl-limits.patch create mode 100644 srcpkgs/qt6-base/template create mode 100644 srcpkgs/qt6-base/update 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 1b284ac33ef2..3ba44093b45d 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 000000000000..8ddee598d5ed --- /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 000000000000..8ddee598d5ed --- /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 000000000000..94d2fc030304 --- /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 000000000000..54f96779b31d --- /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 000000000000..c720e7f51671 --- /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 000000000000..844552465222 --- /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 000000000000..8ddee598d5ed --- /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 000000000000..8ddee598d5ed --- /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 000000000000..8ddee598d5ed --- /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 000000000000..8ddee598d5ed --- /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 000000000000..8ddee598d5ed --- /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 000000000000..8ddee598d5ed --- /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 000000000000..8ddee598d5ed --- /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 000000000000..8ddee598d5ed --- /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 000000000000..8ddee598d5ed --- /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 000000000000..8ddee598d5ed --- /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 000000000000..8ddee598d5ed --- /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 000000000000..8ddee598d5ed --- /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 000000000000..8ddee598d5ed --- /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 000000000000..8ddee598d5ed --- /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 000000000000..8ddee598d5ed --- /dev/null +++ b/srcpkgs/qt6-xml @@ -0,0 +1 @@ +qt6-base \ No newline at end of file From 9aa97dc1505457023ddc25d9ccdd083245dbec2e Mon Sep 17 00:00:00 2001 From: John Date: Thu, 8 Oct 2020 20:40:52 +0200 Subject: [PATCH 03/20] New package: qt6-wayland-6.1.0 --- common/shlibs | 2 ++ srcpkgs/qt6-wayland-devel | 1 + srcpkgs/qt6-wayland/template | 34 ++++++++++++++++++++++++++++++++++ srcpkgs/qt6-wayland/update | 1 + 4 files changed, 38 insertions(+) create mode 120000 srcpkgs/qt6-wayland-devel create mode 100644 srcpkgs/qt6-wayland/template create mode 100644 srcpkgs/qt6-wayland/update diff --git a/common/shlibs b/common/shlibs index 3ba44093b45d..569d4d2237e5 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1998,6 +1998,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.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 000000000000..c4dec18ea9a0 --- /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 000000000000..0d45ccc2450c --- /dev/null +++ b/srcpkgs/qt6-wayland/template @@ -0,0 +1,34 @@ +# Template file for 'qt6-wayland' +pkgname=qt6-wayland +version=6.1.0 +revision=1 +wrksrc="qtwayland-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true" +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 - Wayland" +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=d67e8ffe4014a66b5864acf358a392149555db2adac1b9802a6650a59a70ad97 + +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/qt6/bin/qtwaylandscanner + vmove "usr/lib/*.so" + vmove "usr/lib/*.prl" + } +} diff --git a/srcpkgs/qt6-wayland/update b/srcpkgs/qt6-wayland/update new file mode 100644 index 000000000000..844552465222 --- /dev/null +++ b/srcpkgs/qt6-wayland/update @@ -0,0 +1 @@ +pkgname="${pkgname/6-/}-everywhere-src" From 9c7af471e6156f139697c6246e3dbe72145b4edf Mon Sep 17 00:00:00 2001 From: John Date: Fri, 9 Oct 2020 20:34:02 +0200 Subject: [PATCH 04/20] New package: qt6-declarative-6.1.0 --- common/shlibs | 11 ++++++++ srcpkgs/qt6-declarative-devel | 1 + srcpkgs/qt6-declarative-tools | 1 + srcpkgs/qt6-declarative/template | 43 ++++++++++++++++++++++++++++++++ srcpkgs/qt6-declarative/update | 1 + 5 files changed, 57 insertions(+) create mode 120000 srcpkgs/qt6-declarative-devel create mode 120000 srcpkgs/qt6-declarative-tools create mode 100644 srcpkgs/qt6-declarative/template create mode 100644 srcpkgs/qt6-declarative/update diff --git a/common/shlibs b/common/shlibs index 569d4d2237e5..ba39775b36c9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2000,6 +2000,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 000000000000..fd03a4809f3e --- /dev/null +++ b/srcpkgs/qt6-declarative-devel @@ -0,0 +1 @@ +qt6-declarative \ No newline at end of file diff --git a/srcpkgs/qt6-declarative-tools b/srcpkgs/qt6-declarative-tools new file mode 120000 index 000000000000..fd03a4809f3e --- /dev/null +++ b/srcpkgs/qt6-declarative-tools @@ -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 000000000000..6da38cd33432 --- /dev/null +++ b/srcpkgs/qt6-declarative/template @@ -0,0 +1,43 @@ +# Template file for 'qt6-declarative' +pkgname=qt6-declarative +version=6.1.0 +revision=1 +wrksrc="qtdeclarative-everywhere-src-${version}" +build_style=cmake +configure_args=" -DQT_HOST_PATH=/usr + -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true" +hostmakedepends="qt6-base-devel perl pkg-config wayland-devel + qt6-declarative-devel" +makedepends="qt6-base-devel Vulkan-Headers" +short_desc="Cross-platform application and UI framework - Declarative" +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=e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda + +qt6-declarative-tools_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - tools" + pkg_install() { + vmove usr/lib/qt6/plugins/qmltooling + for bin in qmlcachegen qmleasing qmlformat qmlimportscanner \ + qmllint qmlplugindump qmlpreview qmlprofiler qmlscene \ + qmltestrunner qmltime qmltyperegistrar; do + vmove usr/lib/qt6/bin/$bin + done + } +} + +qt6-declarative-devel_package() { + depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1 + qt6-declarative-tools>=${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" + } +} diff --git a/srcpkgs/qt6-declarative/update b/srcpkgs/qt6-declarative/update new file mode 100644 index 000000000000..844552465222 --- /dev/null +++ b/srcpkgs/qt6-declarative/update @@ -0,0 +1 @@ +pkgname="${pkgname/6-/}-everywhere-src" From 07a67991190a32eabaddfe1b78e8d216e2df57bb Mon Sep 17 00:00:00 2001 From: John Date: Mon, 21 Dec 2020 14:58:17 +0100 Subject: [PATCH 05/20] New package: qt6-qt5compat-6.1.0 --- srcpkgs/qt6-qt5compat-devel | 1 + srcpkgs/qt6-qt5compat/template | 27 +++++++++++++++++++++++++++ srcpkgs/qt6-qt5compat/update | 1 + 3 files changed, 29 insertions(+) create mode 120000 srcpkgs/qt6-qt5compat-devel create mode 100644 srcpkgs/qt6-qt5compat/template create mode 100644 srcpkgs/qt6-qt5compat/update diff --git a/srcpkgs/qt6-qt5compat-devel b/srcpkgs/qt6-qt5compat-devel new file mode 120000 index 000000000000..f88da3a0fe5b --- /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 000000000000..98453ee6365a --- /dev/null +++ b/srcpkgs/qt6-qt5compat/template @@ -0,0 +1,27 @@ +# Template file for 'qt6-qt5compat' +pkgname=qt6-qt5compat +version=6.1.0 +revision=1 +wrksrc="qt5compat-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr " +hostmakedepends="qt6-base-devel ninja perl" +makedepends="qt6-base-devel" +short_desc="Cross-platform application and UI framework - Qt5 Compatibilty 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=c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c + +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" + } +} diff --git a/srcpkgs/qt6-qt5compat/update b/srcpkgs/qt6-qt5compat/update new file mode 100644 index 000000000000..844552465222 --- /dev/null +++ b/srcpkgs/qt6-qt5compat/update @@ -0,0 +1 @@ +pkgname="${pkgname/6-/}-everywhere-src" From 7db19ac2e6f54fdcfde9e56aedcc83ef4496d71c Mon Sep 17 00:00:00 2001 From: John Date: Mon, 21 Dec 2020 15:47:47 +0100 Subject: [PATCH 06/20] New package: qt6-tools-6.1.0 --- srcpkgs/qt6-tools-devel | 1 + srcpkgs/qt6-tools/template | 32 ++++++++++++++++++++++++++++++++ srcpkgs/qt6-tools/update | 1 + 3 files changed, 34 insertions(+) create mode 120000 srcpkgs/qt6-tools-devel create mode 100644 srcpkgs/qt6-tools/template create mode 100644 srcpkgs/qt6-tools/update diff --git a/srcpkgs/qt6-tools-devel b/srcpkgs/qt6-tools-devel new file mode 120000 index 000000000000..d2de59aba453 --- /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 000000000000..574020f5362a --- /dev/null +++ b/srcpkgs/qt6-tools/template @@ -0,0 +1,32 @@ +# Template file for 'qt6-tools' +pkgname=qt6-tools +version=6.1.0 +revision=1 +wrksrc="qttools-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr " +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=6263030c1120a30b0541d37b52dc0be0ea04bbb8d1695ec9648f0bd77e421f3e + +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} 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" + } +} diff --git a/srcpkgs/qt6-tools/update b/srcpkgs/qt6-tools/update new file mode 100644 index 000000000000..844552465222 --- /dev/null +++ b/srcpkgs/qt6-tools/update @@ -0,0 +1 @@ +pkgname="${pkgname/6-/}-everywhere-src" From ec80f043d3f98a07fd93d74f3a7b889be59f58ee Mon Sep 17 00:00:00 2001 From: John Date: Mon, 21 Dec 2020 15:53:22 +0100 Subject: [PATCH 07/20] New package: qt6-svg-6.1.0 --- srcpkgs/qt6-svg-devel | 1 + srcpkgs/qt6-svg/template | 27 +++++++++++++++++++++++++++ srcpkgs/qt6-svg/update | 1 + 3 files changed, 29 insertions(+) create mode 120000 srcpkgs/qt6-svg-devel create mode 100644 srcpkgs/qt6-svg/template create mode 100644 srcpkgs/qt6-svg/update diff --git a/srcpkgs/qt6-svg-devel b/srcpkgs/qt6-svg-devel new file mode 120000 index 000000000000..69c493dbd794 --- /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 000000000000..2257057d4369 --- /dev/null +++ b/srcpkgs/qt6-svg/template @@ -0,0 +1,27 @@ +# Template file for 'qt6-svg' +pkgname=qt6-svg +version=6.1.0 +revision=1 +wrksrc="qtsvg-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr " +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=5dd3aef98c93073b7a1ab5beadcc8948d1f939c7fd19ea4c2041cc4a3bc8b719 + +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" + } +} diff --git a/srcpkgs/qt6-svg/update b/srcpkgs/qt6-svg/update new file mode 100644 index 000000000000..844552465222 --- /dev/null +++ b/srcpkgs/qt6-svg/update @@ -0,0 +1 @@ +pkgname="${pkgname/6-/}-everywhere-src" From 572e19cfcf44bb8d30b661f3b991064a48d8a82e Mon Sep 17 00:00:00 2001 From: John Date: Mon, 21 Dec 2020 16:02:02 +0100 Subject: [PATCH 08/20] New package: qt6-translations-6.1.0 --- srcpkgs/qt6-translations/template | 15 +++++++++++++++ srcpkgs/qt6-translations/update | 1 + 2 files changed, 16 insertions(+) create mode 100644 srcpkgs/qt6-translations/template create mode 100644 srcpkgs/qt6-translations/update diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template new file mode 100644 index 000000000000..e8cef83b21ad --- /dev/null +++ b/srcpkgs/qt6-translations/template @@ -0,0 +1,15 @@ +# Template file for 'qt6-translations' +pkgname=qt6-translations +version=6.1.0 +revision=1 +wrksrc="qttranslations-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr " +hostmakedepends="ninja qt6-base-devel qt6-tools-devel perl" +makedepends="qt6-base-devel qt6-tools-devel" +short_desc="Cross-platform application and UI framework - translations" +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=2affef9a0da9b61e8fc64ebbd515136b59c7392b789cd059ad134b26755dd073 diff --git a/srcpkgs/qt6-translations/update b/srcpkgs/qt6-translations/update new file mode 100644 index 000000000000..844552465222 --- /dev/null +++ b/srcpkgs/qt6-translations/update @@ -0,0 +1 @@ +pkgname="${pkgname/6-/}-everywhere-src" From ac0af71e6ad5b3085e75e355098bd4438b70d46d Mon Sep 17 00:00:00 2001 From: John Date: Tue, 22 Dec 2020 13:24:29 +0100 Subject: [PATCH 09/20] New package: qt6-shadertools-6.1.0 --- common/shlibs | 1 + srcpkgs/qt6-shadertools-devel | 1 + srcpkgs/qt6-shadertools/template | 27 +++++++++++++++++++++++++++ srcpkgs/qt6-shadertools/update | 1 + 4 files changed, 30 insertions(+) create mode 120000 srcpkgs/qt6-shadertools-devel create mode 100644 srcpkgs/qt6-shadertools/template create mode 100644 srcpkgs/qt6-shadertools/update diff --git a/common/shlibs b/common/shlibs index ba39775b36c9..6b6aa8a9cf6f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2011,6 +2011,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 000000000000..f1424d216cb3 --- /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 000000000000..2296f41f1326 --- /dev/null +++ b/srcpkgs/qt6-shadertools/template @@ -0,0 +1,27 @@ +# Template file for 'qt6-shadertools' +pkgname=qt6-shadertools +version=6.1.0 +revision=1 +wrksrc="qtshadertools-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr " +hostmakedepends="ninja perl qt6-base-devel" +makedepends="qt6-base-devel" +short_desc="Cross-platform application and UI framework - shadertools" +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=e391e2fb9dd4bd6b7fec0d6fd55817ca488a49d8e7f56b43655bea26167481e1 + +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" + } +} diff --git a/srcpkgs/qt6-shadertools/update b/srcpkgs/qt6-shadertools/update new file mode 100644 index 000000000000..844552465222 --- /dev/null +++ b/srcpkgs/qt6-shadertools/update @@ -0,0 +1 @@ +pkgname="${pkgname/6-/}-everywhere-src" From e57334f4ccbf81b3ef7c2f85f9472bbc03725d90 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 22 Dec 2020 14:01:58 +0100 Subject: [PATCH 10/20] New package: qt6-quick3d-6.1.0 --- common/shlibs | 8 ++++++++ srcpkgs/qt6-quick3d-devel | 1 + srcpkgs/qt6-quick3d/template | 29 +++++++++++++++++++++++++++++ srcpkgs/qt6-quick3d/update | 1 + 4 files changed, 39 insertions(+) create mode 120000 srcpkgs/qt6-quick3d-devel create mode 100644 srcpkgs/qt6-quick3d/template create mode 100644 srcpkgs/qt6-quick3d/update diff --git a/common/shlibs b/common/shlibs index 6b6aa8a9cf6f..ba192c561b5d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2012,6 +2012,14 @@ 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 +libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_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-quick3d-devel b/srcpkgs/qt6-quick3d-devel new file mode 120000 index 000000000000..91ff6f03e479 --- /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 000000000000..0022dc25a374 --- /dev/null +++ b/srcpkgs/qt6-quick3d/template @@ -0,0 +1,29 @@ +# Template file for 'qt6-quick3d' +pkgname=qt6-quick3d +version=6.1.0 +revision=1 +wrksrc="qtquick3d-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr " +hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel" +makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel + libassimp-devel" +short_desc="Cross-platform application and UI framework - Quick3d" +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=ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268 + +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/qt6/bin + vmove "usr/lib/*.so" + vmove "usr/lib/*.prl" + } +} diff --git a/srcpkgs/qt6-quick3d/update b/srcpkgs/qt6-quick3d/update new file mode 100644 index 000000000000..844552465222 --- /dev/null +++ b/srcpkgs/qt6-quick3d/update @@ -0,0 +1 @@ +pkgname="${pkgname/6-/}-everywhere-src" From bc3863d9e3639d00312fc899b62281231dec9370 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 22 Dec 2020 14:09:47 +0100 Subject: [PATCH 11/20] New package: qt6-quickcontrols2-6.1.0 --- srcpkgs/qt6-quickcontrols2-devel | 1 + srcpkgs/qt6-quickcontrols2/template | 27 +++++++++++++++++++++++++++ srcpkgs/qt6-quickcontrols2/update | 1 + 3 files changed, 29 insertions(+) create mode 120000 srcpkgs/qt6-quickcontrols2-devel create mode 100644 srcpkgs/qt6-quickcontrols2/template create mode 100644 srcpkgs/qt6-quickcontrols2/update diff --git a/srcpkgs/qt6-quickcontrols2-devel b/srcpkgs/qt6-quickcontrols2-devel new file mode 120000 index 000000000000..280bc162057d --- /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 000000000000..b4888d166de5 --- /dev/null +++ b/srcpkgs/qt6-quickcontrols2/template @@ -0,0 +1,27 @@ +# Template file for 'qt6-quickcontrols2' +pkgname=qt6-quickcontrols2 +version=6.1.0 +revision=1 +wrksrc="qtquickcontrols2-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr " +hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel" +makedepends="qt6-base-devel qt6-declarative-devel" +short_desc="Cross-platform application and UI framework - quickcontrols2" +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=784f1d79e74df59f095b126a116d85e72801bd357f5666d6bad8407ac3957d59 + +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" + } +} diff --git a/srcpkgs/qt6-quickcontrols2/update b/srcpkgs/qt6-quickcontrols2/update new file mode 100644 index 000000000000..844552465222 --- /dev/null +++ b/srcpkgs/qt6-quickcontrols2/update @@ -0,0 +1 @@ +pkgname="${pkgname/6-/}-everywhere-src" From 2a372fb75c81e727281c53dd2a12c3ea8f9e39ae Mon Sep 17 00:00:00 2001 From: John Date: Tue, 22 Dec 2020 14:12:46 +0100 Subject: [PATCH 12/20] New package: qt6-quicktimeline-6.1.0 --- srcpkgs/qt6-quicktimeline/template | 15 +++++++++++++++ srcpkgs/qt6-quicktimeline/update | 1 + 2 files changed, 16 insertions(+) create mode 100644 srcpkgs/qt6-quicktimeline/template create mode 100644 srcpkgs/qt6-quicktimeline/update diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template new file mode 100644 index 000000000000..cf5ad15dfb9b --- /dev/null +++ b/srcpkgs/qt6-quicktimeline/template @@ -0,0 +1,15 @@ +# Template file for 'qt6-quicktimeline' +pkgname=qt6-quicktimeline +version=6.1.0 +revision=1 +wrksrc="qtquicktimeline-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr " +hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel" +makedepends="qt6-base-devel qt6-declarative-devel" +short_desc="Cross-platform application and UI framework - quicktimeline" +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=ae7421d5ae692ef7fda5a1be88dcb542c7f3531ad6264ceaea9d870605b6953e diff --git a/srcpkgs/qt6-quicktimeline/update b/srcpkgs/qt6-quicktimeline/update new file mode 100644 index 000000000000..844552465222 --- /dev/null +++ b/srcpkgs/qt6-quicktimeline/update @@ -0,0 +1 @@ +pkgname="${pkgname/6-/}-everywhere-src" From 36fc55fdd59a18e089675635ea870bd9c32099ac Mon Sep 17 00:00:00 2001 From: John Date: Sat, 1 May 2021 10:54:23 +0200 Subject: [PATCH 13/20] New package: qt6-virtualkeyboard-6.1.0 --- srcpkgs/qt6-virtualkeyboard-devel | 1 + srcpkgs/qt6-virtualkeyboard/template | 29 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 120000 srcpkgs/qt6-virtualkeyboard-devel create mode 100644 srcpkgs/qt6-virtualkeyboard/template diff --git a/srcpkgs/qt6-virtualkeyboard-devel b/srcpkgs/qt6-virtualkeyboard-devel new file mode 120000 index 000000000000..5da71523b639 --- /dev/null +++ b/srcpkgs/qt6-virtualkeyboard-devel @@ -0,0 +1 @@ +qt6-virtualkeyboard \ No newline at end of file diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template new file mode 100644 index 000000000000..6488e9c5c80c --- /dev/null +++ b/srcpkgs/qt6-virtualkeyboard/template @@ -0,0 +1,29 @@ +# Template file for 'qt6-virtualkeyboard' +pkgname=qt6-virtualkeyboard +version=6.1.0 +revision=1 +wrksrc="qtvirtualkeyboard-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr" +hostmakedepends="perl pkg-config qt6-declarative-devel" +makedepends="qt6-declarative-devel qt6-quickcontrols2-devel + qt6-svg-devel hunspell-devel" +depends="qt6-quickcontrols2" +short_desc="Cross-platform application and UI framework - virtualkeyboard" +maintainer="John " +license="GPL-3.0-only" +homepage="https://qt.io/" +distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtvirtualkeyboard-everywhere-src-${version}.tar.xz" +checksum=595d69dbfd43a87b4d3a270afed6dd64172551990e29239281f39b727b145c01 + +qt6-virtualkeyboard-devel_package() { + depends="${sourcepkg}>=${version}_${revision} $makedepends" + 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 c734c283babe6bd8250e679331e54c3e8b2c5d00 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 1 May 2021 11:00:25 +0200 Subject: [PATCH 14/20] New package: qt6-networkauth-6.1.0 --- common/shlibs | 1 + srcpkgs/qt6-networkauth-devel | 1 + srcpkgs/qt6-networkauth/template | 27 +++++++++++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 120000 srcpkgs/qt6-networkauth-devel create mode 100644 srcpkgs/qt6-networkauth/template diff --git a/common/shlibs b/common/shlibs index ba192c561b5d..5b7622e48ccc 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2020,6 +2020,7 @@ libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_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 +libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_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-networkauth-devel b/srcpkgs/qt6-networkauth-devel new file mode 120000 index 000000000000..e9763b3bb1a8 --- /dev/null +++ b/srcpkgs/qt6-networkauth-devel @@ -0,0 +1 @@ +qt6-networkauth \ No newline at end of file diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template new file mode 100644 index 000000000000..b70fcc828fb8 --- /dev/null +++ b/srcpkgs/qt6-networkauth/template @@ -0,0 +1,27 @@ +# Template file for 'qt6-networkauth' +pkgname=qt6-networkauth +version=6.1.0 +revision=1 +wrksrc="qtnetworkauth-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr" +hostmakedepends="perl qt6-base-devel" +makedepends="qt6-base-devel" +short_desc="Cross-platform application and UI framework - networkauth" +maintainer="John " +license="GPL-3.0-only" +homepage="https://qt.io/" +distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtnetworkauth-everywhere-src-${version}.tar.xz" +checksum=bae8a941e4b635a364bdc65ea814adfe75b20b06fce0888612f72fc1e81ebdd3 + +qt6-networkauth-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 365294acc0418fd7dab686fc6e5f219949a13910 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 1 May 2021 11:01:48 +0200 Subject: [PATCH 15/20] New package: qt6-scxml-6.1.0 --- common/shlibs | 4 ++++ srcpkgs/qt6-scxml-devel | 1 + srcpkgs/qt6-scxml/template | 27 +++++++++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 120000 srcpkgs/qt6-scxml-devel create mode 100644 srcpkgs/qt6-scxml/template diff --git a/common/shlibs b/common/shlibs index 5b7622e48ccc..f98b1e473be7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2021,6 +2021,10 @@ 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 libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_1 +libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1 +libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1 +libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1 +libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_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-scxml-devel b/srcpkgs/qt6-scxml-devel new file mode 120000 index 000000000000..cd3032d5ed07 --- /dev/null +++ b/srcpkgs/qt6-scxml-devel @@ -0,0 +1 @@ +qt6-scxml \ No newline at end of file diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template new file mode 100644 index 000000000000..b0e60b492782 --- /dev/null +++ b/srcpkgs/qt6-scxml/template @@ -0,0 +1,27 @@ +# Template file for 'qt6-scxml' +pkgname=qt6-scxml +version=6.1.0 +revision=1 +wrksrc="qtscxml-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr" +hostmakedepends="perl qt6-declarative-devel" +makedepends="qt6-declarative-devel" +short_desc="Cross-platform application and UI framework - scxml" +maintainer="John " +license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only" +homepage="https://qt.io/" +distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtscxml-everywhere-src-${version}.tar.xz" +checksum=c835809c2e194171e044464744ee516abce647fb428aa896d9f990e217c363ea + +qt6-scxml-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 c5359b78d25579cfabfef377281c07e4be2d3d18 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 1 May 2021 11:07:02 +0200 Subject: [PATCH 16/20] New package: qt6-imageformats-6.1.0 --- srcpkgs/qt6-imageformats/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/qt6-imageformats/template diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template new file mode 100644 index 000000000000..80c457245cfd --- /dev/null +++ b/srcpkgs/qt6-imageformats/template @@ -0,0 +1,15 @@ +# Template file for 'qt6-imageformats' +pkgname=qt6-imageformats +version=6.1.0 +revision=1 +wrksrc="qtimageformats-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr" +hostmakedepends="perl qt6-base-devel" +makedepends="qt6-base-devel" +short_desc="Cross-platform application and UI framework - imageformats" +maintainer="John " +license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only" +homepage="https://qt.io/" +distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtimageformats-everywhere-src-${version}.tar.xz" +checksum=34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a From 3b29fb800acdcae0f77f9609ff4d79ab9650c977 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 1 May 2021 11:08:18 +0200 Subject: [PATCH 17/20] New package: qt6-lottie-6.1.0 --- common/shlibs | 1 + srcpkgs/qt6-lottie-devel | 1 + srcpkgs/qt6-lottie/template | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+) create mode 120000 srcpkgs/qt6-lottie-devel create mode 100644 srcpkgs/qt6-lottie/template diff --git a/common/shlibs b/common/shlibs index f98b1e473be7..38ed206a6396 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2025,6 +2025,7 @@ libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1 libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1 libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1 libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1 +libQt6Bodymovin.so.6 qt6-lottie-6.1.0rc2_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-lottie-devel b/srcpkgs/qt6-lottie-devel new file mode 120000 index 000000000000..ba915c5589b8 --- /dev/null +++ b/srcpkgs/qt6-lottie-devel @@ -0,0 +1 @@ +qt6-lottie \ No newline at end of file diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template new file mode 100644 index 000000000000..81d2458b7d6d --- /dev/null +++ b/srcpkgs/qt6-lottie/template @@ -0,0 +1,28 @@ +# Template file for 'qt6-lottie' +pkgname=qt6-lottie +version=6.1.0 +revision=1 +wrksrc="qtlottie-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr" +hostmakedepends="perl qt6-base-devel" +makedepends="qt6-declarative-devel" +depends="" +short_desc="Cross-platform application and UI framework - lottie" +maintainer="John " +license="GPL-3.0-only" +homepage="https://qt.io/" +distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtlottie-everywhere-src-${version}.tar.xz" +checksum=3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8 + +qt6-lottie-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 ae98e6e04ceb001a1f9a0c8834fadc26211f2cf5 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 1 May 2021 11:48:19 +0200 Subject: [PATCH 18/20] New package: qt6-3d-6.1.0 --- common/shlibs | 12 ++++++++++++ srcpkgs/qt6-3d-devel | 1 + srcpkgs/qt6-3d/template | 28 ++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 120000 srcpkgs/qt6-3d-devel create mode 100644 srcpkgs/qt6-3d/template diff --git a/common/shlibs b/common/shlibs index 38ed206a6396..111b048e3ff7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2026,6 +2026,18 @@ libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1 libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1 libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1 libQt6Bodymovin.so.6 qt6-lottie-6.1.0rc2_1 +libQt63DQuickAnimation.so.6 qt6-3d-6.1.0rc2_1 +libQt63DQuickRender.so.6 qt6-3d-6.1.0rc2_1 +libQt63DExtras.so.6 qt6-3d-6.1.0rc2_1 +libQt63DQuickInput.so.6 qt6-3d-6.1.0rc2_1 +libQt63DCore.so.6 qt6-3d-6.1.0rc2_1 +libQt63DQuickScene2D.so.6 qt6-3d-6.1.0rc2_1 +libQt63DLogic.so.6 qt6-3d-6.1.0rc2_1 +libQt63DRender.so.6 qt6-3d-6.1.0rc2_1 +libQt63DAnimation.so.6 qt6-3d-6.1.0rc2_1 +libQt63DQuickExtras.so.6 qt6-3d-6.1.0rc2_1 +libQt63DInput.so.6 qt6-3d-6.1.0rc2_1 +libQt63DQuick.so.6 qt6-3d-6.1.0rc2_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-3d-devel b/srcpkgs/qt6-3d-devel new file mode 120000 index 000000000000..4b7cae59503c --- /dev/null +++ b/srcpkgs/qt6-3d-devel @@ -0,0 +1 @@ +qt6-3d \ No newline at end of file diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template new file mode 100644 index 000000000000..101a56552999 --- /dev/null +++ b/srcpkgs/qt6-3d/template @@ -0,0 +1,28 @@ +# Template file for 'qt6-3d' +pkgname=qt6-3d +version=6.1.0 +revision=1 +wrksrc="qt3d-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr" +hostmakedepends="perl qt6-declarative-devel" +makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel + libatomic-devel" +short_desc="Cross-platform application and UI framework - 3d" +maintainer="John " +license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND 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/qt3d-everywhere-src-${version}.tar.xz" +checksum=af48f674883de91a5bcb11caefda0e130b9c8c65dce474c47550dc2fdd3a5660 + +qt6-3d-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 812d6eac7f0399c45bf03ecbab94056a90224c22 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 1 May 2021 11:57:02 +0200 Subject: [PATCH 19/20] New package: qt6-charts-6.1.0 --- common/shlibs | 1 + srcpkgs/qt6-charts-devel | 1 + srcpkgs/qt6-charts/template | 27 +++++++++++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 120000 srcpkgs/qt6-charts-devel create mode 100644 srcpkgs/qt6-charts/template diff --git a/common/shlibs b/common/shlibs index 111b048e3ff7..2ced94d7831f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2038,6 +2038,7 @@ libQt63DAnimation.so.6 qt6-3d-6.1.0rc2_1 libQt63DQuickExtras.so.6 qt6-3d-6.1.0rc2_1 libQt63DInput.so.6 qt6-3d-6.1.0rc2_1 libQt63DQuick.so.6 qt6-3d-6.1.0rc2_1 +libQt6Charts.so.6 qt6-charts-6.1.0rc2_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-charts-devel b/srcpkgs/qt6-charts-devel new file mode 120000 index 000000000000..894d48aa3126 --- /dev/null +++ b/srcpkgs/qt6-charts-devel @@ -0,0 +1 @@ +qt6-charts \ No newline at end of file diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template new file mode 100644 index 000000000000..d8dee490199e --- /dev/null +++ b/srcpkgs/qt6-charts/template @@ -0,0 +1,27 @@ +# Template file for 'qt6-charts' +pkgname=qt6-charts +version=6.1.0 +revision=1 +wrksrc="qtcharts-everywhere-src-${version}" +build_style=cmake +configure_args="-DQT_HOST_PATH=/usr" +hostmakedepends="perl qt6-declarative-devel" +makedepends="qt6-declarative-devel" +short_desc="Cross-platform application and UI framework - charts" +maintainer="John " +license="GPL-3.0-only" +homepage="https://qt.io/" +distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtcharts-everywhere-src-${version}.tar.xz" +checksum=8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd + +qt6-charts-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 a694bfd5c08b2b9956b754af8420c27e0c665157 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 29 Apr 2021 20:52:55 +0200 Subject: [PATCH 20/20] strawberry: update to 0.9.3. --- .../strawberry/patches/less-log-spam.patch | 10 + srcpkgs/strawberry/patches/pb_namespace.patch | 347 ------------------ srcpkgs/strawberry/template | 29 +- 3 files changed, 32 insertions(+), 354 deletions(-) create mode 100644 srcpkgs/strawberry/patches/less-log-spam.patch delete mode 100644 srcpkgs/strawberry/patches/pb_namespace.patch diff --git a/srcpkgs/strawberry/patches/less-log-spam.patch b/srcpkgs/strawberry/patches/less-log-spam.patch new file mode 100644 index 000000000000..5cf85ad5fcdc --- /dev/null +++ b/srcpkgs/strawberry/patches/less-log-spam.patch @@ -0,0 +1,10 @@ +--- CMakeLists.txt 2021-04-14 16:59:00.905391095 +0200 ++++ - 2021-04-29 21:22:05.347050684 +0200 +@@ -50,7 +50,6 @@ + -Winit-self + -Wmissing-include-dirs + -Wmissing-declarations +- -Wstrict-overflow=2 + -Wunused-parameter + -Wformat=2 + -Wdisabled-optimization diff --git a/srcpkgs/strawberry/patches/pb_namespace.patch b/srcpkgs/strawberry/patches/pb_namespace.patch deleted file mode 100644 index 5a9946116ac1..000000000000 --- a/srcpkgs/strawberry/patches/pb_namespace.patch +++ /dev/null @@ -1,347 +0,0 @@ -diff -ur ext/libstrawberry-tagreader/tagreader.cpp ext/libstrawberry-tagreader/tagreader.cpp ---- ext/libstrawberry-tagreader/tagreader.cpp 2020-11-09 17:12:40.431554880 -0500 -+++ ext/libstrawberry-tagreader/tagreader.cpp 2021-02-19 14:36:37.195218302 -0500 -@@ -146,34 +146,34 @@ - - } - --pb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const { -+spb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const { - -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAV; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_FLAC; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAVPACK; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGFLAC; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGVORBIS; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGOPUS; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGSPEEX; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPEG; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_MP4; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_ASF; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_AIFF; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPC; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_TRUEAUDIO; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_APE; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAV; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_FLAC; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAVPACK; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGFLAC; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGVORBIS; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGOPUS; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGSPEEX; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPEG; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_MP4; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_ASF; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_AIFF; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPC; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_TRUEAUDIO; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_APE; - #ifdef HAVE_TAGLIB_DSFFILE -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSF; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSF; - #endif - #ifdef HAVE_TAGLIB_DSDIFFFILE -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSDIFF; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSDIFF; - #endif - -- return pb::tagreader::SongMetadata_FileType_UNKNOWN; -+ return spb::tagreader::SongMetadata_FileType_UNKNOWN; - - } - --void TagReader::ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const { -+void TagReader::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const { - - const QByteArray url(QUrl::fromLocalFile(filename).toEncoded()); - const QFileInfo info(filename); -@@ -435,7 +435,7 @@ - - } - --void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const { -+void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const { - - if (!map["COMPOSER"].isEmpty()) Decode(map["COMPOSER"].front(), song->mutable_composer()); - if (!map["PERFORMER"].isEmpty()) Decode(map["PERFORMER"].front(), song->mutable_performer()); -@@ -459,7 +459,7 @@ - - } - --void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const { -+void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const { - - TagLib::APE::ItemListMap::ConstIterator it = map.find("ALBUM ARTIST"); - if (it != map.end()) { -@@ -503,7 +503,7 @@ - - } - --void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const { -+void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const { - - vorbis_comments->addField("COMPOSER", StdStringToTaglibString(song.composer()), true); - vorbis_comments->addField("PERFORMER", StdStringToTaglibString(song.performer()), true); -@@ -521,7 +521,7 @@ - - } - --bool TagReader::SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const { -+bool TagReader::SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const { - - if (filename.isEmpty()) return false; - -@@ -608,7 +608,7 @@ - return result; - } - --void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const { -+void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const { - - tag->setItem("album artist", TagLib::APE::Item("album artist", TagLib::StringList(song.albumartist().c_str()))); - tag->addValue("disc", QStringToTaglibString(song.disc() <= 0 ? QString() : QString::number(song.disc())), true); -diff -ur ext/libstrawberry-tagreader/tagreader.h ext/libstrawberry-tagreader/tagreader.h ---- ext/libstrawberry-tagreader/tagreader.h 2020-11-09 17:12:40.431554880 -0500 -+++ ext/libstrawberry-tagreader/tagreader.h 2021-02-19 14:36:37.195218302 -0500 -@@ -51,10 +51,10 @@ - ~TagReader(); - - bool IsMediaFile(const QString &filename) const; -- pb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const; -+ spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const; - -- void ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const; -- bool SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const; -+ void ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const; -+ bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const; - - QByteArray LoadEmbeddedArt(const QString &filename) const; - QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const; -@@ -62,11 +62,11 @@ - static void Decode(const TagLib::String &tag, std::string *output); - static void Decode(const QString &tag, std::string *output); - -- void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const; -- void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const; -+ void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const; -+ void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const; - -- void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const; -- void SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const; -+ void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const; -+ void SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const; - - void SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const; - void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const; -diff -ur ext/libstrawberry-tagreader/tagreadermessages.proto ext/libstrawberry-tagreader/tagreadermessages.proto ---- ext/libstrawberry-tagreader/tagreadermessages.proto 2020-09-11 17:34:59.552108115 -0400 -+++ ext/libstrawberry-tagreader/tagreadermessages.proto 2021-02-19 14:36:49.047230658 -0500 -@@ -1,6 +1,6 @@ - syntax = "proto2"; - --package pb.tagreader; -+package spb.tagreader; - - message SongMetadata { - -diff -ur ext/strawberry-tagreader/tagreaderworker.cpp ext/strawberry-tagreader/tagreaderworker.cpp ---- ext/strawberry-tagreader/tagreaderworker.cpp 2020-09-11 17:34:59.552108115 -0400 -+++ ext/strawberry-tagreader/tagreaderworker.cpp 2021-02-19 14:36:37.195218302 -0500 -@@ -27,13 +27,13 @@ - #include "tagreaderworker.h" - - TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent) -- : AbstractMessageHandler(socket, parent) -+ : AbstractMessageHandler(socket, parent) - { - } - --void TagReaderWorker::MessageArrived(const pb::tagreader::Message& message) { -+void TagReaderWorker::MessageArrived(const spb::tagreader::Message& message) { - -- pb::tagreader::Message reply; -+ spb::tagreader::Message reply; - - if (message.has_read_file_request()) { - tag_reader_.ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata()); -@@ -55,7 +55,7 @@ - - - void TagReaderWorker::DeviceClosed() { -- AbstractMessageHandler::DeviceClosed(); -+ AbstractMessageHandler::DeviceClosed(); - - qApp->exit(); - } -diff -ur ext/strawberry-tagreader/tagreaderworker.h ext/strawberry-tagreader/tagreaderworker.h ---- ext/strawberry-tagreader/tagreaderworker.h 2020-09-11 17:34:59.552108115 -0400 -+++ ext/strawberry-tagreader/tagreaderworker.h 2021-02-19 14:36:37.195218302 -0500 -@@ -28,12 +28,12 @@ - - class QIODevice; - --class TagReaderWorker : public AbstractMessageHandler { -+class TagReaderWorker : public AbstractMessageHandler { - public: - explicit TagReaderWorker(QIODevice *socket, QObject *parent = nullptr); - - protected: -- void MessageArrived(const pb::tagreader::Message &message) override; -+ void MessageArrived(const spb::tagreader::Message &message) override; - void DeviceClosed() override; - - private: -diff -ur src/core/song.cpp src/core/song.cpp ---- src/core/song.cpp 2020-11-09 17:12:40.431554880 -0500 -+++ src/core/song.cpp 2021-02-19 14:36:37.196218302 -0500 -@@ -744,7 +744,7 @@ - set_genre(TStringToQString(TagLib::ID3v1::genre(id))); - } - --void Song::InitFromProtobuf(const pb::tagreader::SongMetadata &pb) { -+void Song::InitFromProtobuf(const spb::tagreader::SongMetadata &pb) { - - if (d->source_ == Source_Unknown) d->source_ = Source_LocalFile; - -@@ -791,7 +791,7 @@ - - } - --void Song::ToProtobuf(pb::tagreader::SongMetadata *pb) const { -+void Song::ToProtobuf(spb::tagreader::SongMetadata *pb) const { - - const QByteArray url(d->url_.toEncoded()); - const QByteArray art_automatic(d->art_automatic_.toEncoded()); -@@ -826,7 +826,7 @@ - pb->set_filesize(d->filesize_); - pb->set_suspicious_tags(d->suspicious_tags_); - pb->set_art_automatic(art_automatic.constData(), art_automatic.size()); -- pb->set_filetype(static_cast(d->filetype_)); -+ pb->set_filetype(static_cast(d->filetype_)); - - } - -diff -ur src/core/song.h src/core/song.h ---- src/core/song.h 2020-11-09 17:12:40.431554880 -0500 -+++ src/core/song.h 2021-02-19 14:37:05.177247472 -0500 -@@ -44,11 +44,11 @@ - struct SimpleMetaBundle; - } // namespace Engine - --namespace pb { -+namespace spb { - namespace tagreader { - class SongMetadata; - } // namespace tagreader --} // namespace pb -+} // namespace spb - - #ifdef HAVE_LIBGPOD - struct _Itdb_Track; -@@ -155,7 +155,7 @@ - // Constructors - void Init(const QString &title, const QString &artist, const QString &album, qint64 length_nanosec); - void Init(const QString &title, const QString &artist, const QString &album, qint64 beginning, qint64 end); -- void InitFromProtobuf(const pb::tagreader::SongMetadata &pb); -+ void InitFromProtobuf(const spb::tagreader::SongMetadata &pb); - void InitFromQuery(const SqlRow &query, bool reliable_metadata, int col = 0); - void InitFromFilePartial(const QString &filename); // Just store the filename: incomplete but fast - void InitArtManual(); // Check if there is already a art in the cache and store the filename in art_manual -@@ -180,7 +180,7 @@ - void BindToQuery(QSqlQuery *query) const; - void BindToFtsQuery(QSqlQuery *query) const; - void ToXesam(QVariantMap *map) const; -- void ToProtobuf(pb::tagreader::SongMetadata *pb) const; -+ void ToProtobuf(spb::tagreader::SongMetadata *pb) const; - - // Simple accessors - bool is_valid() const; -diff -ur src/core/tagreaderclient.cpp src/core/tagreaderclient.cpp ---- src/core/tagreaderclient.cpp 2020-10-19 13:09:38.951139121 -0400 -+++ src/core/tagreaderclient.cpp 2021-02-19 14:36:37.195218302 -0500 -@@ -71,8 +71,8 @@ - - TagReaderReply *TagReaderClient::ReadFile(const QString &filename) { - -- pb::tagreader::Message message; -- pb::tagreader::ReadFileRequest *req = message.mutable_read_file_request(); -+ spb::tagreader::Message message; -+ spb::tagreader::ReadFileRequest *req = message.mutable_read_file_request(); - - req->set_filename(DataCommaSizeFromQString(filename)); - -@@ -82,8 +82,8 @@ - - TagReaderReply *TagReaderClient::SaveFile(const QString &filename, const Song &metadata) { - -- pb::tagreader::Message message; -- pb::tagreader::SaveFileRequest *req = message.mutable_save_file_request(); -+ spb::tagreader::Message message; -+ spb::tagreader::SaveFileRequest *req = message.mutable_save_file_request(); - - req->set_filename(DataCommaSizeFromQString(filename)); - metadata.ToProtobuf(req->mutable_metadata()); -@@ -96,8 +96,8 @@ - - TagReaderReply *TagReaderClient::IsMediaFile(const QString &filename) { - -- pb::tagreader::Message message; -- pb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request(); -+ spb::tagreader::Message message; -+ spb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request(); - - req->set_filename(DataCommaSizeFromQString(filename)); - -@@ -107,8 +107,8 @@ - - TagReaderReply *TagReaderClient::LoadEmbeddedArt(const QString &filename) { - -- pb::tagreader::Message message; -- pb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request(); -+ spb::tagreader::Message message; -+ spb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request(); - - req->set_filename(DataCommaSizeFromQString(filename)); - -diff -ur src/core/tagreaderclient.h src/core/tagreaderclient.h ---- src/core/tagreaderclient.h 2020-09-11 17:34:59.560108063 -0400 -+++ src/core/tagreaderclient.h 2021-02-19 14:36:37.196218302 -0500 -@@ -44,7 +44,7 @@ - public: - explicit TagReaderClient(QObject *parent = nullptr); - -- typedef AbstractMessageHandler HandlerType; -+ typedef AbstractMessageHandler HandlerType; - typedef HandlerType::ReplyType ReplyType; - - static const char *kWorkerExecutableName; -@@ -78,7 +78,7 @@ - static TagReaderClient *sInstance; - - WorkerPool *worker_pool_; -- QList message_queue_; -+ QList message_queue_; - QThread *original_thread_; - }; - -diff -ur tests/src/tagreader_test.cpp tests/src/tagreader_test.cpp ---- tests/src/tagreader_test.cpp 2020-09-11 17:34:59.596107832 -0400 -+++ tests/src/tagreader_test.cpp 2021-02-19 14:36:37.194218300 -0500 -@@ -44,7 +44,7 @@ - static Song ReadSongFromFile(const QString& filename) { - TagReader tag_reader; - Song song; -- ::pb::tagreader::SongMetadata pb_song; -+ ::spb::tagreader::SongMetadata pb_song; - - // We need to init protobuf object from a Song object, to have default values initialized correctly. - song.ToProtobuf(&pb_song); -@@ -55,7 +55,7 @@ - - static void WriteSongToFile(const Song& song, const QString& filename) { - TagReader tag_reader; -- ::pb::tagreader::SongMetadata pb_song; -+ ::spb::tagreader::SongMetadata pb_song; - song.ToProtobuf(&pb_song); - tag_reader.SaveFile(filename, pb_song); - } diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template index 2621799c3421..ac2096d495ca 100644 --- a/srcpkgs/strawberry/template +++ b/srcpkgs/strawberry/template @@ -1,18 +1,33 @@ # Template file for 'strawberry' pkgname=strawberry -version=0.8.4 +version=0.9.3 revision=1 build_style=cmake -hostmakedepends="pkg-config qt5-host-tools qt5-devel protobuf gettext" +hostmakedepends="pkg-config protobuf gettext" makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel - libmtp-devel protobuf-devel pulseaudio-devel qt5-tools-devel qt5-plugin-mysql - qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds - qt5-x11extras-devel taglib-devel" -depends="qt5-plugin-sqlite desktop-file-utils" + libmtp-devel protobuf-devel pulseaudio-devel taglib-devel" +depends="desktop-file-utils" short_desc="Audio player and music collection organizer" maintainer="q66 " license="GPL-3.0-or-later" homepage="https://www.strawberrymusicplayer.org/" distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz" -checksum=f93acf3217ae6b63c6ee469bf8b8a86317f724c018cf7e86c43d663c8066760b +checksum=0fe9c38c4d1e2f10c1130dbd87ea6e740bef729fe78820a84ffabe524a80c83e + +build_options="qt6" +build_options_default="" + +if [ "$build_option_qt6" ]; then + configure_args="-DBUILD_WITH_QT6=ON -DQT_HOST_PATH=/usr" + hostmakedepends+=" qt6-base-devel qt6-tools-devel" + makedepends+=" qt6-base-devel qt6-plugin-mysql + qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite" + depends+=" qt6-plugin-sqlite" +else + hostmakedepends+=" qt5-host-tools qt5-devel" + makedepends+=" qt5-tools-devel qt5-plugin-mysql + qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite + qt5-plugin-tds qt5-x11extras-devel" + depends+=" qt5-plugin-sqlite" +fi