[gnome-continuous] Use a simpler autogen.sh for fontconfig



commit 627c3efe549c409fe5da833efac72f409a1dfc1b
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Wed Jan 3 13:41:21 2018 +0000

    Use a simpler autogen.sh for fontconfig
    
    The current one is a mess.

 manifest.json                    |    1 +
 patches/fontconfig-autogen.patch |  207 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 208 insertions(+), 0 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index fc690d9..aa96cd7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -171,6 +171,7 @@
                 "patches": ["freetype-autogen.patch"]},
 
                {"src": "fd:fontconfig",
+                 "patches": ["fontconfig-autogen.patch"],
                 "config-opts": ["--with-cache-dir=/usr/lib/fontconfig/cache"]},
 
                {"src": "fd:xorg/util/macros",
diff --git a/patches/fontconfig-autogen.patch b/patches/fontconfig-autogen.patch
new file mode 100644
index 0000000..a87ec4a
--- /dev/null
+++ b/patches/fontconfig-autogen.patch
@@ -0,0 +1,207 @@
+From b395f9d607b0d3a4860b08974509ad19ad90f609 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi gnome org>
+Date: Wed, 3 Jan 2018 13:38:53 +0000
+Subject: [PATCH] Use a minimal autogen.sh
+
+The whole autogen.sh in fontconfig is a mess geared towards Autotools
+from the '90s.
+
+We can use autoreconf to implement it correctly, and following the build
+API, we don't even need to call the `configure` script.
+---
+ autogen.sh | 184 +------------------------------------------------------------
+ 1 file changed, 1 insertion(+), 183 deletions(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index 98f8be3..c187584 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -1,184 +1,2 @@
+ #!/bin/sh
+-# fontconfig/autogen.sh
+-#
+-# Copyright © 2000 Keith Packard
+-#
+-# Permission to use, copy, modify, distribute, and sell this software and its
+-# documentation for any purpose is hereby granted without fee, provided that
+-# the above copyright notice appear in all copies and that both that
+-# copyright notice and this permission notice appear in supporting
+-# documentation, and that the name of the author(s) not be used in
+-# advertising or publicity pertaining to distribution of the software without
+-# specific, written prior permission.  The authors make no
+-# representations about the suitability of this software for any purpose.  It
+-# is provided "as is" without express or implied warranty.
+-#
+-# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+-# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+-# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+-# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+-# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+-# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+-# PERFORMANCE OF THIS SOFTWARE.
+-
+-# Run this to generate all the initial makefiles, etc.
+-
+-set -e
+-
+-srcdir=`dirname $0`
+-test -z "$srcdir" && srcdir=.
+-
+-case "$1" in
+---noconf*) 
+-      AUTOGEN_SUBDIR_MODE="true"
+-      shift
+-      ;;
+-esac
+-
+-ORIGDIR=`pwd`
+-cd $srcdir
+-PROJECT=Fontconfig
+-TEST_TYPE=-f
+-FILE=fontconfig/fontconfig.h
+-ACLOCAL=${ACLOCAL-aclocal}
+-ACLOCAL_FLAGS="-I m4"
+-LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
+-AUTOMAKE=${AUTOMAKE-automake}
+-AUTOHEADER=${AUTOHEADER-autoheader}
+-AUTOCONF=${AUTOCONF-autoconf}
+-GPERF=${GPERF-gperf}
+-PYTHON=${PYTHON-python}
+-LIBTOOLIZE_FLAGS="--copy --force"
+-GETTEXTIZE=${GETTEXTIZE-gettextize}
+-GETTEXTIZE_FLAGS="--force --no-changelog"
+-
+-DIE=0
+-
+-($GPERF --version) < /dev/null > /dev/null 2>&1 || {
+-      echo
+-      echo "You must have gperf installed to compile $PROJECT."
+-      echo "Install the appropriate package for your distribution."
+-      echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/";
+-      DIE=1
+-}
+-
+-($PYTHON --version) < /dev/null > /dev/null 2>&1 || {
+-      echo
+-      echo "You must have python installed to compile $PROJECT."
+-      echo "Install the appropriate package for your distribution."
+-      echo "or get the source tarball at https://www.python.org/downloads/source/";
+-      DIE=1
+-}
+-
+-have_libtool=false
+-if $LIBTOOLIZE --version < /dev/null > /dev/null 2>&1 ; then
+-      libtool_version=`$LIBTOOLIZE --version | sed 's/^.* \([0-9][.][0-9.]*\)[^ ]*$/\1/'`
+-      case $libtool_version in
+-          1.4*|1.5*|1.6*|1.7*|2*)
+-              have_libtool=true
+-              ;;
+-      esac
+-fi
+-if $have_libtool ; then : ; else
+-      echo
+-      echo "You must have libtool 1.4 installed to compile $PROJECT."
+-      echo "Install the appropriate package for your distribution,"
+-      echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/";
+-      DIE=1
+-fi
+-($GETTEXTIZE --version) < /dev/null > /dev/null 2>&1 || {
+-      echo
+-      echo "You must have gettext installed to compile $PROJECT."
+-      echo "Install the appropriate package for your distribution,"
+-      echo "or get the source tarball at  ftp://ftp.gnu.org/pub/gnu/";
+-      DIE=1
+-}
+-($AUTOCONF --version) < /dev/null > /dev/null 2>&1 || {
+-      echo
+-      echo "You must have autoconf installed to compile $PROJECT."
+-      echo "libtool the appropriate package for your distribution,"
+-      echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/";
+-      DIE=1
+-}
+-
+-have_automake=false
+-need_libtoolize=true
+-if $AUTOMAKE --version < /dev/null > /dev/null 2>&1 ; then
+-      automake_version=`$AUTOMAKE --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
+-      case $automake_version in
+-         1.2*|1.3*|1.4) 
+-              ;;
+-         1.4*)
+-              have_automake=true
+-              need_libtoolize=false
+-              ;;
+-         *)
+-              have_automake=true
+-              ;;
+-      esac
+-fi
+-if $have_automake ; then : ; else
+-      echo
+-      echo "You must have automake 1.4-p1 installed to compile $PROJECT."
+-      echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.4-p1.tar.gz";
+-      echo "(or a newer version if it is available)"
+-      DIE=1
+-fi
+-
+-if test "$DIE" -eq 1; then
+-      exit 1
+-fi
+-
+-test $TEST_TYPE $FILE || {
+-      echo "You must run this script in the top-level $PROJECT directory"
+-      exit 1
+-}
+-
+-if test -z "$AUTOGEN_SUBDIR_MODE" -a -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."
+-        fi
+-fi
+-
+-[ -f configure.ac~ ] && rm configure.ac~
+-[ -f Makefile.am~ ] && rm Makefile.am~
+-echo Running $GETTEXTIZE $GETTEXTIZE_FLAGS
+-$GETTEXTIZE $GETTEXTIZE_FLAGS
+-# revert changes from gettextize for workaround...
+-[ -f configure.ac~ ] && mv configure.ac~ configure.ac
+-[ -f Makefile.am~ ] && mv Makefile.am~ Makefile.am
+-echo Running $GETTEXTIZE $GETTEXTIZE_FLAGS --po-dir=po-conf
+-$GETTEXTIZE $GETTEXTIZE_FLAGS --po-dir=po-conf
+-[ -f configure.ac~ ] && mv configure.ac~ configure.ac
+-[ -f Makefile.am~ ] && mv Makefile.am~ Makefile.am
+-
+-echo Running $ACLOCAL $ACLOCAL_FLAGS
+-$ACLOCAL $ACLOCAL_FLAGS
+-
+-# optionally run autoheader
+-if $AUTOHEADER --version  < /dev/null > /dev/null 2>&1; then
+-      echo Running $AUTOHEADER
+-      $AUTOHEADER
+-fi
+-
+-case $need_libtoolize in
+-   true)
+-      echo Running $LIBTOOLIZE $LIBTOOLIZE_FLAGS
+-      $LIBTOOLIZE $LIBTOOLIZE_FLAGS
+-      ;;
+-esac
+-
+-echo Running $AUTOMAKE -a $am_opt
+-$AUTOMAKE -a $am_opt
+-echo Running $AUTOCONF
+-$AUTOCONF
+-cd $ORIGDIR
+-
+-if test -z "$AUTOGEN_SUBDIR_MODE" -a -z "$NOCONFIGURE"; then
+-      echo Running $srcdir/configure "$@"
+-        $srcdir/configure "$@"
+-
+-        echo 
+-        echo "Now type 'make' to compile $PROJECT."
+-fi
++exec autoreconf -vfi
+-- 
+2.14.3
+


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]