From dccec7efa0031f28ddd7f2315e6a2a6c748d4696 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 9 Jan 2015 15:26:14 +0100 Subject: Everything up to and including plasma-extra built successfully. Functionality has not been tested though. I first want to have all packages compiled successfully. --- kde/cmake/plasma | 4 +--- kde/patch/kdeconnect-framework.patch | 3 +++ kde/patch/kdeconnect-framework/kdeconnect-kde_qca.diff | 11 +++++++++++ kde/pkgsrc/sddm-qt5 | 1 + 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 kde/patch/kdeconnect-framework.patch create mode 100644 kde/patch/kdeconnect-framework/kdeconnect-kde_qca.diff create mode 100644 kde/pkgsrc/sddm-qt5 diff --git a/kde/cmake/plasma b/kde/cmake/plasma index 72fc444..111d30c 100644 --- a/kde/cmake/plasma +++ b/kde/cmake/plasma @@ -1,6 +1,3 @@ -# Makes the build fail: -#export XDG_DATA_DIRS="/opt/kf5/share:$XDG_DATA_DIRS" - mkdir build cd build cmake \ @@ -20,5 +17,6 @@ cd build -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ -DBUILD_TESTING=OFF \ -DHAVE_SHADOW=TRUE \ + -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ .. diff --git a/kde/patch/kdeconnect-framework.patch b/kde/patch/kdeconnect-framework.patch new file mode 100644 index 0000000..ee772bc --- /dev/null +++ b/kde/patch/kdeconnect-framework.patch @@ -0,0 +1,3 @@ +# We use Qca-qt5, not Qca: +cat $CWD/patch/kdeconnect-framework/kdeconnect-kde_qca.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/kde/patch/kdeconnect-framework/kdeconnect-kde_qca.diff b/kde/patch/kdeconnect-framework/kdeconnect-kde_qca.diff new file mode 100644 index 0000000..63d37af --- /dev/null +++ b/kde/patch/kdeconnect-framework/kdeconnect-kde_qca.diff @@ -0,0 +1,11 @@ +--- kdeconnect-kde-408533f_20141209git/CMakeLists.txt.orig 2014-12-09 22:27:16.000000000 +0100 ++++ kdeconnect-kde-408533f_20141209git/CMakeLists.txt 2015-01-09 15:05:31.575681125 +0100 +@@ -7,7 +7,7 @@ + + find_package(Qt5 5.2 REQUIRED COMPONENTS Quick Test) + find_package(KF5 REQUIRED COMPONENTS I18n KIO Notifications ConfigWidgets DBusAddons KCMUtils IconThemes) +-find_package(Qca REQUIRED) ++find_package(Qca-qt5 REQUIRED) + + include(KDEInstallDirs) + include(KDECompilerSettings) diff --git a/kde/pkgsrc/sddm-qt5 b/kde/pkgsrc/sddm-qt5 new file mode 100644 index 0000000..961193e --- /dev/null +++ b/kde/pkgsrc/sddm-qt5 @@ -0,0 +1 @@ +plasma-extra/sddm -- cgit v1.2.3