From f1c6fc5a808e31ac654de7e4fe1ae65f5c61eb1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Thu, 4 Jun 2020 19:46:43 +0200 Subject: [PATCH] kadu: fix build; revbump for qt5-5.14.2 --- srcpkgs/kadu/patches/qt5-qcompare.patch | 11 +++++++++++ srcpkgs/kadu/template | 12 ++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/kadu/patches/qt5-qcompare.patch diff --git a/srcpkgs/kadu/patches/qt5-qcompare.patch b/srcpkgs/kadu/patches/qt5-qcompare.patch new file mode 100644 index 00000000000..03da5cadee3 --- /dev/null +++ b/srcpkgs/kadu/patches/qt5-qcompare.patch @@ -0,0 +1,11 @@ +--- kadu-core/plugin/state/plugin-state.test.cpp 2017-01-24 22:36:21.000000000 +0100 ++++ kadu-core/plugin/state/plugin-state.test.cpp 2020-06-04 19:24:50.219823920 +0200 +@@ -34,7 +34,7 @@ + + void PluginStateTest::newTest() + { +- QCOMPARE(pluginStateToString(PluginState::New), {}); ++ QCOMPARE(pluginStateToString(PluginState::New), nullptr); + QCOMPARE(stringToPluginState(""), PluginState::New); + QCOMPARE(stringToPluginState("New"), PluginState::New); + QCOMPARE(stringToPluginState("Invalid"), PluginState::New); diff --git a/srcpkgs/kadu/template b/srcpkgs/kadu/template index 09516ac3d5b..da8c8c086ff 100644 --- a/srcpkgs/kadu/template +++ b/srcpkgs/kadu/template @@ -1,7 +1,7 @@ # Template file for 'kadu' pkgname=kadu version=4.3 -revision=4 +revision=5 build_style=cmake configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr -DX11_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include @@ -11,12 +11,12 @@ configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr -DX11_Xfixes_LIB=Xfixes -DX11_Xscreensaver_LIB=Xss -DQCA2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/QtCrypto -DQCA2_LIBRARIES=qca -DENABLE_TESTS=OFF -Wno-dev" -hostmakedepends="pkg-config qt5-plugin-mysql qt5-plugin-odbc - qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds" +hostmakedepends="pkg-config qt5-host-tools" makedepends="libao-devel libsndfile-devel libarchive-devel enchant-devel injeqt-devel libgadu-devel libidn-devel libotr-devel qt5-devel qt5-xmlpatterns-devel qt5-declarative-devel qt5-multimedia-devel qt5-script-devel qt5-svg-devel qt5-tools-devel qt5-webkit-devel qt5-x11extras-devel + qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libmpdclient-devel qca-qt5-devel qxmpp-devel phonon-qt5-devel libX11-devel libXfixes-devel libXScrnSaver-devel" depends="${pkgname}-data-${version}_${revision} hicolor-icon-theme qca-qt5-ossl @@ -39,11 +39,7 @@ desc_option_sqlite="Use SQlite database plugin" desc_option_tds="Use Tabular Data Stream database plugin" if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools - qt5-devel qt5-xmlpatterns-devel qt5-declarative-devel qt5-multimedia-devel - qt5-script-devel qt5-svg-devel qt5-tools-devel qt5-webkit-devel qt5-x11extras-devel" - makedepends+=" qt5-plugin-mysql qt5-plugin-odbc - qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds" + hostmakedepends+=" ${makedepends}" fi pre_configure() {