summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-07-27 20:23:53 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-07-27 20:23:53 -0300
commit3a3f329b736af639fdd3c9621816bad627b96903 (patch)
treea0935f38e21136a3b7eeb93d0ec5c449c12de5b0 /extra
parent4d788e769855cbef2539d7cf7049dc2b4d9ac2e0 (diff)
parent2c30604c9ff749660a4b8507eec99e679cf19508 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-staging/kdenlive/PKGBUILD community-staging/openscenegraph/PKGBUILD community-staging/schroot/PKGBUILD community-staging/wt/PKGBUILD community-testing/cdfs/PKGBUILD community-testing/pingus/PKGBUILD community-testing/tagpy/PKGBUILD community-testing/vhba-module/PKGBUILD community-testing/vhba-module/vhba-module.install community/surf/PKGBUILD community/unpaper/PKGBUILD core/flex/PKGBUILD core/gcc/PKGBUILD extra/boost/PKGBUILD extra/cups/PKGBUILD extra/gnutls/PKGBUILD extra/gtk2/PKGBUILD extra/llvm/PKGBUILD extra/mesa/PKGBUILD extra/qt/PKGBUILD kde-unstable/akonadi/PKGBUILD kde-unstable/kdeplasma-addons/PKGBUILD libre/virtualbox-libre/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/lib32-libpng/PKGBUILD testing/bind/PKGBUILD testing/dnsutils/PKGBUILD testing/iptables/PKGBUILD testing/nouveau-dri/PKGBUILD
Diffstat (limited to 'extra')
-rw-r--r--extra/boost/PKGBUILD4
-rw-r--r--extra/clucene/PKGBUILD6
-rw-r--r--extra/cups/PKGBUILD4
-rw-r--r--extra/dbus/PKGBUILD8
-rw-r--r--extra/ddrescue/PKGBUILD4
-rw-r--r--extra/dovecot/PKGBUILD4
-rw-r--r--extra/git/PKGBUILD12
-rw-r--r--extra/gnutls/PKGBUILD6
-rw-r--r--extra/gpsd/PKGBUILD4
-rw-r--r--extra/gtk2/PKGBUILD19
-rw-r--r--extra/gtk2/fix-stuck-grabs.patch47
-rw-r--r--extra/icu/PKGBUILD6
-rw-r--r--extra/imagemagick/PKGBUILD8
-rw-r--r--extra/libmp4v2/PKGBUILD4
-rw-r--r--extra/libpng/PKGBUILD10
-rw-r--r--extra/llvm/PKGBUILD4
-rw-r--r--extra/mesa/PKGBUILD6
-rw-r--r--extra/nouveau-dri/PKGBUILD4
-rw-r--r--extra/qjackctl/PKGBUILD4
-rw-r--r--extra/qt-gstreamer/PKGBUILD4
-rw-r--r--extra/qt/PKGBUILD4
-rw-r--r--extra/rosegarden/PKGBUILD4
-rw-r--r--extra/taglib/PKGBUILD4
-rw-r--r--extra/transmission/PKGBUILD6
-rw-r--r--extra/whois/PKGBUILD6
-rw-r--r--extra/xf86-input-evdev/PKGBUILD13
-rw-r--r--extra/xf86-input-keyboard/PKGBUILD8
-rw-r--r--extra/xf86-video-intel/PKGBUILD17
-rw-r--r--extra/xf86-video-intel/gmux_backlight.diff10
-rw-r--r--extra/xf86-video-intel/sna_backlight_fixes.diff54
-rw-r--r--extra/xf86-video-openchrome/PKGBUILD10
-rw-r--r--extra/xfce4-weather-plugin/PKGBUILD22
-rw-r--r--extra/zsh/PKGBUILD10
33 files changed, 226 insertions, 110 deletions
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index 493c54c31..76ecd2a33 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163703 2012-07-18 01:05:09Z ibiru $
+# $Id: PKGBUILD 163962 2012-07-23 02:59:56Z allan $
# Maintainer: kevin <kevin@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Kritoke <kritoke@gamebox.net>
@@ -8,7 +8,7 @@ pkgbase=boost
pkgname=('boost-libs' 'boost')
pkgver=1.50.0
_boostver=${pkgver//./_}
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url="http://www.boost.org/"
makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
diff --git a/extra/clucene/PKGBUILD b/extra/clucene/PKGBUILD
index 495060879..88d792a93 100644
--- a/extra/clucene/PKGBUILD
+++ b/extra/clucene/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 162256 2012-06-24 14:30:07Z andyrtr $
+# $Id: PKGBUILD 163973 2012-07-23 03:04:22Z allan $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Contributor: Alexander Rødseth
# Contributor: Alois Nespor <alois.nespor@gmail.com>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=clucene
pkgver=2.3.3.4
-pkgrel=5
+pkgrel=6
pkgdesc="C++ port of the high-performance text search engine Lucene"
arch=('x86_64' 'i686' 'mips64el')
url="http://clucene.sourceforge.net/"
license=('APACHE' 'LGPL')
-depends=('gcc-libs' 'zlib' 'boost-libs')
+depends=('gcc-libs>=4.7.1-5' 'zlib' 'boost-libs')
makedepends=('cmake' 'boost')
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-core-$pkgver.tar.gz
# Fedora patches
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 409767b13..acb8b9998 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 161774 2012-06-13 17:38:37Z andyrtr $
+# $Id: PKGBUILD 163972 2012-07-23 03:04:02Z allan $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase="cups"
pkgname=('libcups' 'cups')
pkgver=1.5.3
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://www.cups.org/"
diff --git a/extra/dbus/PKGBUILD b/extra/dbus/PKGBUILD
index 6ca4a7a88..29d4bf3df 100644
--- a/extra/dbus/PKGBUILD
+++ b/extra/dbus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163028 2012-07-06 01:27:22Z ibiru $
+# $Id: PKGBUILD 163993 2012-07-23 14:58:54Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Link Dupont <link@subpop.net>
#
pkgname=dbus
-pkgver=1.6.2
+pkgver=1.6.4
pkgrel=1
pkgdesc="Freedesktop.org message bus system"
url="http://www.freedesktop.org/Software/dbus"
@@ -12,8 +12,8 @@ license=('GPL' 'custom')
depends=("dbus-core>=$pkgver" 'libx11')
source=(http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.asc}
30-dbus)
-md5sums=('7fbf877ed6ff7da6df90f07158373829'
- '2cd74b6efca77e4e3aa2b7ccde770668'
+md5sums=('5ec43dc4554cba638917317b2b4f7640'
+ '3d4482ee39b49da334441c76f83bf1cb'
'9fafe8b28460aeaa6054309ef4c5ed92')
build() {
diff --git a/extra/ddrescue/PKGBUILD b/extra/ddrescue/PKGBUILD
index 1ccd0ef68..1538b084b 100644
--- a/extra/ddrescue/PKGBUILD
+++ b/extra/ddrescue/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 162261 2012-06-24 16:23:55Z schiv $
+# $Id: PKGBUILD 164005 2012-07-23 18:42:21Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Contributor: Paul Mattal <paul@archlinux.org>
pkgname=ddrescue
pkgver=1.16
-pkgrel=1
+pkgrel=2
pkgdesc="GNU data recovery tool"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/ddrescue/ddrescue.html"
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index 4bbd7897f..f716f733e 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162905 2012-07-03 15:00:02Z andyrtr $
+# $Id: PKGBUILD 163971 2012-07-23 03:03:28Z allan $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Paul Mattal <paul@mattal.com>
# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
@@ -6,7 +6,7 @@
pkgname=dovecot
pkgver=2.1.8
-pkgrel=1
+pkgrel=2
pkgdesc="An IMAP and POP3 server written with security primarily in mind"
arch=('i686' 'x86_64' 'mips64el')
url="http://dovecot.org/"
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 47f7b8241..ed9488163 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 163497 2012-07-13 14:43:17Z dan $
+# $Id: PKGBUILD 163990 2012-07-23 13:53:11Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=git
-pkgver=1.7.11.2
+pkgver=1.7.11.3
pkgrel=1
pkgdesc="the fast distributed version control system"
arch=(i686 x86_64 'mips64el')
@@ -100,7 +100,7 @@ package() {
install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
}
-sha1sums=('f67b4f6c0277250411c6872ae7b8a872ae11d313'
- '78b46ca7b5037c61a58086879869dadeac9eea3e'
- 'f2b41828bd912b72e2cb3e14677739c4f370de66'
- '149e2da1ecb48872ddb31c0945afeaad1f9653d7')
+md5sums=('23caacd9f3f421b6c05b40796df3505d'
+ 'f07bfe5a0f7e4165cab0091e710062dc'
+ '8e2648910fd5dd4f1c41d3c7fa9e9156'
+ '2e42bf97779a1c6411d89043334c9e78')
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 77d6c8ba6..6ab346548 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 162907 2012-07-03 15:25:08Z andyrtr $
+# $Id: PKGBUILD 163970 2012-07-23 03:03:19Z allan $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gnutls
pkgver=3.0.21
-pkgrel=1
+pkgrel=2
pkgdesc="A library which provides a secure layer over a reliable transport layer"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL3' 'LGPL')
url="http://www.gnu.org/software/gnutls/"
install=gnutls.install
options=('!libtool' '!zipman')
-depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12')
+depends=('gcc-libs>=4.7.1-5' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12')
makedepends=('strace')
[ "$CARCH" = "mips64el" ] || makedepends+=('valgrind')
source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig})
diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD
index d11fcc7f4..18c75f327 100644
--- a/extra/gpsd/PKGBUILD
+++ b/extra/gpsd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162159 2012-06-22 12:58:34Z dreisner $
+# $Id: PKGBUILD 163966 2012-07-23 03:02:55Z allan $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -6,7 +6,7 @@
pkgname=gpsd
pkgver=3.6
-pkgrel=1
+pkgrel=2
pkgdesc="GPS daemon and library to support USB/serial GPS devices"
arch=('i686' 'x86_64' 'mips64el')
url="http://catb.org/gpsd/"
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index 1f9c41919..bbec2f7f0 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163898 2012-07-21 19:20:18Z ibiru $
+# $Id: PKGBUILD 163911 2012-07-22 09:08:14Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=gtk2
pkgname=('gtk2' 'gtk-update-icon-cache')
pkgver=2.24.11
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gtk.org/"
makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
@@ -12,13 +12,16 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc
options=('!libtool')
license=('LGPL')
source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
- xid-collision-debug.patch)
+ xid-collision-debug.patch
+ fix-stuck-grabs.patch)
sha256sums=('328b4ea19a61040145e777e2ac49820968a382ac8581a380c9429897881812a9'
- 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+ 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+ '7739a1ab04aaf6e7f87987bad106062456e71933bc50acd948160cc03634dcd9')
build() {
- cd "$srcdir/gtk+-$pkgver"
- patch -Np1 -i "$srcdir/xid-collision-debug.patch"
+ cd gtk+-$pkgver
+ patch -Np1 -i ../xid-collision-debug.patch
+ patch -Np1 -i ../fix-stuck-grabs.patch
CXX=/bin/false ./configure --prefix=/usr \
--sysconfdir=/etc \
@@ -38,7 +41,7 @@ package_gtk2() {
backup=(etc/gtk-2.0/gtkrc)
replaces=('gtk2-docs')
- cd "$srcdir/gtk+-$pkgver"
+ cd gtk+-$pkgver
make DESTDIR="$pkgdir" install
sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
@@ -50,7 +53,7 @@ package_gtk-update-icon-cache() {
pkgdesc="The GTK+ update icon cache tool"
depends=('gdk-pixbuf2>=2.24.1-3')
- cd "$srcdir/gtk+-$pkgver/gtk"
+ cd gtk+-$pkgver/gtk
install -D -m755 gtk-update-icon-cache $pkgdir/usr/bin/gtk-update-icon-cache
}
diff --git a/extra/gtk2/fix-stuck-grabs.patch b/extra/gtk2/fix-stuck-grabs.patch
new file mode 100644
index 000000000..accec431e
--- /dev/null
+++ b/extra/gtk2/fix-stuck-grabs.patch
@@ -0,0 +1,47 @@
+From a9fb816a3f64227936f4b25882e4f20ab5018c9c Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Wed, 16 May 2012 21:18:51 +0000
+Subject: Fix a case of 'stuck grab'
+
+This was showing up when using a combo box in list mode. After popping
+up the list, the keyboard grab appeared stuck. What was stuck here is
+only the client-side grab, since we forgot to clean up our grabs
+when receiving an UnmapNotify.
+
+This bug was introduced in 3f6592f60fd15fb353fc84600caefba3054dc892.
+
+[ Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 2.24 ]
+
+https://bugzilla.gnome.org/show_bug.cgi?id=680346
+---
+diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
+index 7cc1000..b96e9f5 100644
+--- a/gdk/x11/gdkevents-x11.c
++++ b/gdk/x11/gdkevents-x11.c
+@@ -1799,16 +1799,15 @@ gdk_event_translate (GdkDisplay *display,
+ * means we hid the window ourselves, so we will have already flipped
+ * the iconified bit off.
+ */
+- if (window)
+- {
+- if (GDK_WINDOW_IS_MAPPED (window))
+- gdk_synthesize_window_state (window,
+- 0,
+- GDK_WINDOW_STATE_ICONIFIED);
+-
+- _gdk_xgrab_check_unmap (window, xevent->xany.serial);
+- }
++ if (window && GDK_WINDOW_IS_MAPPED (window))
++ gdk_synthesize_window_state (window,
++ 0,
++ GDK_WINDOW_STATE_ICONIFIED);
+ }
++
++ if (window)
++ _gdk_xgrab_check_unmap (window, xevent->xany.serial);
++
+ break;
+
+ case MapNotify:
+--
+cgit v0.9.0.2
diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD
index 862baee9f..4ea33a20d 100644
--- a/extra/icu/PKGBUILD
+++ b/extra/icu/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 160960 2012-06-07 13:35:03Z andyrtr $
+# $Id: PKGBUILD 163969 2012-07-23 03:03:14Z allan $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Art Gramlich <art@gramlich-net.com>
pkgname=icu
pkgver=49.1.2
-pkgrel=1
+pkgrel=2
pkgdesc="International Components for Unicode library"
arch=(i686 x86_64 'mips64el')
url="http://www.icu-project.org/"
license=('custom:"icu"')
-depends=('gcc-libs' 'sh')
+depends=('gcc-libs>=4.7.1-5' 'sh')
source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz
http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz
icu.8198.revert.icu5431.patch)
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index df520d619..ef9db324c 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163750 2012-07-19 04:55:07Z eric $
+# $Id: PKGBUILD 164013 2012-07-23 22:32:35Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgbase=imagemagick
pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.8.4
+pkgver=6.7.8.6
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://www.imagemagick.org/"
@@ -12,14 +12,14 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr')
source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
perlmagick.rpath.patch)
-sha1sums=('3cca01dad3596502a149229e28226b1b2a037915'
+sha1sums=('4965710cf4dca18583691d121e22b114c84e0643'
'23405f80904b1de94ebd7bd6fe2a332471b8c283')
build() {
cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
sed '/AC_PATH_XTRA/d' -i configure.ac
- autoreconf --install
+ autoreconf --force --install
patch -p0 -i ../perlmagick.rpath.patch
./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
diff --git a/extra/libmp4v2/PKGBUILD b/extra/libmp4v2/PKGBUILD
index 22a92c785..f3dbacfc9 100644
--- a/extra/libmp4v2/PKGBUILD
+++ b/extra/libmp4v2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 159958 2012-05-27 10:22:24Z tomegun $
+# $Id: PKGBUILD 163965 2012-07-23 03:02:46Z allan $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=libmp4v2
pkgver=2.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="MPEG-4 library"
arch=('i686' 'x86_64' 'mips64el')
license=('MPL')
diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD
index cb29f066c..8bbad77b9 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 161912 2012-06-16 14:11:51Z ibiru $
+# $Id: PKGBUILD 164030 2012-07-24 16:52:28Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
# Contributor: Travis Willard <travis@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=libpng
-pkgver=1.5.11
-_apngver=1.5.11
+pkgver=1.5.12
+_apngver=1.5.12
pkgrel=1
pkgdesc="A collection of routines used to create PNG format graphics files"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,8 +16,8 @@ depends=('zlib' 'sh')
options=('!libtool')
source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz"
"http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz")
-md5sums=('57f838299e701b6db9e8389c5602dc18'
- 'e9ddf7670e78ad93f4cc189c884d4f26')
+md5sums=('0fd51add1da6a0e470e0c726c59171b9'
+ '7f2924b1fe0cca9080e18b8720443716')
build() {
cd $pkgname-$pkgver
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index 96b257a88..cae3d2931 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 159472 2012-05-24 20:02:15Z foutrelis $
+# $Id: PKGBUILD 163974 2012-07-23 03:57:55Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -11,7 +11,7 @@
pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
pkgver=3.1
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64' 'mips64el')
url="http://llvm.org/"
license=('custom:University of Illinois/NCSA Open Source License')
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 4073d4cc6..8f4d776aa 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163468 2012-07-12 16:40:51Z andyrtr $
+# $Id: PKGBUILD 163968 2012-07-23 03:03:08Z allan $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
@@ -16,10 +16,10 @@ if [ "${_git}" = "true" ]; then
else
pkgver=8.0.4
fi
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1'
- 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'udev>=183')
+ 'gcc-libs>=4.7.1-5' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'udev>=183')
[[ "$CARCH" != "mips64el" ]] && makedepends+=('llvm')
url="http://mesa3d.sourceforge.net"
license=('custom')
diff --git a/extra/nouveau-dri/PKGBUILD b/extra/nouveau-dri/PKGBUILD
index ad1daa62a..2848f0bff 100644
--- a/extra/nouveau-dri/PKGBUILD
+++ b/extra/nouveau-dri/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163472 2012-07-12 17:49:23Z ibiru $
+# $Id: PKGBUILD 163980 2012-07-23 08:35:29Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=nouveau-dri
pkgver=8.0.4
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
makedepends=('glproto>=1.4.15' 'libdrm-old' 'libdrm-nouveau1' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1'
'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183')
diff --git a/extra/qjackctl/PKGBUILD b/extra/qjackctl/PKGBUILD
index 73bf3de67..7692ca6e7 100644
--- a/extra/qjackctl/PKGBUILD
+++ b/extra/qjackctl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 159470 2012-05-24 18:44:02Z schiv $
+# $Id: PKGBUILD 164008 2012-07-23 18:45:37Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Tobias Kieslich <tobias@archlinux.org>
pkgname=qjackctl
pkgver=0.3.9
-pkgrel=1
+pkgrel=2
pkgdesc="A Qt front-end for the JACK low-latency audio server"
url="http://qjackctl.sourceforge.net/"
arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/qt-gstreamer/PKGBUILD b/extra/qt-gstreamer/PKGBUILD
index 782193830..b40cbdd56 100644
--- a/extra/qt-gstreamer/PKGBUILD
+++ b/extra/qt-gstreamer/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 161451 2012-06-11 17:44:06Z andrea $
+# $Id: PKGBUILD 163964 2012-07-23 03:00:17Z allan $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: laloch <laloch@atlas.cz>
pkgname=qt-gstreamer
pkgver=0.10.2
-pkgrel=1
+pkgrel=2
pkgdesc="Qt bindings for GStreamer"
arch=('i686' 'x86_64' 'mips64el')
url='http://gstreamer.freedesktop.org/modules/qt-gstreamer.html'
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index 8726234fa..47cd3a2c5 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 162529 2012-06-27 06:33:44Z andrea $
+# $Id: PKGBUILD 163963 2012-07-23 03:00:13Z allan $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.2
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64' 'mips64el')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD
index 0423c974b..5eb884c14 100644
--- a/extra/rosegarden/PKGBUILD
+++ b/extra/rosegarden/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 159220 2012-05-18 11:33:18Z schiv $
+# $Id: PKGBUILD 164009 2012-07-23 18:45:40Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: damir <damir@archlinux.org>
@@ -6,7 +6,7 @@
pkgname=rosegarden
pkgver=12.04
-pkgrel=1
+pkgrel=2
pkgdesc="MIDI/audio sequencer and notation editor"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.rosegardenmusic.com/"
diff --git a/extra/taglib/PKGBUILD b/extra/taglib/PKGBUILD
index fa8a2da1a..aed74cccf 100644
--- a/extra/taglib/PKGBUILD
+++ b/extra/taglib/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 158844 2012-05-12 11:47:35Z tomegun $
+# $Id: PKGBUILD 163967 2012-07-23 03:03:00Z allan $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=taglib
pkgver=1.7.2
-pkgrel=1
+pkgrel=2
pkgdesc="A Library for reading and editing the meta-data of several popular audio formats"
arch=('i686' 'x86_64' 'mips64el')
url="http://developer.kde.org/~wheeler/taglib.html"
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index d718c87c1..7369bf9c8 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163181 2012-07-08 13:55:46Z ibiru $
+# $Id: PKGBUILD 164034 2012-07-24 18:37:58Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
pkgbase=transmission
pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
-pkgver=2.60
+pkgver=2.61
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://www.transmissionbt.com/"
@@ -11,7 +11,7 @@ license=('MIT')
makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent')
source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
transmissiond transmissiond.conf)
-md5sums=('2aff84c29a3c4b51ac5682a89d96bda5'
+md5sums=('2ed5b7815ebda65223bac6bdb09dec42'
'08875299e3fbb68fc546c1f350ac1f06'
'be39806c35b7544856fa4070b00fc960')
diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD
index 4cba29cb9..fa4d21b40 100644
--- a/extra/whois/PKGBUILD
+++ b/extra/whois/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 162734 2012-06-29 09:39:59Z giovanni $
+# $Id: PKGBUILD 164051 2012-07-25 06:08:06Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=whois
-pkgver=5.0.17
+pkgver=5.0.18
pkgrel=1
pkgdesc="The whois client by Marco d'Itri"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
depends=('libidn')
makedepends=('perl')
source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.xz")
-md5sums=('754ff9a089913bf198400eb937e24055')
+md5sums=('15d777273d44a5b9a0814c1ea0d22b1a')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD
index f8cfb55cf..42cf2f3d5 100644
--- a/extra/xf86-input-evdev/PKGBUILD
+++ b/extra/xf86-input-evdev/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153700 2012-03-18 08:50:36Z andyrtr $
+# $Id: PKGBUILD 164024 2012-07-24 15:40:48Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <Alexander@archlinux.org
pkgname=xf86-input-evdev
-pkgver=2.7.0
-pkgrel=2
+pkgver=2.7.1
+pkgrel=1
pkgdesc="X.org evdev input driver"
arch=(i686 x86_64 'mips64el')
url="http://xorg.freedesktop.org/"
@@ -14,14 +14,11 @@ makedepends=('xorg-server-devel>=1.11.99.902')
conflicts=('xorg-server<1.11.99.902')
options=('!libtool' '!makeflags')
groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
- Fix_inverted_horizontal_scroll.diff)
-sha1sums=('f0cb2d8400c33e8e83b538b53512e77ba73367fa'
- 'e959e710d9a0c60a3af967148b9d5e014544993c')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('1c128bbd34bc17d08cc723c2429cdfe7efc426cb753e38189ffd290002a3b598')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ${srcdir}/Fix_inverted_horizontal_scroll.diff
./configure --prefix=/usr
make
}
diff --git a/extra/xf86-input-keyboard/PKGBUILD b/extra/xf86-input-keyboard/PKGBUILD
index a84212019..621262005 100644
--- a/extra/xf86-input-keyboard/PKGBUILD
+++ b/extra/xf86-input-keyboard/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153307 2012-03-12 20:52:44Z andyrtr $
+# $Id: PKGBUILD 164026 2012-07-24 15:46:19Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xf86-input-keyboard
-pkgver=1.6.1
-pkgrel=2
+pkgver=1.6.2
+pkgrel=1
pkgdesc="X.Org keyboard input driver"
arch=(i686 x86_64)
license=('custom')
@@ -14,7 +14,7 @@ conflicts=('xorg-server<1.11.99.902')
options=('!libtool')
groups=('xorg-drivers' 'xorg')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('ef30fecb9e846a5268ae339846401489a785e413')
+sha256sums=('76651a84f5031f7c6ecf075d55989c04a00689642579df6d1a1bee6d5c2e5f8a')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index d15b41d82..342454cfc 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163776 2012-07-19 20:25:09Z andyrtr $
+# $Id: PKGBUILD 164055 2012-07-25 15:11:19Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xf86-video-intel
-pkgver=2.20.0
-pkgrel=1
+pkgver=2.20.1
+pkgrel=3
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
@@ -17,11 +17,18 @@ provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
options=('!libtool')
groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('21949297220ceda32bba430f778c6409002079dc717c7190dbd1062ab4a56783')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ gmux_backlight.diff
+ sna_backlight_fixes.diff)
+sha256sums=('de340a527dfa26bba6f79b423c2fe2b1d70657e46fa3fb468613c047443ff424'
+ '87383122dae69512f86039e9d72110bd6bf4cf717756a31b34862c200277b31b'
+ 'a4a6bc1c4a6b79c80c56764eed8ab318a587ed554d5d9a381cc7238ab884ec04')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ # https://bugs.freedesktop.org/show_bug.cgi?id=52423
+ patch -Np1 -i ${srcdir}/gmux_backlight.diff
+ patch -Np1 -i ${srcdir}/sna_backlight_fixes.diff
./configure --prefix=/usr \
--enable-dri
make
diff --git a/extra/xf86-video-intel/gmux_backlight.diff b/extra/xf86-video-intel/gmux_backlight.diff
new file mode 100644
index 000000000..a5522e82b
--- /dev/null
+++ b/extra/xf86-video-intel/gmux_backlight.diff
@@ -0,0 +1,10 @@
+--- xf86-video-intel-2.20.0.orig/src/intel_display.c 2012-07-15 21:02:49.000000000 +1000
++++ xf86-video-intel-2.20.0/src/intel_display.c 2012-07-24 11:53:42.762165514 +1000
+@@ -127,6 +127,7 @@
+ * List of available kernel interfaces in priority order
+ */
+ static const char *backlight_interfaces[] = {
++ "gmux_backlight",
+ "asus-laptop",
+ "asus-nb-wmi",
+ "eeepc",
diff --git a/extra/xf86-video-intel/sna_backlight_fixes.diff b/extra/xf86-video-intel/sna_backlight_fixes.diff
new file mode 100644
index 000000000..1511a8d79
--- /dev/null
+++ b/extra/xf86-video-intel/sna_backlight_fixes.diff
@@ -0,0 +1,54 @@
+From 0ab6d7a50d37cf4454577cb8c333d4b8683aa054 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed, 25 Jul 2012 11:20:36 +0000
+Subject: sna: Prefer platform backlight devices over firmware
+
+This is in contrast to libbacklight but closer to our original code as
+we prefer a known custom backlight controller over the ACPI interfaces.
+As only the ACPI interfaces are marked as firmware, and the custom
+backlight controllers as platform, we therefore need to prefer platform
+backlight devices.
+
+Reported-by: Austin Lund <austin.lund@gmail.com>
+References: https://bugs.freedesktop.org/show_bug.cgi?id=52423
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index b31f08d..ebecd21 100644
+--- a/src/sna/sna_display.c
++++ b/src/sna/sna_display.c
+@@ -282,8 +282,8 @@ sna_output_backlight_get_max(xf86OutputPtr output)
+ }
+
+ enum {
+- FIRMWARE,
+ PLATFORM,
++ FIRMWARE,
+ RAW,
+ NAMED,
+ };
+--
+cgit v0.9.0.2-2-gbebe
+From 484b072072c8297a87940c9e32097923f0a77c8f Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed, 25 Jul 2012 11:22:47 +0000
+Subject: sna: Add 'gmux_backlight' to list of known devices for backwards compatability
+
+Reported-by: Austin Lund <austin.lund@gmail.com>
+References: https://bugs.freedesktop.org/show_bug.cgi?id=52423
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index ebecd21..a908596 100644
+--- a/src/sna/sna_display.c
++++ b/src/sna/sna_display.c
+@@ -292,6 +292,7 @@ static void
+ sna_output_backlight_init(xf86OutputPtr output)
+ {
+ static const char *known_interfaces[] = {
++ "gmux_backlight",
+ "asus-laptop",
+ "asus-nb-wmi",
+ "eeepc",
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD
index 7a494f861..62bbad9bc 100644
--- a/extra/xf86-video-openchrome/PKGBUILD
+++ b/extra/xf86-video-openchrome/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 159185 2012-05-17 13:29:35Z andyrtr $
+# $Id: PKGBUILD 164022 2012-07-24 15:38:49Z andyrtr $
# Contributor: Paul Mattal <paul@mattal.com>
# Maintainer: Juergen Hoetzel <juergen@hoetzel.info>
pkgname=xf86-video-openchrome
-pkgver=0.2.906
+pkgver=0.3.0
pkgrel=1
pkgdesc="X.Org Openchrome drivers"
arch=(i686 x86_64)
license=('custom')
url="http://www.openchrome.org"
depends=('libdrm' 'libxvmc')
-makedepends=('xorg-server-devel>=1.11.99.902' 'libx11' 'xf86driproto' 'mesa') #'glproto' 'libgl')
+makedepends=('xorg-server-devel>=1.11.99.902' 'libx11' 'xf86driproto' 'mesa')
replaces=('openchrome' 'xf86-video-via')
options=('!libtool' '!emptydirs' '!makeflags')
conflicts=('xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'xorg-server<1.11.99.902' 'unichrome-dri')
source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('1c49bf722326442393288db490ff48d437e337f9')
+sha1sums=('6916be0deaff4a07974590dcef1bc37a1a59e5df')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr # --disable-dri
+ ./configure --prefix=/usr
make
}
diff --git a/extra/xfce4-weather-plugin/PKGBUILD b/extra/xfce4-weather-plugin/PKGBUILD
index 495505e25..1766a2430 100644
--- a/extra/xfce4-weather-plugin/PKGBUILD
+++ b/extra/xfce4-weather-plugin/PKGBUILD
@@ -1,33 +1,27 @@
-# $Id: PKGBUILD 157901 2012-04-30 04:21:38Z foutrelis $
+# $Id: PKGBUILD 163983 2012-07-23 10:32:47Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Suzy Williams <suzanne.williams3@verizon.net>
pkgname=xfce4-weather-plugin
-pkgver=0.7.4
-pkgrel=3
+pkgver=0.8.0
+pkgrel=1
pkgdesc="A weather plugin for the Xfce4 panel"
arch=('i686' 'x86_64' 'mips64el')
url="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
license=('GPL2')
groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4' 'libxml2' 'hicolor-icon-theme')
+depends=('xfce4-panel' 'libxml2' 'hicolor-icon-theme')
makedepends=('intltool')
options=('!libtool')
install=$pkgname.install
-source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.7/$pkgname-$pkgver.tar.bz2)
-sha256sums=('3f76207b8a845d15bfec6825bd5300aedd086c455259c4dd8670a89a3c8ab382')
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.8/$pkgname-$pkgver.tar.bz2)
+sha256sums=('37157456e41b1d6367ee3d785c92845d6b3d826cc1a3740282db5c3f6b0647b9')
build() {
cd "$srcdir/$pkgname-$pkgver"
- # Switch to a working license key
- # https://bugs.archlinux.org/task/26815
- sed -i \
- -e 's/^#define PARTNER_ID.*/#define PARTNER_ID "1003666583"/' \
- -e 's/^#define LICENSE_KEY.*/#define LICENSE_KEY "4128909340a9b2fc"/' \
- panel-plugin/weather.h
-
- ./configure --prefix=/usr \
+ ./configure \
+ --prefix=/usr \
--sysconfdir=/etc \
--libexecdir=/usr/lib \
--localstatedir=/var \
diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD
index 1f12e4f3e..d594bcef6 100644
--- a/extra/zsh/PKGBUILD
+++ b/extra/zsh/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 157985 2012-04-30 15:21:56Z pierre $
+# $Id: PKGBUILD 164038 2012-07-24 20:46:25Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=zsh
-pkgver=4.3.17
+pkgver=5.0.0
pkgrel=2
pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
arch=('i686' 'x86_64' 'mips64el')
@@ -13,17 +13,21 @@ install=zsh.install
source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2"
'zprofile')
backup=('etc/zsh/zprofile')
-md5sums=('8258967060b2654f30001a011946ac6a'
+md5sums=('e8484468925cec8d9a84b8b04797e764'
'24a9335edf77252a7b5f52e079f7aef7')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+
# FS#16360
sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \
Doc/zsh.texi \
Completion/Unix/Type/_services \
Completion/Unix/Command/_init_d
+ # Set correct keymap path
+ sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys
+
# Remove unneeded and conflicting completion scripts
rm -rf Completion/{AIX,BSD,Cygwin,Darwin,Debian,Mandriva,openSUSE,Redhat,Solaris}
rm -f Completion/Linux/Command/_{pkgtool,rpmbuild,yast}