diff --git a/swig/PKGBUILD b/swig/PKGBUILD index 916f394d..17c325a5 100644 --- a/swig/PKGBUILD +++ b/swig/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=swig -pkgver=3.0.0 +pkgver=3.0.2 pkgrel=1 pkgdesc="Generate scripting interfaces to C/C++ code" arch=('i686' 'x86_64') @@ -12,8 +12,8 @@ depends=('zlib' 'libpcre') makedepends=('zlib-devel' 'pcre-devel') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz swig-2.0.10-msys2.patch) -sha1sums=('10a1cc5ba6abbc7282b8146ccc0d8eefe233bfab' - '2eddacacf7606aa0d9824bd5d7e5fa53f6b80d27') +sha1sums=('e695a14acf39b25f3ea2d7303e23e39dfe284e31' + 'd4149ffc5e4111439fa1aa530cd4be11fd80ea28') prepare() { cd ${pkgname}-${pkgver} diff --git a/swig/swig-2.0.10-msys2.patch b/swig/swig-2.0.10-msys2.patch index 51c8fffd..4cb67831 100644 --- a/swig/swig-2.0.10-msys2.patch +++ b/swig/swig-2.0.10-msys2.patch @@ -1,159 +1,3 @@ -diff -Naur swig-2.0.10-orig/configure swig-2.0.10/configure ---- swig-2.0.10-orig/configure 2013-05-27 22:50:41.000000000 +0400 -+++ swig-2.0.10/configure 2013-07-23 13:48:07.083984400 +0400 -@@ -6373,7 +6373,7 @@ - case $host in - *-*-hp*) SO=.sl;; - *-*-darwin*) SO=.bundle;; -- *-*-cygwin* | *-*-mingw*) SO=.dll;; -+ *-*-cygwin* | *-*-msys* | *-*-mingw*) SO=.dll;; - *) SO=.so;; - esac - fi -@@ -6390,7 +6390,7 @@ - then - case $host in - *-*-aix*) LDSHARED="\$(srcdir)/ld_so_aix \$(CC)";; -- *-*-cygwin* | *-*-mingw*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw*) - if test "$GCC" = yes; then - LDSHARED="$CC -shared" - else -@@ -6460,7 +6460,7 @@ - fi;; - *-*-hp*) TRYLINKINGWITHCXX="CXXSHARED= $CXX +z ";; - *-*-darwin*) TRYLINKINGWITHCXX="CXXSHARED= $CXX -bundle -undefined suppress -flat_namespace";; -- *-*-cygwin* | *-*-mingw*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw*) - if test "$GCC" = yes; then - TRYLINKINGWITHCXX="CXXSHARED= $CXX -shared " - else -@@ -7495,7 +7495,7 @@ - - # Cygwin (Windows) needs the library for dynamic linking - case $host in --*-*-cygwin* | *-*-mingw*) TCLDYNAMICLINKING="$TCLLIB";; -+*-*-cygwin* | *-*-msys* | *-*-mingw*) TCLDYNAMICLINKING="$TCLLIB";; - *)TCLDYNAMICLINKING="";; - esac - -@@ -7663,7 +7663,7 @@ - - # Cygwin (Windows) needs the library for dynamic linking - case $host in -- *-*-cygwin* | *-*-mingw*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw*) - PYTHONDYNAMICLINKING="-L$PYLIB $PYLINK" - DEFS="-DUSE_DL_IMPORT $DEFS" - ;; -@@ -7861,7 +7861,7 @@ - - # Cygwin (Windows) needs the library for dynamic linking - case $host in -- *-*-cygwin* | *-*-mingw*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw*) - PYTHON3DYNAMICLINKING="-L$PYLIB $PY3LINK" - DEFS="-DUSE_DL_IMPORT $DEFS" - ;; -@@ -8032,7 +8032,7 @@ - - # Cygwin (Windows) needs the library for dynamic linking - case $host in --*-*-cygwin* | *-*-mingw*) PERL5DYNAMICLINKING="-L$PERL5EXT -l$PERL5LIB";; -+*-*-cygwin* | *-*-msys* | *-*-mingw*) PERL5DYNAMICLINKING="-L$PERL5EXT -l$PERL5LIB";; - *)PERL5DYNAMICLINKING="";; - esac - fi -@@ -8303,7 +8303,7 @@ - - # Add in default installation directory on Windows for Cygwin - case $host in -- *-*-cygwin* | *-*-mingw*) JAVAINCDIR="c:/Program*Files/Java/jdk*/include d:/Program*Files/Java/jdk*/include c:/j2sdk*/include d:/j2sdk*/include c:/jdk*/include d:/jdk*/include $JAVAINCDIR";; -+ *-*-cygwin* | *-*-msys* | *-*-mingw*) JAVAINCDIR="c:/Program*Files/Java/jdk*/include d:/Program*Files/Java/jdk*/include c:/j2sdk*/include d:/j2sdk*/include c:/jdk*/include d:/jdk*/include $JAVAINCDIR";; - *-*-darwin*) JAVAINCDIR="/System/Library/Frameworks/JavaVM.framework/Headers $JAVAINCDIR";; - *);; - esac -@@ -8341,7 +8341,7 @@ - - # java.exe on Cygwin requires the Windows standard (Pascal) calling convention as it is a normal Windows executable and not a Cygwin built executable - case $host in --*-*-cygwin* | *-*-mingw*) -+*-*-cygwin* | *-*-msys* | *-*-mingw*) - if test "$GCC" = yes; then - JAVADYNAMICLINKING=" -mno-cygwin -mthreads -Wl,--add-stdcall-alias" - JAVACFLAGS="-mno-cygwin -mthreads" -@@ -8361,7 +8361,7 @@ - - # Java on Windows platforms including Cygwin doesn't use libname.dll, rather name.dll when loading dlls - case $host in --*-*-cygwin* | *-*-mingw*) JAVALIBRARYPREFIX="";; -+*-*-cygwin* | *-*-msys* | *-*-mingw*) JAVALIBRARYPREFIX="";; - *)JAVALIBRARYPREFIX="lib";; - esac - -@@ -9241,7 +9241,7 @@ - fi - - case $host in --*-*-cygwin* | *-*-mingw*) RUBYDYNAMICLINKING="-L$RUBYLIB $RUBYLINK";; -+*-*-cygwin* | *-*-msys* | *-*-mingw*) RUBYDYNAMICLINKING="-L$RUBYLIB $RUBYLINK";; - *) RUBYDYNAMICLINKING="";; - esac - fi -@@ -10198,7 +10198,7 @@ - - if test -z "$CSHARPCOMPILERBIN" ; then - case $host in -- *-*-cygwin* | *-*-mingw*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw*) - # prefer Mono gmcs (.NET 2.0) over mcs (.NET 1.1) - note mcs-1.2.3 has major pinvoke bug - for ac_prog in csc mono-csc gmcs mcs cscc - do -@@ -10465,7 +10465,7 @@ - - # Cygwin requires the Windows standard (Pascal) calling convention as it is a Windows executable and not a Cygwin built executable - case $host in --*-*-cygwin* | *-*-mingw*) -+*-*-cygwin* | *-*-msys* | *-*-mingw*) - if test "$GCC" = yes; then - CSHARPDYNAMICLINKING=" -mno-cygwin -mthreads -Wl,--add-stdcall-alias" - CSHARPCFLAGS="-mno-cygwin -mthreads" -@@ -10481,7 +10481,7 @@ - - # CSharp on Windows platforms including Cygwin doesn't use libname.dll, rather name.dll when loading dlls - case $host in --*-*-cygwin* | *-*-mingw*) CSHARPLIBRARYPREFIX="";; -+*-*-cygwin* | *-*-msys* | *-*-mingw*) CSHARPLIBRARYPREFIX="";; - *)CSHARPLIBRARYPREFIX="lib";; - esac - -@@ -11413,7 +11413,7 @@ - - # Do not prefix library file names with "lib" on Windows. - case $host in --*-*-cygwin* | *-*-mingw*) DLIBPREFIX="";; -+*-*-cygwin* | *-*-msys* | *-*-mingw*) DLIBPREFIX="";; - *)DLIBPREFIX="lib";; - esac - -@@ -11609,7 +11609,7 @@ - # Translate path for native Windows compilers for use with 'make check' - ROOT_DIR=`pwd` - case $host in --*-*-cygwin* | *-*-mingw*) -+*-*-cygwin* | *-*-msys* | *-*-mingw*) - if (cygpath --mixed $ROOT_DIR) >/dev/null 2>/dev/null; then - ROOT_DIR=`cygpath --mixed $ROOT_DIR` - fi -@@ -11654,7 +11654,7 @@ - case $build in - # Windows does not understand unix directories. Convert into a windows directory with drive letter. - *-*-mingw*) SWIG_LIB_WIN_UNIX=`cmd //c echo $SWIG_LIB | sed -e "s/ *$//"`;; # This echo converts unix to mixed paths. Then zap unexpected trailing space. -- *-*-cygwin*) SWIG_LIB_WIN_UNIX=`cygpath --mixed "$SWIG_LIB"`;; -+ *-*-cygwin* | *-*-msys*) SWIG_LIB_WIN_UNIX=`cygpath --mixed "$SWIG_LIB"`;; - *) SWIG_LIB_WIN_UNIX="";; - esac - diff -Naur swig-2.0.10-orig/configure.ac swig-2.0.10/configure.ac --- swig-2.0.10-orig/configure.ac 2013-05-27 22:24:04.000000000 +0400 +++ swig-2.0.10/configure.ac 2013-07-23 13:49:28.552734400 +0400