diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-30 12:51:06 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-30 12:51:06 +0100 |
commit | e8a18157bce8e0b0cbde5bd52aaf5ae0940297d3 (patch) | |
tree | 89fc1343a6302c7ee5d72774fde0f5b67d0b1927 /extra/libqzeitgeist | |
parent | 6d4537b67f90b1decadcf8434e1a5bdcb6694f7f (diff) | |
parent | 39711f3264d3b9de2ff6392649274d6333932457 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/arpack/PKGBUILD
extra/gtk2/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
staging/digikam/PKGBUILD
testing/curl/PKGBUILD
Diffstat (limited to 'extra/libqzeitgeist')
-rw-r--r-- | extra/libqzeitgeist/PKGBUILD | 20 | ||||
-rw-r--r-- | extra/libqzeitgeist/set-declarative-installation-dir.patch | 14 |
2 files changed, 26 insertions, 8 deletions
diff --git a/extra/libqzeitgeist/PKGBUILD b/extra/libqzeitgeist/PKGBUILD index c2aca401d..229511c81 100644 --- a/extra/libqzeitgeist/PKGBUILD +++ b/extra/libqzeitgeist/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 141345 2011-10-29 16:06:26Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 147936 2012-01-28 11:01:16Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> 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' 'mips64el') 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}" + 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 @@ build() { 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 } diff --git a/extra/libqzeitgeist/set-declarative-installation-dir.patch b/extra/libqzeitgeist/set-declarative-installation-dir.patch new file mode 100644 index 000000000..961c7900d --- /dev/null +++ b/extra/libqzeitgeist/set-declarative-installation-dir.patch @@ -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) |