diff --git a/mingw-w64-ansicon-git/0001-Do-not-invoke-cmd-in-makefile.patch b/mingw-w64-ansicon-git/0001-Do-not-invoke-cmd-in-makefile.patch deleted file mode 100644 index c0fe83b85c..0000000000 --- a/mingw-w64-ansicon-git/0001-Do-not-invoke-cmd-in-makefile.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ba0444146c35848917101b28f3463cd0df08a02d Mon Sep 17 00:00:00 2001 -From: David Macek -Date: Tue, 10 Mar 2015 00:22:35 +0100 -Subject: [PATCH] Do not invoke cmd in makefile - ---- - makefile.gcc | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/makefile.gcc b/makefile.gcc -index 7000335..281cbe7 100644 ---- a/makefile.gcc -+++ b/makefile.gcc -@@ -90,7 +90,7 @@ ansicon32: x86 x86/ansicon.exe x86/ANSI32.dll x64 x64/ANSI32.dll - ansicon64: x64 x64/ansicon.exe x64/ANSI64.dll - - x86: -- cmd /c "mkdir x86" -+ mkdir x86 - - x86/ansicon.exe: x86/ansicon.o $(X86OBJS) x86/procrva.o x86/ansiconv.o - $(LDmsg)$(CC) -m32 $+ -s -o $@ $(IVER) -@@ -99,7 +99,7 @@ x86/ANSI32.dll: x86/ANSI.o $(X86OBJS) x86/ansiv.o - $(LDmsg)$(CC) -m32 $+ -s -o $@ -mdll -Wl,-shared,--image-base,0xAC0000 - - x64: -- cmd /c "mkdir x64" -+ mkdir x64 - - x64/ansicon.exe: x64/ansicon.o $(X64OBJS) x64/ansiconv.o - $(LDmsg)$(CC) -m64 $+ -s -o $@ $(IVER) -@@ -121,5 +121,5 @@ x64/util.o: version.h - # Need two commands, because if the directory doesn't exist, it won't delete - # anything at all. - clean: -- -cmd /c "del x86\*.o 2>nul" -- -cmd /c "del x64\*.o 2>nul" -+ rm -f x86\*.o -+ rm -f x64\*.o --- -2.3.1 - diff --git a/mingw-w64-ansicon-git/PKGBUILD b/mingw-w64-ansicon-git/PKGBUILD deleted file mode 100644 index 7872247330..0000000000 --- a/mingw-w64-ansicon-git/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# Maintainer: David Macek - -_realname=ansicon -pkgbase=mingw-w64-${_realname}-git -pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" -pkgver=1.70.r65.3acc7a9 -pkgrel=2 -pkgdesc="Process ANSI escape sequences for Windows console programs (mingw-w64)" -arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64') -url="http://adoxa.altervista.org/ansicon/" -license=("zlib") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "git") -provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") -conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") -source=("git+https://github.com/adoxa/ansicon.git" - "0001-Do-not-invoke-cmd-in-makefile.patch" - "ansicon.bat") -sha256sums=('SKIP' - '89d247f6fc888e66bd1b1982bf565b4b08bbff476063a380e6553a3d5ff7fad2' - '715175d22838e71a15c24a90a6ca21ba5131aa98a7c437e6c62a7c83c4227486') - -pkgver() { - cd ${srcdir}/${_realname} - printf "%s.r%s.%s" "$(grep PVERSA version.h | sed -r 's/.*"(.+)".*/\1/')" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" -} - -prepare() { - cd "${srcdir}/${_realname}" - patch -p1 -i "${srcdir}/0001-Do-not-invoke-cmd-in-makefile.patch" -} - -build() { - local _bit - case ${CARCH} in - x86_64) _bit=64 ;; - i686) _bit=32 ;; - esac - - cd "${srcdir}/${_realname}" - ARCH=${_bit} make -f makefile.gcc -} - -package() { - local _arch _bit - case ${CARCH} in - x86_64) _arch=64; _bit=64 ;; - i686) _arch=86; _bit=32 ;; - esac - - cd "${srcdir}/${_realname}" - - mkdir -p "${pkgdir}${MINGW_PREFIX}/bin" - cp "${srcdir}/ansicon.bat" "${pkgdir}${MINGW_PREFIX}/bin" - cp "x${_arch}/ansicon.exe" "${pkgdir}${MINGW_PREFIX}/bin/ansicon_x${_arch}.exe" - cp "x${_arch}/ansi${_bit}.dll" "${pkgdir}${MINGW_PREFIX}/bin/ansi${_bit}.dll" - - mkdir -p "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}" - cp readme.* sequences.txt G1.* "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}" - - mkdir -p "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}" - cp LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}" -} diff --git a/mingw-w64-ansicon-git/ansicon.bat b/mingw-w64-ansicon-git/ansicon.bat deleted file mode 100644 index b46c40d2cd..0000000000 --- a/mingw-w64-ansicon-git/ansicon.bat +++ /dev/null @@ -1,56 +0,0 @@ -:: -:: Copyright (c) 2012 Martin Ridgers -:: -:: -:: Permission is hereby granted, free of charge, to any person obtaining a copy -:: of this software and associated documentation files (the "Software"), to deal -:: in the Software without restriction, including without limitation the rights -:: to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -:: copies of the Software, and to permit persons to whom the Software is -:: furnished to do so, subject to the following conditions: -:: -:: The above copyright notice and this permission notice shall be included in -:: all copies or substantial portions of the Software. -:: -:: THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -:: IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -:: FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -:: AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -:: LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -:: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -:: SOFTWARE. -:: - -@echo off - -:: Pass through to appropriate loader. -:: -if /i "%PROCESSOR_ARCHITECTURE%"=="x86" ( - call :loader_x86 %* -) else if /i "%PROCESSOR_ARCHITECTURE%"=="amd64" ( - call :loader_x64 %* -) - -:end -goto :eof - -:: Helper functions to avoid cmd.exe's issues with brackets. -:loader_x86 -if exist "%~dp0../../mingw32/bin/%~n0_x86.exe" ( - "%~dp0../../mingw32/bin/%~n0_x86.exe" %* - exit /b 0 -) else ( - echo Cannot find "%~dp0../../mingw32/bin/%~n0_x86.exe" >&2 - exit /b 1 -) - -:loader_x64 -if exist "%~dp0../../mingw64/bin/%~n0_x64.exe" ( - "%~dp0../../mingw64/bin/%~n0_x64.exe" %* - exit /b 0 -) else ( - echo Cannot find "%~dp0../../mingw64/bin/%~n0_x64.exe" >&2 - exit /b 1 -) - -exit /b 0