[gnome-ostree] manifest: Add xdg-user-dirs



commit 24d9adfce1f427bd2337d8076572f4f5ca598ae3
Author: Colin Walters <walters verbum org>
Date:   Thu May 23 13:29:48 2013 -0400

    manifest: Add xdg-user-dirs
    
    So we get ~/Pictures and all of that.

 manifest.json                       |    2 +
 patches/xdg-user-dirs-autogen.patch |   95 +++++++++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+), 0 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 29d5449..3d2ad29 100644
--- a/manifest.json
+++ b/manifest.json
@@ -757,6 +757,8 @@
                {"src": "fd-xdg:desktop-file-utils",
                 "patches": ["desktop-file-utils-autogen.patch"]},
 
+               {"src": "fd-xdg:xdg-user-dirs"},
+
                {"src": "fd-xdg:shared-mime-info",
                 "config-opts": ["--disable-default-make-check"]},
 
diff --git a/patches/xdg-user-dirs-autogen.patch b/patches/xdg-user-dirs-autogen.patch
new file mode 100644
index 0000000..912e83b
--- /dev/null
+++ b/patches/xdg-user-dirs-autogen.patch
@@ -0,0 +1,95 @@
+From 3669c28ee73481faaf64f0e928c41ba9c8a47d6a Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Thu, 23 May 2013 13:09:11 -0400
+Subject: [PATCH] autogen.sh: Just use autoreconf
+
+We really don't need to hardcode looking for Automake 1.11, and all of
+this stuff is basically unnecessary.  Replace it all with the
+"standard" autogen.sh from X.org.
+---
+ autogen.sh |   65 +++--------------------------------------------------------
+ 1 files changed, 4 insertions(+), 61 deletions(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index 9463b44..fc34bd5 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -1,71 +1,14 @@
+-#!/bin/sh
+-# Run this to generate all the initial makefiles, etc.
++#! /bin/sh
+ 
+ srcdir=`dirname $0`
+ test -z "$srcdir" && srcdir=.
+ 
+ ORIGDIR=`pwd`
+ cd $srcdir
+-PROJECT=xdg-user-dirs
+-TEST_TYPE=-f
+-FILE=user-dirs.conf
+ 
+-DIE=0
+-
+-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+-      echo
+-      echo "You must have autoconf installed to compile $PROJECT."
+-      echo "Install the appropriate package for your distribution,"
+-      echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/";
+-      DIE=1
+-}
+-
+-if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
+-    AUTOMAKE=automake-1.11
+-    ACLOCAL=aclocal-1.11
+-else
+-      echo
+-      echo "You must have automake 1.11.x installed to compile $PROJECT."
+-      echo "Install the appropriate package for your distribution,"
+-      echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/";
+-      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"; 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
+-
+-
+-rm -rf autom4te.cache
+-
+-# README and INSTALL are required by automake, but may be deleted by clean
+-# up rules. to get automake to work, simply touch these here, they will be
+-# regenerated from their corresponding *.in files by ./configure anyway.
+-touch README INSTALL
+-
+-$ACLOCAL $ACLOCAL_FLAGS || exit $?
+-
+-autoheader || exit $?
+-
+-$AUTOMAKE --add-missing || exit $?
+-autoconf || exit $?
++autoreconf -v --install || exit 1
+ cd $ORIGDIR || exit $?
+ 
+-if test -z "$AUTOGEN_SUBDIR_MODE"; then
+-        $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
+-
+-        echo 
+-        echo "Now type 'make' to compile $PROJECT."
++if test -z "$NOCONFIGURE"; then
++    $srcdir/configure "$@"
+ fi
+-- 
+1.7.1
+


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