From 42723a2d7e56f2f0860b53517aff08c47e0f804e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 25 Mar 2024 22:08:54 +0700 Subject: [PATCH] *: drop qt6-tools-devel from hostmakedepends --- srcpkgs/cmake/template | 2 +- srcpkgs/gnuplot/template | 6 +++--- srcpkgs/kapow/template | 2 +- srcpkgs/kvantum/template | 2 +- srcpkgs/mlt7/template | 2 +- srcpkgs/phonon/template | 3 +-- srcpkgs/qflipper/template | 2 +- srcpkgs/qtcreator/template | 4 ++-- srcpkgs/rssguard/template | 5 ++--- srcpkgs/shotcut/template | 2 +- 10 files changed, 14 insertions(+), 16 deletions(-) diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index ac17760dd4a965..e3fbf72cc1ca4b 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -10,7 +10,7 @@ configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1" hostmakedepends="gcc-fortran python3-Sphinx qt6-base qt6-tools" makedepends="expat-devel libarchive-devel libcurl-devel libuv-devel cppdap-devel - ncurses-devel rhash-devel jsoncpp-devel qt6-base-devel qt6-tools-devel" + ncurses-devel rhash-devel jsoncpp-devel qt6-base-devel" checkdepends="pax pkg-config git" short_desc="Cross-platform, open-source build system" maintainer="Đoàn Trần Công Danh " diff --git a/srcpkgs/gnuplot/template b/srcpkgs/gnuplot/template index b000bba1a763d3..f57aa54d5a9fe5 100644 --- a/srcpkgs/gnuplot/template +++ b/srcpkgs/gnuplot/template @@ -11,16 +11,16 @@ makedepends="zlib-devel libX11-devel gd-devel lua52-devel depends="gnuplot-common>=${version}_${revision}" short_desc="Command-line driven graphing utility" maintainer="Leah Neukirchen " -homepage="http://www.gnuplot.info/" license="gnuplot" +homepage="http://www.gnuplot.info/" distfiles="${SOURCEFORGE_SITE}/gnuplot/gnuplot/${version}/gnuplot-${version}.tar.gz" checksum=635a28f0993f6ab0d1179e072ad39b8139d07f51237f841d93c6c2ff4b1758ec subpackages="gnuplot-common" if [ -z "$CROSS_BUILD" ]; then - hostmakedepends+=" qt6-base qt6-base-devel pkg-config" + hostmakedepends+=" qt6-base qt6-tools" makedepends+=" wxWidgets-gtk3-devel - qt6-base-devel qt6-tools-devel qt6-svg-devel qt6-qt5compat-devel" + qt6-base-devel qt6-svg-devel qt6-qt5compat-devel" subpackages+=" gnuplot-wx gnuplot-qt" fi diff --git a/srcpkgs/kapow/template b/srcpkgs/kapow/template index dd298257752299..099166bc0abe81 100644 --- a/srcpkgs/kapow/template +++ b/srcpkgs/kapow/template @@ -3,7 +3,7 @@ pkgname=kapow version=1.6.1 revision=1 build_style=cmake -hostmakedepends="qt6-tools-devel" +hostmakedepends="qt6-tools qt6-base" makedepends="qt6-base-devel" short_desc="Simple punch-clock style time tracker" maintainer="Orphaned " diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template index c9f8f8e2e22c12..e53a09220cb723 100644 --- a/srcpkgs/kvantum/template +++ b/srcpkgs/kvantum/template @@ -4,7 +4,7 @@ version=1.0.10 revision=1 build_wrksrc=Kvantum build_style=cmake -hostmakedepends="qt5-tools-devel qt5-host-tools qt6-tools-devel" +hostmakedepends="qt5-tools-devel qt5-host-tools qt6-tools qt6-base" makedepends="qt5-devel qt6-base-devel qt5-svg-devel qt6-svg-devel qt5-x11extras-devel kwindowsystem-devel" short_desc="SVG-based theme engine for Qt5/Qt6, KDE and LXQt" diff --git a/srcpkgs/mlt7/template b/srcpkgs/mlt7/template index 98f302ad3a5167..65eed998d39832 100644 --- a/srcpkgs/mlt7/template +++ b/srcpkgs/mlt7/template @@ -5,7 +5,7 @@ revision=2 build_style=cmake configure_args="-DSWIG_PYTHON=ON -DMOD_QT6=ON" hostmakedepends="doxygen pkg-config ladspa-sdk swig python3 which - qt5-host-tools qt5-qmake qt6-tools-devel" + qt5-host-tools qt5-qmake qt6-base qt6-tools" makedepends="alsa-lib-devel ffmpeg-devel gtk+-devel jack-devel ladspa-sdk libexif-devel libsamplerate-devel libxml2-devel sox-devel SDL_image-devel fftw-devel frei0r-plugins python3-devel pulseaudio-devel movit-devel diff --git a/srcpkgs/phonon/template b/srcpkgs/phonon/template index 33bc8d5f684709..00eee500d11e16 100644 --- a/srcpkgs/phonon/template +++ b/srcpkgs/phonon/template @@ -5,7 +5,7 @@ revision=2 build_style=cmake configure_args="$(vopt_bool designerplugin PHONON_BUILD_DESIGNER_PLUGIN)" hostmakedepends="extra-cmake-modules qt5-host-tools qt5-devel - qt6-base qt6-tools qt6-tools" + qt6-base qt6-tools" makedepends="glib-devel qt5-devel pulseaudio-devel qt6-qt5compat-devel" depends="phonon-locale" short_desc="Multimedia framework for KDE" @@ -16,7 +16,6 @@ distfiles="${KDE_SITE}/${pkgname%-*}/${version}/${pkgname%-*}-${version}.tar.xz" checksum=3287ffe0fbcc2d4aa1363f9e15747302d0b080090fe76e5f211d809ecb43f39a build_options="designerplugin" -build_options_default="" if [ -z "$CROSS_BUILD" ]; then build_options_default="designerplugin" diff --git a/srcpkgs/qflipper/template b/srcpkgs/qflipper/template index fa946c30d2f425..96b85df24b1659 100644 --- a/srcpkgs/qflipper/template +++ b/srcpkgs/qflipper/template @@ -5,7 +5,7 @@ revision=3 _nanopb_version=0.4.6 build_style=qmake configure_args="CONFIG+=qtquickcompiler DEFINES+=DISABLE_APPLICATION_UPDATES" -hostmakedepends="pkg-config qt6-tools-devel" +hostmakedepends="pkg-config qt6-base qt6-tools" makedepends="qt6-serialport-devel qt6-declarative-devel qt6-wayland-devel qt6-qt5compat-devel qt6-svg-devel libusb-devel" depends="qt6-plugin-tls-openssl qt6-svg" diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template index c9ff18781412bc..3d146646259daa 100644 --- a/srcpkgs/qtcreator/template +++ b/srcpkgs/qtcreator/template @@ -25,8 +25,8 @@ python_version=3 build_options="qbs" desc_option_qbs="Build vendored Qbs" -if [ -z "$XBPS_CROSS_BUILD" ] && [ "$XBPS_TARGET_WORDSIZE" != 32 ]; then - hostmakedepends+=" qt6-tools-devel" +if [ -z "$CROSS_BUILD" ] && [ "$XBPS_TARGET_WORDSIZE" != 32 ]; then + makedepends+=" qt6-tools-devel" build_options_default="qbs" fi diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template index 71e11f8ec926d7..18771a1503a723 100644 --- a/srcpkgs/rssguard/template +++ b/srcpkgs/rssguard/template @@ -4,8 +4,9 @@ version=4.6.3 revision=1 build_style=cmake configure_args="-DNO_LITE=OFF" +hostmakedepends="qt6-base qt6-tools" makedepends="qt6-base-devel qt6-declarative-devel qt6-multimedia-devel - qt6-qt5compat-devel qt6-tools-devel mpv-devel" + qt6-qt5compat-devel mpv-devel" depends="desktop-file-utils qt6-plugin-sqlite" short_desc="Simple (yet powerful) Qt6 feed reader" maintainer="mobinmob " @@ -13,8 +14,6 @@ license="GPL-3.0-only" homepage="https://github.com/martinrotter/rssguard" distfiles="https://github.com/martinrotter/rssguard/archive/${version}.tar.gz" checksum=5b710776146f7f642aa04525e0547bbac7125b99a5ca8410cb82627c7f6ede70 -nocross="yes" #wrong binaries detected even if the packages are in -#hostmakedepends post_install() { # Install rssguard icon manually diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template index 33141fbd862d7a..b0dc9377558941 100644 --- a/srcpkgs/shotcut/template +++ b/srcpkgs/shotcut/template @@ -4,7 +4,7 @@ version=23.09.29 revision=1 build_style=cmake configure_args="-DSHOTCUT_VERSION=${version}" -hostmakedepends="pkg-config qt6-tools-devel" +hostmakedepends="pkg-config qt6-base qt6-tools" makedepends="mlt7-devel qt6-declarative-devel qt6-multimedia-devel qt6-websockets-devel qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"