Date: Tue, 23 Nov 2021 13:42:20 GMT From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1bf0377bfc92 - main - textproc/uncrustify: remove outdated patches Message-ID: <202111231342.1ANDgKcj072039@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=1bf0377bfc92d89097a976deb12a9a9e51d2ad51 commit 1bf0377bfc92d89097a976deb12a9a9e51d2ad51 Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2021-11-23 13:41:14 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2021-11-23 13:41:17 +0000 textproc/uncrustify: remove outdated patches Fixup for 96e88b5 --- textproc/uncrustify/files/patch-src_backup.cpp | 13 ------------- textproc/uncrustify/files/patch-src_keywords.cpp | 10 ---------- textproc/uncrustify/files/patch-src_output.cpp | 16 ---------------- textproc/uncrustify/files/patch-src_tokenize.cpp | 14 -------------- textproc/uncrustify/files/patch-src_uncrustify.cpp | 10 ---------- 5 files changed, 63 deletions(-) diff --git a/textproc/uncrustify/files/patch-src_backup.cpp b/textproc/uncrustify/files/patch-src_backup.cpp deleted file mode 100644 index 3559973d0d7b..000000000000 --- a/textproc/uncrustify/files/patch-src_backup.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/backup.cpp.orig 2021-05-13 14:53:40 UTC -+++ src/backup.cpp -@@ -29,9 +29,7 @@ - #include "md5.h" - #include "unc_ctype.h" - --#ifdef __APPLE__ --#include <cerrno> // is needed under OSX --#endif -+#include <cerrno> - - using namespace std; - diff --git a/textproc/uncrustify/files/patch-src_keywords.cpp b/textproc/uncrustify/files/patch-src_keywords.cpp deleted file mode 100644 index d0923a5ac44d..000000000000 --- a/textproc/uncrustify/files/patch-src_keywords.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/keywords.cpp.orig 2021-05-13 14:53:40 UTC -+++ src/keywords.cpp -@@ -13,6 +13,7 @@ - #include "args.h" - #include "prototypes.h" - -+#include <cerrno> - #include <map> - - diff --git a/textproc/uncrustify/files/patch-src_output.cpp b/textproc/uncrustify/files/patch-src_output.cpp deleted file mode 100644 index 85c70a21a9bf..000000000000 --- a/textproc/uncrustify/files/patch-src_output.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- src/output.cpp.orig 2021-05-13 14:53:40 UTC -+++ src/output.cpp -@@ -17,12 +17,9 @@ - #include "unc_ctype.h" - #include "unicode.h" - -+#include <map> - #include <regex> - #include <set> -- --#ifdef WIN32 --#include <map> // to get std::map --#endif // WIN32 - - - constexpr static auto LCURRENT = LOUTPUT; diff --git a/textproc/uncrustify/files/patch-src_tokenize.cpp b/textproc/uncrustify/files/patch-src_tokenize.cpp deleted file mode 100644 index 5355d9270c67..000000000000 --- a/textproc/uncrustify/files/patch-src_tokenize.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- src/tokenize.cpp.orig 2021-05-13 14:53:40 UTC -+++ src/tokenize.cpp -@@ -16,10 +16,7 @@ - #include "unc_ctype.h" - - #include <regex> -- --#ifdef WIN32 --#include <stack> // to get std::stack --#endif // WIN32 -+#include <stack> - - - #define LE_COUNT(x) cpd.le_counts[static_cast<size_t>(LE_ ## x)] diff --git a/textproc/uncrustify/files/patch-src_uncrustify.cpp b/textproc/uncrustify/files/patch-src_uncrustify.cpp deleted file mode 100644 index 0e042ba8fee5..000000000000 --- a/textproc/uncrustify/files/patch-src_uncrustify.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/uncrustify.cpp.orig 2021-05-13 14:53:40 UTC -+++ src/uncrustify.cpp -@@ -43,6 +43,7 @@ - #include "universalindentgui.h" - #include "width.h" - -+#include <cerrno> - #include <fcntl.h> - #include <map> - #ifdef HAVE_UNISTD_H
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111231342.1ANDgKcj072039>