diff --git a/kactivities/FindKactivities.patch b/kactivities/FindKactivities.patch new file mode 100644 index 000000000..58b1bd894 --- /dev/null +++ b/kactivities/FindKactivities.patch @@ -0,0 +1,11 @@ +--- a/lib/KActivitiesConfig.cmake.in ++++ b/lib/KActivitiesConfig.cmake.in +@@ -1,6 +1,8 @@ + get_filename_component(myDir ${CMAKE_CURRENT_LIST_FILE} PATH) # get the directory where I myself am + get_filename_component(rootDir ${myDir}/@relInstallDir@ ABSOLUTE) # get the chosen install prefix + ++set(KACTIVITIES_FOUND TRUE) ++ + # set the version of myself + set(KACTIVITIES_VERSION_MAJOR @KACTIVITIES_LIB_MAJOR_VERSION@) + set(KACTIVITIES_VERSION_MINOR @KACTIVITIES_LIB_MINOR_VERSION@) diff --git a/kactivities/PKGBUILD b/kactivities/PKGBUILD index 0da98d190..07dc1f4e8 100644 --- a/kactivities/PKGBUILD +++ b/kactivities/PKGBUILD @@ -23,19 +23,21 @@ md5sums=(`grep ${pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`) build() { - cd "${srcdir}" + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ${startdir}/FindKactivities.patch rm -rf build mkdir build && cd build - cmake ../${pkgname}-${pkgver} \ + cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd $srcdir/build + cd $srcdir/$pkgname-$pkgver/build make DESTDIR=$pkgdir install } diff --git a/kde-runtime/PKGBUILD b/kde-runtime/PKGBUILD index 39d4478b7..e8605cf6c 100644 --- a/kde-runtime/PKGBUILD +++ b/kde-runtime/PKGBUILD @@ -31,10 +31,13 @@ noextract=(branding.svgz) source=($_mirror/${pkgname}-$_kdever.tar.xz branding.svgz - 01_disable_logout_sound.patch) + 01_disable_logout_sound.patch + FindKactivities.patch) + md5sums=(`grep ${pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1` '68cd8eb57db22c2f2ed554b721253bc2' # branding.svgz - 'a434bf282ee391b2f857184be59a3b6f') # 01_disable_logout_sound.patch + 'a434bf282ee391b2f857184be59a3b6f' # 01_disable_logout_sound.patch + '259d02a6fc6a1e2aa8ade4558250e9e4') # FIndKactivities.patch # # build function @@ -44,6 +47,7 @@ build() { msg "applying main patchset ..." patch -Np1 -i ${srcdir}/01_disable_logout_sound.patch + patch -p1 -i ${srcdir}/FindKactivities.patch # copy our branding stuff cp -f ${srcdir}/branding.svgz ${srcdir}/${pkgname}-${pkgver}/desktoptheme/oxygen/widgets/