Changeset 38170


Ignore:
Timestamp:
2013-09-24T22:01:03+02:00 (4 years ago)
Author:
luka
Message:

[tools] quilt: update to 0.60

Signed-off-by: Luka Perkov <luka@…>

Location:
trunk/tools/quilt
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/quilt/Makefile

    r35900 r38170  
    11#  
    2 # Copyright (C) 2006 -2010 OpenWrt.org 
     2# Copyright (C) 2006-2013 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    88 
    99PKG_NAME:=quilt 
    10 PKG_VERSION:=0.48 
     10PKG_VERSION:=0.60 
    1111 
    1212PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1313PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/$(PKG_NAME) 
    14 PKG_MD5SUM:=f77adda60039ffa753f3c584a286f12b 
     14PKG_MD5SUM:=058a08a9b626bdec9ec8c519dc92158c 
    1515 
    1616include $(INCLUDE_DIR)/host-build.mk 
     
    2626 
    2727define Host/Compile 
    28         $(MAKE) -C $(HOST_BUILD_DIR) SHELL="$(BASH)" all lib/backup-files 
     28        $(MAKE) -C $(HOST_BUILD_DIR) SHELL="$(BASH)" all 
    2929endef 
    3030 
  • trunk/tools/quilt/patches/000-relocatable.patch

    r29834 r38170  
    11--- a/bin/quilt.in 
    22+++ b/bin/quilt.in 
    3 @@ -7,9 +7,15 @@ 
    4  #  See the COPYING and AUTHORS files for more details. 
     3@@ -11,9 +11,15 @@ 
     4 unset POSIXLY_CORRECT 
    55  
    66 export TEXTDOMAIN=quilt 
    77-export TEXTDOMAINDIR=@LOCALEDIR@ 
    88  
    9 -: ${QUILT_DIR=@QUILT_DIR@} ${QUILT_LIB=@QUILT_LIB@} 
     9-: ${QUILT_DIR=@QUILT_DIR@} 
    1010+if test -n "$STAGING_DIR"; then 
    1111+       export TEXTDOMAINDIR="$STAGING_DIR/../host/share/locale" 
     
    1313+else 
    1414+       export TEXTDOMAINDIR=@LOCALEDIR@ 
    15 +       : ${QUILT_DIR=@QUILT_DIR@} ${QUILT_LIB=@QUILT_LIB@} 
     15+       : ${QUILT_DIR=@QUILT_DIR@} 
    1616+fi 
    1717+ 
    18  export QUILT_DIR QUILT_LIB 
     18 export QUILT_DIR 
    1919  
    2020 if [ -z "$QUILTRC" ] 
     
    4545 if ! [ -r $QUILT_DIR/scripts/patchfns ] 
    4646 then 
    47 --- a/quilt/scripts/parse-patch.in 
    48 +++ b/quilt/scripts/parse-patch.in 
    49 @@ -34,7 +34,7 @@ BEGIN { 
    50  } 
    51   
    52  setlocale(LC_MESSAGES, ""); 
    53 -bindtextdomain("quilt", "@LOCALEDIR@"); 
    54 +bindtextdomain("quilt", $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/locale' : "@LOCALEDIR@"); 
    55  textdomain("quilt"); 
    56   
    57  sub _($) { 
    5847--- a/quilt/scripts/patchfns.in 
    5948+++ b/quilt/scripts/patchfns.in 
    60 @@ -10,7 +10,11 @@ 
     49@@ -8,7 +8,11 @@ 
    6150 #  See the COPYING and AUTHORS files for more details. 
    6251  
  • trunk/tools/quilt/patches/001-fix_compile.patch

    r29829 r38170  
    11--- a/Makefile.in 
    22+++ b/Makefile.in 
    3 @@ -273,13 +273,10 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu 
    4  lib/backup-files.o :: Makefile 
     3@@ -266,13 +266,10 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu 
     4        @$(if $(filter $@,$(NON_EXEC_IN)),,chmod +x $@) 
    55  
    66 configure : configure.ac aclocal.m4 
Note: See TracChangeset for help on using the changeset viewer.