Add missing patch

This commit is contained in:
Manuel 2012-06-09 22:08:35 +00:00
parent e1659eafec
commit bd78b5f47c
3 changed files with 38 additions and 14 deletions

View File

@ -0,0 +1,25 @@
From: Allen Winter <allen.winter@kdab.com>
Date: Sat, 09 Jun 2012 17:03:12 +0000
Subject: remove REQUIRED from the find_package(KActivities).
X-Git-Url: http://quickgit.kde.org/?p=kde-runtime.git&amp;a=commitdiff&amp;h=a7766cdcd1be164d1cda35df959c1fea1136decc
---
remove REQUIRED from the find_package(KActivities).
then tell the macro_log_feature that KActivities is required.
this way, if people are missing KActivities they will get a nice log
message about it.
---
--- a/plasma/declarativeimports/plasmaextracomponents/CMakeLists.txt
+++ b/plasma/declarativeimports/plasmaextracomponents/CMakeLists.txt
@@ -1,7 +1,7 @@
project(plasmaextracomponents)
-find_package(KActivities REQUIRED NO_MODULE)
-macro_log_feature(KACTIVITIES_FOUND "KActivities" "Library and infrasturcture for using Activities from applications" "http://kde.org/" FALSE "" "Provides the ability to access activities from QML.")
+find_package(KActivities)
+macro_log_feature(KACTIVITIES_FOUND "KActivities" "Library and infrasturcture for using Activities from applications" "git://anongit.kde.org/kactivities" TRUE "" "Provides the ability to access activities from QML.")
#include(KDE4Defaults)

View File

@ -28,15 +28,17 @@ provides=('smokekde')
options=('docs' '!splithdr' 'splitdbg' 'log')
build() {
cd ${srcdir}/${_pkgname}-${pkgver}
cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
-DCMAKE_INSTALL_PREFIX=${_installprefix}
# -DWITH_Soprano=OFF
make
cd "${srcdir}"
mkdir build
cd build
cmake ../smokekde-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_Soprano=OFF
make
}
package() {
cd ${srcdir}/${_pkgname}-${pkgver}
make DESTDIR=${pkgdir} install || return 1
cd "${srcdir}"/build
make DESTDIR="${pkgdir}" install
}

View File

@ -24,20 +24,17 @@ depends=("kdepimlibs>=${_kdever}" "kde-runtime>=${_kdever}" "kdelibs>=${_kdever}
makedepends=('pkg-config' 'cmake' 'automoc4')
groups=("kde" "kdepim" "kde-uninstall" "kde-minimal")
source=($_mirror/${pkgbase}-$_kdever.tar.xz
'libkgapi.patch')
md5sums=(`grep ${pkgbase}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
'484ba92b3bb78987d18fa53ad8b693a5')
source=($_mirror/${pkgbase}-$_kdever.tar.xz)
md5sums=(`grep ${pkgbase}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`)
#
# build and install
#
build() {
cd "${srcdir}"/${pkgbase}-${pkgver}
patch -p1 -i "${srcdir}"/libkgapi.patch
msg "starting build ..."
cd ${srcdir}
mkdir -p build
cd build