diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-23 18:34:11 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-23 18:34:11 +0200 |
commit | 7673017eb554fd206a8a2ffad61b5f0eb28f7c4e (patch) | |
tree | 2ca58ba08a1fc1f4b877449ccb5c0fa877299222 | |
parent | a39ff03808875d90f3bba567dcff4f50e2555277 (diff) |
downgrade
-rw-r--r-- | package/vte/Makefile | 6 | ||||
-rw-r--r-- | package/vte/patches/patch-config_sub | 243 | ||||
-rw-r--r-- | package/vte/patches/patch-ltmain_sh | 11 |
3 files changed, 3 insertions, 257 deletions
diff --git a/package/vte/Makefile b/package/vte/Makefile index aeccbd900..58c1b9dc2 100644 --- a/package/vte/Makefile +++ b/package/vte/Makefile @@ -4,10 +4,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= vte -PKG_VERSION:= 0.27.5 -PKG_EXTRAVER:= 0.27 +PKG_VERSION:= 0.25.1 +PKG_EXTRAVER:= 0.25 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7155e90b78fb80f4ede9adf959931ef9 +PKG_MD5SUM:= 415ba972ea60b8016b7a98019fa412b1 PKG_DESCR:= an experimental terminal emulator widget PKG_SECTION:= libs PKG_BUILDDEP:= ncurses diff --git a/package/vte/patches/patch-config_sub b/package/vte/patches/patch-config_sub deleted file mode 100644 index 65d84a780..000000000 --- a/package/vte/patches/patch-config_sub +++ /dev/null @@ -1,243 +0,0 @@ ---- vte-0.27.5.orig/config.sub 2011-02-02 08:15:27.000000000 +0100 -+++ vte-0.27.5/config.sub 2010-11-26 15:32:59.100676381 +0100 -@@ -1,10 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 - # Free Software Foundation, Inc. - --timestamp='2009-11-20' -+timestamp='2008-09-08' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -32,16 +32,13 @@ timestamp='2009-11-20' - - - # Please send patches to <config-patches@gnu.org>. Submit a context --# diff and a properly formatted GNU ChangeLog entry. -+# diff and a properly formatted ChangeLog entry. - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. - # If it is invalid, we print an error message on stderr and exit with code 1. - # Otherwise, we print the canonical config type on stdout and succeed. - --# You can get the latest version of this script from: --# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD -- - # This file is supposed to be the same for all GNU packages - # and recognize all the CPU types, system types and aliases - # that are meaningful with *any* GNU software. -@@ -125,7 +122,6 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^- - case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -- kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` -@@ -152,13 +148,10 @@ case $os in - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis | -knuth | -cray | -microblaze) -+ -apple | -axis | -knuth | -cray) - os= - basic_machine=$1 - ;; -- -bluegene*) -- os=-cnk -- ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 -@@ -251,12 +244,11 @@ case $basic_machine in - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | bfin \ - | c4x | clipper \ -- | d10v | d30v | dlx | dsp16xx \ -+ | d10v | d30v | dlx | dsp16xx | dvp \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -- | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ -@@ -278,7 +270,6 @@ case $basic_machine in - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ -- | moxie \ - | mt \ - | msp430 \ - | nios | nios2 \ -@@ -287,22 +278,20 @@ case $basic_machine in - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ -- | rx \ - | score \ -- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ -+ | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ -- | ubicom32 \ - | v850 | v850e \ - | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12 | picochip) -+ m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none -@@ -342,10 +331,9 @@ case $basic_machine in - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -- | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -@@ -373,8 +361,8 @@ case $basic_machine in - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ -- | romp-* | rs6000-* | rx-* \ -- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ -+ | romp-* | rs6000-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ -@@ -382,7 +370,6 @@ case $basic_machine in - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ - | tron-* \ -- | ubicom32-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -@@ -456,10 +443,6 @@ case $basic_machine in - basic_machine=m68k-apollo - os=-bsd - ;; -- aros) -- basic_machine=i386-pc -- os=-aros -- ;; - aux) - basic_machine=m68k-apple - os=-aux -@@ -476,10 +459,6 @@ case $basic_machine in - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; -- bluegene*) -- basic_machine=powerpc-ibm -- os=-cnk -- ;; - c90) - basic_machine=c90-cray - os=-unicos -@@ -732,9 +711,6 @@ case $basic_machine in - basic_machine=ns32k-utek - os=-sysv - ;; -- microblaze) -- basic_machine=microblaze-xilinx -- ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 -@@ -750,6 +726,24 @@ case $basic_machine in - basic_machine=m68k-atari - os=-mint - ;; -+ mipsEE* | ee | ps2) -+ basic_machine=mips64r5900el-scei -+ case $os in -+ -linux*) -+ ;; -+ *) -+ os=-elf -+ ;; -+ esac -+ ;; -+ iop) -+ basic_machine=mipsel-scei -+ os=-irx -+ ;; -+ dvp) -+ basic_machine=dvp-scei -+ os=-elf -+ ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; -@@ -1206,7 +1200,7 @@ case $basic_machine in - we32k) - basic_machine=we32k-att - ;; -- sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) -+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) -@@ -1256,9 +1250,6 @@ case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. -- -auroraux) -- os=-auroraux -- ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; -@@ -1279,11 +1270,10 @@ case $os in - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ -- | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ -- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ -- | -sym* | -kopensolaris* \ -+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ -+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ -- | -aos* | -aros* \ -+ | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -@@ -1302,7 +1292,7 @@ case $os in - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1632,7 +1622,7 @@ case $basic_machine in - -sunos*) - vendor=sun - ;; -- -cnk*|-aix*) -+ -aix*) - vendor=ibm - ;; - -beos*) diff --git a/package/vte/patches/patch-ltmain_sh b/package/vte/patches/patch-ltmain_sh deleted file mode 100644 index e7a7ff760..000000000 --- a/package/vte/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- vte-0.27.5.orig/ltmain.sh 2011-02-02 08:15:19.000000000 +0100 -+++ vte-0.27.5/ltmain.sh 2011-03-18 11:30:26.133370623 +0100 -@@ -5840,7 +5840,7 @@ func_mode_link () - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" |