Thu May 8 03:53:28 UTC 2014

10 files changed, 76 insertions, 90 deletions

diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD
deleted file mode 100644
index 523b1e25d..000000000
--- a/extra/evince/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 210428 2014-04-14 20:06:04Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evince
-pkgver=3.12.1
-pkgrel=1
-pkgdesc="Document viewer (PDF, Postscript, djvu, tiff, dvi, XPS, SyncTex support with gedit, comics books (cbr,cbz,cb7 and cbt))"
-url="https://wiki.gnome.org/Apps/Evince"
-arch=(i686 x86_64)
-license=(GPL)
-depends=(gtk3 libgxps libspectre gsfonts poppler-glib djvulibre gnome-icon-theme t1lib libsecret desktop-file-utils dconf gsettings-desktop-schemas)
-makedepends=(itstool libnautilus-extension texlive-bin intltool gobject-introspection docbook-xsl python)
-optdepends=('texlive-bin: DVI support'
-	    'gvfs: bookmark support and session saving'
-            'p7zip: cbz and cb7 compressed comic books'
-            'tar: cbt compressed comic books'
-            'unrar: cbr compressed comic books')
-groups=(gnome)
-install=evince.install
-options=('!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ef22cc29a7cbe70d2e7ce8c0b5b7ee774187ea69f3ae49a64c6d4a91559ef137')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr   --sysconfdir=/etc \
-      --localstatedir=/var    --libexecdir=/usr/lib/evince \
-      --disable-static        --enable-nautilus \
-      --enable-pdf            --enable-tiff \
-      --enable-djvu           --enable-dvi \
-      --enable-t1lib          --enable-comics \
-      --disable-scrollkeeper  --disable-schemas-compile \
-      --enable-introspection
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/extra/evince/evince.install b/extra/evince/evince.install
deleted file mode 100644
index 1571179ca..000000000
--- a/extra/evince/evince.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 312e32c4f..8b20c50c3 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 212064 2014-05-06 08:27:42Z bpiotrowski $
+# $Id: PKGBUILD 212100 2014-05-07 11:11:14Z bpiotrowski $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -6,7 +6,7 @@
 
 pkgname=ffmpeg
 pkgver=2.2.2
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='Complete and free Internet live audio and video broadcasting solution'
 arch=('i686' 'x86_64')
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 2fa0d7d02..fefd14ad0 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 211541 2014-04-19 19:24:46Z andyrtr $
+# $Id: PKGBUILD 212113 2014-05-07 17:45:06Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.3.1
+pkgver=3.3.2
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ install=gnutls.install
 options=('!zipman')
 depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit')
 source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('6bf7faa9d4996197e0e404e8c25016f8'
+md5sums=('590851c331b1851c0ed3388879922c06'
          'SKIP')
 
 build() {
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD
index 98bf838ea..88aa75b10 100644
--- a/extra/lftp/PKGBUILD
+++ b/extra/lftp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 204639 2014-01-24 13:26:47Z andyrtr $
+# $Id: PKGBUILD 212115 2014-05-07 17:52:16Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=lftp
-pkgver=4.4.15
+pkgver=4.4.16
 pkgrel=1
 pkgdesc="Sophisticated command line based FTP client"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ optdepends=('perl: needed for convert-netscape-cookies and verify-file')
 url="http://lftp.yar.ru/"
 backup=('etc/lftp.conf')
 source=(http://lftp.yar.ru/ftp/${pkgname}-${pkgver}.tar.xz{,.asc})
-md5sums=('f19cc0cea1d427aa2a952b27661b91e5'
+md5sums=('73e9084731e4ba9bd886a86fdccec519'
          'SKIP')
 
 build() {
diff --git a/extra/libkscreen/PKGBUILD b/extra/libkscreen/PKGBUILD
index 198df650d..94a2da31f 100644
--- a/extra/libkscreen/PKGBUILD
+++ b/extra/libkscreen/PKGBUILD
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD 212048 2014-05-05 12:13:22Z andrea $
+# $Id: PKGBUILD 212107 2014-05-07 15:48:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: birdflesh <antkoul at gmail dot com>
 
 pkgname=libkscreen
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE's screen management library"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/libkscreen'
 license=('GPL')
 depends=('kdelibs' 'qjson')
 makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-md5sums=('7048db071d669193f8dafc9a1319998b')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
+        'fix-crash.patch')
+md5sums=('7048db071d669193f8dafc9a1319998b'
+         'fef9233861b848d569c015f6095d390a')
 
 prepare() {
   mkdir build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i "$srcdir"/fix-crash.patch
 }
 
 build() {
diff --git a/extra/libkscreen/fix-crash.patch b/extra/libkscreen/fix-crash.patch
new file mode 100644
index 000000000..a385edc5b
--- /dev/null
+++ b/extra/libkscreen/fix-crash.patch
@@ -0,0 +1,53 @@
+From: Aleix Pol <aleixpol@kde.org>
+Date: Mon, 05 May 2014 13:13:25 +0000
+Subject: Fix crash
+X-Git-Url: http://quickgit.kde.org/?p=libkscreen.git&a=commitdiff&h=221dff2e2f9fbd1c18eae9b59f23b1dbbdb1870b
+---
+Fix crash
+
+If we don't have a primary output, don't query it. Set a new primary
+output instead.
+
+Reviewed by Alex Fiestas
+---
+
+
+--- a/backends/xrandr/xrandrconfig.cpp
++++ b/backends/xrandr/xrandrconfig.cpp
+@@ -157,7 +157,7 @@
+         output->updateKScreenOutput(kscreenOutput);
+     }
+ 
+-    if (config->primaryOutput()->id() != m_primaryOutput) {
++    if (!config->primaryOutput() || config->primaryOutput()->id() != m_primaryOutput) {
+         config->setPrimaryOutput(config->output(m_primaryOutput));
+     }
+ }
+
+From: Aleix Pol <aleixpol@kde.org>
+Date: Tue, 06 May 2014 13:55:16 +0000
+Subject: Don't crash when printing a null KScreen::Output* from qDebug
+X-Git-Url: http://quickgit.kde.org/?p=libkscreen.git&a=commitdiff&h=31f07fd26e6091dfd37c54fef3352a95182e5bba
+---
+Don't crash when printing a null KScreen::Output* from qDebug
+
+Reviewed by Alex Fiestas
+---
+
+
+--- a/src/output.cpp
++++ b/src/output.cpp
+@@ -425,7 +425,11 @@
+ 
+ QDebug operator<<(QDebug dbg, const KScreen::Output *output)
+ {
+-    dbg << "KScreen::Output(Id:" << output->id() <<", Name:" << output->name() << ")";
++    if(output) {
++        dbg << "KScreen::Output(Id:" << output->id() <<", Name:" << output->name() << ")";
++    } else {
++        dbg << "KScreen::Output(NULL)";
++    }
+     return dbg;
+ }
+ 
+
diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD
index 63ae8e01f..df23e6412 100644
--- a/extra/nx/PKGBUILD
+++ b/extra/nx/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 203653 2014-01-13 17:17:43Z andyrtr $
+# $Id: PKGBUILD 212117 2014-05-07 18:08:07Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers')
-pkgver=3.5.0.22
+pkgver=3.5.0.24
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://wiki.x2go.org/"
@@ -13,20 +13,12 @@ makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' 'fontconfig' # run
              'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr'
              'libxcomposite' 'libxtst' 'xorg-sessreg' 'libfontenc' # makedepends
              )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
-        keyboard_rule.diff)
-md5sums=('739c7a28f3bb6d5f957e6cec9168335d'
-         'f681bc66827cd7ddff4b81b983c20401')
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz)
+sha1sums=('bd1cdbefe81c9a05dcc2f738639bf4af8f056588')
 
 build() {
   cd "${srcdir}/nx-libs-$pkgver"
   
-  # fix keyboard layout with xkeyboard-config >= 2.6 - doesn't solve proper layout detection
-  # upstream needs to do much more work in that area
-  patch -Np1 -i ${srcdir}/keyboard_rule.diff
-  
-  sed -i "s/3.5.0.21/3.5.0.22/" VERSION.x2goagent
-  
   # debug flags
 #  export CFLAGS="-march=x86-64 -O1 -g -pipe"
 #  export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
diff --git a/extra/nx/keyboard_rule.diff b/extra/nx/keyboard_rule.diff
deleted file mode 100644
index dccab160b..000000000
--- a/extra/nx/keyboard_rule.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- nx-libs-3.5.0.17/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c	2013-01-04 13:25:49.000000000 +0100
-+++ nx-libs-3.5.0.17/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c.new	2013-03-15 18:24:54.084216888 +0100
-@@ -140,7 +140,7 @@
- #define XKB_CONFIG_FILE      "/etc/nxagent/nxagent.keyboard"
- #endif
- #ifndef XKB_DFLT_RULES_FILE
--#define XKB_DFLT_RULES_FILE  "xfree86"
-+#define XKB_DFLT_RULES_FILE  "base"
- #endif
- #ifndef XKB_ALTS_RULES_FILE
- #define XKB_ALTS_RULES_FILE  "xorg"
diff --git a/extra/xfce4-power-manager/PKGBUILD b/extra/xfce4-power-manager/PKGBUILD
index ff9ecca15..15efdcaff 100644
--- a/extra/xfce4-power-manager/PKGBUILD
+++ b/extra/xfce4-power-manager/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 211804 2014-04-27 09:35:08Z foutrelis $
+# $Id: PKGBUILD 212098 2014-05-07 09:06:59Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
 
 pkgname=xfce4-power-manager
-pkgver=1.2.0.198.g76d1f4f
+pkgver=1.2.0.212.g75107db
 pkgrel=1
 pkgdesc="Power manager for Xfce desktop"
 arch=('i686' 'x86_64')