[arch-commits] Commit in xorg-server/trunk (PKGBUILD git-fixes.patch)

[Andreas Radke]

    Date: Saturday, March 9, 2013 @ 11:48:32
  Author: andyrtr
Revision: 179670

upgpkg: xorg-server 1.14.0-2

add a post release fix

Added:
  xorg-server/trunk/git-fixes.patch
Modified:
  xorg-server/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   11 ++++++++---
 git-fixes.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-09 10:39:40 UTC (rev 179669)
+++ PKGBUILD	2013-03-09 10:48:32 UTC (rev 179670)
@@ -5,7 +5,7 @@
 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.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -21,7 +21,8 @@
         bug59825.patch
         xvfb-run
         xvfb-run.1
-        10-quirks.conf)
+        10-quirks.conf
+        git-fixes.patch)
 sha256sums=('1f5107573252c26439fdd165481765a2c0964e02a2e9fab36e02414d08f30630'
             '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
             'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
@@ -29,7 +30,8 @@
             '26ee6ff255a60d7c1e136c612925eb63c86e85a4a3a55d531852ad9275526588'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-            '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166')
+            '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
+            'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -46,6 +48,9 @@
   # From Fedora. Do not build acpid code, it is buggy and we do not need it
   patch -Np1 -i "${srcdir}/xserver-1.6.0-less-acpi-brokenness.patch"
 
+  # post release git fixes
+  patch -Np1 -i "${srcdir}/git-fixes.patch"
+
   autoreconf -fi
   ./configure --prefix=/usr \
       --enable-ipv6 \

Added: git-fixes.patch
===================================================================
--- git-fixes.patch	                        (rev 0)
+++ git-fixes.patch	2013-03-09 10:48:32 UTC (rev 179670)
@@ -0,0 +1,27 @@
+From 5047810a4c20fab444b8c6eb146c55dcdb0d4219 Mon Sep 17 00:00:00 2001
+From: Aaron Plattner <aplattner at nvidia.com>
+Date: Wed, 06 Mar 2013 17:40:28 +0000
+Subject: fb: Rename wfbDestroyGlyphCache
+
+Renaming this function was missed in commit
+9cbcb5bd6a5360a128d15b77a02d8d3351f74366, so both libfb.so and libwfb.so define
+functions named fbDestroyGlyphCache.
+
+Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
+Reviewed-by: Søren Sandmann <ssp at redhat.com>
+Signed-off-by: Keith Packard <keithp at keithp.com>
+---
+diff --git a/fb/wfbrename.h b/fb/wfbrename.h
+index 588440c..54d00d0 100644
+--- a/fb/wfbrename.h
++++ b/fb/wfbrename.h
+@@ -52,6 +52,7 @@
+ #define fbCreatePixmap wfbCreatePixmap
+ #define fbCreatePixmapBpp wfbCreatePixmapBpp
+ #define fbCreateWindow wfbCreateWindow
++#define fbDestroyGlyphCache wfbDestroyGlyphCache
+ #define fbDestroyPixmap wfbDestroyPixmap
+ #define fbDestroyWindow wfbDestroyWindow
+ #define fbDoCopy wfbDoCopy
+--
+cgit v0.9.0.2-2-gbebe