[arch-commits] Commit in (5 files)

Antonio Rojas arojas at archlinux.org
Tue Jul 28 16:41:26 UTC 2015


    Date: Tuesday, July 28, 2015 @ 18:41:26
  Author: arojas
Revision: 242568

Add legacy qt4 akonadi libraries

Added:
  libakonadi-qt4/
  libakonadi-qt4/trunk/
  libakonadi-qt4/trunk/libakonadi-qt4.install
    (from rev 242562, akonadi/trunk/akonadi.install)
Modified:
  libakonadi-qt4/trunk/PKGBUILD
Deleted:
  libakonadi-qt4/trunk/akonadi.install

---------------------------------------------+
 libakonadi-qt4/trunk/libakonadi-qt4.install |   11 +++++++++
 trunk/PKGBUILD                              |   30 ++++++++++----------------
 trunk/akonadi.install                       |   11 ---------
 3 files changed, 23 insertions(+), 29 deletions(-)

Modified: libakonadi-qt4/trunk/PKGBUILD
===================================================================
--- akonadi/trunk/PKGBUILD	2015-07-28 10:11:52 UTC (rev 242562)
+++ libakonadi-qt4/trunk/PKGBUILD	2015-07-28 16:41:26 UTC (rev 242568)
@@ -3,28 +3,26 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
-pkgname=akonadi
+pkgname=libakonadi-qt4
 pkgver=1.13.0
-pkgrel=6
-pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
+pkgrel=1
+pkgdesc="Qt4 akonadi libraries"
 arch=('i686' 'x86_64')
 url='http://community.kde.org/KDE_PIM/Akonadi'
 license=('LGPL')
-depends=('shared-mime-info' 'boost-libs' 'qt4' 'libxslt')
+depends=('boost-libs' 'qt4' 'libxslt')
 makedepends=('cmake' 'automoc4' 'boost' 'postgresql' 'mariadb')
-checkdepends=('xorg-server-xvfb')
-optdepends=('postgresql: PostgreSQL backend'
-            'mariadb: MariaDB backend')
+conflicts=('akonadi<2')
 install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2"
+source=("http://download.kde.org/stable/akonadi/src/akonadi-${pkgver}.tar.bz2"
         dont-leak-old-external-payload-files.patch)
 md5sums=('84eb2e471bd6bdfe54a2a2f1d858c07d'
          '9711e300dde3775a38637daa3c20befe')
 
 prepare() {
-  mkdir build
+  mkdir -p build
 
-  cd $pkgname-$pkgver
+  cd akonadi-$pkgver
   # https://bugs.kde.org/show_bug.cgi?id=341884
   patch -p1 -i ../dont-leak-old-external-payload-files.patch
 }
@@ -31,7 +29,7 @@
 
 build() {
   cd build
-  cmake ../${pkgname}-${pkgver} \
+  cmake ../akonadi-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE \
@@ -41,14 +39,10 @@
   make
 }
 
-check() {
-  # 17 akonadi-dbconfigtest failed as we changed the default backend
-  # 24~30 failed due to qt cannot find the sqldriver which is not installed yet
-  cd build
-  xvfb-run -a dbus-launch --exit-with-session make test || warning "Tests failed"
-}
-
 package() {
   cd build
   make DESTDIR="${pkgdir}" install
+
+# conflicts with akonadi
+  rm -r "$pkgdir"/usr/{bin,share}
 }

Deleted: libakonadi-qt4/trunk/akonadi.install
===================================================================
--- akonadi/trunk/akonadi.install	2015-07-28 10:11:52 UTC (rev 242562)
+++ libakonadi-qt4/trunk/akonadi.install	2015-07-28 16:41:26 UTC (rev 242568)
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: libakonadi-qt4/trunk/libakonadi-qt4.install (from rev 242562, akonadi/trunk/akonadi.install)
===================================================================
--- libakonadi-qt4/trunk/libakonadi-qt4.install	                        (rev 0)
+++ libakonadi-qt4/trunk/libakonadi-qt4.install	2015-07-28 16:41:26 UTC (rev 242568)
@@ -0,0 +1,11 @@
+post_install() {
+	update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}



More information about the arch-commits mailing list