uncrustify: update to 0.77.1

This commit is contained in:
Mehdi Chinoune
2023-05-11 18:09:55 +00:00
committed by مهدي شينون (Mehdi Chinoune)
parent 0ce54d2bc9
commit 2f2ea52ff0
2 changed files with 42 additions and 8 deletions

View File

@@ -0,0 +1,31 @@
--- a/src/indent.cpp
+++ b/src/indent.cpp
@@ -16,6 +16,7 @@
#include "prototypes.h"
#include "quick_align_again.h"
#include "space.h"
+#include <cstdint>
#ifdef WIN32
#include <algorithm> // to get max
--- a/src/unc_text.cpp
+++ b/src/unc_text.cpp
@@ -12,6 +12,7 @@
#include "unicode.h" // encode_utf8()
#include <algorithm>
+#include <cstdint>
#include <stdexcept>
--- a/src/unc_tools.cpp
+++ b/src/unc_tools.cpp
@@ -516,7 +516,7 @@ void dump_keyword_for_lang(size_t language_count, chunk_tag_t *keyword_for_lang)
LOG_FMT(LDYNKW, "%s: %3zu: %18s, %14s, %12ld, %16s, %s\n",
__func__, ii,
keyword_for_lang[ii].tag, get_token_name(keyword_for_lang[ii].type),
- keyword_for_lang[ii].lang_flags,
+ (long)keyword_for_lang[ii].lang_flags,
g_a.data(),
language_name_from_flags(keyword_for_lang[ii].lang_flags));
}

View File

@@ -3,7 +3,7 @@
_realname=uncrustify
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=0.76.0
pkgver=0.77.1
pkgrel=1
pkgdesc="Source Code Beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA (mingw-w64)"
arch=(any)
@@ -11,20 +11,22 @@ mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
url="https://uncrustify.sourceforge.io/"
license=('spdx:GPL-2.0-or-later')
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-ninja"
"${MINGW_PACKAGE_PREFIX}-python"
"${MINGW_PACKAGE_PREFIX}-cc")
source=("https://github.com/uncrustify/uncrustify/archive/${_realname}-${pkgver}.tar.gz")
sha512sums=('2d0f4dcca091890d3c384b2253b87dd51dba264b289890cc0dd39eff307d9f4069638be0493a8814d3e03a58c10dd1dc40bee5afd342ce28cccbc45bb61e9ed9')
"${MINGW_PACKAGE_PREFIX}-python")
source=("https://github.com/uncrustify/uncrustify/archive/${_realname}-${pkgver}.tar.gz"
001-fix-building-with-gcc-13.patch)
sha256sums=('414bbc9f7860eb18a53074f9af14ed04638a633b2216a73f2629291300d37c1b'
'ab2b3fa5debcbde9f7c44550910b78465fda819d27fca7028aa024e4be52d1ea')
prepare() {
cd "${srcdir}/${_realname}-${_realname}-${pkgver}"
# https://github.com/uncrustify/uncrustify/pull/4014
patch -p1 -i "${srcdir}"/001-fix-building-with-gcc-13.patch
}
build() {
[[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
declare -a _extra_config
@@ -39,6 +41,7 @@ build() {
-G "Ninja" \
"${_extra_config[@]}" \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-DPython3_EXECUTABLE=${MINGW_PREFIX}/bin/python \
"../${_realname}-${_realname}-${pkgver}"
${MINGW_PREFIX}/bin/cmake.exe --build ./