diff options
Diffstat (limited to 'cad/gtkwave/patches')
3 files changed, 98 insertions, 10 deletions
diff --git a/cad/gtkwave/patches/patch-aa b/cad/gtkwave/patches/patch-aa index b352f1bd7e8..c7f68be40ba 100644 --- a/cad/gtkwave/patches/patch-aa +++ b/cad/gtkwave/patches/patch-aa @@ -1,17 +1,19 @@ -$NetBSD: patch-aa,v 1.8 2011/12/16 10:58:14 drochner Exp $ +$NetBSD: patch-aa,v 1.9 2014/01/19 09:25:18 mef Exp $ ---- configure.orig 2011-11-13 22:58:22.000000000 +0000 -+++ configure -@@ -5567,7 +5567,7 @@ $as_echo "$EXZ" >&6; } +ERROR: [check-portability.awk] => Found test ... == ...: + +--- configure~ 2013-12-21 16:23:25.000000000 +0900 ++++ configure 2013-12-21 16:24:48.000000000 +0900 +@@ -6834,7 +6834,7 @@ $as_echo "$EXZ" >&6; } LIBXZ_LDADD= LIBXZ_CFLAGS= -if test "X$EXZ" == "Xyes"; then +if test "X$EXZ" = "Xyes"; then have_liblzma=no - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -5714,7 +5714,7 @@ fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -6924,7 +6924,7 @@ fi $as_echo "$FASTTREE" >&6; } FASTTREE_CFLAGS= @@ -20,12 +22,12 @@ $NetBSD: patch-aa,v 1.8 2011/12/16 10:58:14 drochner Exp $ FASTTREE_CFLAGS='-DWAVE_DISABLE_FAST_TREE' fi -@@ -5741,7 +5741,7 @@ $as_echo "$EJUDY" >&6; } +@@ -6951,7 +6951,7 @@ $as_echo "$EJUDY" >&6; } LIBJUDY_LDADD= LIBJUDY_CFLAGS= -if test "X$EJUDY" == "Xyes"; then +if test "X$EJUDY" = "Xyes"; then have_libjudy=no - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ diff --git a/cad/gtkwave/patches/patch-contrib_bundle__for__osx_gtkwave__bin__launcher.sh b/cad/gtkwave/patches/patch-contrib_bundle__for__osx_gtkwave__bin__launcher.sh new file mode 100644 index 00000000000..5335a59b349 --- /dev/null +++ b/cad/gtkwave/patches/patch-contrib_bundle__for__osx_gtkwave__bin__launcher.sh @@ -0,0 +1,42 @@ +$NetBSD: patch-contrib_bundle__for__osx_gtkwave__bin__launcher.sh,v 1.1 2014/01/19 09:25:18 mef Exp $ + +ERROR: [check-portability.awk] => Found test ... == ...: + +--- contrib/bundle_for_osx/gtkwave_bin_launcher.sh~ 2013-10-16 04:18:04.000000000 +0900 ++++ contrib/bundle_for_osx/gtkwave_bin_launcher.sh 2013-12-21 16:32:27.000000000 +0900 +@@ -28,7 +28,7 @@ fi + + export OWD="`pwd`" + +-if [[ $(echo $0 | awk '/^\//') == $0 ]]; then ++if [[ $(echo $0 | awk '/^\//') = $0 ]]; then + export NNAM=$(dirname $0) + name="$NNAM" + bundle="$NNAM/../../.." +@@ -81,7 +81,7 @@ if test "$APPLELANGUAGES"; then + fi + #This is a special case, because often the original strings are in US + #English and there is no translation file. +- if test "x$L" == "xen_US"; then ++ if test "x$L" = "xen_US"; then + export LANG=$L + break + fi +@@ -91,7 +91,7 @@ if test "$APPLELANGUAGES"; then + break + fi + #Same thing, but checking for any english variant. +- if test "x${L:0:2}" == "xen"; then ++ if test "x${L:0:2}" = "xen"; then + export LANG=$L + break + fi; +@@ -146,7 +146,7 @@ if test -n $LANG; then + #english to set en_US + + # elif test $LANG == "en"; then +- if test $LANG == "en"; then ++ if test $LANG = "en"; then + export LC_MESSAGES="en_US" + else + LOC=`find $PREFIX/share/locale -name $LANG???` diff --git a/cad/gtkwave/patches/patch-contrib_bundle__for__osx_launcher.sh b/cad/gtkwave/patches/patch-contrib_bundle__for__osx_launcher.sh new file mode 100644 index 00000000000..4bfdef28326 --- /dev/null +++ b/cad/gtkwave/patches/patch-contrib_bundle__for__osx_launcher.sh @@ -0,0 +1,44 @@ +$NetBSD: patch-contrib_bundle__for__osx_launcher.sh,v 1.1 2014/01/19 09:25:18 mef Exp $ + +ERROR: [check-portability.awk] => Found test ... == ...: + +--- contrib/bundle_for_osx/launcher.sh~ 2013-10-22 03:27:08.000000000 +0900 ++++ contrib/bundle_for_osx/launcher.sh 2013-12-21 16:28:17.000000000 +0900 +@@ -54,7 +54,7 @@ if test "$APPLELANGUAGES"; then + fi + #This is a special case, because often the original strings are in US + #English and there is no translation file. +- if test "x$L" == "xen_US"; then ++ if test "x$L" = "xen_US"; then + export LANG=$L + break + fi +@@ -64,7 +64,7 @@ if test "$APPLELANGUAGES"; then + break + fi + #Same thing, but checking for any english variant. +- if test "x${L:0:2}" == "xen"; then ++ if test "x${L:0:2}" = "xen"; then + export LANG=$L + break + fi; +@@ -104,16 +104,16 @@ if test -n $LANG; then + #If the language code matches the applelocale, then that's the message + #locale; otherwise, if it's longer than two characters, then it's + #probably a good message locale and we'll go with it. +- if test $LANG == ${APPLELOCALE:0:5} -o $LANG != ${LANG:0:2}; then ++ if test $LANG = ${APPLELOCALE:0:5} -o $LANG != ${LANG:0:2}; then + export LC_MESSAGES=$LANG + #Next try if the Applelocale is longer than 2 chars and the language + #bit matches $LANG +- elif test $LANG == ${APPLELOCALE:0:2} -a $APPLELOCALE > ${APPLELOCALE:0:2}; then ++ elif test $LANG = ${APPLELOCALE:0:2} -a $APPLELOCALE > ${APPLELOCALE:0:2}; then + export LC_MESSAGES=${APPLELOCALE:0:5} + #Fail. Get a list of the locales in $PREFIX/share/locale that match + #our two letter language code and pick the first one, special casing + #english to set en_US +- elif test $LANG == "en"; then ++ elif test $LANG = "en"; then + export LC_MESSAGES="en_US" + else + LOC=`find $PREFIX/share/locale -name $LANG???` |