[gnome-ostree] Update fontconfig patch
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-ostree] Update fontconfig patch
- Date: Thu, 10 Jan 2013 13:06:40 +0000 (UTC)
commit 2c897df4a334a391a9658b9b5f5387da497ea00d
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Jan 10 08:07:16 2013 -0500
Update fontconfig patch
patches/fontconfig-autogen.patch | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
---
diff --git a/patches/fontconfig-autogen.patch b/patches/fontconfig-autogen.patch
index f9d0f2b..59781d4 100644
--- a/patches/fontconfig-autogen.patch
+++ b/patches/fontconfig-autogen.patch
@@ -1,26 +1,35 @@
-From 3582884f5b6246c06d60bd4abd986713b4c4c05d Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters verbum org>
-Date: Fri, 6 Jan 2012 19:42:12 -0500
+From 09850fbe88ca27458e75a942d8f7d3ccbbbb7b12 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen redhat com>
+Date: Thu, 10 Jan 2013 08:06:18 -0500
Subject: [PATCH] autogen.sh: Honor NOCONFIGURE environment variable
http://people.gnome.org/~walters/docs/build-api.txt
---
- autogen.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ autogen.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autogen.sh b/autogen.sh
-index 820c457..f534bdd 100755
+index 93855cb..19832f6 100755
--- a/autogen.sh
+++ b/autogen.sh
-@@ -114,7 +114,7 @@ echo Running $AUTOCONF
+@@ -86,7 +86,7 @@ test $TEST_TYPE $FILE || {
+ exit 1
+ }
+
+-if test -z "$AUTOGEN_SUBDIR_MODE"; then
++if test -z "$AUTOGEN_SUBDIR_MODE && test -z "$NOCONFIGURE"; then
+ if test -z "$*"; then
+ echo "I am going to run ./configure with no arguments - if you wish "
+ echo "to pass any to it, please specify them on the $0 command line."
+@@ -115,7 +115,7 @@ echo Running $AUTOCONF
$AUTOCONF
cd $ORIGDIR
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
+if test -z "$AUTOGEN_SUBDIR_MODE" && test -z "$NOCONFIGURE"; then
- echo Running $srcdir/configure --enable-maintainer-mode "$@"
- $srcdir/configure --enable-maintainer-mode "$@"
+ echo Running $srcdir/configure "$@"
+ $srcdir/configure "$@"
--
-1.7.6.4
+1.8.1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]