diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | 0001-R-plugin-fix-preprocessor.patch | 2 | ||||
| -rw-r--r-- | 0002-Sage-plugin-fix-which-not-found.patch | 2 | ||||
| -rw-r--r-- | 0003-Revert-Further-fixes-for-iconv.patch | 610 | ||||
| -rw-r--r-- | 0004-Fix-mktemp-too-few-X-s-in-template-texmacs.patch | 4 | ||||
| -rw-r--r-- | PKGBUILD | 10 |
6 files changed, 34 insertions, 606 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sat Jun 11 10:17:05 UTC 2016 +# Thu Jun 16 03:38:44 UTC 2016 pkgbase = texmacs-svn pkgdesc = Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor and CAS-interface. - pkgver = 20160610.10459 + pkgver = 20160615.10471 pkgrel = 1 url = http://www.texmacs.org/ arch = i686 @@ -34,10 +34,10 @@ pkgbase = texmacs-svn source = 0003-Revert-Further-fixes-for-iconv.patch source = 0004-Fix-mktemp-too-few-X-s-in-template-texmacs.patch sha1sums = SKIP - sha1sums = 064d0db04fdaace4e491a4e81ff894e713e173b3 - sha1sums = 95c28c40f2c44de40961dac434dcd4edae849823 - sha1sums = 207d4cf889046e57abfca4509fc0876491686ef9 - sha1sums = 73dd8e72f69fb7f5cbc8e25b000aa1f923ab21a6 + sha1sums = 72c9ed59808b1d43bdff98f6ce306a8752d08175 + sha1sums = e977a4331ed8341e49adc924feeda054aab97836 + sha1sums = c0417abbf2ac6b405dc6d2af63508ffde5255e59 + sha1sums = 947695826852e1885838b87945dd31177891fcd3 pkgname = texmacs-svn diff --git a/0001-R-plugin-fix-preprocessor.patch b/0001-R-plugin-fix-preprocessor.patch index 2d0460bfc47a..626aed3cc776 100644 --- a/0001-R-plugin-fix-preprocessor.patch +++ b/0001-R-plugin-fix-preprocessor.patch @@ -1,4 +1,4 @@ -From cbc75f1bfcb3a25b119c408886517669ed3fd305 Mon Sep 17 00:00:00 2001 +From d53eff861354e6a626d2692fea2f24c9dc5ef965 Mon Sep 17 00:00:00 2001 From: wangjiezhe <wangjiezhe@gmail.com> Date: Mon, 23 May 2016 13:36:44 +0800 Subject: [PATCH 1/4] R plugin: fix preprocessor diff --git a/0002-Sage-plugin-fix-which-not-found.patch b/0002-Sage-plugin-fix-which-not-found.patch index a418b913ca0f..3fdb0a6d506a 100644 --- a/0002-Sage-plugin-fix-which-not-found.patch +++ b/0002-Sage-plugin-fix-which-not-found.patch @@ -1,4 +1,4 @@ -From 07b94ffd7cd0c842d5cb8991a2af29e8ecfe7c38 Mon Sep 17 00:00:00 2001 +From 92264b5e868fb8b8399dfbb78b714ae5cf38c24e Mon Sep 17 00:00:00 2001 From: wangjiezhe <wangjiezhe@gmail.com> Date: Wed, 8 Jun 2016 11:20:42 +0800 Subject: [PATCH 2/4] Sage plugin: fix `which` not found diff --git a/0003-Revert-Further-fixes-for-iconv.patch b/0003-Revert-Further-fixes-for-iconv.patch index d55963099391..097b4607a23c 100644 --- a/0003-Revert-Further-fixes-for-iconv.patch +++ b/0003-Revert-Further-fixes-for-iconv.patch @@ -1,14 +1,14 @@ -From f3c35ad317bebd691057307f3b5ac7ccf8f9ef48 Mon Sep 17 00:00:00 2001 +From c858ebcbd9de4a82116e49d9c7fd2fd3a6f1b5f4 Mon Sep 17 00:00:00 2001 From: wangjiezhe <wangjiezhe@gmail.com> Date: Sat, 11 Jun 2016 17:40:28 +0800 Subject: [PATCH 3/4] Revert "Further fixes for iconv" This reverts commit 9caa8ff5de8642d84bcc445c0248a7f645307fff. --- - aclocal.m4 | 10 +- - configure | 304 +++++++++++++++++++++++++++++-------------------------- - misc/m4/iconv.m4 | 15 +-- - 3 files changed, 170 insertions(+), 159 deletions(-) + aclocal.m4 | 10 +++----- + configure | 70 ++++++++++++++++++++++++++++++-------------------------- + misc/m4/iconv.m4 | 15 ++++++------ + 3 files changed, 48 insertions(+), 47 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 7ff3475..8b32f52 100644 @@ -39,428 +39,10 @@ index 7ff3475..8b32f52 100644 then LC_APPEND_FLAG([-static], [CFLAGS]) LC_APPEND_FLAG([-static], [CXXFLAGS]) diff --git a/configure b/configure -index a3ec454..6b01ec5 100755 +index 6ba59c7..93f6484 100755 --- a/configure +++ b/configure -@@ -1,11 +1,9 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.68. -+# Generated by GNU Autoconf 2.69. - # - # --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software --# Foundation, Inc. -+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. - # - # - # This configure script is free software; the Free Software Foundation -@@ -134,6 +132,31 @@ export LANGUAGE - # CDPATH. - (unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -+# Use a proper internal environment variable to ensure we don't fall -+ # into an infinite loop, continuously re-executing ourselves. -+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then -+ _as_can_reexec=no; export _as_can_reexec; -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+as_fn_exit 255 -+ fi -+ # We don't want this to propagate to other subprocesses. -+ { _as_can_reexec=; unset _as_can_reexec;} - if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : - emulate sh -@@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : - else - exitcode=1; echo positional parameters were not saved. - fi --test x\$exitcode = x0 || exit 1" -+test x\$exitcode = x0 || exit 1 -+test -x / || exit 1" - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && -@@ -212,21 +236,25 @@ IFS=$as_save_IFS - - - if test "x$CONFIG_SHELL" != x; then : -- # We cannot yet assume a decent shell, so we have to provide a -- # neutralization value for shells without unset; and this also -- # works around shells that cannot unset nonexistent variables. -- # Preserve -v and -x to the replacement shell. -- BASH_ENV=/dev/null -- ENV=/dev/null -- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -- export CONFIG_SHELL -- case $- in # (((( -- *v*x* | *x*v* ) as_opts=-vx ;; -- *v* ) as_opts=-v ;; -- *x* ) as_opts=-x ;; -- * ) as_opts= ;; -- esac -- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} -+ export CONFIG_SHELL -+ # We cannot yet assume a decent shell, so we have to provide a -+# neutralization value for shells without unset; and this also -+# works around shells that cannot unset nonexistent variables. -+# Preserve -v and -x to the replacement shell. -+BASH_ENV=/dev/null -+ENV=/dev/null -+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+esac -+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -+# Admittedly, this is quite paranoid, since all the known shells bail -+# out after a failed `exec'. -+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -+exit 255 - fi - - if test x$as_have_required = xno; then : -@@ -328,6 +356,14 @@ $as_echo X"$as_dir" | - - - } # as_fn_mkdir_p -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p - # as_fn_append VAR VALUE - # ---------------------- - # Append the text in VALUE to the end of the definition contained in VAR. Take -@@ -449,6 +485,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - -+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have -+ # already done that, so ensure we don't try to do so again and fall -+ # in an infinite loop. This has already happened in practice. -+ _as_can_reexec=no; export _as_can_reexec - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). -@@ -483,16 +523,16 @@ if (echo >conf$$.file) 2>/dev/null; then - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -+ # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file - rmdir conf$$.dir 2>/dev/null -@@ -504,28 +544,8 @@ else - as_mkdir_p=false - fi - --if test -x / >/dev/null 2>&1; then -- as_test_x='test -x' --else -- if ls -dL / >/dev/null 2>&1; then -- as_ls_L_option=L -- else -- as_ls_L_option= -- fi -- as_test_x=' -- eval sh -c '\'' -- if test -d "$1"; then -- test -d "$1/."; -- else -- case $1 in #( -- -*)set "./$1";; -- esac; -- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -- ???[sx]*):;;*)false;;esac;fi -- '\'' sh -- ' --fi --as_executable_p=$as_test_x -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -1303,8 +1323,6 @@ target=$target_alias - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. -- If a cross compiler is detected then cross compile mode will be used" >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -@@ -1586,9 +1604,9 @@ test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF - configure --generated by GNU Autoconf 2.68 -+generated by GNU Autoconf 2.69 - --Copyright (C) 2010 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -@@ -1820,7 +1838,7 @@ $as_echo "$ac_try_echo"; } >&5 - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -+ test -x conftest$ac_exeext - }; then : - ac_retval=0 - else -@@ -2171,7 +2189,7 @@ $as_echo "$ac_try_echo"; } >&5 - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -+ test -x conftest$ac_exeext - }; then : - ac_retval=0 - else -@@ -2217,7 +2235,7 @@ $as_echo "$ac_try_echo"; } >&5 - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -+ test -x conftest$ac_exeext - }; then : - ac_retval=0 - else -@@ -2253,7 +2271,8 @@ int - main () - { - static int test_array [1 - 2 * !(($2) >= 0)]; --test_array [0] = 0 -+test_array [0] = 0; -+return test_array [0]; - - ; - return 0; -@@ -2269,7 +2288,8 @@ int - main () - { - static int test_array [1 - 2 * !(($2) <= $ac_mid)]; --test_array [0] = 0 -+test_array [0] = 0; -+return test_array [0]; - - ; - return 0; -@@ -2295,7 +2315,8 @@ int - main () - { - static int test_array [1 - 2 * !(($2) < 0)]; --test_array [0] = 0 -+test_array [0] = 0; -+return test_array [0]; - - ; - return 0; -@@ -2311,7 +2332,8 @@ int - main () - { - static int test_array [1 - 2 * !(($2) >= $ac_mid)]; --test_array [0] = 0 -+test_array [0] = 0; -+return test_array [0]; - - ; - return 0; -@@ -2345,7 +2367,8 @@ int - main () - { - static int test_array [1 - 2 * !(($2) <= $ac_mid)]; --test_array [0] = 0 -+test_array [0] = 0; -+return test_array [0]; - - ; - return 0; -@@ -2418,7 +2441,7 @@ This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - - It was created by $as_me, which was --generated by GNU Autoconf 2.68. Invocation command line was -+generated by GNU Autoconf 2.69. Invocation command line was - - $ $0 $@ - -@@ -2936,7 +2959,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2976,7 +2999,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3029,7 +3052,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3070,7 +3093,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -@@ -3128,7 +3151,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3172,7 +3195,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3618,8 +3641,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <stdarg.h> - #include <stdio.h> --#include <sys/types.h> --#include <sys/stat.h> -+struct stat; - /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ - struct buf { int x; }; - FILE * (*rcsopen) (struct buf *, struct stat *, int); -@@ -3732,7 +3754,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3776,7 +3798,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3985,7 +4007,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OBJC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4029,7 +4051,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_OBJC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4236,7 +4258,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OBJCXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4280,7 +4302,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_OBJCXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4748,7 +4770,7 @@ do - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -+ as_fn_executable_p "$ac_path_GREP" || continue - # Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP - case `"$ac_path_GREP" --version 2>&1` in -@@ -4814,7 +4836,7 @@ do - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -+ as_fn_executable_p "$ac_path_EGREP" || continue - # Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP - case `"$ac_path_EGREP" --version 2>&1` in -@@ -5522,7 +5544,7 @@ _ACEOF +@@ -5544,7 +5544,7 @@ _ACEOF @@ -469,7 +51,7 @@ index a3ec454..6b01ec5 100755 LC_MERGE_FLAGS_list="$GUILE_LDFLAGS" if [[ "LDFLAGS" =~ $(echo "(^|_)LIBS") ]] -@@ -6920,10 +6942,8 @@ main () +@@ -6942,10 +6942,8 @@ main () } _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -481,7 +63,7 @@ index a3ec454..6b01ec5 100755 g_success=1 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Guile DOTS linking" >&5 -@@ -6954,20 +6974,16 @@ main () +@@ -6976,20 +6974,16 @@ main () } _ACEOF if ac_fn_cxx_try_run "$LINENO"; then : @@ -504,7 +86,7 @@ index a3ec454..6b01ec5 100755 # LC_MERGE_FLAGS([-fpermissive],[CXXFLAGS]) # LC_RUN_IFELSE([Guile DOTS with -fpermissive], [LM_GUILE_DOTS],[ # LC_MERGE_FLAGS([-fpermissive],[GUILE_CXXFLAGS]) -@@ -7027,11 +7043,9 @@ fi +@@ -7049,11 +7043,9 @@ fi else @@ -517,7 +99,7 @@ index a3ec454..6b01ec5 100755 fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -@@ -10064,7 +10078,6 @@ then +@@ -10086,7 +10078,6 @@ then @@ -525,7 +107,7 @@ index a3ec454..6b01ec5 100755 CPPFLAGS="${LC_ICONV_PATH//-L/-I} -I$withval/include -I/opt/local/include -I/sw/include -MM -MF $LC_ICONV_TEMP" -@@ -10077,7 +10090,29 @@ if test "x$ac_cv_header_iconv_h" = xyes; then : +@@ -10099,7 +10090,29 @@ if test "x$ac_cv_header_iconv_h" = xyes; then : LC_ICONV_ICONV=${LC_ICONV_DEPEND%/include/iconv.h*} if [[ "$LC_ICONV_DEPEND" == "$LC_ICONV_ICONV" ]] then @@ -556,7 +138,7 @@ index a3ec454..6b01ec5 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: iconv found in default compiler location" >&5 $as_echo "$as_me: iconv found in default compiler location" >&6;} -@@ -11083,7 +11118,7 @@ fi +@@ -11105,7 +11118,7 @@ fi fi @@ -565,7 +147,7 @@ index a3ec454..6b01ec5 100755 LC_MERGE_FLAGS_list="$ICONV_LDFLAGS" if [[ "LDFLAGS" =~ $(echo "(^|_)LIBS") ]] -@@ -12440,10 +12475,7 @@ fi +@@ -12462,10 +12475,7 @@ fi ac_fn_cxx_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default" if test "x$ac_cv_header_iconv_h" = xyes; then : @@ -577,7 +159,7 @@ index a3ec454..6b01ec5 100755 /* end confdefs.h. */ #include <iconv.h> int -@@ -12455,9 +12487,8 @@ iconv_open("",""); +@@ -12477,9 +12487,8 @@ iconv_open("",""); } _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : @@ -589,7 +171,7 @@ index a3ec454..6b01ec5 100755 CFLAGS=$CFLAGS__ax_save_flags -@@ -13154,13 +13185,8 @@ fi +@@ -13176,13 +13185,8 @@ fi $as_echo "#define USE_ICONV 1" >>confdefs.h @@ -605,7 +187,7 @@ index a3ec454..6b01ec5 100755 fi rm -f core conftest.err conftest.$ac_objext \ -@@ -13176,7 +13202,8 @@ fi +@@ -13198,7 +13202,8 @@ fi else rm $LC_ICONV_TEMP @@ -615,7 +197,7 @@ index a3ec454..6b01ec5 100755 fi -@@ -13210,7 +13237,6 @@ $as_echo "$as_me: ICONV_LDFLAGS:$ICONV_LDFLAGS" >&6;} +@@ -13232,7 +13237,6 @@ $as_echo "$as_me: ICONV_LDFLAGS:$ICONV_LDFLAGS" >&6;} ICONV_LDFLAGS="" @@ -623,16 +205,7 @@ index a3ec454..6b01ec5 100755 #-------------------------------------------------------------------- -@@ -13249,7 +13275,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_FREETYPE_tmp1="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -13641,7 +13667,7 @@ $as_echo "$as_me: WARNING: freetype-config not found" >&2;} +@@ -13663,7 +13667,7 @@ $as_echo "$as_me: WARNING: freetype-config not found" >&2;} @@ -641,151 +214,6 @@ index a3ec454..6b01ec5 100755 LC_MERGE_FLAGS_list="$FREETYPE_LDFLAGS" if [[ "LDFLAGS" =~ $(echo "(^|_)LIBS") ]] -@@ -16221,7 +16247,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GS_EXE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -16266,7 +16292,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GS_DLL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -17157,7 +17183,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_QMAKE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -17217,7 +17243,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MOC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -17276,7 +17302,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_UIC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -17335,7 +17361,7 @@ do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_RCC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -20634,16 +20660,16 @@ if (echo >conf$$.file) 2>/dev/null; then - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -+ # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - else -- as_ln_s='cp -p' -+ as_ln_s='cp -pR' - fi - rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file - rmdir conf$$.dir 2>/dev/null -@@ -20703,28 +20729,16 @@ else - as_mkdir_p=false - fi - --if test -x / >/dev/null 2>&1; then -- as_test_x='test -x' --else -- if ls -dL / >/dev/null 2>&1; then -- as_ls_L_option=L -- else -- as_ls_L_option= -- fi -- as_test_x=' -- eval sh -c '\'' -- if test -d "$1"; then -- test -d "$1/."; -- else -- case $1 in #( -- -*)set "./$1";; -- esac; -- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -- ???[sx]*):;;*)false;;esac;fi -- '\'' sh -- ' --fi --as_executable_p=$as_test_x -+ -+# as_fn_executable_p FILE -+# ----------------------- -+# Test if FILE is an executable regular file. -+as_fn_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} # as_fn_executable_p -+as_test_x='test -x' -+as_executable_p=as_fn_executable_p - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -20746,7 +20760,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - # values after options handling. - ac_log=" - This file was extended by $as_me, which was --generated by GNU Autoconf 2.68. Invocation command line was -+generated by GNU Autoconf 2.69. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -20808,10 +20822,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ - config.status --configured by $0, generated by GNU Autoconf 2.68, -+configured by $0, generated by GNU Autoconf 2.69, - with options \\"\$ac_cs_config\\" - --Copyright (C) 2010 Free Software Foundation, Inc. -+Copyright (C) 2012 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." - -@@ -20899,7 +20913,7 @@ fi - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - if \$ac_cs_recheck; then -- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' diff --git a/misc/m4/iconv.m4 b/misc/m4/iconv.m4 index 2c286ee..fa88c6f 100644 --- a/misc/m4/iconv.m4 diff --git a/0004-Fix-mktemp-too-few-X-s-in-template-texmacs.patch b/0004-Fix-mktemp-too-few-X-s-in-template-texmacs.patch index 1b37e2cb780a..1f46b3b0117f 100644 --- a/0004-Fix-mktemp-too-few-X-s-in-template-texmacs.patch +++ b/0004-Fix-mktemp-too-few-X-s-in-template-texmacs.patch @@ -1,4 +1,4 @@ -From a16fc15f9a4045e5c35878dd3daf56bc231db60b Mon Sep 17 00:00:00 2001 +From 22f3a160c30d473ae339ce4269e21083883e4a34 Mon Sep 17 00:00:00 2001 From: wangjiezhe <wangjiezhe@gmail.com> Date: Sat, 11 Jun 2016 17:41:26 +0800 Subject: [PATCH 4/4] Fix: `mktemp: too few X's in template 'texmacs'` @@ -9,7 +9,7 @@ Subject: [PATCH 4/4] Fix: `mktemp: too few X's in template 'texmacs'` 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 6b01ec5..da63a18 100755 +index 93f6484..c272115 100755 --- a/configure +++ b/configure @@ -10045,7 +10045,7 @@ fi @@ -4,7 +4,7 @@ pkgname=texmacs-svn _pkgname=texmacs -pkgver=20160610.10459 +pkgver=20160615.10471 pkgrel=1 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor and CAS-interface." arch=('i686' 'x86_64') @@ -26,10 +26,10 @@ source=("${_pkgname}::svn://svn.savannah.gnu.org/texmacs/trunk/src" "0004-Fix-mktemp-too-few-X-s-in-template-texmacs.patch" ) sha1sums=('SKIP' - '064d0db04fdaace4e491a4e81ff894e713e173b3' - '95c28c40f2c44de40961dac434dcd4edae849823' - '207d4cf889046e57abfca4509fc0876491686ef9' - '73dd8e72f69fb7f5cbc8e25b000aa1f923ab21a6') + '72c9ed59808b1d43bdff98f6ce306a8752d08175' + 'e977a4331ed8341e49adc924feeda054aab97836' + 'c0417abbf2ac6b405dc6d2af63508ffde5255e59' + '947695826852e1885838b87945dd31177891fcd3') options=('!emptydirs' '!ccache') provides=('texmacs') conflicts=('texmacs') |