| 1 |
pacho 14/06/26 11:20:22 |
| 2 |
|
| 3 |
Added: gtk+-2.24.24-out-of-source.patch |
| 4 |
Log: |
| 5 |
Version bump, fix tests when compiling out of sources directory (#510596 by mgorny) |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gtk+-2.24.24-out-of-source.patch |
| 16 |
=================================================================== |
| 17 |
From 9e0f33144aff8d792ab105927cf686eda0afd25e Mon Sep 17 00:00:00 2001 |
| 18 |
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 19 |
Date: Sun, 18 May 2014 10:50:05 +0200 |
| 20 |
Subject: [PATCH] aliasfilecheck: check for sources both in builddir & srcdir. |
| 21 |
|
| 22 |
The $gtk_all_c_sources variable contains both supplied and generated |
| 23 |
sources. The former reside in $srcdir, the latter in the build directory |
| 24 |
(cwd). |
| 25 |
|
| 26 |
In order to handle both kinds properly, first try to find each source |
| 27 |
file in cwd, and then fallback to $srcdir. This makes it possible to use |
| 28 |
out-of-source builds, and guarantees that fresh-built source files will |
| 29 |
be used rather than pre-generated copies included in the distribution |
| 30 |
tarball. |
| 31 |
--- |
| 32 |
gtk/aliasfilescheck.sh | 2 +- |
| 33 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 34 |
|
| 35 |
diff --git a/gtk/aliasfilescheck.sh b/gtk/aliasfilescheck.sh |
| 36 |
index 31b49d4..3636a82 100755 |
| 37 |
--- a/gtk/aliasfilescheck.sh |
| 38 |
+++ b/gtk/aliasfilescheck.sh |
| 39 |
@@ -6,6 +6,6 @@ if test "x$gtk_all_c_sources" = x; then |
| 40 |
fi |
| 41 |
|
| 42 |
grep 'IN_FILE' ${srcdir-.}/gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files |
| 43 |
-{ cd ${srcdir-.}; grep '^ *# *define __' $gtk_all_c_sources; } | sed 's/.*define //;s/ *$//' | sort > actual-files |
| 44 |
+{ for f in $gtk_all_c_sources; do if test -f ${f}; then grep '^ *# *define __' ${f}; else grep '^ *# *define __' "${srcdir-.}"/${f}; fi; done } | sed 's/.*define //;s/ *$//' | sort > actual-files |
| 45 |
|
| 46 |
diff expected-files actual-files && rm -f expected-files actual-files |
| 47 |
-- |
| 48 |
1.9.3 |
Archives