Merge remote-tracking branch 'origin/master'

calibre/PKGBUILD

@@ -4,7 +4,7 @@
 # contributor (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
 
 pkgname=calibre
-pkgver=0.8.59
+pkgver=0.8.60
 pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64')
@@ -20,8 +20,8 @@ screenshot=('https://lh5.googleusercontent.com/_lG58t3XWd3c/TcNwiXkAx_I/AAAAAAAA
 install=calibre.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"
         'desktop_integration.patch')
-md5sums=('4a88b55f5efa735193533014e8e95c60'
-         'd4273962f670c7a089e7747473827e3e')
+md5sums=('6ff046cb66d244121f998d0ec5f8db1f'
+         '049558ae8372a011aee43e873171fbf2')
 
 build() {
   cd "${srcdir}/${pkgname}"

calibre/desktop_integration.patch

@@ -1,6 +1,6 @@
---- a/src/calibre/linux.py	2012-07-06 04:46:21.000000000 +0200
-+++ b/src/calibre/linux.py	2012-07-08 11:59:14.000000000 +0200
-@@ -179,18 +179,6 @@
+--- a/src/calibre/linux.py	2012-07-13 07:21:34.000000000 +0200
++++ b/src/calibre/linux.py	2012-07-14 20:45:30.000000000 +0200
+@@ -180,19 +180,6 @@
              self.setup_completion()
          if islinux or isbsd:
              self.setup_desktop_integration()
@@ -16,10 +16,11 @@
 -                        shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f)
 -                if os.stat(config_dir).st_uid == 0:
 -                    os.rmdir(config_dir)
-
+-
          if warn is None and self.warnings:
              self.info('There were %d warnings'%len(self.warnings))
-@@ -237,7 +225,7 @@
+             for args, kwargs in self.warnings:
+@@ -238,7 +225,7 @@
                  if isnetbsd:
                      f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
                  else:
@@ -28,21 +29,21 @@
              if not os.path.exists(os.path.dirname(f)):
                  os.makedirs(os.path.dirname(f))
              self.manifest.append(f)
-@@ -348,51 +336,39 @@
+@@ -358,51 +345,39 @@
  
              with TemporaryDirectory() as tdir, CurrentDir(tdir), \
                                  PreserveMIMEDefaults():
 -                render_img('mimetypes/lrf.png', 'calibre-lrf.png')
--                check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
+-                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
 -                self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
--                check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
+-                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
 -                self.icon_resources.append(('mimetypes', 'application-lrs',
 -                '128'))
 -                render_img('lt.png', 'calibre-gui.png', width=256, height=256)
--                check_call('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True)
+-                cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True)
 -                self.icon_resources.append(('apps', 'calibre-gui', '128'))
 -                render_img('viewer.png', 'calibre-viewer.png')
--                check_call('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
+-                cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
 -                self.icon_resources.append(('apps', 'calibre-viewer', '128'))
 +                dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
 +                os.mkdir(dir)
@@ -80,9 +81,9 @@
 -                        'calibre-ebook-viewer.desktop')
 -                for x in des:
 -                    cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
--                    check_call(' '.join(cmd), shell=True)
+-                    cc(' '.join(cmd), shell=True)
 -                    self.menu_resources.append(x)
--                check_call(['xdg-desktop-menu', 'forceupdate'])
+-                cc(['xdg-desktop-menu', 'forceupdate'])
 -                f = open('calibre-mimetypes', 'wb')
 +                dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/')
 +                os.makedirs(dir)
@@ -90,7 +91,8 @@
                  f.write(MIME)
                  f.close()
 -                self.mime_resources.append('calibre-mimetypes')
--                check_call('xdg-mime install ./calibre-mimetypes', shell=True)
+-                cc('xdg-mime install ./calibre-mimetypes', shell=True)
          except Exception:
              if self.opts.fatal_errors:
                  raise
+                 

ktp-text-ui/PKGBUILD

@@ -1,27 +1,25 @@
 #
-# Chakra Packages for Chakra, part of chakra-project.org
+# Apps Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# Maintainer: Neophytos Kolokotronis <tetris4@gmail.com>
 
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=ktp-text-ui
-pkgver=0.3.1
-pkgrel=1
+pkgver=0.4.0
+pkgrel=6
 pkgdesc="Telepathy text chat handler"
 arch=('i686' 'x86_64')
 url="http://www.kde.org"
 license=('GPL')
-depends=('kde-runtime' 'telepathy-qt' 'ktp-common-internals')
-makedepends=('cmake' 'automoc4')
+depends=('ktp-common-internals' 'ktp-contact-list' 'telepathy-logger-qt')
+makedepends=('cmake' 'automoc4' 'boost')
+optdepends=('telepathy-logger-qt: enables logging of chats, causes issues for some users')
 conflicts=('telepathy-kde-text-ui')
 replaces=('telepathy-kde-text-ui')
 provides=('telepathy-kde-text-ui')
 groups=('kde-telepathy')
 source=("ftp://mirrors.mit.edu/kde/unstable/kde-telepathy/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('78741579fa62d5beca6ff87f074a3821c02d1f15')
+md5sums=('9e44558bdcbd86cd55968e3a15d09761')
 
 build() {
   cd "${srcdir}"

telepathy-logger-qt/PKGBUILD

@@ -0,0 +1,35 @@
+#
+# Platform Packages for Chakra, part of chakra-project.org
+#
+# Maintainer: Neophytos Kolokotronis <tetris4@gmail.com>
+# Contributor: George Brooke <george+arch.aur@george-brooke.co.uk>
+
+
+pkgname=telepathy-logger-qt
+pkgver=0.4.0
+pkgrel=5
+pkgdesc="Qt bindings for telepathy logger"
+arch=('i686' 'x86_64')
+url="https://projects.kde.org/projects/kdereview/telepathy-logger-qt"
+license=('GPL')
+depends=('telepathy-qt' 'qt-gstreamer' 'telepathy-logger' 'boost-libs')
+makedepends=('automoc4' 'cmake' 'python2' 'boost')
+group=('kde-telepathy')
+source=("ftp://mirrors.mit.edu/kde/unstable/kde-telepathy/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('ad24c30ef8ce13e6460fd4b6a241efca')
+
+build() {
+  cd "${srcdir}"
+  rm -rf build && mkdir build
+  cd build
+
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2
+  make
+}
+
+package() {
+  cd "${srcdir}/build"
+  make DESTDIR="$pkgdir/" install
+}

telepathy-logger/PKGBUILD

@@ -3,22 +3,19 @@
 #
 # maintainer (x86_64): Giuseppe calà <jiveaxe@gmail.com>
 
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 pkgname=telepathy-logger
-pkgver=0.2.8
+pkgver=0.4.0
 pkgrel=3
 pkgdesc="Telepathy framework logging daemon"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://telepathy.freedesktop.org/wiki/Logger"
 license=('LGPL2.1')
-depends=('telepathy-glib' 'sqlite3' 'libxml2')
+depends=('telepathy-glib' 'sqlite3' 'libxml2' 'dconf')
 makedepends=('intltool' 'gobject-introspection' 'libxslt')
+install=${pkgname}.install
 options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('755e6dcaa6a9ccf47f2fe73f3d4d888b')
+source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('0b891b860c7f3a01926f5cc22fd26120')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"

telepathy-logger/telepathy-logger.install

@@ -1,5 +1,5 @@
 post_install() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+    glib-compile-schemas /usr/share/glib-2.0/schemas
 }
 
 post_upgrade() {
@@ -9,3 +9,4 @@ post_upgrade() {
 post_remove(){
     post_install
 }
+