Thu Jun 13 00:06:37 PDT 2013

8 files changed, 29 insertions, 85 deletions

diff --git a/extra/libxkbcommon/PKGBUILD b/extra/libxkbcommon/PKGBUILD
index ae4d1bdff..1d4c5811d 100644
--- a/extra/libxkbcommon/PKGBUILD
+++ b/extra/libxkbcommon/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 181161 2013-04-01 20:10:49Z heftig $
+# $Id: PKGBUILD 188191 2013-06-12 13:53:24Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Daniel Micay <danielmicay@gmail.com>
 # Contributor: Mladen Pejakovic <pejakm@gmail.com>
 
 pkgname=libxkbcommon
-pkgver=0.3.0
+pkgver=0.3.1
 pkgrel=1
 pkgdesc="Keyboard handling library using XKB data"
 arch=(i686 x86_64)
@@ -14,7 +14,8 @@ depends=(xkeyboard-config)
 makedepends=(doxygen xorg-util-macros)
 options=('!libtool')
 source=("http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz")
-md5sums=('22a046100738f99b4cc0297aa210f4e4')
+#source=("$pkgname-$pkgver::git://github.com/xkbcommon/$pkgname.git")
+md5sums=('7287ea51df79c0f80e92b970a30b95e9')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 2b794f481..30aa977a8 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 186427 2013-05-26 09:26:08Z bluewind $
+# $Id: PKGBUILD 188189 2013-06-12 11:20:08Z bpiotrowski $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
-pkgver=1.7.9
-pkgrel=6
+pkgver=1.7.10
+pkgrel=1
 pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -25,7 +25,7 @@ source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2 #{,.as
         svnserve.tmpfiles
         svnserve.service
         subversion.rpath.fix.patch)
-md5sums=('8d532025771a67c06c23f299699f056f'
+md5sums=('4088a77e14232876c9b4ff1541e6e200'
          'a0db6dd43af33952739b6ec089852630'
          'c459e299192552f61578f3438abf0664'
          'bb2857eceafcfac35dde39dcffad2314'
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD
index faf3f61c8..47a80be3c 100644
--- a/extra/webkitgtk/PKGBUILD
+++ b/extra/webkitgtk/PKGBUILD
@@ -1,31 +1,23 @@
-# $Id: PKGBUILD 187877 2013-06-07 17:10:54Z heftig $
+# $Id: PKGBUILD 188207 2013-06-12 20:16:30Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=webkitgtk
-pkgver=2.0.2
-pkgrel=3
+pkgver=2.0.3
+pkgrel=1
 pkgdesc="GTK+ Web content engine library"
 arch=(i686 x86_64)
 url="http://webkitgtk.org/"
 license=(custom)
-depends=(libxt libxslt sqlite libsoup enchant libgl geoclue gtk3 gst-plugins-base-libs libsecret libwebp
-         harfbuzz-icu)
+depends=(libxt libxslt sqlite libsoup enchant libgl geoclue gtk3 gst-plugins-base-libs
+         libsecret libwebp harfbuzz-icu)
 makedepends=(gtk2 gperf gobject-introspection python mesa ruby gtk-doc)
-optdepends=('gtk2: Webkit2 plugin support')
-conflicts=(webkitgtk3 libwebkit3)
+optdepends=('gtk2: Netscape plugin support')
 provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}")
+conflicts=(webkitgtk3 libwebkit3)
 replaces=(webkitgtk3 libwebkit3)
 options=(!libtool !emptydirs)
-source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz
-        changeset_150963.diff)
-sha256sums=('c3685032545eb4c23f3f56826817783a6963ad59bd7bbf806705059b3d8caeb2'
-            '8d2542600cba876b714cdf6be478d847b6672bff2856e6e6d0582b1566fe5764')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np2 -i ../changeset_150963.diff
-  autoreconf -fi -I Source/autotools
-}
+source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz)
+sha256sums=('9bf8a32afbf087c4fc2c652b193a52c44b180735ba9c7c8db88137904d458e1b')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/webkitgtk/changeset_150963.diff b/extra/webkitgtk/changeset_150963.diff
deleted file mode 100644
index d56c1c729..000000000
--- a/extra/webkitgtk/changeset_150963.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-2013-05-30  Alberto Garcia  <agarcia@igalia.com>
-
-[GTK] Needs to check for harfbuzz-icu
-https://bugs.webkit.org/show_bug.cgi?id=116978
-
-Reviewed by Xan Lopez.
-
-HarfBuzz 0.9.18 splits harbuzz-icu into a separate library so we
-also need to check for it in order to get the necessary flags for
-the compiler and the linker.
-
-We keep this conditional for now since we still want to support
-earlier versions of HarfBuzz.
-
-Index: /trunk/Source/autotools/FindDependencies.m4
-===================================================================
---- /trunk/Source/autotools/FindDependencies.m4	(revision 150962)
-+++ /trunk/Source/autotools/FindDependencies.m4	(revision 150963)
-@@ -376,4 +376,11 @@
-         [cairo-ft fontconfig >= fontconfig_required_version freetype2 >= freetype2_required_version harfbuzz >= harfbuzz_required_version])
- fi
-+# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library.
-+# Since we support earlier HarfBuzz versions we keep this conditional for now.
-+if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
-+    PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version)
-+    FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS"
-+    FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS"
-+fi
- AC_SUBST([FREETYPE_CFLAGS])
- AC_SUBST([FREETYPE_LIBS])
diff --git a/extra/webkitgtk/python3.patch b/extra/webkitgtk/python3.patch
deleted file mode 100644
index efd640043..000000000
--- a/extra/webkitgtk/python3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/Tools/gtk/generate-feature-defines-files b/Tools/gtk/generate-feature-defines-files
-index 1a92bf50a05831655308cb62646eb05a6db4b63c..f5b2c7e61eab12bf0eb25b0f9c595f2fd83ebbe9 100755
---- a/Tools/gtk/generate-feature-defines-files
-+++ b/Tools/gtk/generate-feature-defines-files
-@@ -32,13 +32,13 @@ def write_file_if_contents_changed(filename, contents):
- 
- def write_feature_defines_header(feature_defines):
-     contents = ''
--    for (feature, value) in feature_defines.iteritems():
-+    for (feature, value) in feature_defines.items():
-         contents += '#define {0} {1}\n'.format(feature, value)
-     write_file_if_contents_changed("WebKitFeatures.h", contents)
- 
- def write_flattened_feature_defines_file(feature_defines):
-     contents = ''
--    for (feature, value) in feature_defines.iteritems():
-+    for (feature, value) in feature_defines.items():
-         contents += '{0}={1}\n'.format(feature, value)
-     write_file_if_contents_changed("WebKitFeatures.txt", contents)
- 
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index 8a3f13e9e..946bce8bd 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 188105 2013-06-09 20:39:09Z guillaume $
+# $Id: PKGBUILD 188206 2013-06-12 20:04:04Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
 pkgver=1.10.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL2')
-makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
+makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
              'libgcrypt' 'lua51' 'python')
 url='http://www.wireshark.org/'
 options=(!libtool)
@@ -36,7 +36,8 @@ build() {
       --prefix=/usr \
       --with-ssl \
       --with-zlib=yes \
-      --with-lua
+      --with-lua \
+      --with-gtk3=yes
   make all
 }
 
@@ -66,7 +67,7 @@ package_wireshark-cli() {
 
 package_wireshark-gtk() {
   pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend'
-  depends=('gtk2' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme')
+  depends=('gtk3' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme')
   install=wireshark-gtk.install
   replaces=(wireshark)
   conflicts=(wireshark)
diff --git a/extra/xf86-video-modesetting/PKGBUILD b/extra/xf86-video-modesetting/PKGBUILD
index 98ba58173..d443a228b 100644
--- a/extra/xf86-video-modesetting/PKGBUILD
+++ b/extra/xf86-video-modesetting/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180914 2013-03-27 23:14:30Z andyrtr $
+# $Id: PKGBUILD 188204 2013-06-12 19:08:23Z lcarlier $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
 pkgname=xf86-video-modesetting
-pkgver=0.7.0
+pkgver=0.8.0
 pkgrel=1
 pkgdesc="X.org generic modesetting video driver"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ groups=('xorg-drivers' 'xorg')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('2bc55f776eaee7b4e13df13238d36c4facf1cdca095a11519baf2376f5c996ac')
+sha256sums=('13dc349e9aa50987ab2479d27d6879cda2c1f9ad8c8d3a1422a2f53c36f047f8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD
index 5de63e725..c3a3570fb 100644
--- a/extra/xf86-video-nouveau/PKGBUILD
+++ b/extra/xf86-video-nouveau/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180916 2013-03-27 23:16:59Z andyrtr $
+# $Id: PKGBUILD 188202 2013-06-12 18:59:24Z lcarlier $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: buddabrod <buddabrod@gmail.com>
 
 pkgname=xf86-video-nouveau
-pkgver=1.0.7
+pkgver=1.0.8
 pkgrel=1
 pkgdesc="Open Source 2D acceleration driver for nVidia cards"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 install=$pkgname.install
 source=(http://xorg.freedesktop.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2)
-sha256sums=('d187c658e1823ca829c941f3f601f8e7220d427e079c3e52b94ecff45bc2e131')
+sha256sums=('9b904314b8e9c7a5800724a6a31038ed88fa3fcfd35da6f4015fc104c8283617')
 
 build() {
   cd $pkgname-$pkgver