Wed Jun 26 01:37:43 PDT 2013

8 files changed, 91 insertions, 25 deletions

diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index 282da69ac..8551ab565 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188728 2013-06-18 15:46:35Z andyrtr $
+# $Id: PKGBUILD 188926 2013-06-25 16:51:14Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
@@ -8,7 +8,7 @@
 # --->>> remember to rebuild/bump pigeonhole in one step <<<---
 
 pkgname=dovecot
-pkgver=2.2.3
+pkgver=2.2.4
 pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@ options=('!libtool')
 install=$pkgname.install
 source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig}
         dovecot.tmpfilesd)
-md5sums=('306664f09560d2c6515ba80e1dd7f353'
+md5sums=('984cfc921a83c580c52c86e128e9dac2'
          'SKIP'
          '342a28251d40f983c98c0d1f1bf3d07d')
 
diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD
index 69233cf8c..618a08d28 100644
--- a/extra/freetype2/PKGBUILD
+++ b/extra/freetype2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 185748 2013-05-18 10:42:24Z andyrtr $
+# $Id: PKGBUILD 188918 2013-06-25 14:14:01Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=freetype2
-pkgver=2.4.12
+pkgver=2.5.0.1
 pkgrel=1
 pkgdesc="TrueType font rendering library"
 arch=(i686 x86_64)
@@ -11,18 +11,32 @@ url="http://freetype.sourceforge.net"
 depends=('zlib' 'bzip2' 'sh')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
+        freetype-2.2.1-enable-valid.patch
         freetype-2.3.0-enable-spr.patch
-        freetype-2.2.1-enable-valid.patch)
-md5sums=('3463102764315eb86c0d3c2e1f3ffb7d'
+        freetype-2.4.11-enable-sph.patch)
+md5sums=('c72e9010b1d986d556fc0b2b5fcbf31a'
+         '214119610444c9b02766ccee5e220680'
          '816dc8619a6904a7385769433c0a8653'
-         '214119610444c9b02766ccee5e220680')
+         '2422f8902224fedb46ae9eec08c8ceac')
 
-build() {
+prepare() {
   cd "${srcdir}/freetype-${pkgver}"
-  patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch"
   patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
+  patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch"
+
+  # Disabled for now due to resistance
+  # Kept here for easier rebuilds via ABS
+  # https://bugs.archlinux.org/task/35274
+  #patch -Np1 -i "${srcdir}/freetype-2.4.11-enable-sph.patch"
+}
+
+build() {
+  cd "${srcdir}/freetype-${pkgver}"
+
+  # PNG support is useless if FT_CONFIG_OPTION_USE_PNG is disabled
+  ./configure --prefix=/usr --disable-static \
+    --without-png
 
-  ./configure --prefix=/usr
   make
 }
 
diff --git a/extra/freetype2/freetype-2.4.11-enable-sph.patch b/extra/freetype2/freetype-2.4.11-enable-sph.patch
new file mode 100644
index 000000000..34c8d63bf
--- /dev/null
+++ b/extra/freetype2/freetype-2.4.11-enable-sph.patch
@@ -0,0 +1,13 @@
+diff --git i/include/freetype/config/ftoption.h w/include/freetype/config/ftoption.h
+index a73fff4..0a081bf 100644
+--- i/include/freetype/config/ftoption.h
++++ w/include/freetype/config/ftoption.h
+@@ -577,7 +577,7 @@ FT_BEGIN_HEADER
+   /*   This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be    */
+   /*   defined.                                                            */
+   /*                                                                       */
+-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING
+ 
+ 
+   /*************************************************************************/
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index f5f4aa392..4540abee8 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185365 2013-05-13 17:49:32Z heftig $
+# $Id: PKGBUILD 188910 2013-06-25 07:42:51Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gedit
-pkgver=3.8.2
+pkgver=3.8.3
 pkgrel=1
 pkgdesc="A text editor for GNOME"
 arch=(i686 x86_64)
@@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gedit.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1b7450cb194d4dadb7a82635d0e7f92da2b65a8487341e0410b676d9f33e19d2')
+sha256sums=('dfbc2d9cf975b247c6a6b8bd1ae1b72d8e8a1f862f5f3d084a404853092cf9d3')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD
index 4caacad2b..75557252a 100644
--- a/extra/pigeonhole/PKGBUILD
+++ b/extra/pigeonhole/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188729 2013-06-18 15:46:36Z andyrtr $
+# $Id: PKGBUILD 188927 2013-06-25 16:51:15Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 # Contributorr: Peter Lewis <plewis@aur.archlinux.org>
@@ -7,12 +7,12 @@
 # This must be built against the version of dovecot being used,
 # else mail delivery will fail.
 # Specify the version of dovecot to be used here:
-_dcpkgver=2.2.3
+_dcpkgver=2.2.4
 # Make sure to bump pkgrel if changing this.
 
 pkgname=pigeonhole
 pkgver=0.4.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Sieve implementation for Dovecot"
 arch=('i686' 'x86_64')
 url="http://pigeonhole.dovecot.org/"
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index c936481fc..205ef1547 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 187885 2013-06-07 20:50:17Z lcarlier $
+# $Id: PKGBUILD 188921 2013-06-25 16:24:01Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.21.9
-pkgrel=1
+pkgver=2.21.10
+pkgrel=2
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
@@ -18,19 +18,28 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS
            'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('1359cbc9e494a284faa52d1db83e7388cb8ab590b660e29e78e6e7f5ee7ff189')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        firefox_image_fix.diff)
+sha256sums=('7a4bcad83e8153ab1eec46dfee2412b7b20d087f438af4bf97f460f67c5ca9b6'
+            '33465c66b0a4bca2dfd242c86cb8cb882fbf841e1c2da632a5aa76f9d04b84d1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # fix image issues in FF+TB, https://bugs.freedesktop.org/show_bug.cgi?id=66059
+  patch -Np1 -i ${srcdir}/firefox_image_fix.diff
+
   ./configure --prefix=/usr \
     --enable-dri
+
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   make DESTDIR="${pkgdir}" install
+
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
diff --git a/extra/xf86-video-intel/firefox_image_fix.diff b/extra/xf86-video-intel/firefox_image_fix.diff
new file mode 100644
index 000000000..653295dab
--- /dev/null
+++ b/extra/xf86-video-intel/firefox_image_fix.diff
@@ -0,0 +1,30 @@
+From 77ddadf0ec6b867a0638660bf06c82ad31577795 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun, 23 Jun 2013 21:01:12 +0000
+Subject: sna: Clear 'clear' hint upon uploading into tiled
+
+Fixes regression from
+commit 53c113c3cc2f8527debc185f0819139ca8637637 [2.21.10]
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date:   Fri Jun 21 19:27:24 2013 +0100
+
+    sna: Allow PutImage to write inplace using manual tiling
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66059
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index 0994c33..43d6a67 100644
+--- a/src/sna/sna_accel.c
++++ b/src/sna/sna_accel.c
+@@ -4000,6 +4000,8 @@ try_upload_tiled_x(PixmapPtr pixmap, RegionRec *region,
+ 	} while (--n);
+ 	__kgem_bo_unmap__cpu(&sna->kgem, priv->gpu_bo, dst);
+ 
++	priv->clear = false;
++	priv->cpu = false;
+ 	return true;
+ }
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 77ce16d88..c864253f4 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183085 2013-04-17 12:51:32Z andyrtr $
+# $Id: PKGBUILD 188929 2013-06-25 17:07:01Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.14.1
+pkgver=1.14.2
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
@@ -23,7 +23,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         xvfb-run.1
         10-quirks.conf
         git-fixes.patch)
-sha256sums=('a5adb02571efb7d7459dde83286a3adb77dfd1a52a7348e75d2dc72d6f8d28aa'
+sha256sums=('f6ddfb3f1cfff2d69d45657aec626ebe8b5847810154ff7df7ed2072b076c86b'
             '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
             'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
             'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a'