diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-09-24 20:01:03 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-09-24 20:01:03 +0000 |
| commit | 5166bb0b1bca795ce53157f32f81b3c7c9b5e555 (patch) | |
| tree | ab823ea30f98e063a17dcb670386459fd7b60566 /tools/quilt/patches | |
| parent | 948f060014e1ecf1d5c95ecb14320d1deeead32b (diff) | |
| download | upstream-5166bb0b1bca795ce53157f32f81b3c7c9b5e555.tar.gz upstream-5166bb0b1bca795ce53157f32f81b3c7c9b5e555.tar.bz2 upstream-5166bb0b1bca795ce53157f32f81b3c7c9b5e555.zip | |
quilt: update to 0.60
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 38170
Diffstat (limited to 'tools/quilt/patches')
| -rw-r--r-- | tools/quilt/patches/000-relocatable.patch | 23 | ||||
| -rw-r--r-- | tools/quilt/patches/001-fix_compile.patch | 4 | ||||
| -rw-r--r-- | tools/quilt/patches/100-patch_2.6.1_version.patch | 15 |
3 files changed, 8 insertions, 34 deletions
diff --git a/tools/quilt/patches/000-relocatable.patch b/tools/quilt/patches/000-relocatable.patch index f8110236a6..dab42c2f4c 100644 --- a/tools/quilt/patches/000-relocatable.patch +++ b/tools/quilt/patches/000-relocatable.patch @@ -1,21 +1,21 @@ --- a/bin/quilt.in +++ b/bin/quilt.in -@@ -7,9 +7,15 @@ - # See the COPYING and AUTHORS files for more details. +@@ -11,9 +11,15 @@ + unset POSIXLY_CORRECT export TEXTDOMAIN=quilt -export TEXTDOMAINDIR=@LOCALEDIR@ --: ${QUILT_DIR=@QUILT_DIR@} ${QUILT_LIB=@QUILT_LIB@} +-: ${QUILT_DIR=@QUILT_DIR@} +if test -n "$STAGING_DIR"; then + export TEXTDOMAINDIR="$STAGING_DIR/../host/share/locale" + : ${QUILT_DIR=$STAGING_DIR/../host/share/quilt} ${QUILT_LIB=$STAGING_DIR/../host/lib/quilt} +else + export TEXTDOMAINDIR=@LOCALEDIR@ -+ : ${QUILT_DIR=@QUILT_DIR@} ${QUILT_LIB=@QUILT_LIB@} ++ : ${QUILT_DIR=@QUILT_DIR@} +fi + - export QUILT_DIR QUILT_LIB + export QUILT_DIR if [ -z "$QUILTRC" ] --- a/quilt/scripts/edmail.in @@ -44,20 +44,9 @@ if ! [ -r $QUILT_DIR/scripts/patchfns ] then ---- a/quilt/scripts/parse-patch.in -+++ b/quilt/scripts/parse-patch.in -@@ -34,7 +34,7 @@ BEGIN { - } - - setlocale(LC_MESSAGES, ""); --bindtextdomain("quilt", "@LOCALEDIR@"); -+bindtextdomain("quilt", $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/locale' : "@LOCALEDIR@"); - textdomain("quilt"); - - sub _($) { --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in -@@ -10,7 +10,11 @@ +@@ -8,7 +8,11 @@ # See the COPYING and AUTHORS files for more details. export TEXTDOMAIN=quilt diff --git a/tools/quilt/patches/001-fix_compile.patch b/tools/quilt/patches/001-fix_compile.patch index 51a4f5e206..c256c65e75 100644 --- a/tools/quilt/patches/001-fix_compile.patch +++ b/tools/quilt/patches/001-fix_compile.patch @@ -1,7 +1,7 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -273,13 +273,10 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu - lib/backup-files.o :: Makefile +@@ -266,13 +266,10 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu + @$(if $(filter $@,$(NON_EXEC_IN)),,chmod +x $@) configure : configure.ac aclocal.m4 - autoconf diff --git a/tools/quilt/patches/100-patch_2.6.1_version.patch b/tools/quilt/patches/100-patch_2.6.1_version.patch deleted file mode 100644 index 1e9ed75df1..0000000000 --- a/tools/quilt/patches/100-patch_2.6.1_version.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -274,7 +274,11 @@ fi - AC_MSG_CHECKING([the version of $PATCH]) - if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then - set -- `$PATCH --version 2> /dev/null` -- patch_version=$2 -+ if test x$1 = xGNU ; then -+ patch_version=$3 -+ else -+ patch_version=$2 -+ fi - AC_MSG_RESULT($patch_version) - saved_IFS=$IFS; IFS='.' - set -- $patch_version |