diff --git a/msys2-runtime/0003-Add-msys2_path_conv.patch b/msys2-runtime/0003-Add-msys2_path_conv.patch index 8f13965d..a176d703 100644 --- a/msys2-runtime/0003-Add-msys2_path_conv.patch +++ b/msys2-runtime/0003-Add-msys2_path_conv.patch @@ -16,40 +16,40 @@ diff -Naur msys-orig/winsup/cygwin/msys2_path_conv.cc src/msys2-runtime/winsup/c --- msys-orig/winsup/cygwin/msys2_path_conv.cc 1970-01-01 03:00:00.000000000 +0300 +++ src/msys2-runtime/winsup/cygwin/msys2_path_conv.cc 2014-03-18 18:15:36.220600000 +0400 @@ -0,0 +1,441 @@ -+# -+# The BSD 3-Clause License. http://www.opensource.org/licenses/BSD-3-Clause -+# -+# This file is part of 'MSYS2' project. -+# Copyright (c) 2014 by Alexey Pavlov -+# Copyright (c) 2014 by niXman -+# Copyright (c) 2014 by Ray Donnelly -+# All rights reserved. -+# -+# Project: MSYS2 ( http://sourceforge.net/projects/msys2/ ) -+# -+# Redistribution and use in source and binary forms, with or without -+# modification, are permitted provided that the following conditions are met: -+# - Redistributions of source code must retain the above copyright -+# notice, this list of conditions and the following disclaimer. -+# - Redistributions in binary form must reproduce the above copyright -+# notice, this list of conditions and the following disclaimer in -+# the documentation and/or other materials provided with the distribution. -+# - Neither the name of the 'MinGW-W64' nor the names of its contributors may -+# be used to endorse or promote products derived from this software -+# without specific prior written permission. -+# -+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -+# A PARTICULAR PURPOSE ARE DISCLAIMED. -+# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY -+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -+# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+# ++/* ++ The BSD 3-Clause License. http://www.opensource.org/licenses/BSD-3-Clause ++ ++ This file is part of 'MSYS2' project. ++ Copyright (c) 2014 by Alexey Pavlov ++ Copyright (c) 2014 by niXman ++ Copyright (c) 2014 by Ray Donnelly ++ All rights reserved. ++ ++ Project: MSYS2 ( http://sourceforge.net/projects/msys2/ ) ++ ++ Redistribution and use in source and binary forms, with or without ++ modification, are permitted provided that the following conditions are met: ++ - Redistributions of source code must retain the above copyright ++ notice, this list of conditions and the following disclaimer. ++ - Redistributions in binary form must reproduce the above copyright ++ notice, this list of conditions and the following disclaimer in ++ the documentation and/or other materials provided with the distribution. ++ - Neither the name of the 'MinGW-W64' nor the names of its contributors may ++ be used to endorse or promote products derived from this software ++ without specific prior written permission. ++ ++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ++ A PARTICULAR PURPOSE ARE DISCLAIMED. ++ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY ++ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ++ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER ++ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE ++ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++*/ + +#include "winsup.h" +#include "miscfuncs.h" @@ -449,7 +449,7 @@ diff -Naur msys-orig/winsup/cygwin/msys2_path_conv.cc src/msys2-runtime/winsup/c + set_errno(conv.error); + copy_to_dst(one_path, NULL, dst, dstend); + } else { -+ const char* win32_path = tp.c_get(); ++ char* win32_path = tp.c_get(); + stpcpy (win32_path, conv.get_win32 ()); + for (; (*win32_path != '\0') && (*dst != dstend); ++win32_path, ++(*dst)) { + **dst = (*win32_path == '\\') ? '/' : *win32_path; @@ -461,40 +461,40 @@ diff -Naur msys-orig/winsup/cygwin/msys2_path_conv.h src/msys2-runtime/winsup/cy --- msys-orig/winsup/cygwin/msys2_path_conv.h 1970-01-01 03:00:00.000000000 +0300 +++ src/msys2-runtime/winsup/cygwin/msys2_path_conv.h 2014-03-15 00:02:57.403600000 +0400 @@ -0,0 +1,44 @@ -+# -+# The BSD 3-Clause License. http://www.opensource.org/licenses/BSD-3-Clause -+# -+# This file is part of 'MSYS2' project. -+# Copyright (c) 2014 by Alexey Pavlov -+# Copyright (c) 2014 by niXman -+# Copyright (c) 2014 by Ray Donnelly -+# All rights reserved. -+# -+# Project: MSYS2 ( http://sourceforge.net/projects/msys2/ ) -+# -+# Redistribution and use in source and binary forms, with or without -+# modification, are permitted provided that the following conditions are met: -+# - Redistributions of source code must retain the above copyright -+# notice, this list of conditions and the following disclaimer. -+# - Redistributions in binary form must reproduce the above copyright -+# notice, this list of conditions and the following disclaimer in -+# the documentation and/or other materials provided with the distribution. -+# - Neither the name of the 'MinGW-W64' nor the names of its contributors may -+# be used to endorse or promote products derived from this software -+# without specific prior written permission. -+# -+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -+# A PARTICULAR PURPOSE ARE DISCLAIMED. -+# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY -+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -+# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+# ++/* ++ The BSD 3-Clause License. http://www.opensource.org/licenses/BSD-3-Clause ++ ++ This file is part of 'MSYS2' project. ++ Copyright (c) 2014 by Alexey Pavlov ++ Copyright (c) 2014 by niXman ++ Copyright (c) 2014 by Ray Donnelly ++ All rights reserved. ++ ++ Project: MSYS2 ( http://sourceforge.net/projects/msys2/ ) ++ ++ Redistribution and use in source and binary forms, with or without ++ modification, are permitted provided that the following conditions are met: ++ - Redistributions of source code must retain the above copyright ++ notice, this list of conditions and the following disclaimer. ++ - Redistributions in binary form must reproduce the above copyright ++ notice, this list of conditions and the following disclaimer in ++ the documentation and/or other materials provided with the distribution. ++ - Neither the name of the 'MinGW-W64' nor the names of its contributors may ++ be used to endorse or promote products derived from this software ++ without specific prior written permission. ++ ++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ++ A PARTICULAR PURPOSE ARE DISCLAIMED. ++ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY ++ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ++ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER ++ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE ++ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++*/ + +#ifndef PATH_CONV_H_DB4IQBH3 +#define PATH_CONV_H_DB4IQBH3 diff --git a/msys2-runtime/PKGBUILD b/msys2-runtime/PKGBUILD index 46d9e20a..6a903d88 100644 --- a/msys2-runtime/PKGBUILD +++ b/msys2-runtime/PKGBUILD @@ -20,7 +20,7 @@ source=('msys2-runtime'::'git+https://github.com/Alexpux/Cygwin.git#branch=devel md5sums=('SKIP' '85fabbc5d9cdb46cf73da9654f2c83bc' 'ace414fde822ae633183fe94cbb0e1d9' - '4731abea146cdc12971ed168ba70ca79') + 'abe6e96b4a12713345a8da05bb55abc2') pkgver() { cd "$srcdir/msys2-runtime"