wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

kadu: fix build; revbump for qt5-5.14.2

Browse source
This commit is contained in:
Jürgen Buchmüller 2020-06-04 19:46:43 +02:00
parent 1ee1158013
commit f1c6fc5a80
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
srcpkgs/kadu/patches/qt5-qcompare.patch Normal file
View file

@ -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);

12
srcpkgs/kadu/template
View file

@ -1,7 +1,7 @@
# Template file for 'kadu' # Template file for 'kadu'
pkgname=kadu pkgname=kadu
version=4.3 version=4.3
revision=4 revision=5
build_style=cmake build_style=cmake
configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
-DX11_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include -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 -DX11_Xfixes_LIB=Xfixes -DX11_Xscreensaver_LIB=Xss
-DQCA2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/QtCrypto -DQCA2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/QtCrypto
-DQCA2_LIBRARIES=qca -DENABLE_TESTS=OFF -Wno-dev" -DQCA2_LIBRARIES=qca -DENABLE_TESTS=OFF -Wno-dev"
hostmakedepends="pkg-config qt5-plugin-mysql qt5-plugin-odbc hostmakedepends="pkg-config qt5-host-tools"
qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
makedepends="libao-devel libsndfile-devel libarchive-devel makedepends="libao-devel libsndfile-devel libarchive-devel
enchant-devel injeqt-devel libgadu-devel libidn-devel libotr-devel enchant-devel injeqt-devel libgadu-devel libidn-devel libotr-devel
qt5-devel qt5-xmlpatterns-devel qt5-declarative-devel qt5-multimedia-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-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 libmpdclient-devel qca-qt5-devel qxmpp-devel phonon-qt5-devel
libX11-devel libXfixes-devel libXScrnSaver-devel" libX11-devel libXfixes-devel libXScrnSaver-devel"
depends="${pkgname}-data-${version}_${revision} hicolor-icon-theme qca-qt5-ossl 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" desc_option_tds="Use Tabular Data Stream database plugin"
if [ -n "$CROSS_BUILD" ]; then if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools hostmakedepends+=" ${makedepends}"
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"
fi fi
pre_configure() { pre_configure() {