Thu May 29 04:04:14 UTC 2014

11 files changed, 319 insertions, 63 deletions

diff --git a/extra/burp/PKGBUILD b/extra/burp/PKGBUILD
index 90c8cf227..e85c798fa 100644
--- a/extra/burp/PKGBUILD
+++ b/extra/burp/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 199808 2013-11-17 00:47:14Z dreisner $
+# $Id: PKGBUILD 213673 2014-05-28 05:10:10Z dreisner $
 # Maintainer: Dave Reisner <d@falconindy.com>
 
 pkgname=burp
-pkgver=3
+pkgver=4
 pkgrel=1
 pkgdesc="A simple AUR uploader"
 arch=('i686' 'x86_64')
 url="http://github.com/falconindy/burp"
 license=('GPL')
 depends=('glibc' 'curl')
-makedepends=('perl')
-source=("http://code.falconindy.com/archive/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
-md5sums=('3afc7346b3ba63ce9487bdbba1e370f1'
+source=("http://code.falconindy.com/archive/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
+md5sums=('f1369e5f46f9617654419d1e00a614d8'
          'SKIP')
 
 build() {
-  make -C "$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
+
+  ./configure
+  make
 }
 
 package() {
-  make -C "$pkgname-$pkgver" PREFIX=/usr DESTDIR="$pkgdir" MANPREFIX=/usr/share/man install
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index b3ebf1daf..8c20c1541 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 210252 2014-04-13 07:29:52Z andyrtr $
+# $Id: PKGBUILD 213693 2014-05-28 14:54:23Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=1.7.2
+pkgver=1.7.3
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -31,7 +31,7 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b
         cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
         get-ppd-file-for-statically-configured-ipp-shared-queues.patch
         ppd-poll-with-client-conf.patch)
-md5sums=('f06a997d4b71b81b23324e27174f93e7'
+md5sums=('d498c3020acda0904ab0c13b6389a1ec'
          'SKIP'
          'f861b18f4446c43918c8643dcbbd7f6d'
          '96f82c38f3f540b53f3e5144900acf17'
diff --git a/extra/frameworkintegration/PKGBUILD b/extra/frameworkintegration/PKGBUILD
index 623844c3b..437f289e8 100644
--- a/extra/frameworkintegration/PKGBUILD
+++ b/extra/frameworkintegration/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 213067 2014-05-18 18:58:27Z andrea $
+# $Id: PKGBUILD 213670 2014-05-27 22:20:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=frameworkintegration
 pkgver=4.99.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Framework providing components to allow applications to integrate with a KDE Workspace'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/frameworks/frameworkintegration'
diff --git a/extra/gnu-efi-libs/PKGBUILD b/extra/gnu-efi-libs/PKGBUILD
index 28de86fd1..a081dd705 100644
--- a/extra/gnu-efi-libs/PKGBUILD
+++ b/extra/gnu-efi-libs/PKGBUILD
@@ -1,11 +1,14 @@
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
+[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
+[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="ia32"
+
 _pkgver="3.0"
 pkgname="gnu-efi-libs"
-pkgver="${_pkgver}u"
-pkgrel="4"
+pkgver="${_pkgver}v"
+pkgrel="2"
 pkgdesc="Library for building UEFI Applications using GNU toolchain"
 url="http://sourceforge.net/projects/gnu-efi/"
 license=('GPL')
@@ -13,11 +16,13 @@ arch=('x86_64' 'i686')
 options=('!strip' '!makeflags' 'staticlibs')
 makedepends=('pciutils')
 
-source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz")
-md5sums=('d15d3c700e79a1e2938544d73edc572d')
+source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz"
+        'gnu-efi-3.0v-revert-makefile-commit.patch')
 
-[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
-[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="ia32"
+prepare() {
+	cd "${srcdir}/gnu-efi-${_pkgver}/"
+	patch -Np1 -R -i "${srcdir}/gnu-efi-3.0v-revert-makefile-commit.patch"
+}
 
 build() {
 	
@@ -45,3 +50,6 @@ package() {
 	install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/apps/${_EFI_ARCH}/"
 	
 }
+
+md5sums=('57f0a308c0e939e5d18e40840a5484a9'
+         '97ef85cd3d4aba2349aa1fab706568ab')
diff --git a/extra/gnu-efi-libs/gnu-efi-3.0v-revert-makefile-commit.patch b/extra/gnu-efi-libs/gnu-efi-3.0v-revert-makefile-commit.patch
new file mode 100644
index 000000000..3a04a4b3e
--- /dev/null
+++ b/extra/gnu-efi-libs/gnu-efi-3.0v-revert-makefile-commit.patch
@@ -0,0 +1,148 @@
+commit 06744d69273de4945cf0ffcaa4a6abf7cec707b6
+Author: Nigel Croxon <nigel.croxon@hp.com>
+Date:   Fri Mar 14 13:47:39 2014 -0400
+
+    From: Sylvain Gault <sylvain.gault@gmail.com>
+    Date: Wed, 19 Feb 2014 05:18:14 +0100
+    Subject: [PATCH] make install: Don't overwrite up-to-date files
+    
+    make install used to copy files unconditionnally to their destination.
+    However, if the destination is used by another Makefile, it will always
+    see modified files. "install" target now only update the files when they
+    need to.
+    
+    Signed-off-by: Sylvain Gault <sylvain.gault@gmail.com>
+    Signed-off-by: Nigel Croxon <nigel.croxon@hp.com>
+
+diff --git a/gnuefi/Makefile b/gnuefi/Makefile
+index e99adbe..85a7db8 100644
+--- a/gnuefi/Makefile
++++ b/gnuefi/Makefile
+@@ -49,6 +49,19 @@ OBJS	= $(FILES:%=%.o)
+ 
+ TARGETS	= crt0-efi-$(ARCH).o libgnuefi.a
+ 
++INSTALLTARGETS = $(TARGETS)
++ifneq (,$(findstring FreeBSD,$(OS)))
++ ifeq ($(ARCH),x86_64)
++  INSTALLTARGETS += elf_$(ARCH)_fbsd_efi.lds
++ else
++  INSTALLTARGETS += elf_$(ARCH)_efi.lds
++ endif
++else
++  INSTALLTARGETS += elf_$(ARCH)_efi.lds
++endif
++
++LIBDIRINSTALL = $(INSTALLROOT)/$(LIBDIR)
++
+ all:	$(TARGETS)
+ 
+ libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS))
+@@ -56,17 +69,14 @@ libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS))
+ clean:
+ 	rm -f $(TARGETS) *~ *.o $(OBJS)
+ 
+-install:
+-	mkdir -p $(INSTALLROOT)/$(LIBDIR)
+-	$(INSTALL) -m 644 $(TARGETS) $(INSTALLROOT)/$(LIBDIR)
+-ifneq (,$(findstring FreeBSD,$(OS)))
+- ifeq ($(ARCH),x86_64)
+-	$(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)/$(LIBDIR)
+- else
+-	$(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)/$(LIBDIR)
+- endif
+-else
+-	$(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)/$(LIBDIR)
+-endif
++$(LIBDIRINSTALL):
++	mkdir -p $@
++
++.SECONDEXPANSION:
++
++$(LIBDIRINSTALL)/%: % | $$(dir $$@)
++	$(INSTALL) -m 644 $< $(dir $@)
++
++install: $(addprefix $(LIBDIRINSTALL)/,$(INSTALLTARGETS))
+ 
+ include $(SRCDIR)/../Make.rules
+diff --git a/inc/Makefile b/inc/Makefile
+index 273d303..297385b 100644
+--- a/inc/Makefile
++++ b/inc/Makefile
+@@ -8,20 +8,32 @@ TOPDIR = $(SRCDIR)/..
+ 
+ CDIR=$(TOPDIR)/..
+ 
++INCDIRINSTALL = $(INSTALLROOT)$(PREFIX)/include/efi
++
++SRCHEADERS = $(wildcard $(SRCDIR)/*.h) \
++             $(wildcard $(SRCDIR)/protocol/*.h) \
++             $(wildcard $(SRCDIR)/$(ARCH)/*.h)
++ifeq ($(ARCH),ia64)
++ SRCHEADERS += $(wildcard $(SRCDIR)/protocol/$(ARCH)/*.h)
++endif
++
++HEADERS = $(patsubst $(SRCDIR)/%,%,$(SRCHEADERS))
++
+ all:
+ 
+ clean:
+ 
+-install:
+-	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi
+-	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol
+-	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
+-	$(INSTALL) -m 644 $(SRCDIR)/*.h $(INSTALLROOT)$(PREFIX)/include/efi
+-	$(INSTALL) -m 644 $(SRCDIR)/protocol/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol
+-	$(INSTALL) -m 644 $(SRCDIR)/$(ARCH)/*.h $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
+-ifeq ($(ARCH),ia64)
+-	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64
+-	$(INSTALL) -m 644 $(SRCDIR)/protocol/ia64/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64
+-endif
++$(INCDIRINSTALL) \
++$(INCDIRINSTALL)/protocol \
++$(INCDIRINSTALL)/$(ARCH) \
++$(INCDIRINSTALL)/protocol/$(ARCH):
++	mkdir -p $@
++
++.SECONDEXPANSION:
++
++$(INCDIRINSTALL)/%.h: %.h | $$(dir $$@)
++	$(INSTALL) -m 644 $< $(dir $@)
++
++install: $(addprefix $(INCDIRINSTALL)/,$(HEADERS))
+ 
+ include $(SRCDIR)/../Make.rules
+diff --git a/lib/Makefile b/lib/Makefile
+index e9f604e..d2635ad 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -61,8 +61,11 @@ OBJS  = $(FILES:%=%.o)
+ 
+ SUBDIRS = ia32 x86_64 ia64 runtime
+ 
++LIBDIRINSTALL = $(INSTALLROOT)/$(LIBDIR)
++
+ all: libsubdirs libefi.a
+ 
++.PHONY: libsubdirs
+ libsubdirs:
+ 	for sdir in $(SUBDIRS); do mkdir -p $$sdir; done
+ 
+@@ -71,9 +74,13 @@ libefi.a: $(patsubst %,libefi.a(%),$(OBJS))
+ clean:
+ 	rm -f libefi.a *~ $(OBJS) */*.o
+ 
+-install: libefi.a
+-	mkdir -p $(INSTALLROOT)/$(LIBDIR)
+-	$(INSTALL) -m 644 libefi.a $(INSTALLROOT)/$(LIBDIR)
++$(LIBDIRINSTALL):
++	mkdir -p $@
++
++$(LIBDIRINSTALL)/libefi.a: libefi.a | $(LIBDIRINSTALL)
++	$(INSTALL) -m 644 $< $(dir $@)
++
++install: $(LIBDIRINSTALL)/libefi.a
+ 
+ include $(SRCDIR)/../Make.rules
+ 
diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD
index f1ad7cbb8..ebc217b1c 100644
--- a/extra/qt5/PKGBUILD
+++ b/extra/qt5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 211872 2014-04-28 15:12:15Z andrea $
+# $Id: PKGBUILD 213668 2014-05-27 22:18:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=qt5
@@ -6,6 +6,7 @@ pkgname=('qt5-base'
          'qt5-connectivity'
          'qt5-declarative'
          'qt5-doc'
+         'qt5-enginio'
          'qt5-graphicaleffects'
          'qt5-imageformats'
          'qt5-location'
@@ -19,10 +20,11 @@ pkgname=('qt5-base'
          'qt5-tools'
          'qt5-translations'
          'qt5-webkit'
+         'qt5-websockets'
          'qt5-x11extras'
          'qt5-xmlpatterns')
-pkgver=5.2.1
-pkgrel=4
+pkgver=5.3.0
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -31,18 +33,20 @@ makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb
             'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils'
             'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc' 'libfbclient'
             'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
-            'openal' 'gtk2' 'libxkbcommon' 'python')
+            'openal' 'gtk2' 'libxkbcommon-x11' 'python' 'mtdev' 'harfbuzz')
 groups=('qt' 'qt5')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
-source=("http://download.qt-project.org/official_releases/qt/5.2/${pkgver}/single/${_pkgfqn}.tar.xz"
+source=("http://download.qt-project.org/official_releases/qt/5.3/${pkgver}/single/${_pkgfqn}.tar.xz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop'
-        'use-python2.patch')
-md5sums=('0c8d2aa45f38be9c3f7c9325eb059d9d'
+        'use-python2.patch'
+        'QTBUG-39047.patch')
+md5sums=('f00ac7930e3b1b2b364dedcd15acc142'
          'b2897dd6a2967bccf8f10e397aafee55'
          '9638a78e502719ef8fe5f8d10d0361a9'
          '188da8f4c87316e730ebf1c6217bf5a0'
          '322b419b16c75d4de0ee7ad0a246caa1'
-         'a378deccf363bd6079da459c89aff7b9')
+         'a378deccf363bd6079da459c89aff7b9'
+         '819813c53ab11b2341baf54afbc37e37')
 
 prepare() {
   cd ${_pkgfqn}
@@ -56,6 +60,9 @@ prepare() {
   sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
     -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
     $(find . -name '*.py')
+
+  cd qtdeclarative
+  patch -p1 -i "${srcdir}"/QTBUG-39047.patch
 }
 
 build() {
@@ -83,6 +90,8 @@ build() {
     -no-rpath \
     -optimized-qmake \
     -dbus-linked \
+    -system-harfbuzz \
+    -journald \
     -reduce-relocations ${SSE2}
 
   make
@@ -101,11 +110,15 @@ package_qt5-base() {
   pkgdesc='A cross-platform application and UI framework'
   depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd'
            'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
-           'qtchooser' 'libxkbcommon')
+           'qtchooser')
   optdepends=('postgresql-libs: PostgreSQL driver'
               'libmariadbclient: MariaDB driver'
               'unixodbc: ODBC driver'
-              'libfbclient: Firebird/iBase driver')
+              'libfbclient: Firebird/iBase driver'
+              'mtdev: evdev plugin'
+              'libxkbcommon-x11: xcb plugin'
+              'libsm: xcb plugin'
+              'gtk2: GTK2 plugin')
   conflicts=('qt')
   options=('staticlibs') #libQt5PlatformSupport builds static only
 
@@ -131,7 +144,7 @@ package_qt5-base() {
 }
 
 package_qt5-connectivity() {
-  pkgdesc='A cross-platform application and UI framework (QtBluetooth, QtNfc)'
+  pkgdesc='Provides access to Bluetooth hardware'
   depends=('qt5-declarative')
 
   cd ${_pkgfqn}/qtconnectivity
@@ -146,8 +159,8 @@ package_qt5-connectivity() {
 }
 
 package_qt5-declarative() {
-  pkgdesc='A cross-platform application and UI framework (QtQml, QtQuick)'
-  depends=('qt5-xmlpatterns')
+  pkgdesc='Classes for QML and JavaScript languages'
+  depends=('qt5-xmlpatterns' 'libxkbcommon-x11')
   conflicts=('qt')
 
   cd ${_pkgfqn}/qtdeclarative
@@ -184,8 +197,23 @@ package_qt5-doc() {
     "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
 }
 
+package_qt5-enginio() {
+  pkgdesc='A Backend-as-a-Service solution to ease the backend development for connected and data-driven application'
+  depends=('qt5-declarative')
+
+  cd ${_pkgfqn}/qtenginio
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+
+  install -D -m644 LGPL_EXCEPTION.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
 package_qt5-xmlpatterns() {
-  pkgdesc='A cross-platform application and UI framework (QtXmlPatterns)'
+  pkgdesc='Support for XPath, XQuery, XSLT and XML schema validation'
   depends=('qt5-base')
   conflicts=('qt')
 
@@ -219,7 +247,7 @@ package_qt5-translations() {
 }
 
 package_qt5-multimedia() {
-  pkgdesc='A cross-platform application and UI framework (QtMultimedia)'
+  pkgdesc='Classes for audio, video, radio and camera functionality'
   depends=('qt5-declarative' 'libpulse' 'gstreamer0.10-base' 'openal')
   conflicts=('qt')
 
@@ -235,7 +263,7 @@ package_qt5-multimedia() {
 }
 
 package_qt5-graphicaleffects() {
-  pkgdesc='A cross-platform application and UI framework (QtGraphicalEffects)'
+  pkgdesc='Graphical effects for use with Qt Quick 2'
   depends=('qt5-declarative')
 
   cd ${_pkgfqn}/qtgraphicaleffects
@@ -246,8 +274,8 @@ package_qt5-graphicaleffects() {
 }
 
 package_qt5-imageformats() {
-  pkgdesc='A cross-platform application and UI framework (Images plugins)'
-  depends=('qt5-base' 'libtiff' 'libmng')
+  pkgdesc='Plugins for additional image formats: TIFF, MNG, TGA, WBMP'
+  depends=('qt5-base' 'jasper' 'libmng')
   conflicts=('qt')
 
   cd ${_pkgfqn}/qtimageformats
@@ -258,7 +286,7 @@ package_qt5-imageformats() {
 }
 
 package_qt5-location() {
-  pkgdesc='A cross-platform application and UI framework (QtLocation, QtPositioning)'
+  pkgdesc='Provides access to position, satellite and area monitoring classes'
   depends=('qt5-declarative')
 
   cd ${_pkgfqn}/qtlocation
@@ -273,7 +301,7 @@ package_qt5-location() {
 }
 
 package_qt5-quick1() {
-  pkgdesc='A cross-platform application and UI framework (QtDeclarative)'
+  pkgdesc='Qt Declarative is provided for Qt 4 compatibility'
   depends=('qt5-webkit' 'qt5-script')
   conflicts=('qt')
 
@@ -295,7 +323,7 @@ package_qt5-quick1() {
 }
 
 package_qt5-quickcontrols() {
-  pkgdesc='A cross-platform application and UI framework (QtQuick)'
+  pkgdesc='Reusable Qt Quick based UI controls to create classic desktop-style user interfaces'
   depends=('qt5-declarative')
 
   cd ${_pkgfqn}/qtquickcontrols
@@ -306,7 +334,7 @@ package_qt5-quickcontrols() {
 }
 
 package_qt5-script() {
-  pkgdesc='A cross-platform application and UI framework (QtScript)'
+  pkgdesc='Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility'
   depends=('qt5-base')
   conflicts=('qt')
 
@@ -322,7 +350,7 @@ package_qt5-script() {
 }
 
 package_qt5-sensors() {
-  pkgdesc='A cross-platform application and UI framework (QtSensors)'
+  pkgdesc='Provides access to sensor hardware and motion gesture recognition'
   depends=('qt5-declarative')
 
   cd ${_pkgfqn}/qtsensors
@@ -337,7 +365,7 @@ package_qt5-sensors() {
 }
 
 package_qt5-serialport() {
-  pkgdesc='A cross-platform application and UI framework (QtSerialPort)'
+  pkgdesc='Provides access to hardware and virtual serial ports'
   depends=('qt5-base')
 
   cd ${_pkgfqn}/qtserialport
@@ -352,7 +380,7 @@ package_qt5-serialport() {
 }
 
 package_qt5-svg() {
-  pkgdesc='A cross-platform application and UI framework (QtSvg)'
+  pkgdesc='Classes for displaying the contents of SVG files'
   depends=('qt5-base')
   conflicts=('qt')
 
@@ -415,7 +443,7 @@ package_qt5-tools() {
 }
 
 package_qt5-webkit() {
-  pkgdesc='A cross-platform application and UI framework (QtWebKit)'
+  pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
   depends=('qt5-sensors' 'qt5-location' 'gst-plugins-base' 'libxslt' 'libxcomposite')
   license=('GPL3' 'LGPL' 'FDL')
 
@@ -430,8 +458,21 @@ package_qt5-webkit() {
   perl -pi -e "s, -L${srcdir}/?\S+,,g" "${pkgdir}"/usr/lib/pkgconfig/Qt5WebKit.pc
 }
 
+package_qt5-websockets() {
+  pkgdesc='Provides WebSocket communication compliant with RFC 6455'
+  depends=('qt5-declarative')
+  license=('LGPL')
+
+  cd ${_pkgfqn}/qtwebsockets
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+}
+
 package_qt5-x11extras() {
-  pkgdesc='A cross-platform application and UI framework (QtX11Extras)'
+  pkgdesc='Provides platform-specific APIs for X11'
   depends=('qt5-base')
 
   cd ${_pkgfqn}/qtx11extras
diff --git a/extra/qt5/QTBUG-39047.patch b/extra/qt5/QTBUG-39047.patch
new file mode 100644
index 000000000..ee6e4ad40
--- /dev/null
+++ b/extra/qt5/QTBUG-39047.patch
@@ -0,0 +1,57 @@
+From 009ad875f89d7d7bc4447e18c2fbbd485a75e0b5 Mon Sep 17 00:00:00 2001
+From: Oleg Shparber <trollixx@gmail.com>
+Date: Mon, 19 May 2014 00:53:39 -0700
+Subject: [PATCH] Fix improper antialiasing property behavior
+
+For components antialiased by default the property was returned
+as false if default true value was set to true again.
+
+Task-number: QTBUG-39047
+Change-Id: I16960a12b6d38a0d9e487fc6612610c39c4949d4
+Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
+---
+ src/quick/items/qquickitem.cpp                 |    8 +++++---
+ tests/auto/quick/qquicktext/tst_qquicktext.cpp |    7 +++++++
+ 2 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
+index 3f0dae8..ef2eac4 100644
+--- a/src/quick/items/qquickitem.cpp
++++ b/src/quick/items/qquickitem.cpp
+@@ -5691,10 +5691,12 @@ void QQuickItem::setAntialiasing(bool aa)
+ {
+     Q_D(QQuickItem);
+ 
+-    bool changed = (aa != antialiasing());
+-    d->antialiasingValid = true;
++    if (!d->antialiasingValid) {
++        d->antialiasingValid = true;
++        d->antialiasing = d->implicitAntialiasing;
++    }
+ 
+-    if (!changed)
++    if (aa == d->antialiasing)
+         return;
+ 
+     d->antialiasing = aa;
+diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+index 0b69981..d36c55d 100644
+--- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp
++++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+@@ -1334,6 +1334,13 @@ void tst_qquicktext::antialiasing()
+     text->resetAntialiasing();
+     QCOMPARE(text->antialiasing(), true);
+     QCOMPARE(spy.count(), 2);
++
++    // QTBUG-39047
++    component.setData("import QtQuick 2.0\n Text { antialiasing: true }", QUrl());
++    object.reset(component.create());
++    text = qobject_cast<QQuickText *>(object.data());
++    QVERIFY(text);
++    QCOMPARE(text->antialiasing(), true);
+ }
+ 
+ void tst_qquicktext::weight()
+-- 
+1.7.1
+
diff --git a/extra/qtchooser/3.conf b/extra/qtchooser/3.conf
deleted file mode 100644
index bea263c91..000000000
--- a/extra/qtchooser/3.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/lib/qt3/bin
-/usr/lib
diff --git a/extra/qtchooser/PKGBUILD b/extra/qtchooser/PKGBUILD
index 7f8a0e02a..6012a82c3 100644
--- a/extra/qtchooser/PKGBUILD
+++ b/extra/qtchooser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 201641 2013-12-17 11:16:59Z andrea $
+# $Id: PKGBUILD 213671 2014-05-27 22:55:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qtchooser
-pkgver=39
+pkgver=41
 pkgrel=1
 pkgdesc='Wrap the other Qt tools by searching for different instances of Qt on the system'
 arch=('i686' 'x86_64')
@@ -10,24 +10,24 @@ url='http://qt.gitorious.org/qt/qtchooser'
 license=('GPL')
 backup=('etc/xdg/qtchooser/default.conf')
 depends=('gcc-libs')
-source=("http://macieira.org/${pkgname}/${pkgname}-${pkgver}-g4717841.tar.gz"
-        {3,4,5}.conf)
-md5sums=('fcf1b5e8373147e48ce72b9c1ffe3d10'
-         '7c5da2b7911d1c4fabc63d6ef00f0020'
+makedepends=('git')
+source=("git://gitorious.org/qt/${pkgname}.git#commit=7985f775fb9cf9b77bbbb394a832f0c5f26de47c"
+        {4,5}.conf)
+md5sums=('SKIP'
          'aa4d49b269e1b806f5eea170801f0aa6'
          'cf83f09a9a5a44d898b93f624d74dd11')
 
 build() {
-  cd ${pkgname}-${pkgver}-g4717841
+  cd ${pkgname}
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}-g4717841
+  cd ${pkgname}
   make INSTALL_ROOT="${pkgdir}" install
 
   install -d "${pkgdir}"/etc/xdg/qtchooser
-  install -m644 "${srcdir}"/{3,4,5}.conf \
+  install -m644 "${srcdir}"/{4,5}.conf \
     "${pkgdir}"/etc/xdg/qtchooser/
 
   # Set the default Qt
diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD
index 78eecc20b..cca535e4b 100644
--- a/extra/smplayer/PKGBUILD
+++ b/extra/smplayer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 211325 2014-04-18 17:38:47Z bpiotrowski $
+# $Id: PKGBUILD 213683 2014-05-28 09:21:43Z bpiotrowski $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
@@ -6,12 +6,12 @@
 
 pkgname=smplayer
 pkgver=14.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A complete front-end for MPlayer"
 arch=('i686' 'x86_64')
 url="http://smplayer.sourceforge.net/"
 license=('GPL')
-depends=('qt5-script' 'mplayer' 'hicolor-icon-theme')
+depends=('qt5-script' 'mplayer' 'hicolor-icon-theme' 'libxkbcommon-x11')
 makedepends=('qt5-tools')
 optdepends=('smplayer-themes: icon themes collection'
             'smplayer-skins: skin themes collection'
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 2988b1389..541a9aaac 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -10,7 +10,7 @@ _patchlevel=307
 __hgrev=54d96e3b2eec
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom:vim')
 url="http://www.vim.org"
@@ -230,8 +230,8 @@ package_gvim-python3() {
     rm -f ex.1 view.1 # provided by (n)vi
   done
 
-  # Move the runtime for later packaging
-  mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install
+  # need to remove since this is provided by vim-runtime
+  rm -rf "${pkgdir}"/usr/share/vim
 
   # freedesktop links
   install -Dm644 "${srcdir}"/gvim.desktop \