From: Adam Tkac <atkac@redhat.com>
Date: Wed, 15 Sep 2010 11:58:16 +0000 (+0000)
Subject: [Development] build-xorg: apply patches from xorg-7.5-patches directory only.
X-Git-Tag: v1.0.90~175
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7b0a2b50b9838ccca485660c5d4b57397a41eb85;p=tigervnc.git

[Development] build-xorg: apply patches from xorg-7.5-patches directory only.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4139 3789f03b-4d11-0410-bbf8-ca57d06f2519
---

diff --git a/unix/build-xorg b/unix/build-xorg
index 1ddff9cb..9739b57f 100755
--- a/unix/build-xorg
+++ b/unix/build-xorg
@@ -73,8 +73,9 @@ init()
     if [ "$XORG_VERSION" = "7.4" ]; then
 	patch -p1 < $SRCDIR/unix/xserver15.patch
     else
-	patch -p1 < $SRCDIR/unix/xserver17.patch
-	for all in `find $SRCDIR/unix/xorg-7.5-patches/ -type f`; do
+	patch -p1 < $SRCDIR/unix/xserver18.patch
+	for all in `find $SRCDIR/unix/xorg-7.5-patches/ -type f |grep '.*\.patch$'`; do
+	    echo Applying $all
 	    patch -p1 < $all
 	done
     fi