Sun Jun 16 01:25:28 PDT 2013

author: root <root@rshg054.dnsready.net> 2013-06-16 01:26:25 -0700
committer: root <root@rshg054.dnsready.net> 2013-06-16 01:26:25 -0700
commit: 44c10f274ec720a1512b15457b9eeffea28c6041 (patch)
tree: 48d27d6116dfd4fdce957af918c3d62385fd9226 /extra
parent: 0a069ede63336b105cda051cebe136f2592847d2 (diff)
31 files changed, 295 insertions, 376 deletions
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD
index 1f255b672..90e291606 100644
--- a/extra/amarok/PKGBUILD
+++ b/extra/amarok/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185605 2013-05-15 22:40:19Z andrea $
+# $Id: PKGBUILD 188524 2013-06-15 07:43:53Z andrea $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
@@ -6,7 +6,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org/"
@@ -22,11 +22,19 @@ optdepends=("libgpod: support for Apple iPod audio devices"
             "libmygpo-qt: gpodder.net Internet Service"
             "clamz: allow to download songs from Amazon.com")
 install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('445eba6aaadface756410cf0f568a3770d437d2d')
-	
-build() {
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+        'kde411.patch')
+sha1sums=('445eba6aaadface756410cf0f568a3770d437d2d'
+          'c2fd0153ec622fccac47ebd31a1b0548c6222541')
+
+prepare() {
   mkdir build
+
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/kde411.patch
+}
+
+build() {
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/amarok/kde411.patch b/extra/amarok/kde411.patch
new file mode 100644
index 000000000..8099a4432
--- /dev/null
+++ b/extra/amarok/kde411.patch
@@ -0,0 +1,35 @@
+commit e899704b3db4af2ff228eb0d4dbbec05fb9a2448
+Author: Hrvoje Senjan <hrvoje.senjan@gmail.com>
+Date:   Mon Jun 10 09:26:37 2013 +0200
+
+    Remove usage of (fake) Amarok-Mockup theme
+    
+    This is due to https://bugs.kde.org/show_bug.cgi?id=320855
+    Amarok-Mockup is unused, as far i can see, and also makes Amarok crash with kdelibs master/4.11
+    If it is still needed, or there is a better solution, i'll discard the review...
+    
+    From 6b85a2899a30db5acebee92182a67778499a8d9e Mon Sep 17 00:00:00 2001
+    From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
+    Date: Sun, 9 Jun 2013 19:55:58 +0200
+    Subject: [PATCH 1/1] Kill Amarok-Mockup
+    
+    BUG: 320855
+    FIXED-IN: 2.8
+    REVIEW: 110917
+
+diff --git a/src/context/ContextView.cpp b/src/context/ContextView.cpp
+index f61518f..152f8da 100644
+--- a/src/context/ContextView.cpp
++++ b/src/context/ContextView.cpp
+@@ -78,11 +78,6 @@ ContextView::ContextView( Plasma::Containment *cont, Plasma::Corona *corona, QWi
+     p.setColor( QPalette::Base, c );
+     setPalette( p );
+ 
+-    PERF_LOG( "Accessing Plasma::Theme" );
+-    // here we initialize all the Plasma paths to Amarok paths
+-    Plasma::Theme::defaultTheme()->setUseGlobalSettings( false );
+-    Theme::defaultTheme()->setThemeName( "Amarok-Mockup" );
+-    PERF_LOG( "Access to Plasma::Theme complete" )
+     contextScene()->setAppletMimeType( "text/x-amarokappletservicename" );
+ 
+     cont->setPos( 0, 0 );
diff --git a/extra/arora/PKGBUILD b/extra/arora/PKGBUILD
index ac4085b60..90b88109f 100644
--- a/extra/arora/PKGBUILD
+++ b/extra/arora/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 145325 2011-12-21 20:47:00Z andrea $
+# $Id: PKGBUILD 188497 2013-06-15 04:38:48Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=arora
 pkgver=0.11.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Lightweight cross-platform Web browser'
-url='http://www.arora-browser.org/'
+url='http://code.google.com/p/arora/'
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('qtwebkit' 'desktop-file-utils')
@@ -18,7 +18,7 @@ install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	qmake PREFIX='/usr' 'CONFIG-=debug' -r
+	qmake-qt4 PREFIX='/usr' 'CONFIG-=debug' -r
 	make
 }
 
diff --git a/extra/arora/install b/extra/arora/install
index 6c87527e2..b0409600c 100644
--- a/extra/arora/install
+++ b/extra/arora/install
@@ -1,6 +1,6 @@
 post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null || true
+	update-desktop-database -q || true
 }
 
 post_upgrade() {
diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD
index d07211f14..2fbcbb9a6 100644
--- a/extra/graphite/PKGBUILD
+++ b/extra/graphite/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 186328 2013-05-24 20:18:53Z andyrtr $
+# $Id: PKGBUILD 188519 2013-06-15 07:02:29Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=graphite
-pkgver=1.2.2
+pkgver=1.2.3
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
@@ -10,23 +10,40 @@ url="http://projects.palaso.org/projects/graphitedev"
 pkgdesc='reimplementation of the SIL Graphite text processing engine'
 license=('LGPL' 'GPL' 'custom')
 depends=('gcc-libs')
-makedepends=('cmake' 'freetype2' 'python2') 
-# 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') - only for docs - target doesn't install properly
+makedepends=('cmake' 'freetype2' 'python2')
+             # - only for docs - target doesn't install properly
+             #  'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') # builds doc properly? 'texlive-helvetic' seems to be missing
 options=('!libtool' '!emptydirs')
-source=("http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz")
-md5sums=('4bfd5db6c91a4097cd76a699beaca70e')
+source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz
+        graphite2-1.2.0-cmakepath.patch)
+md5sums=('7042305e4208af4c2d5249d814ccce58'
+         '00353b67941dbc30b76a43253760769e')
 
 build() {
   cd "${srcdir}"
+  
+  # python2 fixes
   sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" graphite2-${pkgver}/tests/{jsoncmp,fuzztest,defuzz,corrupt.py}
+  
+  # fix install path - .cmake files contain architecture dependend content - patch taken from FC/Slackware
+  pushd graphite2-${pkgver}
+  patch -Np1 -i ${srcdir}/graphite2-1.2.0-cmakepath.patch
+  popd
+  
   mkdir build
   cd build
   cmake -G "Unix Makefiles" ../graphite2-${pkgver} \
+	-DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DCMAKE_BUILD_TYPE:STRING=Release \
-	-DGRAPHITE2_COMPARE_RENDERER=OFF
-  make
-#  make docs
+	-DGRAPHITE2_COMPARE_RENDERER=OFF \
+	#-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON # remove when docs install target will be fixed
+
+  # fix unwanted -O3 cflag (taken form Debian)
+  find . -type f ! -name "rules" ! -name "changelog" -exec sed -i -e 's/\-O3//g' {} \;
+
+  make 
+  #make docs
 }
 
 check() {
@@ -37,7 +54,8 @@ check() {
 
 package() {
   cd "${srcdir}"/build
-  make DESTDIR="$pkgdir/" install
+  # FIXME: all target doesn't install the docs target files
+  make DESTDIR="$pkgdir/" install 
 
   # licenses
   mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
diff --git a/extra/graphite/graphite2-1.2.0-cmakepath.patch b/extra/graphite/graphite2-1.2.0-cmakepath.patch
new file mode 100644
index 000000000..ee71cd6de
--- /dev/null
+++ b/extra/graphite/graphite2-1.2.0-cmakepath.patch
@@ -0,0 +1,9 @@
+diff -urN graphite2-1.2.0.orig/src/CMakeLists.txt graphite2-1.2.0/src/CMakeLists.txt
+--- graphite2-1.2.0.orig/src/CMakeLists.txt	2013-01-29 15:47:32.465841769 +0530
++++ graphite2-1.2.0/src/CMakeLists.txt	2013-01-29 15:48:24.056843352 +0530
+@@ -136,4 +136,4 @@
+ 
+ 
+ install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)
+-install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)
++install(EXPORT graphite2 DESTINATION lib${LIB_SUFFIX}/graphite2 NAMESPACE gr2_)
diff --git a/extra/gts/PKGBUILD b/extra/gts/PKGBUILD
index 57d38d906..bd56d00dc 100644
--- a/extra/gts/PKGBUILD
+++ b/extra/gts/PKGBUILD
@@ -1,5 +1,4 @@
-# $Id: PKGBUILD 143014 2011-11-20 23:59:13Z bisson $
-
+# $Id: PKGBUILD 188503 2013-06-15 04:44:21Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Thomas Dziedzic <gostrc at gmail>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
@@ -7,7 +6,7 @@
 
 pkgname=gts
 pkgver=0.7.6
-pkgrel=2
+pkgrel=3
 pkgdesc='Provides useful functions to deal with 3D surfaces meshed with interconnected triangles'
 url='http://gts.sourceforge.net/'
 license=('LGPL')
@@ -15,6 +14,7 @@ arch=('i686' 'x86_64')
 depends=('glib2')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('000720bebecf0b153eb28260bd30fbd979dcc040')
+
 options=('!libtool')
 
 build() {
diff --git a/extra/jsoncpp/PKGBUILD b/extra/jsoncpp/PKGBUILD
new file mode 100644
index 000000000..94a3aae2b
--- /dev/null
+++ b/extra/jsoncpp/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 188521 2013-06-15 07:18:30Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Jonahtan Schaeffer <joschaeffer@gmail.com>
+# COntributor: Drake Arconis <lightdrake@gmail.com>
+
+pkgname=jsoncpp
+pkgver=0.5.0
+pkgrel=4
+pkgdesc="A JSON C++ library"
+url='http://jsoncpp.sourceforge.net/'
+license=('custom:Public_Domain')
+arch=('i686' 'x86_64')
+depends=('gcc-libs')
+makedepends=('scons')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-src-${pkgver}.tar.gz")
+md5sums=('24482b67c1cb17aac1ed1814288a3a8f')
+
+build() {
+  cd ${pkgname}-src-${pkgver}
+  scons platform=linux-gcc
+}
+
+package() {
+  cd ${pkgname}-src-${pkgver}
+
+  install -d "${pkgdir}"/usr/include/jsoncpp
+  cp -r include/json "${pkgdir}"/usr/include/jsoncpp/json
+
+  install -Dm644 buildscons/linux-gcc-*/src/lib_json/libjson_linux-gcc*libmt.so \
+    "${pkgdir}"/usr/lib/libjsoncpp.so
+
+  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
+
diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD
index 5653fcf1c..d0084d9fe 100644
--- a/extra/kdenetwork/PKGBUILD
+++ b/extra/kdenetwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188044 2013-06-08 08:01:48Z andrea $
+# $Id: PKGBUILD 188553 2013-06-15 11:11:29Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -11,15 +11,15 @@ pkgname=('kdenetwork-filesharing'
          'kdenetwork-krdc'
          'kdenetwork-krfb')
 pkgver=4.10.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
-makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp'
+makedepends=('cmake' 'automoc4' 'boost' 'speex' 'libotr3' 'ppp'
 	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
     'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
-    'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
+    'libktorrent' 'libmms' 'telepathy-qt')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'use-libotr3.patch')
 sha1sums=('891277c8dcbf231452947e9b4c54324bad35fd1a'
@@ -74,7 +74,7 @@ package_kdenetwork-kget() {
 package_kdenetwork-kopete() {
 	pkgdesc='Instant Messenger'
 	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn'
-	         'libidn' 'qimageblitz' 'libgadu' 'mediastreamer')
+	         'libidn' 'qimageblitz' 'libgadu')
 	url="http://kde.org/applications/internet/kopete/"
 	install='kdenetwork-kopete.install'
 	cd $srcdir/build/kopete
diff --git a/extra/libhangul/PKGBUILD b/extra/libhangul/PKGBUILD
index b5dd98216..5ac0c5fbb 100644
--- a/extra/libhangul/PKGBUILD
+++ b/extra/libhangul/PKGBUILD
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD 140549 2011-10-17 07:24:10Z bisson $
+# $Id: PKGBUILD 188501 2013-06-15 04:42:48Z bisson $
 # Contributor: damir <damir@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=libhangul
 pkgver=0.1.0
-pkgrel=1
-_filecode=6000
+pkgrel=2
 pkgdesc='Input method library for Korean'
-arch=('i686' 'x86_64')
-url='http://kldp.net/projects/hangul/'
+url='http://code.google.com/p/libhangul/'
 license=('LGPL')
-options=('!libtool')
-DLAGENTS=("http::/usr/bin/curl -A '' -fLC - --retry 3 --retry-delay 3 -o %o %u") # moronic httpd bans curl's user-agent
-source=("http://kldp.net/frs/download.php/${_filecode}/${pkgname}-${pkgver}.tar.gz")
+arch=('i686' 'x86_64')
+source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('9c6f3a82f2d4068771215f1b9f13a0d4bdbbfc77')
 
+options=('!libtool')
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --enable-static=no
+	./configure --prefix=/usr --disable-static
 	make
 }
 
diff --git a/extra/libspiro/PKGBUILD b/extra/libspiro/PKGBUILD
index d27e6b9c1..0bcc6d7c1 100644
--- a/extra/libspiro/PKGBUILD
+++ b/extra/libspiro/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 145163 2011-12-18 12:09:22Z bisson $
-# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr>
+# $Id: PKGBUILD 188499 2013-06-15 04:42:05Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr>
 
 pkgname=libspiro
 pkgver=20071029
-pkgrel=2
+pkgrel=3
 pkgdesc='Simplifies the drawing of beautiful curves'
 url='http://libspiro.sourceforge.net/'
 license=('GPL')
-options=('!libtool')
 arch=('i686' 'x86_64')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_src-${pkgver}.tar.bz2")
 sha1sums=('d8b407b835b35289af2914877a4c6000b4fdd382')
 
+options=('!libtool')
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure --prefix=/usr
diff --git a/extra/libsrtp/PKGBUILD b/extra/libsrtp/PKGBUILD
index 13f8142c3..731f2ea75 100644
--- a/extra/libsrtp/PKGBUILD
+++ b/extra/libsrtp/PKGBUILD
@@ -1,27 +1,35 @@
-# $Id: PKGBUILD 159152 2012-05-16 20:08:38Z andrea $
+# $Id: PKGBUILD 188535 2013-06-15 10:01:17Z andrea $
 # Maintainer:
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Yejun Yang <yejunx AT gmail DOT com>
 # Contributor: Michal Krenek <mikos@sg1.cz>
 
 pkgname=libsrtp
-pkgver=1.4.4
-pkgrel=2
+pkgver=15.1c9bd90
+pkgrel=1
 pkgdesc="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
 url="http://srtp.sourceforge.net/srtp.html"
 arch=('i686' 'x86_64')
 license=('BSD')
-source=("http://downloads.sourceforge.net/srtp/srtp-${pkgver}.tgz")
-md5sums=('9b449edb011c934ca97009e7e0566d22')
+depends=('glibc')
+makedepends=('git')
+source=("git://git.linphone.org/srtp.git#commit=1c9bd90")
+md5sums=('SKIP')
+
+pkgver() {
+  cd srtp
+  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+}
 
 build() {
-  cd "${srcdir}"/srtp
+  cd srtp
+  autoconf
   ./configure --prefix=/usr
-  make CFLAGS="${CFLAGS} -fPIC"
+  make
 }
 
 package() {
-  cd "${srcdir}"/srtp
+  cd srtp
   make DESTDIR="${pkgdir}" install
 
   install -Dm0644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD
index 1c3a15fa7..a877daa75 100644
--- a/extra/mediastreamer/PKGBUILD
+++ b/extra/mediastreamer/PKGBUILD
@@ -1,29 +1,23 @@
-# $Id: PKGBUILD 183011 2013-04-16 22:29:29Z eric $
+# $Id: PKGBUILD 188540 2013-06-15 10:10:22Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Adrià Arrufat <swiftscythe@gmail.com>
 
 pkgname=mediastreamer
-pkgver=2.8.2
-pkgrel=5
+pkgver=2.9.0
+pkgrel=1
 pkgdesc="A library written in C that allows you to create and run audio and video streams"
 arch=('i686' 'x86_64')
 url="http://www.linphone.org/"
 license=('GPL')
-depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse')
-makedepends=('intltool')
+depends=('ortp' 'ffmpeg' 'libxv' 'glew' 'libupnp')
+# xxd from Vim is needed to build
+makedepends=('intltool' 'vim')
 options=('!libtool')
-source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        mediastreamer-ffmpeg.patch)
-md5sums=('e51ea9d5fce1396b374d10473dfbadec'
-         '805da7def98f367e621363fa0c951fe8'
-         '553d5d47ea4a8c8dfeabdc0281849d5f')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch
-}
+source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
+md5sums=('f2ea0fe731a363749a81b6eaac22a62c'
+         'SKIP')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/mediastreamer/mediastreamer-ffmpeg.patch b/extra/mediastreamer/mediastreamer-ffmpeg.patch
deleted file mode 100644
index 3304e9f56..000000000
--- a/extra/mediastreamer/mediastreamer-ffmpeg.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-commit f586917ea4d66f9ba8910f0967a8830e54d50784
-Author: Yann Diorcet <yann.diorcet@belledonne-communications.com>
-Date:   Tue Jun 5 11:07:48 2012 +0200
-
-    Fixes for new versions of ffmpeg
-
-diff --git a/src/h264dec.c b/src/h264dec.c
-index c4a84ee..5229b5e 100644
---- a/src/h264dec.c
-+++ b/src/h264dec.c
-@@ -45,7 +45,9 @@ typedef struct _DecData{
- static void ffmpeg_init(){
- 	static bool_t done=FALSE;
- 	if (!done){
-+#ifdef FF_API_AVCODEC_INIT
- 		avcodec_init();
-+#endif
- 		avcodec_register_all();
- 		done=TRUE;
- 	}
-diff --git a/src/videoenc.c b/src/videoenc.c
-index 21d016f..fb35760 100644
---- a/src/videoenc.c
-+++ b/src/videoenc.c
-@@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
- static bool_t avcodec_initialized=FALSE;
- 
-+#ifndef FF_I_TYPE
-+#define FF_I_TYPE AV_PICTURE_TYPE_I
-+#endif
-+
- #ifdef ENABLE_LOG_FFMPEG
- 
- void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
-@@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
- 
- void ms_ffmpeg_check_init(){
- 	if(!avcodec_initialized){
-+#ifdef FF_API_AVCODEC_INIT
- 		avcodec_init();
-+#endif
- 		avcodec_register_all();
- 		avcodec_initialized=TRUE;
- #ifdef ENABLE_LOG_FFMPEG
-@@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){
- 	if (s->profile==0){
- 		s->codec=CODEC_ID_H263;
- 	}else{
-+		/*
- 		c->flags|=CODEC_FLAG_H263P_UMV;
- 		c->flags|=CODEC_FLAG_AC_PRED;
- 		c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
--		/*
- 		c->flags|=CODEC_FLAG_OBMC;
- 		c->flags|=CODEC_FLAG_AC_PRED;
- 		*/
diff --git a/extra/ortp/PKGBUILD b/extra/ortp/PKGBUILD
index 3f132b4e9..1cb6bc708 100644
--- a/extra/ortp/PKGBUILD
+++ b/extra/ortp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 162825 2012-07-01 07:46:57Z andrea $
+# $Id: PKGBUILD 188538 2013-06-15 10:09:55Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=ortp
-pkgver=0.20.0.20120701
+pkgver=0.22.0
 pkgrel=1
 pkgdesc="A Real-time Transport Protocol (RTP) library"
 arch=('i686' 'x86_64')
@@ -13,14 +13,13 @@ url="http://www.linphone.org/index.php/eng/code_review/ortp"
 license=('GPL3')
 depends=('libzrtpcpp' 'libsrtp')
 options=('!libtool')
-#source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"{,.sig}
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('91b66787c6ac3e8d4d43946beb7611ce')
+source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"{,.sig})
+sha1sums=('3f4712307ceba27c6498abd2090f411e02084dbd'
+          'SKIP')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
-  ./autogen.sh
   ./configure --prefix=/usr \
     --enable-zrtp \
     --disable-strict
@@ -28,6 +27,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/perl-dbd-sqlite/PKGBUILD b/extra/perl-dbd-sqlite/PKGBUILD
index 00ba3f4a3..61d0d5996 100644
--- a/extra/perl-dbd-sqlite/PKGBUILD
+++ b/extra/perl-dbd-sqlite/PKGBUILD
@@ -1,33 +1,30 @@
-# $Id: PKGBUILD 186400 2013-05-26 09:25:06Z bluewind $
+# $Id: PKGBUILD 188483 2013-06-14 22:43:41Z eric $
 # Maintainer:
-# Contributor: Tom Killian <tomk@runbox.com>
-# Contributor: francois at archlinux dot org
 
 pkgname=perl-dbd-sqlite
-_cpanname=DBD-SQLite
-pkgver=1.37
-pkgrel=2
+pkgver=1.39
+pkgrel=1
 pkgdesc="Self-contained RDBMS in a DBI driver"
 arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/${_cpanname}"
+url="http://search.cpan.org/dist/DBD-SQLite"
 license=('GPL' 'PerlArtistic')
 depends=('perl-dbi' 'sqlite')
 options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz)
-md5sums=('b8ac1c584befa63cd5ffc391b2366e84')
+source=(http://www.cpan.org/authors/id/I/IS/ISHIGAKI/DBD-SQLite-${pkgver}.tar.gz)
+md5sums=('8ca0719852fcbcbbee470c705eeff24a')
 
 build() {
-  cd "${srcdir}/${_cpanname}-${pkgver}"
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  cd DBD-SQLite-${pkgver}
+  perl Makefile.PL INSTALLDIRS=vendor
   make
 }
 
 check() {
-  cd "${srcdir}/${_cpanname}-${pkgver}"
+  cd DBD-SQLite-${pkgver}
   make test
 }
 
 package() {
-  cd "${srcdir}/${_cpanname}-${pkgver}"
+  cd DBD-SQLite-${pkgver}
   make install DESTDIR="${pkgdir}"
 }
diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD
index 7f2b29caf..722116ab7 100644
--- a/extra/perl-net-ssleay/PKGBUILD
+++ b/extra/perl-net-ssleay/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 186413 2013-05-26 09:25:31Z bluewind $
+# $Id: PKGBUILD 188575 2013-06-15 17:19:47Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Manolis Tzanidakis
 
 pkgname=perl-net-ssleay
 _cpanname=Net-SSLeay
-pkgver=1.54
-pkgrel=2
+pkgver=1.55
+pkgrel=1
 pkgdesc="Perl extension for using OpenSSL"
 arch=('i686' 'x86_64')
 license=('custom:BSD')
@@ -15,7 +15,7 @@ options=(!emptydirs)
 replaces=('net-ssleay')
 provides=('net-ssleay')
 source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz")
-md5sums=('26e758fff1c90cb00e9358fea7e1e22f')
+md5sums=('473b8d66ca69d5784bb0e428721f58e0')
 
 build() {
   cd ${srcdir}/${_cpanname}-${pkgver}
diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD
index d7e987d38..f8ebacc12 100644
--- a/extra/polkit/PKGBUILD
+++ b/extra/polkit/PKGBUILD
@@ -1,29 +1,27 @@
-# $Id: PKGBUILD 183452 2013-04-21 22:11:58Z heftig $
+# $Id: PKGBUILD 188528 2013-06-15 09:16:15Z tomegun $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=polkit
-pkgver=0.110
-pkgrel=2
+pkgver=0.111
+pkgrel=1
 pkgdesc="Application development toolkit for controlling system-wide privileges"
 arch=(i686 x86_64)
 license=(LGPL)
 url="http://www.freedesktop.org/wiki/Software/polkit"
-depends=(glib2 pam expat libsystemd js185)
+depends=(glib2 pam expat libsystemd js)
 makedepends=(intltool gtk-doc gobject-introspection)
 options=('!libtool')
 install=polkit.install
 source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz
         polkit.pam)
-md5sums=('06e0d3b72e566ac277fc35c8206d2a28'
-         '6564f95878297b954f0572bc1610dd15')
 
 build() {
   cd $pkgname-$pkgver
 
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system \
-      --disable-static --enable-gtk-doc
+      --enable-libsystemd-login=yes --disable-static \
+      --enable-gtk-doc
   make
 }
 
@@ -36,3 +34,5 @@ package() {
 
   install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1"
 }
+md5sums=('81b116edf986d8e13502929a171f4e0d'
+         '6564f95878297b954f0572bc1610dd15')
diff --git a/extra/scim-anthy/PKGBUILD b/extra/scim-anthy/PKGBUILD
index 08dfac7cc..5263aa628 100644
--- a/extra/scim-anthy/PKGBUILD
+++ b/extra/scim-anthy/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 148916 2012-02-05 11:55:48Z ibiru $
-# Contributor: damir <damir@archlinux.org>
+# $Id: PKGBUILD 188489 2013-06-15 00:05:53Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: damir <damir@archlinux.org>
 
 pkgname=scim-anthy
 pkgver=1.2.7
-pkgrel=3
+pkgrel=4
 _filecode=37309
 pkgdesc='Japanese input method module for SCIM'
-arch=('i686' 'x86_64')
 url='http://sourceforge.jp/projects/scim-imengine/'
+arch=('i686' 'x86_64')
 license=('GPL')
 depends=('scim' 'anthy')
-options=('!libtool')
 source=("http://osdn.dl.sourceforge.jp/scim-imengine/${_filecode}/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('1429cf202f5cdcfc4733220acbe27dd9edb75db8')
 
+options=('!libtool')
+
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	./configure --prefix=/usr --disable-static
diff --git a/extra/scim-chewing/PKGBUILD b/extra/scim-chewing/PKGBUILD
index ea3d7fac2..c1fbe9c6e 100644
--- a/extra/scim-chewing/PKGBUILD
+++ b/extra/scim-chewing/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 176853 2013-02-01 14:44:22Z bisson $
-# Contributor: damir <damir@archlinux.org>
-# Contributor: whisky <archlinux.cle(at)gmail.com>
+# $Id: PKGBUILD 188490 2013-06-15 00:05:54Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: whisky <archlinux.cle(at)gmail.com>
+# Contributor: damir <damir@archlinux.org>
 
 pkgname=scim-chewing
 pkgver=0.3.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Traditional Chinese input method module for SCIM'
 url='http://chewing.csie.net/'
 license=('GPL')
-options=('!libtool')
 arch=('i686' 'x86_64')
 makedepends=('intltool')
 depends=('scim' 'libchewing')
 source=("http://chewing.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('f26ced990f0c9e5d43e271cd6e77583de81a008d')
 
+options=('!libtool')
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure --prefix=/usr --disable-static
diff --git a/extra/scim-hangul/PKGBUILD b/extra/scim-hangul/PKGBUILD
index b5e08cac0..9ca70271d 100644
--- a/extra/scim-hangul/PKGBUILD
+++ b/extra/scim-hangul/PKGBUILD
@@ -1,24 +1,29 @@
-# $Id: PKGBUILD 165326 2012-08-15 15:47:04Z bisson $
-# Contributor: damir <damir@archlinux.org>
+# $Id: PKGBUILD 188491 2013-06-15 00:05:55Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: damir <damir@archlinux.org>
 
 pkgname=scim-hangul
 pkgver=0.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Korean input method module for SCIM'
 url='http://www.scim-im.org/'
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('libhangul' 'scim')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz"
         '2012.patch')
 sha1sums=('2ba06a6d851a1d86c5a9b659c573bfd87e6a7555'
           'a046c40b78521f85418b8ad2138b51815d47abec')
 
-build() {
+options=('!libtool')
+
+prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	patch -p1 -i ../2012.patch
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure --prefix=/usr --enable-skim-support
 	make
 }
diff --git a/extra/scim-m17n/PKGBUILD b/extra/scim-m17n/PKGBUILD
index 7938e7768..ffbc7bb51 100644
--- a/extra/scim-m17n/PKGBUILD
+++ b/extra/scim-m17n/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 149048 2012-02-05 15:25:52Z bisson $
+# $Id: PKGBUILD 188492 2013-06-15 00:05:56Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Camille Moncelier <pix@devlife.org>
 # Contributor: damir <damir@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=scim-m17n
 pkgver=0.2.3
-pkgrel=4
+pkgrel=5
 pkgdesc='Multilingual input method module for SCIM'
 url='http://www.scim-im.org/'
 license=('GPL')
-options=('!libtool')
 arch=('i686' 'x86_64')
 depends=('scim' 'm17n-lib')
 source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('96172846eaa211d2bde0f76184990d13e5ecdaea')
 
+options=('!libtool')
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --enable-static=no
+	./configure --prefix=/usr --disable-static
 	make
 }
 
diff --git a/extra/scim-pinyin/PKGBUILD b/extra/scim-pinyin/PKGBUILD
index 0364e310d..a31e1eadc 100644
--- a/extra/scim-pinyin/PKGBUILD
+++ b/extra/scim-pinyin/PKGBUILD
@@ -1,27 +1,23 @@
-# $Id: PKGBUILD 165322 2012-08-15 15:28:33Z bisson $
+# $Id: PKGBUILD 188493 2013-06-15 00:05:57Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributer: Gan Lu <rhythm.gan@gmail.com>
 
 pkgname=scim-pinyin
 pkgver=0.5.92
-pkgrel=1
+pkgrel=2
 pkgdesc='Chinese pinyin input for SCIM'
 url='http://www.scim-im.org/'
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('scim')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('d7c2d52a5712753af241a5301db23527ba438ea1')
 
+options=('!libtool')
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-static \
-
+	./configure --prefix=/usr --sysconfdir=/etc --disable-static
 	make
 }
 
diff --git a/extra/scim-tables/PKGBUILD b/extra/scim-tables/PKGBUILD
index 557d9d80c..3868c42c0 100644
--- a/extra/scim-tables/PKGBUILD
+++ b/extra/scim-tables/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183256 2013-04-19 15:20:34Z bisson $
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Gan Lu <rhythm.gan@gmail.com>
+# $Id: PKGBUILD 188494 2013-06-15 00:05:58Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Gan Lu <rhythm.gan@gmail.com>
+# Contributor: damir <damir@archlinux.org>
 
 pkgname=scim-tables
-pkgver=0.5.12
+pkgver=0.5.13
 pkgrel=1
 pkgdesc='Generic table input method module for SCIM'
 url='http://www.scim-im.org/'
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('scim')
 makedepends=('intltool')
 source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('c83515c1c3ce0c40fb7cf30f576d8837a06a626f')
+sha1sums=('75363466cfca30e3cdff804e0dad713f12521776')
 
 options=('!libtool')
 
diff --git a/extra/scim-uim/PKGBUILD b/extra/scim-uim/PKGBUILD
index 0edb9b433..8a3b46ed9 100644
--- a/extra/scim-uim/PKGBUILD
+++ b/extra/scim-uim/PKGBUILD
@@ -1,14 +1,13 @@
-# $Id: PKGBUILD 166977 2012-09-24 04:57:10Z bisson $
-# Contributor: damir <damir@archlinux.org>
+# $Id: PKGBUILD 188495 2013-06-15 00:05:59Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org
+# Contributor: damir <damir@archlinux.org>
 
 pkgname=scim-uim
 pkgver=0.2.0
-pkgrel=6
+pkgrel=7
 pkgdesc='UIM bridging input engine for SCIM'
 url='http://www.scim-im.org/'
 license=('GPL')
-options=('!libtool')
 depends=('scim' 'uim')
 arch=('i686' 'x86_64')
 source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz"
@@ -18,10 +17,16 @@ sha1sums=('456621d5969b6552c3c33c83cf295aa4134fff0a'
           'a9d67946f956d0572c73065e2b4b268bfdf149e3'
           '3b083260910f7855b5446960ab1203c052f4b56c')
 
-build() {
+options=('!libtool')
+
+prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	patch -p1 -i ../fix-gcc43-build.patch
 	patch -p1 -i ../uim-1.5.5-header.patch
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure --prefix=/usr --sysconfdir=/etc --disable-static
 	make
 }
diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD
index c2900e866..a04ce1828 100644
--- a/extra/scim/PKGBUILD
+++ b/extra/scim/PKGBUILD
@@ -1,34 +1,35 @@
-# $Id: PKGBUILD 185781 2013-05-18 17:19:08Z bisson $
+# $Id: PKGBUILD 188488 2013-06-15 00:05:52Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Gan Lu <rhythm.gan@gmail.com>
 
 pkgname=scim
 pkgver=1.4.14
-pkgrel=3
+pkgrel=4
 pkgdesc='Input method user interface and development platform'
 url='http://www.scim-im.org/projects/scim'
 license=('LGPL')
-options=('!libtool')
 arch=('i686' 'x86_64')
 depends=('libltdl' 'gtk2')
-makedepends=('intltool' 'optipng')
-backup=('etc/scim/config' 'etc/scim/global')
+optdepends=('qt4: qt4 immodule'
+            'gtk3: gtk3 immodule')
+makedepends=('intltool' 'qt4' 'gtk3' 'optipng')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('73391be371dd7ef9f9af8b3a211e2bedec0cf71b')
 
+backup=('etc/scim/config' 'etc/scim/global')
+options=('!libtool')
 install=install
 
-prepare() {
-	find -name '*.png' -exec optipng -quiet -force -fix {} +
-}
-
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	find -name '*.png' -exec optipng -quiet -force -fix {} +
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--disable-static \
+		--with-qt4-moc=/usr/bin/moc-qt4 \
+		--with-gtk-version=2 # no gtk3 support in scim-anthy
 
 	make
 }
diff --git a/extra/vte/PKGBUILD b/extra/vte/PKGBUILD
index d35c20c63..b517f492c 100644
--- a/extra/vte/PKGBUILD
+++ b/extra/vte/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 142691 2011-11-12 18:51:31Z ibiru $
+# $Id: PKGBUILD 188481 2013-06-14 22:21:14Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=vte
@@ -12,9 +12,9 @@ depends=('gtk2' 'vte-common')
 makedepends=('pygtk' 'intltool' 'gobject-introspection' 'pygobject2-devel')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-$pkgver.tar.xz
-make_alt_work.patch::http://git.gnome.org/browse/vte/patch/?id=b73782a28894e25ed146271f9d6c6775a6836199)
+        make_alt_work.patch)
 sha256sums=('86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae'
-            '8307623b13bcaf214cc25207ee7afaf65575d334623460311c24437fbbae14d3')
+            '978c989fb63884289068bcee05a92614a3a2be9e5d9386ab789dfb87163b92c8')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/vte/make_alt_work.patch b/extra/vte/make_alt_work.patch
new file mode 100644
index 000000000..8e6e3fcad
--- /dev/null
+++ b/extra/vte/make_alt_work.patch
@@ -0,0 +1,21 @@
+From b73782a28894e25ed146271f9d6c6775a6836199 Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad@behdad.org>
+Date: Fri, 04 Jun 2010 18:36:45 +0000
+Subject: Bug 601926 - Don't hardcode meta to alt
+
+---
+diff --git a/src/keymap.h b/src/keymap.h
+index 3a4cefe..243e22e 100644
+--- a/src/keymap.h
++++ b/src/keymap.h
+@@ -27,7 +27,7 @@
+ 
+ G_BEGIN_DECLS
+ 
+-#define VTE_META_MASK		GDK_MOD1_MASK
++#define VTE_META_MASK		GDK_META_MASK
+ #define VTE_NUMLOCK_MASK	GDK_MOD2_MASK
+ 
+ /* Map the specified keyval/modifier setup, dependent on the mode, to either
+--
+cgit v0.9.2
diff --git a/extra/webkitgtk2/PKGBUILD b/extra/webkitgtk2/PKGBUILD
index 60865fe7c..2b2dc3754 100644
--- a/extra/webkitgtk2/PKGBUILD
+++ b/extra/webkitgtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 188478 2013-06-14 20:00:26Z heftig $
+# $Id: PKGBUILD 188485 2013-06-14 23:12:24Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=webkitgtk2
 pkgver=1.10.2
-pkgrel=6
+pkgrel=7
 pkgdesc="GTK+ Web content engine library for GTK+ 2.0"
 arch=(i686 x86_64)
 url="http://webkitgtk.org/"
@@ -42,4 +42,5 @@ package() {
   cd webkitgtk-$pkgver
   make -j1 DESTDIR="$pkgdir" install
   install -Dm644 Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -r "$pkgdir/usr/share/gtk-doc/html/webkitgtk"
 }
diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD
index 064bd2c71..db8bd3503 100644
--- a/extra/x2goserver/PKGBUILD
+++ b/extra/x2goserver/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186036 2013-05-20 18:09:21Z andyrtr $
+# $Id: PKGBUILD 188542 2013-06-15 10:17:06Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
@@ -7,8 +7,8 @@
 # Contributor: Milan Knížek <knizek@volny.cz>
 
 pkgname=x2goserver
-pkgver=4.0.0.2
-pkgrel=2
+pkgver=4.0.1.1
+pkgrel=1
 pkgdesc="Open source terminal server"
 arch=('i686' 'x86_64')
 url="http://www.x2go.org/"
@@ -20,19 +20,13 @@ options=('emptydirs')
 install=x2goserver.install
 backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql')
 source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        x2goserver.service
-        revert.patch)
-md5sums=('6b8cecfdd31a8877203f50d3666c265f'
-         'f76081c01e40b6206895d194dc949707'
-         'c487c31e7c0aa9a73323313007497764')
+        x2goserver.service)
+md5sums=('d970699f1df8d7096a7d3151c0ede447'
+         'f76081c01e40b6206895d194dc949707')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # revert an upstream commit that breaks sessions showing up
-  # http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=011d14ae076ba6fec96cd1e019c4f82444ab0f9f
-  patch -Rp1 -i ${srcdir}/revert.patch
-
   # -r option does not exist in Arch linux
   # (However, html man pages do not get installed anyway...)
   for Makefile in $(find . -type f -name Makefile); do
@@ -45,7 +39,7 @@ build() {
     sed -i "s:-o root -g root ::g" $Makefile
   done
 
-  make
+  make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir"
 }
 
 package() {
@@ -60,8 +54,8 @@ package() {
   install -dm 770 $pkgdir/var/spool/x2go
   
   # load fuse module at system start
-  install -dm755 $pkgdir/lib/modules-load.d
-  echo "fuse" > $pkgdir/lib/modules-load.d/x2goserver.conf
+  install -dm755 $pkgdir/usr/lib/modules-load.d
+  echo "fuse" > $pkgdir/usr/lib/modules-load.d/x2goserver.conf
 
   install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}"
   install -m 644 "debian/changelog" "${pkgdir}/usr/share/doc/${pkgname}/changelog.DEBIAN"
diff --git a/extra/x2goserver/revert.patch b/extra/x2goserver/revert.patch
deleted file mode 100644
index 023bbd18c..000000000
--- a/extra/x2goserver/revert.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From 011d14ae076ba6fec96cd1e019c4f82444ab0f9f Mon Sep 17 00:00:00 2001
-From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Date: Sun, 19 May 2013 00:41:32 +0200
-Subject: [PATCH] Security fix for setgid wrapper x2gosqlitewrapper.c.
- Hard-code path to x2gosqlitewrapper.pl during build via
- defining a macro in the Makefile. Thanks to Richard
- Weinberger for spotting this!!!
-
----
- Makefile                       |    2 +-
- debian/changelog               |    3 +++
- debian/rules                   |    4 +--
- x2goserver/Makefile            |    4 +--
- x2goserver/x2gosqlitewrapper.c |   54 +++-------------------------------------
- 5 files changed, 12 insertions(+), 55 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 3be40f9..588084f 100755
---- a/Makefile
-+++ b/Makefile
-@@ -4,7 +4,7 @@ RM_FILE=rm -f
- RM_DIR=rmdir -p --ignore-fail-on-non-empty
- 
- DESTDIR=
--PREFIX=/usr/local
-+PREFIX ?= /usr/local
- ETCDIR=/etc/x2go
- LIBDIR=$(PREFIX)/lib/x2go
- SHAREDIR=$(PREFIX)/share/x2go
-diff --git a/debian/changelog b/debian/changelog
-index 470a502..2cf2dde 100644
---- a/debian/changelog
-+++ b/debian/changelog
-@@ -12,6 +12,9 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low
-   * New upstream version (4.0.0.2):
-     - Use make_path from File::Path in x2godbadmin to create user directory if
-       not present. (Fixes: #200).
-+    - Security fix for setgid wrapper x2gosqlitewrapper.c. Hard-code path to
-+      x2gosqlitewrapper.pl during build via defining a macro in the Makefile.
-+      Thanks to Richard Weinberger for spotting this!!!
-   /debian/control:
-     + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes:
-       #163).
-diff --git a/debian/rules b/debian/rules
-index b32e08d..5bb94b2 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -1,10 +1,10 @@
- #!/usr/bin/make -f
- 
- %:
--	dh $@
-+	PREFIX=/usr dh $@
- 
- override_dh_auto_install:
--	make -f Makefile build-arch
-+	PREFIX=/usr make -f Makefile build-arch
- 
- override_dh_auto_clean:
- 	rm -fv x2gosqlitewrapper
-diff --git a/x2goserver/Makefile b/x2goserver/Makefile
-index 4287478..e9d56e6 100755
---- a/x2goserver/Makefile
-+++ b/x2goserver/Makefile
-@@ -15,7 +15,7 @@ RM_FILE=rm -f
- RM_DIR=rmdir -p --ignore-fail-on-non-empty
- 
- DESTDIR=
--PREFIX=/usr/local
-+PREFIX ?= /usr/local
- ETCDIR=/etc/x2go
- BINDIR=$(PREFIX)/bin
- SBINDIR=$(PREFIX)/sbin
-@@ -41,7 +41,7 @@ build: build-arch build-indep
- build-arch: build_setgidwrappers
- 
- build_setgidwrappers:
--	$(CC) $(CFLAGS) $(LDFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/x2gosqlitewrapper.pl\" -o x2gosqlitewrapper x2gosqlitewrapper.c
- 
- build-indep: build_man2html
- 
-diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c
-index a134efc..ad95eff 100644
---- a/x2goserver/x2gosqlitewrapper.c
-+++ b/x2goserver/x2gosqlitewrapper.c
-@@ -21,58 +21,12 @@
-  * 
-  */
- 
--#include <stdio.h>
--#include <stdlib.h>
--#include <unistd.h>
--#include <libgen.h>
--#include <errno.h>
--
- int main( int argc, char *argv[] ) {
--	char * x2gosqlitewrapper = NULL;
--	size_t path_max;
--	
--/*
--	The following snippet is taken from the realpath manpage
--*/
--#ifdef PATH_MAX
--	path_max = PATH_MAX;
--#else
--	path_max = pathconf (".", _PC_PATH_MAX);
--	if (path_max <= 0){
--		path_max = 4096;
--	}
--#endif
--	{
--		// allocate dynamic buffer in stack: this needs C99 or gnu??
--		char buffer[path_max];
--		ssize_t rvrl;
--		int rvap;
--
--		// resolve link of /proc/self/exe to find out where we are
--		rvrl = readlink("/proc/self/exe", buffer, path_max);
--		if(rvrl == -1){
--			perror("readlink(\"/proc/self/exe\",buffer,path_max)");
--			exit(EXIT_FAILURE);
--		}
--		if(rvrl >= path_max){
--			fprintf(stderr, "Could not resolve the path of this file using \"/proc/self/exe\". The path is too long (> %i)", path_max);
--			exit(EXIT_FAILURE);
--		}
--
--		// derive the full path of x2gosqlitewrapper.pl from path of this binary
--		rvap = asprintf(&x2gosqlitewrapper, "%s/%s", dirname(buffer), "x2gosqlitewrapper.pl");
--		if(rvap == -1){
--			fprintf(stderr, "Failed to allocate memory calling asprintf\n");
--			exit(EXIT_FAILURE);
--		}
--
--		// execute the script, running with user-rights of this binary 
--		execv(x2gosqlitewrapper, argv);
- 
--	}
-+	char x2gosqlitewrapper[] = TRUSTED_BINARY;
- 
--	// ...fail
--	fprintf(stderr, "Failed to execute %s: %s\n", x2gosqlitewrapper, strerror(errno));
--	return EXIT_FAILURE;
-+	argv[0] = "x2gosqlitewrapper.pl";
-+	// execute the script, running with user-rights of this binary
-+	execv(x2gosqlitewrapper, argv);
- 
- }
--- 
-1.7.9.5
-
author	root <root@rshg054.dnsready.net>	2013-06-16 01:26:25 -0700
committer	root <root@rshg054.dnsready.net>	2013-06-16 01:26:25 -0700
commit	44c10f274ec720a1512b15457b9eeffea28c6041 (patch)
tree	48d27d6116dfd4fdce957af918c3d62385fd9226 /extra
parent	0a069ede63336b105cda051cebe136f2592847d2 (diff)