Date: Saturday, January 28, 2012 @ 06:00:50 Author: andrea Revision: 147935
upgpkg: libqzeitgeist 0.8.0-2 Fix qt plugin install dir (FS#28136) Added: libqzeitgeist/trunk/set-declarative-installation-dir.patch Modified: libqzeitgeist/trunk/PKGBUILD ----------------------------------------+ PKGBUILD | 18 +++++++++++------- set-declarative-installation-dir.patch | 14 ++++++++++++++ 2 files changed, 25 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-01-28 10:37:20 UTC (rev 147934) +++ PKGBUILD 2012-01-28 11:00:50 UTC (rev 147935) @@ -1,22 +1,25 @@ # $Id$ -# Maintainer: -# Contributor: Andrea Scarpino <[email protected]> +# Maintainer: Andrea Scarpino <[email protected]> pkgname=libqzeitgeist pkgver=0.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="A Qt interface to the Zeitgeist event tracking system" url="https://projects.kde.org/projects/kdesupport/libqzeitgeist"; arch=('i686' 'x86_64') license=('GPL') depends=('qt') makedepends=('cmake' 'automoc4' 'python2' 'zeitgeist') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";) -md5sums=('97bdea6a1865db7d5f29c93e3a492f24') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"; + 'set-declarative-installation-dir.patch') +md5sums=('97bdea6a1865db7d5f29c93e3a492f24' + '712013e582acb73296e41ad842d0da01') build() { + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/set-declarative-installation-dir.patch + cd "${srcdir}" - # Fix python2 path sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ ${pkgname}-${pkgver}/scripts/onto2cpp.py @@ -25,7 +28,8 @@ cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DDECLARATIVE_IMPORT_PREFIX=/usr/lib/qt/imports/ make } Added: set-declarative-installation-dir.patch =================================================================== --- set-declarative-installation-dir.patch (rev 0) +++ set-declarative-installation-dir.patch 2012-01-28 11:00:50 UTC (rev 147935) @@ -0,0 +1,14 @@ +--- libqzeitgeist-0.8.0/declarative/CMakeLists.txt~ 2012-01-28 10:55:56.178972521 +0000 ++++ libqzeitgeist-0.8.0/declarative/CMakeLists.txt 2012-01-28 10:57:29.601561527 +0000 +@@ -14,7 +14,9 @@ + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src/) + automoc4_add_library(QZeitgeistDeclarativePlugin MODULE ${declarative_SRCS}) + +-target_link_libraries(QZeitgeistDeclarativePlugin ${QT_LIBRARIES} qzeitgeist) ++target_link_libraries(QZeitgeistDeclarativePlugin ${QT_QTDECLARATIVE_LIBRARIES} qzeitgeist) + +-install(TARGETS QZeitgeistDeclarativePlugin DESTINATION lib${LIB_SUFFIX}/qt4/imports/org/gnome/zeitgeist) ++set(DECLARATIVE_IMPORT_PREFIX ${QT_IMPORTS_DIR} CACHE PATH "Location to install declarative bindings") ++ ++install(TARGETS QZeitgeistDeclarativePlugin DESTINATION ${DECLARATIVE_IMPORT_PREFIX}/org/gnome/zeitgeist) + install(FILES qmldir DESTINATION ${QT_IMPORTS_DIR}/org/gnome/zeitgeist)
