[arch-commits] Commit in (5 files)

[Antonio Rojas]

    Date: Saturday, August 15, 2015 @ 10:01:52
  Author: arojas
Revision: 243722

Add full akonadi-qt4 package, we're keeping kdepim 4 for the 15.08 cycle

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

------------------------------------------+
 /trunk/PKGBUILD                          |   61 +++++++++++++++++++++++++++++
 akonadi-qt4/trunk/PKGBUILD               |   48 ----------------------
 akonadi-qt4/trunk/akonadi-qt4.install    |   11 +++++
 akonadi-qt4/trunk/libakonadi-qt4.install |   11 -----
 4 files changed, 72 insertions(+), 59 deletions(-)

Deleted: akonadi-qt4/trunk/PKGBUILD
===================================================================
--- libakonadi-qt4/trunk/PKGBUILD	2015-07-28 16:41:26 UTC (rev 242568)
+++ akonadi-qt4/trunk/PKGBUILD	2015-08-15 08:01:52 UTC (rev 243722)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=libakonadi-qt4
-pkgver=1.13.0
-pkgrel=1
-pkgdesc="Qt4 akonadi libraries"
-arch=('i686' 'x86_64')
-url='http://community.kde.org/KDE_PIM/Akonadi'
-license=('LGPL')
-depends=('boost-libs' 'qt4' 'libxslt')
-makedepends=('cmake' 'automoc4' 'boost' 'postgresql' 'mariadb')
-conflicts=('akonadi<2')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/akonadi/src/akonadi-${pkgver}.tar.bz2"
-        dont-leak-old-external-payload-files.patch)
-md5sums=('84eb2e471bd6bdfe54a2a2f1d858c07d'
-         '9711e300dde3775a38637daa3c20befe')
-
-prepare() {
-  mkdir -p build
-
-  cd akonadi-$pkgver
-  # https://bugs.kde.org/show_bug.cgi?id=341884
-  patch -p1 -i ../dont-leak-old-external-payload-files.patch
-}
-
-build() {
-  cd build
-  cmake ../akonadi-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE \
-    -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
-    -DDATABASE_BACKEND=SQLITE \
-    -DWITH_SOPRANO=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-
-# conflicts with akonadi
-  rm -r "$pkgdir"/usr/{bin,share}
-}

Copied: akonadi-qt4/trunk/PKGBUILD (from rev 242576, libakonadi-qt4/trunk/PKGBUILD)
===================================================================
--- akonadi-qt4/trunk/PKGBUILD	                        (rev 0)
+++ akonadi-qt4/trunk/PKGBUILD	2015-08-15 08:01:52 UTC (rev 243722)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=akonadi-qt4
+pkgname=(libakonadi-qt4 akonadi-qt4)
+pkgver=1.13.0
+pkgrel=3
+pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data (Qt4 version)"
+arch=('i686' 'x86_64')
+url='http://community.kde.org/KDE_PIM/Akonadi'
+license=('LGPL')
+makedepends=('cmake' 'automoc4' 'boost' 'postgresql' 'mariadb' 'qt4' 'libxslt')
+install="$pkgbase.install"
+source=("http://download.kde.org/stable/akonadi/src/akonadi-${pkgver}.tar.bz2"
+        dont-leak-old-external-payload-files.patch)
+md5sums=('84eb2e471bd6bdfe54a2a2f1d858c07d'
+         '9711e300dde3775a38637daa3c20befe')
+
+prepare() {
+  mkdir -p build
+
+  cd akonadi-$pkgver
+  # https://bugs.kde.org/show_bug.cgi?id=341884
+  patch -p1 -i ../dont-leak-old-external-payload-files.patch
+}
+
+build() {
+  cd build
+  cmake ../akonadi-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE \
+    -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
+    -DDATABASE_BACKEND=SQLITE \
+    -DWITH_SOPRANO=OFF
+  make
+}
+
+package_libakonadi-qt4() {
+  pkgdesc='Qt4 akonadi libraries'
+  depends=('boost-libs' 'qt4' 'libxslt')
+
+  cd build
+  make DESTDIR="$pkgdir" install
+
+# conflicts with akonadi
+  rm -r "$pkgdir"/usr/{bin,share}
+}
+
+package_akonadi-qt4() {
+  depends=(libakonadi-qt4)
+  conflicts=(akonadi)
+
+  cd build
+  make DESTDIR="$pkgdir" install
+
+# provided by libakonadi-qt4
+  rm -r "$pkgdir"/usr/{lib,include}
+}

Copied: akonadi-qt4/trunk/akonadi-qt4.install (from rev 242568, libakonadi-qt4/trunk/libakonadi-qt4.install)
===================================================================
--- akonadi-qt4/trunk/akonadi-qt4.install	                        (rev 0)
+++ akonadi-qt4/trunk/akonadi-qt4.install	2015-08-15 08:01:52 UTC (rev 243722)
@@ -0,0 +1,11 @@
+post_install() {
+	update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

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