[arch-commits] Commit in libqzeitgeist/repos (6 files)

Andrea Scarpino andrea at archlinux.org
Sat Jan 28 11:01:17 UTC 2012


    Date: Saturday, January 28, 2012 @ 06:01:16
  Author: andrea
Revision: 147936

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  libqzeitgeist/repos/extra-i686/PKGBUILD
    (from rev 147935, libqzeitgeist/trunk/PKGBUILD)
  libqzeitgeist/repos/extra-i686/set-declarative-installation-dir.patch
    (from rev 147935, libqzeitgeist/trunk/set-declarative-installation-dir.patch)
  libqzeitgeist/repos/extra-x86_64/PKGBUILD
    (from rev 147935, libqzeitgeist/trunk/PKGBUILD)
  libqzeitgeist/repos/extra-x86_64/set-declarative-installation-dir.patch
    (from rev 147935, libqzeitgeist/trunk/set-declarative-installation-dir.patch)
Deleted:
  libqzeitgeist/repos/extra-i686/PKGBUILD
  libqzeitgeist/repos/extra-x86_64/PKGBUILD

-----------------------------------------------------+
 extra-i686/PKGBUILD                                 |   74 +++++++++---------
 extra-i686/set-declarative-installation-dir.patch   |   14 +++
 extra-x86_64/PKGBUILD                               |   74 +++++++++---------
 extra-x86_64/set-declarative-installation-dir.patch |   14 +++
 4 files changed, 106 insertions(+), 70 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-01-28 11:00:50 UTC (rev 147935)
+++ extra-i686/PKGBUILD	2012-01-28 11:01:16 UTC (rev 147936)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=libqzeitgeist
-pkgver=0.8.0
-pkgrel=1
-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')
-
-build() {
-  cd "${srcdir}"
-
-  # 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
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}

Copied: libqzeitgeist/repos/extra-i686/PKGBUILD (from rev 147935, libqzeitgeist/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-01-28 11:01:16 UTC (rev 147936)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=libqzeitgeist
+pkgver=0.8.0
+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"
+        '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
+
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+    -DDECLARATIVE_IMPORT_PREFIX=/usr/lib/qt/imports/
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}

Copied: libqzeitgeist/repos/extra-i686/set-declarative-installation-dir.patch (from rev 147935, libqzeitgeist/trunk/set-declarative-installation-dir.patch)
===================================================================
--- extra-i686/set-declarative-installation-dir.patch	                        (rev 0)
+++ extra-i686/set-declarative-installation-dir.patch	2012-01-28 11:01:16 UTC (rev 147936)
@@ -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)

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-01-28 11:00:50 UTC (rev 147935)
+++ extra-x86_64/PKGBUILD	2012-01-28 11:01:16 UTC (rev 147936)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=libqzeitgeist
-pkgver=0.8.0
-pkgrel=1
-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')
-
-build() {
-  cd "${srcdir}"
-
-  # 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
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}

Copied: libqzeitgeist/repos/extra-x86_64/PKGBUILD (from rev 147935, libqzeitgeist/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-01-28 11:01:16 UTC (rev 147936)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=libqzeitgeist
+pkgver=0.8.0
+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"
+        '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
+
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+    -DDECLARATIVE_IMPORT_PREFIX=/usr/lib/qt/imports/
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}

Copied: libqzeitgeist/repos/extra-x86_64/set-declarative-installation-dir.patch (from rev 147935, libqzeitgeist/trunk/set-declarative-installation-dir.patch)
===================================================================
--- extra-x86_64/set-declarative-installation-dir.patch	                        (rev 0)
+++ extra-x86_64/set-declarative-installation-dir.patch	2012-01-28 11:01:16 UTC (rev 147936)
@@ -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)




More information about the arch-commits mailing list