cmake: remove obsolete cm_codecvt.patch (#2798)

was fixed for 3.9.0 and disabled since then anyway
https://gitlab.kitware.com/cmake/cmake/issues/16893
This commit is contained in:
Norbert Pfeiler
2017-09-03 20:39:21 +02:00
committed by Алексей
parent dc93711c91
commit 39b025ee56
2 changed files with 3 additions and 17 deletions

View File

@@ -5,7 +5,7 @@ _realname=cmake
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.9.1
pkgrel=1
pkgrel=2
pkgdesc="A cross-platform open-source make system (mingw-w64)"
arch=('any')
url="https://www.cmake.org/"
@@ -30,8 +30,7 @@ source=("https://www.cmake.org/files/v${pkgver%.*}/${_realname}-${pkgver}.tar.gz
"0005-Do-not-install-Qt-bundle-in-cmake-gui.patch"
"0006-pkg-config-Add-dont-define-prefix-when-PKG_CONFIG_WI.patch"
"0007-Do-not-generate-import-libs-for-exes.patch"
"0008-Output-line-numbers-in-callstacks.patch"
"cm_codecvt.patch")
"0008-Output-line-numbers-in-callstacks.patch")
sha256sums=('d768ee83d217f91bb597b3ca2ac663da7a8603c97e1f1a5184bc01e0ad2b12bb'
'0d8557d7964a624d00c64ce390a4440d6d82119b45c1cd24ddeae3ee028dcf87'
'6845069dc9428e09d837b0f260ec3dd477533f8b19812b6d44eb29e8f4561c29'
@@ -39,8 +38,7 @@ sha256sums=('d768ee83d217f91bb597b3ca2ac663da7a8603c97e1f1a5184bc01e0ad2b12bb'
'f8886078cb61e2b3d2cb6d7fe9325290206e006d7a1f1423425078bd35b0023f'
'c230783cdd1a32ddd3d0d938c63d70a24e23bc6947f90f22770d85be5af54c6a'
'a3541d1272805fa11de0bb7cb19b37f55f2e0664410247c5cfab4ee93d2637a5'
'9dc604b25b97ff612723c8955b27ab015d22af3e762851a01a934a656c8b80c5'
'2d3e54836f93f0391fe805dfc9a895477ed7a304b9148bc8baf49062f117958d')
'9dc604b25b97ff612723c8955b27ab015d22af3e762851a01a934a656c8b80c5')
# Helper macros to help make tasks easier #
@@ -73,7 +71,6 @@ prepare() {
0006-pkg-config-Add-dont-define-prefix-when-PKG_CONFIG_WI.patch \
0007-Do-not-generate-import-libs-for-exes.patch \
0008-Output-line-numbers-in-callstacks.patch
# cm_codecvt.patch
}
build() {

View File

@@ -1,11 +0,0 @@
--- a/Source/cm_codecvt.cxx 2017-05-02 12:59:43.000000000 +0000
+++ b/Source/cm_codecvt.cxx 2017-05-17 00:09:09.492859300 +0000
@@ -58,7 +58,7 @@
unsigned int& stateId = reinterpret_cast<unsigned int&>(state);
if (count == 0) {
return codecvt::ok;
- } else if (count == 1) {
+ } else if (count >= 1) {
if (stateId == 0) {
// decode first byte for UTF-8
if ((*from & 0xF8) == 0xF0 || // 1111 0xxx; 4 bytes for codepoint