From: Alexx83 <no...@so...> - 2013-03-25 14:50:56
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Repository: msys2-tools". The branch, master has been updated via 6529be9295457005b9e68f6df86919ddf7c107bf (commit) from fb86e40fe049015ca370e790c928eb1c0ffb0b11 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://sf.net/p/mingw/msys2-tools/ci/6529be9295457005b9e68f6df86919ddf7c107bf/ commit 6529be9295457005b9e68f6df86919ddf7c107bf Author: Alexpux <ale...@gm...> Date: Mon Mar 25 18:50:41 2013 +0400 Update NCURSES patch diff --git a/ncurses/ncurses-5.9-20130209-msys.patch b/ncurses/ncurses-5.9-20130324-msys2.patch similarity index 78% rename from ncurses/ncurses-5.9-20130209-msys.patch rename to ncurses/ncurses-5.9-20130324-msys2.patch index e651358..05d92d7 100644 --- a/ncurses/ncurses-5.9-20130209-msys.patch +++ b/ncurses/ncurses-5.9-20130324-msys2.patch @@ -1,7 +1,7 @@ -diff -Naur ncurses-5.9-20130209/aclocal.m4 ncurses-5.9-20130209-p/aclocal.m4 ---- ncurses-5.9-20130209/aclocal.m4 2013-02-09 21:55:03.000000000 +0400 -+++ ncurses-5.9-20130209-p/aclocal.m4 2013-02-13 10:19:04.438476500 +0400 -@@ -2127,7 +2127,7 @@ +diff -Naur ncurses-5.9-20130324/aclocal.m4 ncurses-orig/aclocal.m4 +--- ncurses-5.9-20130324/aclocal.m4 2013-03-25 01:10:41.000000000 +0400 ++++ ncurses-orig/aclocal.m4 2013-03-25 15:42:23.863333573 +0400 +@@ -2128,7 +2128,7 @@ ;; *) case $cf_cv_system_name in #(vi @@ -10,7 +10,7 @@ diff -Naur ncurses-5.9-20130209/aclocal.m4 ncurses-5.9-20130209-p/aclocal.m4 ;; *) mkdir conftest.src conftest.bin conftest.lib -@@ -3087,7 +3087,7 @@ +@@ -3089,7 +3089,7 @@ AC_REQUIRE([CF_SUBST_NCURSES_VERSION]) case $cf_cv_shlib_version in #(vi @@ -19,19 +19,19 @@ diff -Naur ncurses-5.9-20130209/aclocal.m4 ncurses-5.9-20130209-p/aclocal.m4 TINFO_NAME=$TINFO_ARG_SUFFIX TINFO_SUFFIX=.dll ;; -@@ -3183,6 +3183,11 @@ - Libs_To_Make="$Libs_To_Make ../lib/cyg${cf_dir}${cf_cygsuf}" - continue - ;; -+ msysdll) #(vi -+ cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` -+ Libs_To_Make="$Libs_To_Make ../lib/msys-${cf_dir}${cf_cygsuf}" -+ continue -+ ;; - mingw) - cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` - Libs_To_Make="$Libs_To_Make ../lib/lib${cf_dir}${cf_cygsuf}" -@@ -3630,7 +3635,7 @@ +@@ -3172,6 +3172,11 @@ + Libs_To_Make="$Libs_To_Make ../lib/cyg${cf_libname}${cf_cygsuf}" + continue + ;; ++ msysdll) #(vi ++ cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` ++ Libs_To_Make="$Libs_To_Make ../lib/msys-${cf_libname}${cf_cygsuf}" ++ continue ++ ;; + mingw) + cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` + Libs_To_Make="$Libs_To_Make ../lib/lib${cf_libname}${cf_cygsuf}" +@@ -3664,7 +3669,7 @@ $2='.a' $3=[$]$2 ;; @@ -40,7 +40,7 @@ diff -Naur ncurses-5.9-20130209/aclocal.m4 ncurses-5.9-20130209-p/aclocal.m4 $2='.dll' $3='.dll.a' ;; -@@ -4467,7 +4472,7 @@ +@@ -4501,7 +4506,7 @@ AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[ if test "$cross_compiling" = yes ; then case $target_alias in #(vi @@ -49,7 +49,7 @@ diff -Naur ncurses-5.9-20130209/aclocal.m4 ncurses-5.9-20130209-p/aclocal.m4 cf_cv_mixedcase=no ;; *) -@@ -4624,7 +4629,7 @@ +@@ -4658,7 +4663,7 @@ profile) $2='obj_p' ;; shared) case $cf_cv_system_name in #(vi @@ -58,7 +58,7 @@ diff -Naur ncurses-5.9-20130209/aclocal.m4 ncurses-5.9-20130209-p/aclocal.m4 $2='objects' ;; *) $2='obj_s' ;; -@@ -5367,6 +5372,25 @@ +@@ -5401,6 +5406,25 @@ CF_EOF chmod +x mk_shared_lib.sh ;; @@ -84,7 +84,7 @@ diff -Naur ncurses-5.9-20130209/aclocal.m4 ncurses-5.9-20130209-p/aclocal.m4 darwin*) #(vi cf_try_cflags="no-cpp-precomp" CC_SHARED_OPTS="-dynamic" -@@ -6667,7 +6691,7 @@ +@@ -6701,7 +6725,7 @@ # special hack to add -no-undefined (which libtool should do for itself) LT_UNDEF= case "$cf_cv_system_name" in #(vi @@ -93,7 +93,7 @@ diff -Naur ncurses-5.9-20130209/aclocal.m4 ncurses-5.9-20130209-p/aclocal.m4 LT_UNDEF=-no-undefined ;; esac -@@ -6993,7 +7017,7 @@ +@@ -7028,7 +7052,7 @@ aix[[4-7]]*) #(vi cf_xopen_source="-D_ALL_SOURCE" ;; @@ -102,10 +102,10 @@ diff -Naur ncurses-5.9-20130209/aclocal.m4 ncurses-5.9-20130209-p/aclocal.m4 cf_XOPEN_SOURCE=600 ;; darwin[[0-8]].*) #(vi -diff -Naur ncurses-5.9-20130209/Ada95/aclocal.m4 ncurses-5.9-20130209-p/Ada95/aclocal.m4 ---- ncurses-5.9-20130209/Ada95/aclocal.m4 2013-01-27 02:15:40.000000000 +0400 -+++ ncurses-5.9-20130209-p/Ada95/aclocal.m4 2013-02-13 10:29:39.240234300 +0400 -@@ -1248,7 +1248,7 @@ +diff -Naur ncurses-5.9-20130324/Ada95/aclocal.m4 ncurses-orig/Ada95/aclocal.m4 +--- ncurses-5.9-20130324/Ada95/aclocal.m4 2013-03-10 01:39:08.000000000 +0400 ++++ ncurses-orig/Ada95/aclocal.m4 2013-03-25 15:40:21.533333572 +0400 +@@ -1249,7 +1249,7 @@ ;; *) case $cf_cv_system_name in #(vi @@ -114,7 +114,7 @@ diff -Naur ncurses-5.9-20130209/Ada95/aclocal.m4 ncurses-5.9-20130209-p/Ada95/ac ;; *) mkdir conftest.src conftest.bin conftest.lib -@@ -1783,7 +1783,7 @@ +@@ -1785,7 +1785,7 @@ $2='.a' $3=[$]$2 ;; @@ -123,7 +123,7 @@ diff -Naur ncurses-5.9-20130209/Ada95/aclocal.m4 ncurses-5.9-20130209-p/Ada95/ac $2='.dll' $3='.dll.a' ;; -@@ -1979,7 +1979,7 @@ +@@ -1981,7 +1981,7 @@ AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[ if test "$cross_compiling" = yes ; then case $target_alias in #(vi @@ -132,7 +132,7 @@ diff -Naur ncurses-5.9-20130209/Ada95/aclocal.m4 ncurses-5.9-20130209-p/Ada95/ac cf_cv_mixedcase=no ;; *) -@@ -2471,7 +2471,7 @@ +@@ -2473,7 +2473,7 @@ profile) $2='obj_p' ;; shared) case $cf_cv_system_name in #(vi @@ -141,7 +141,7 @@ diff -Naur ncurses-5.9-20130209/Ada95/aclocal.m4 ncurses-5.9-20130209-p/Ada95/ac $2='objects' ;; *) $2='obj_s' ;; -@@ -2941,6 +2941,25 @@ +@@ -2943,6 +2943,25 @@ CF_EOF chmod +x mk_shared_lib.sh ;; @@ -167,7 +167,7 @@ diff -Naur ncurses-5.9-20130209/Ada95/aclocal.m4 ncurses-5.9-20130209-p/Ada95/ac darwin*) #(vi cf_try_cflags="no-cpp-precomp" CC_SHARED_OPTS="-dynamic" -@@ -3685,7 +3704,7 @@ +@@ -3688,7 +3707,7 @@ aix[[4-7]]*) #(vi cf_xopen_source="-D_ALL_SOURCE" ;; @@ -176,9 +176,9 @@ diff -Naur ncurses-5.9-20130209/Ada95/aclocal.m4 ncurses-5.9-20130209-p/Ada95/ac cf_XOPEN_SOURCE=600 ;; darwin[[0-8]].*) #(vi -diff -Naur ncurses-5.9-20130209/Ada95/configure ncurses-5.9-20130209-p/Ada95/configure ---- ncurses-5.9-20130209/Ada95/configure 2013-01-27 02:16:48.000000000 +0400 -+++ ncurses-5.9-20130209-p/Ada95/configure 2013-02-13 10:31:48.255859300 +0400 +diff -Naur ncurses-5.9-20130324/Ada95/configure ncurses-orig/Ada95/configure +--- ncurses-5.9-20130324/Ada95/configure 2013-01-27 02:16:48.000000000 +0400 ++++ ncurses-orig/Ada95/configure 2013-03-25 15:40:21.536666906 +0400 @@ -2673,7 +2673,7 @@ if test "$cross_compiling" = yes ; then @@ -270,10 +270,10 @@ diff -Naur ncurses-5.9-20130209/Ada95/configure ncurses-5.9-20130209-p/Ada95/con ;; esac fi -diff -Naur ncurses-5.9-20130209/config.guess ncurses-5.9-20130209-p/config.guess ---- ncurses-5.9-20130209/config.guess 2012-10-06 15:54:45.000000000 +0400 -+++ ncurses-5.9-20130209-p/config.guess 2013-02-13 10:20:52.329101500 +0400 -@@ -805,6 +805,9 @@ +diff -Naur ncurses-5.9-20130324/config.guess ncurses-orig/config.guess +--- ncurses-5.9-20130324/config.guess 2013-02-10 18:28:37.000000000 +0400 ++++ ncurses-orig/config.guess 2013-03-25 15:40:21.550000237 +0400 +@@ -799,6 +799,9 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; @@ -283,7 +283,7 @@ diff -Naur ncurses-5.9-20130209/config.guess ncurses-5.9-20130209-p/config.guess *:MINGW64*:*) echo ${UNAME_MACHINE}-pc-mingw64 exit ;; -@@ -851,6 +854,9 @@ +@@ -845,6 +848,9 @@ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; @@ -293,10 +293,10 @@ diff -Naur ncurses-5.9-20130209/config.guess ncurses-5.9-20130209-p/config.guess p*:CYGWIN*:*) echo powerpcle-unknown-cygwin exit ;; -diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure ---- ncurses-5.9-20130209/configure 2013-02-09 21:55:28.000000000 +0400 -+++ ncurses-5.9-20130209-p/configure 2013-02-13 12:18:49.913085900 +0400 -@@ -4401,7 +4401,7 @@ +diff -Naur ncurses-5.9-20130324/configure ncurses-orig/configure +--- ncurses-5.9-20130324/configure 2013-03-25 03:40:56.000000000 +0400 ++++ ncurses-orig/configure 2013-03-25 15:43:56.216666904 +0400 +@@ -4402,7 +4402,7 @@ # special hack to add -no-undefined (which libtool should do for itself) LT_UNDEF= case "$cf_cv_system_name" in #(vi @@ -305,7 +305,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure LT_UNDEF=-no-undefined ;; esac -@@ -5409,6 +5409,25 @@ +@@ -5427,6 +5427,25 @@ CF_EOF chmod +x mk_shared_lib.sh ;; @@ -331,7 +331,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure darwin*) #(vi cf_try_cflags="no-cpp-precomp" CC_SHARED_OPTS="-dynamic" -@@ -6876,14 +6895,14 @@ +@@ -6894,14 +6913,14 @@ BROKEN_LINKER=1 elif test "$DFT_LWR_MODEL" = shared ; then case $cf_cv_system_name in #(vi @@ -346,9 +346,9 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure - test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 + test -n "$verbose" && echo " cygwin/msys linker is broken anyway" 1>&6 - echo "${as_me:-configure}:6888: testing cygwin linker is broken anyway ..." 1>&5 + echo "${as_me:-configure}:6906: testing cygwin linker is broken anyway ..." 1>&5 -@@ -6928,7 +6947,7 @@ +@@ -6946,7 +6965,7 @@ aix[4-7]*) #(vi cf_xopen_source="-D_ALL_SOURCE" ;; @@ -357,7 +357,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure cf_XOPEN_SOURCE=600 ;; darwin[0-8].*) #(vi -@@ -11768,7 +11787,17 @@ +@@ -11786,7 +11805,17 @@ TEST_LIBS="-lpthread $TEST_LIBS" TEST_LIBS2="-lpthread $TEST_LIBS2" else @@ -376,7 +376,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure fi cat >>confdefs.h <<\EOF -@@ -19409,7 +19438,7 @@ +@@ -19427,7 +19456,7 @@ ;; *) case $cf_cv_system_name in #(vi @@ -385,7 +385,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure ;; *) mkdir conftest.src conftest.bin conftest.lib -@@ -19769,7 +19798,7 @@ +@@ -19787,7 +19816,7 @@ DFT_LIB_SUFFIX='.a' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; @@ -394,7 +394,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure DFT_LIB_SUFFIX='.dll' DFT_DEP_SUFFIX='.dll.a' ;; -@@ -19809,7 +19838,7 @@ +@@ -19827,7 +19856,7 @@ profile) DFT_OBJ_SUBDIR='obj_p' ;; shared) case $cf_cv_system_name in #(vi @@ -403,7 +403,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure DFT_OBJ_SUBDIR='objects' ;; *) DFT_OBJ_SUBDIR='obj_s' ;; -@@ -19849,7 +19878,7 @@ +@@ -19871,7 +19900,7 @@ CXX_LIB_SUFFIX='.a' CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX ;; @@ -412,7 +412,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure CXX_LIB_SUFFIX='.dll' CXX_DEP_SUFFIX='.dll.a' ;; -@@ -19978,8 +20007,8 @@ +@@ -20001,8 +20030,8 @@ if test "$DFT_LWR_MODEL" = shared ; then case $cf_cv_system_name in #(vi @@ -423,7 +423,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure TINFO_SUFFIX=.dll ;; esac -@@ -20293,7 +20322,7 @@ +@@ -20316,7 +20345,7 @@ profile) cf_subdir='obj_p' ;; shared) case $cf_cv_system_name in #(vi @@ -432,7 +432,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure cf_subdir='objects' ;; *) cf_subdir='obj_s' ;; -@@ -21603,7 +21632,7 @@ +@@ -21637,7 +21666,7 @@ cf_prefix=$LIB_PREFIX case $cf_cv_shlib_version in #(vi @@ -441,7 +441,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure TINFO_NAME=$TINFO_ARG_SUFFIX TINFO_SUFFIX=.dll ;; -@@ -21660,7 +21689,7 @@ +@@ -21694,7 +21723,7 @@ cf_suffix='.a' cf_depsuf=$cf_suffix ;; @@ -450,19 +450,19 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure cf_suffix='.dll' cf_depsuf='.dll.a' ;; -@@ -21750,6 +21779,11 @@ - Libs_To_Make="$Libs_To_Make ../lib/cyg${cf_dir}${cf_cygsuf}" - continue - ;; -+ msysdll) #(vi -+ cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` -+ Libs_To_Make="$Libs_To_Make ../lib/msys-${cf_dir}${cf_cygsuf}" -+ continue -+ ;; - mingw) - cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` - Libs_To_Make="$Libs_To_Make ../lib/lib${cf_dir}${cf_cygsuf}" -@@ -21834,7 +21868,7 @@ +@@ -21771,6 +21800,11 @@ + Libs_To_Make="$Libs_To_Make ../lib/cyg${cf_libname}${cf_cygsuf}" + continue + ;; ++ msysdll) #(vi ++ cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` ++ Libs_To_Make="$Libs_To_Make ../lib/msys-${cf_libname}${cf_cygsuf}" ++ continue ++ ;; + mingw) + cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` + Libs_To_Make="$Libs_To_Make ../lib/lib${cf_libname}${cf_cygsuf}" +@@ -21899,7 +21933,7 @@ cf_suffix='.a' cf_depsuf=$cf_suffix ;; @@ -471,7 +471,7 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure cf_suffix='.dll' cf_depsuf='.dll.a' ;; -@@ -21869,7 +21903,7 @@ +@@ -21934,7 +21968,7 @@ profile) cf_subdir='obj_p' ;; shared) case $cf_cv_system_name in #(vi @@ -480,10 +480,10 @@ diff -Naur ncurses-5.9-20130209/configure ncurses-5.9-20130209-p/configure cf_subdir='objects' ;; *) cf_subdir='obj_s' ;; -diff -Naur ncurses-5.9-20130209/configure.in ncurses-5.9-20130209-p/configure.in ---- ncurses-5.9-20130209/configure.in 2013-01-27 00:59:15.000000000 +0400 -+++ ncurses-5.9-20130209-p/configure.in 2013-02-13 11:22:20.655273400 +0400 -@@ -671,10 +671,10 @@ +diff -Naur ncurses-5.9-20130324/configure.in ncurses-orig/configure.in +--- ncurses-5.9-20130324/configure.in 2013-03-17 03:32:24.000000000 +0400 ++++ ncurses-orig/configure.in 2013-03-25 15:40:21.566666904 +0400 +@@ -682,10 +682,10 @@ BROKEN_LINKER=1 elif test "$DFT_LWR_MODEL" = shared ; then case $cf_cv_system_name in #(vi @@ -496,7 +496,7 @@ diff -Naur ncurses-5.9-20130209/configure.in ncurses-5.9-20130209-p/configure.in ;; esac fi -@@ -1156,7 +1156,17 @@ +@@ -1167,7 +1167,17 @@ CF_ADD_LIB(pthread,TEST_LIBS) CF_ADD_LIB(pthread,TEST_LIBS2) else @@ -515,7 +515,7 @@ diff -Naur ncurses-5.9-20130209/configure.in ncurses-5.9-20130209-p/configure.in fi AC_DEFINE(USE_REENTRANT,1,[Define to 1 to use experimental reentrant feature]) CF_NCURSES_ABI_6 -@@ -1765,8 +1775,8 @@ +@@ -1780,8 +1790,8 @@ if test "$DFT_LWR_MODEL" = shared ; then case $cf_cv_system_name in #(vi @@ -526,9 +526,9 @@ diff -Naur ncurses-5.9-20130209/configure.in ncurses-5.9-20130209-p/configure.in TINFO_SUFFIX=.dll ;; esac -diff -Naur ncurses-5.9-20130209/misc/shlib ncurses-5.9-20130209-p/misc/shlib ---- ncurses-5.9-20130209/misc/shlib 2007-01-13 20:09:52.000000000 +0300 -+++ ncurses-5.9-20130209-p/misc/shlib 2013-02-13 10:34:24.400390600 +0400 +diff -Naur ncurses-5.9-20130324/misc/shlib ncurses-orig/misc/shlib +--- ncurses-5.9-20130324/misc/shlib 2007-01-13 20:09:52.000000000 +0300 ++++ ncurses-orig/misc/shlib 2013-03-25 15:40:21.570000238 +0400 @@ -93,7 +93,7 @@ if test -n "$SHLIB_HOST" ; then system="$SHLIB_HOST" @@ -556,10 +556,10 @@ diff -Naur ncurses-5.9-20130209/misc/shlib ncurses-5.9-20130209-p/misc/shlib variable=PATH ;; .beos*) -diff -Naur ncurses-5.9-20130209/mk-1st.awk ncurses-5.9-20130209-p/mk-1st.awk ---- ncurses-5.9-20130209/mk-1st.awk 2012-02-26 00:22:09.000000000 +0400 -+++ ncurses-5.9-20130209-p/mk-1st.awk 2013-02-13 16:47:29.754882800 +0400 -@@ -70,7 +70,7 @@ +diff -Naur ncurses-5.9-20130324/mk-1st.awk ncurses-orig/mk-1st.awk +--- ncurses-5.9-20130324/mk-1st.awk 2013-03-12 15:09:40.000000000 +0400 ++++ ncurses-orig/mk-1st.awk 2013-03-25 15:40:21.570000238 +0400 +@@ -71,7 +71,7 @@ } # see imp_name function imp_name_of(a_name) { @@ -568,7 +568,7 @@ diff -Naur ncurses-5.9-20130209/mk-1st.awk ncurses-5.9-20130209-p/mk-1st.awk result = sprintf("%s%s%s.a", prefix, a_name, suffix); } else { result = ""; -@@ -81,6 +81,8 @@ +@@ -82,6 +82,8 @@ function abi_name_of(a_name) { if (ShlibVerInfix == "cygdll") { result = sprintf("%s%s$(ABI_VERSION)%s", "cyg", a_name, suffix); @@ -577,7 +577,7 @@ diff -Naur ncurses-5.9-20130209/mk-1st.awk ncurses-5.9-20130209-p/mk-1st.awk } else if (ShlibVerInfix == "mingw") { result = sprintf("%s%s$(ABI_VERSION)%s", prefix, a_name, suffix); } else if (ShlibVerInfix == "yes") { -@@ -94,6 +96,8 @@ +@@ -95,6 +97,8 @@ function rel_name_of(a_name) { if (ShlibVerInfix == "cygdll") { result = sprintf("%s%s$(REL_VERSION)%s", "cyg", a_name, suffix); @@ -586,7 +586,7 @@ diff -Naur ncurses-5.9-20130209/mk-1st.awk ncurses-5.9-20130209-p/mk-1st.awk } else if (ShlibVerInfix == "mingw") { result = sprintf("%s%s$(REL_VERSION)%s", prefix, a_name, suffix); } else if (ShlibVerInfix == "yes") { -@@ -112,7 +116,7 @@ +@@ -113,7 +117,7 @@ } else { if ( ShlibVer == "rel" ) { result = rel_name_of(a_name); @@ -595,7 +595,7 @@ diff -Naur ncurses-5.9-20130209/mk-1st.awk ncurses-5.9-20130209-p/mk-1st.awk result = abi_name_of(a_name); } else { result = lib_name_of(a_name); -@@ -153,7 +157,7 @@ +@@ -169,7 +173,7 @@ printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(%s) $(LDFLAGS)\n", objs, shlib_list } function sharedlinks(directory) { @@ -604,7 +604,7 @@ diff -Naur ncurses-5.9-20130209/mk-1st.awk ncurses-5.9-20130209-p/mk-1st.awk printf "\tcd %s && (", directory if ( DoLinks == "reverse" ) { if ( ShlibVer == "rel" ) { -@@ -327,7 +331,7 @@ +@@ -365,7 +369,7 @@ print "install \\" print "install.libs \\" @@ -613,7 +613,7 @@ diff -Naur ncurses-5.9-20130209/mk-1st.awk ncurses-5.9-20130209-p/mk-1st.awk dst_dirs = "$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)"; printf "install.%s :: %s $(LIBRARIES)\n", name, dst_dirs -@@ -348,7 +352,7 @@ +@@ -386,7 +390,7 @@ if ( overwrite == "yes" && name == "ncurses" ) { @@ -622,7 +622,7 @@ diff -Naur ncurses-5.9-20130209/mk-1st.awk ncurses-5.9-20130209-p/mk-1st.awk ovr_name = sprintf("libcurses%s.a", suffix) printf "\t@echo linking %s to %s\n", imp_name, ovr_name printf "\tcd $(DESTDIR)$(libdir) && (" -@@ -369,7 +373,7 @@ +@@ -407,7 +411,7 @@ print "uninstall \\" print "uninstall.libs \\" printf "uninstall.%s ::\n", name @@ -631,10 +631,10 @@ diff -Naur ncurses-5.9-20130209/mk-1st.awk ncurses-5.9-20130209-p/mk-1st.awk printf "\t@echo uninstalling $(DESTDIR)$(bindir)/%s\n", end_name printf "\t-@rm -f $(DESTDIR)$(bindir)/%s\n", end_name -diff -Naur ncurses-5.9-20130209/test/aclocal.m4 ncurses-5.9-20130209-p/test/aclocal.m4 ---- ncurses-5.9-20130209/test/aclocal.m4 2013-02-10 02:36:13.000000000 +0400 -+++ ncurses-5.9-20130209-p/test/aclocal.m4 2013-02-13 10:35:05.967773400 +0400 -@@ -1807,7 +1807,7 @@ +diff -Naur ncurses-5.9-20130324/test/aclocal.m4 ncurses-orig/test/aclocal.m4 +--- ncurses-5.9-20130324/test/aclocal.m4 2013-03-10 01:41:33.000000000 +0400 ++++ ncurses-orig/test/aclocal.m4 2013-03-25 15:40:21.570000238 +0400 +@@ -1809,7 +1809,7 @@ AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[ if test "$cross_compiling" = yes ; then case $target_alias in #(vi @@ -643,7 +643,7 @@ diff -Naur ncurses-5.9-20130209/test/aclocal.m4 ncurses-5.9-20130209-p/test/aclo cf_cv_mixedcase=no ;; *) -@@ -3168,7 +3168,7 @@ +@@ -3171,7 +3171,7 @@ aix[[4-7]]*) #(vi cf_xopen_source="-D_ALL_SOURCE" ;; @@ -652,9 +652,9 @@ diff -Naur ncurses-5.9-20130209/test/aclocal.m4 ncurses-5.9-20130209-p/test/aclo cf_XOPEN_SOURCE=600 ;; darwin[[0-8]].*) #(vi -diff -Naur ncurses-5.9-20130209/test/configure ncurses-5.9-20130209-p/test/configure ---- ncurses-5.9-20130209/test/configure 2013-02-10 02:38:20.000000000 +0400 -+++ ncurses-5.9-20130209-p/test/configure 2013-02-13 10:35:29.983398400 +0400 +diff -Naur ncurses-5.9-20130324/test/configure ncurses-orig/test/configure +--- ncurses-5.9-20130324/test/configure 2013-02-10 02:38:20.000000000 +0400 ++++ ncurses-orig/test/configure 2013-03-25 15:40:21.573333571 +0400 @@ -2394,7 +2394,7 @@ if test "$cross_compiling" = yes ; then ----------------------------------------------------------------------- Summary of changes: ...msys.patch => ncurses-5.9-20130324-msys2.patch} | 198 ++++++++++---------- 1 files changed, 99 insertions(+), 99 deletions(-) rename ncurses/{ncurses-5.9-20130209-msys.patch => ncurses-5.9-20130324-msys2.patch} (78%) hooks/post-receive -- Repository: msys2-tools |