Date: Tuesday, February 19, 2013 @ 00:57:18 Author: andrea Revision: 178269
archrelease: copy trunk to staging-x86_64 Added: libqzeitgeist/repos/staging-x86_64/PKGBUILD (from rev 178268, libqzeitgeist/trunk/PKGBUILD) libqzeitgeist/repos/staging-x86_64/set-declarative-installation-dir.patch (from rev 178268, libqzeitgeist/trunk/set-declarative-installation-dir.patch) Deleted: libqzeitgeist/repos/staging-x86_64/PKGBUILD libqzeitgeist/repos/staging-x86_64/set-declarative-installation-dir.patch ----------------------------------------+ PKGBUILD | 80 +++++++++++++++---------------- set-declarative-installation-dir.patch | 28 +++++----- 2 files changed, 55 insertions(+), 53 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2013-02-18 23:57:13 UTC (rev 178268) +++ PKGBUILD 2013-02-18 23:57:18 UTC (rev 178269) @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <and...@archlinux.org> - -pkgname=libqzeitgeist -pkgver=0.8.0 -pkgrel=3 -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=('qt4') -makedepends=('cmake' 'automoc4' 'python2' 'zeitgeist') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'set-declarative-installation-dir.patch') -md5sums=('97bdea6a1865db7d5f29c93e3a492f24' - '712013e582acb73296e41ad842d0da01') - -build() { - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/set-declarative-installation-dir.patch - cd ../ - - # Fix python2 path - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ - ${pkgname}-${pkgver}/scripts/onto2cpp.py - - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DDECLARATIVE_IMPORT_PREFIX=/usr/lib/qt4/imports/ - make -} - -package() { - cd build - make DESTDIR="${pkgdir}" install -} Copied: libqzeitgeist/repos/staging-x86_64/PKGBUILD (from rev 178268, libqzeitgeist/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2013-02-18 23:57:18 UTC (rev 178269) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> + +pkgname=libqzeitgeist +pkgver=0.8.0 +pkgrel=3 +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=('qt4') +makedepends=('cmake' 'automoc4' 'python2' 'zeitgeist') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + 'set-declarative-installation-dir.patch') +md5sums=('97bdea6a1865db7d5f29c93e3a492f24' + '712013e582acb73296e41ad842d0da01') + +build() { + . /etc/profile.d/qt4.sh + + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/set-declarative-installation-dir.patch + cd ../ + + # Fix python2 path + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ + ${pkgname}-${pkgver}/scripts/onto2cpp.py + + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DDECLARATIVE_IMPORT_PREFIX=/usr/lib/qt4/imports/ + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} Deleted: set-declarative-installation-dir.patch =================================================================== --- set-declarative-installation-dir.patch 2013-02-18 23:57:13 UTC (rev 178268) +++ set-declarative-installation-dir.patch 2013-02-18 23:57:18 UTC (rev 178269) @@ -1,14 +0,0 @@ ---- 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) Copied: libqzeitgeist/repos/staging-x86_64/set-declarative-installation-dir.patch (from rev 178268, libqzeitgeist/trunk/set-declarative-installation-dir.patch) =================================================================== --- set-declarative-installation-dir.patch (rev 0) +++ set-declarative-installation-dir.patch 2013-02-18 23:57:18 UTC (rev 178269) @@ -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)