kadu: rebuild for qxmpp-1.1.0

This package has not been maintained upstream for 2 years now and needs
quite a few hacks to build at all. I wonder if we should remove it
from the repository.

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
Jürgen Buchmüller 2019-10-27 10:04:20 +01:00
parent e22da89e71
commit bb5ada7565
No known key found for this signature in database
GPG key ID: DE55AD8DBEBB4EE8
2 changed files with 49 additions and 3 deletions

View file

@ -0,0 +1,40 @@
--- kadu-core/CMakeLists.txt 2017-01-24 22:36:21.000000000 +0100
+++ kadu-core/CMakeLists.txt 2019-10-27 08:50:28.152486629 +0100
@@ -111,7 +111,6 @@
list (APPEND ADDITIONAL_LIBKADU_LIBRARIES ${LibArchive_LIBRARIES})
if (UNIX AND NOT APPLE)
- find_package (X11 REQUIRED COMPONENTS X11 Xutil Xfixes)
if (X11_FOUND AND X11_Xutil_FOUND AND X11_Xfixes_FOUND)
message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xfixes_LIB}")
else ()
--- plugins/idle/CMakeLists.txt 2017-01-24 22:36:22.000000000 +0100
+++ plugins/idle/CMakeLists.txt 2019-10-27 08:52:28.448492835 +0100
@@ -15,7 +15,6 @@
)
if (UNIX AND NOT APPLE)
- find_package (X11 REQUIRED COMPONENTS X11 Xutil Xscreensaver)
if (X11_Xscreensaver_FOUND)
message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xscreensaver_LIB}")
else ()
--- plugins/pcspeaker/CMakeLists.txt 2017-01-24 22:36:22.000000000 +0100
+++ plugins/pcspeaker/CMakeLists.txt 2019-10-27 08:55:53.297503403 +0100
@@ -15,7 +15,6 @@
set (LIBRARIES "")
if (UNIX AND NOT APPLE)
- find_package (X11 REQUIRED COMPONENTS X11)
if (NOT X11_FOUND)
message (SEND_ERROR "Could NOT find X11")
endif ()
--- plugins/screenshot/CMakeLists.txt 2017-01-24 22:36:22.000000000 +0100
+++ plugins/screenshot/CMakeLists.txt 2019-10-27 09:02:31.066523924 +0100
@@ -30,7 +30,6 @@
if (UNIX AND NOT APPLE)
set (PLUGIN_ADDITIONAL_QT_MODULES X11Extras)
- find_package (X11 REQUIRED COMPONENTS X11 Xext Xshape)
if (X11_Xshape_FOUND)
message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xext_LIB}")
else ()

View file

@ -1,18 +1,24 @@
# Template file for 'kadu'
pkgname=kadu
version=4.3
revision=2
revision=3
build_style=cmake
configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
-DX11_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
-DX11_FOUND=1 -DX11_Xutil_FOUND=1 -DX11_Xshape_FOUND=1
-DX11_Xfixes_FOUND=1 -DX11_Xscreensaver_FOUND=1
-DX11_X11_LIB=X11 -DX11_Xext_LIB=Xext
-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"
makedepends="libao-devel libsndfile-devel libarchive-devel
enchant-devel injeqt-devel libgadu-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-script-devel qt5-svg-devel qt5-tools-devel qt5-webkit-devel qt5-x11extras-devel
libmpdclient-devel qca-qt5-devel qxmpp-devel phonon-qt5-devel libXScrnSaver-devel"
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
$(vopt_if mysql qt5-plugin-mysql) $(vopt_if odbc qt5-plugin-odbc)
$(vopt_if pgsql qt5-plugin-pgsql) $(vopt_if sqlite qt5-plugin-sqlite)