From 6ba1f0ab0a89f029b883dc7d07877c4efc975466 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Wed, 25 Apr 2018 00:35:42 +0200 Subject: Make kopete compile --- kde/cmake/kopete | 24 ++++++++++++++++++++++++ kde/modules/applications | 2 +- kde/patch/kopete.patch | 4 ++++ kde/patch/kopete/kopete_kdebug393372.patch | 30 ++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 kde/cmake/kopete create mode 100644 kde/patch/kopete/kopete_kdebug393372.patch diff --git a/kde/cmake/kopete b/kde/cmake/kopete new file mode 100644 index 0000000..f25d089 --- /dev/null +++ b/kde/cmake/kopete @@ -0,0 +1,24 @@ +mkdir build +cd build + cmake \ + $KDE_OPT_ARGS \ + -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DSYSCONF_INSTALL_DIR=/etc/kde \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ + -DLIBEXEC_INSTALL_DIR=lib$LIBDIRSUFFIX \ + -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ + -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DBUILD_TESTING=OFF \ + -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ + -DWITH_wlm:BOOL=OFF \ + .. + diff --git a/kde/modules/applications b/kde/modules/applications index 2c5093c..31ea53d 100644 --- a/kde/modules/applications +++ b/kde/modules/applications @@ -84,7 +84,7 @@ kamoso kdenetwork-filesharing zeroconf-ioslave kget -#kopete +kopete krdc krfb diff --git a/kde/patch/kopete.patch b/kde/patch/kopete.patch index a40c7f5..ad5cf05 100644 --- a/kde/patch/kopete.patch +++ b/kde/patch/kopete.patch @@ -3,3 +3,7 @@ # Fixed in 16.12.3. # cat $CWD/patch/kopete/kopete_kdebug376348.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +# Make 18.04.0 compile. +# Fixed in 18.04.1. +cat $CWD/patch/kopete/kopete_kdebug393372.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/kde/patch/kopete/kopete_kdebug393372.patch b/kde/patch/kopete/kopete_kdebug393372.patch new file mode 100644 index 0000000..2d1b1f0 --- /dev/null +++ b/kde/patch/kopete/kopete_kdebug393372.patch @@ -0,0 +1,30 @@ +From b1f4fa1401cba2e359e5a4b3ea2bafd119fca62b Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 24 Apr 2018 06:30:19 +0200 +Subject: oscar: include buffer.h + +This header uses Buffer as by-value parameter, so make sure it knows +about it. + +BUG: 393372 +FIXED-IN: 18.04.1 +--- + protocols/oscar/liboscar/tasks/messagereceivertask.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/protocols/oscar/liboscar/tasks/messagereceivertask.h b/protocols/oscar/liboscar/tasks/messagereceivertask.h +index 8f52cd7..908e903 100644 +--- a/protocols/oscar/liboscar/tasks/messagereceivertask.h ++++ b/protocols/oscar/liboscar/tasks/messagereceivertask.h +@@ -21,6 +21,7 @@ + #include + #include "oscarmessage.h" + #include "oscartypeclasses.h" ++#include "buffer.h" + + class QTextCodec; + +-- +cgit v0.11.2 + + -- cgit v1.2.3