From 6d8995627fc244ba1e557d81f830fcf8b44ec5df Mon Sep 17 00:00:00 2001 From: schmonz Date: Mon, 11 Jul 2016 18:26:52 +0000 Subject: [PATCH] Update to 2.05.1. From the changelog: - Fix incorrectly reporting files containing disabled formatting as being formatted. - Fix incorrect handling of quoted arguments in the options file (#321). - Fix error in identifying an enum return type as an enumeration (#322, 323). - Fix error in identifying an enum argument as an enumeration (#327). - Fix recognition of Qt keywords when used as variables in C++ (#329). - Fix recognition of a pointer in a C++ cast (#316). - Fix removing trailing whitespace after a changed pointer or reference cast. - Add new bracket style option "style=vtk" (#155). - Add new option "indent-preproc-block" to indent blocks of preprocessor directives (#21, #114, #229, #242, #294). - Add new option, "dry-run", to run AStyle without updating the files (#184, #285). - Add new options, "html" (-!") and "html=###", to display the HTML help documentation in the default browser. - Add tags "*INDENT-OFF*" and "*INDENT_ON*" to disable formatting of source code blocks (#2, #47, #55, #78, #110, #176). - Add tag *NOPAD* to disable selected formatting on a single line. - Add '__attribute__ ((visibility ("default")))' to Linux exported functions. - Remove option "style=ansi" and make it depreciated (#146). - Remove fix for broken 'case' statements from release 2.02.1, Nov 21, 2011. - Improve Korean translation (#256). - Change shared libraries to include the version number as part of the file name (#264) - Change "help" display to stdout to allow piping and redirection (#63). - Change "version" display to stdout. - Change headers to include foreach, forever, Q_FOREACH, and Q_FOREVER (#98, #154). - Change compiler definition ASTYLE_NO_VCX (no Visual Studio exports) to ASTYLE_NO_EXPORTS. - Change shared library error handler argument from "char*" to "const char*". - Fix not recognizing noexcept, interrupt, and autoreleasepool as pre-command headers (#225, #259). - Fix formatting of C++11 uniform initializer brackets (#253, #257, #260, #284). - Fix to not automatically space pad C++11 uniform initializer brackets (#275). - Fix formatting of enums with leading commas (#159, #179, #270). - Fix formatting of logical && operator in class initializers (#290). - Fix flagging a 'const' variable as a 'const' method (#275). - Fix piping and redirection adding an extra character to the output (#245, #252, #305). - Fix "indent-modifiers" to attach class access modifiers to Horstmann style brackets. - Fix ASFormatter to correctly recognize the end of a C++ raw string literal (#261). - Fix to recognize C++11 "enum class" as an enum (#303). - Fix indent of C++11 "noexecpt" statements within a class (#260, #304). - Fix not resetting templateDepth when a template was not found (#295). - Fix formatting of multiplication in a block paren (#144). - Fix whitespace padding when formatting an rvalue references (#297). - Fix to recognize an rvalue reference without a name (#265). - Fix to not identify an operator overload method as a calculation (#296). - Fix concatenating multiplication with a pointer dereference (#291). - Fix recognition of a pointer dereference following a question mark (#213). - Fix extra space after a trailing reference type (#300). - Fix _asm blocks not being identified as a block opener and the variable not cleared on exit (#163). - Fix indentation of line comments before a "class" opening bracket. - Fix indentation of line comments before a "namespace" opening bracket. - Fix isBracketType() method to correctly process a NULL_TYPE. - Fix unpad-paren to recognize additional variables (#43, #132, #143). - Fix indentation of C# "let" statements. - Fix a few omissions with "fill-empty-lines". - Fix file read to read 64K blocks of data. - Refactor to un-obfuscate (clarify) the code, and improve design and decomposition:: - Extract class Utf8_16 from ASConsole. - Replace Linux dependency on iconv with a Utf8_16 class for ASLibrary. - Move global "using" statements to the astyle namespace in astyle.h and ASLocalizer.h. - Move shared library declarations from astyle.h to astyle_main.h. - Move indentable macros from ASEnhancer to ASResource and create static pairs. - Simplify ASBeautifier procedure to identify the colon (:) type. - Major refactoring in ASBeautifier to create separate variables for an enum, a class statement and a class initializer. - This was needed to fix the processing of C++11 uniform initializers in a class initializer. - Minor changes to ASFormatter and ASBeautifier based on results of the Clang analyzer. - Change several methods in astyle_main to "const". --- devel/astyle/Makefile | 4 +-- devel/astyle/PLIST | 7 +---- devel/astyle/distinfo | 11 +++---- .../astyle/patches/patch-src_astyle__main.cpp | 31 ------------------- 4 files changed, 8 insertions(+), 45 deletions(-) delete mode 100644 devel/astyle/patches/patch-src_astyle__main.cpp diff --git a/devel/astyle/Makefile b/devel/astyle/Makefile index fa5498dd677be..63d7bc428abb1 100644 --- a/devel/astyle/Makefile +++ b/devel/astyle/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2015/03/13 17:08:14 tnn Exp $ +# $NetBSD: Makefile,v 1.18 2016/07/11 18:26:52 schmonz Exp $ -DISTNAME= astyle_2.04_linux +DISTNAME= astyle_2.05.1_linux PKGNAME= ${DISTNAME:S/_linux//:S/_/-/} CATEGORIES= textproc devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=astyle/} diff --git a/devel/astyle/PLIST b/devel/astyle/PLIST index 5e0b989769848..13e99c2e6cf6a 100644 --- a/devel/astyle/PLIST +++ b/devel/astyle/PLIST @@ -1,13 +1,8 @@ -@comment $NetBSD: PLIST,v 1.3 2014/08/13 20:56:25 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2016/07/11 18:26:52 schmonz Exp $ bin/astyle share/doc/html/astyle/astyle.html -share/doc/html/astyle/index.html share/doc/html/astyle/install.html share/doc/html/astyle/license.html -share/doc/html/astyle/links.html share/doc/html/astyle/news.html share/doc/html/astyle/notes.html -share/doc/html/astyle/scripts.html share/doc/html/astyle/styles.css -share/doc/html/astyle/subversion.html -share/doc/html/astyle/vsinstall.html diff --git a/devel/astyle/distinfo b/devel/astyle/distinfo index ba3c3275f2638..9be97cea3f588 100644 --- a/devel/astyle/distinfo +++ b/devel/astyle/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.14 2015/11/03 03:27:14 agc Exp $ +$NetBSD: distinfo,v 1.15 2016/07/11 18:26:52 schmonz Exp $ -SHA1 (astyle_2.04_linux.tar.gz) = 8d7701afa3ecb7fb24d3647d8b278dcf17f3ae3e -RMD160 (astyle_2.04_linux.tar.gz) = 94d237759e5d2e4d45db5614ee091996f1a995f2 -SHA512 (astyle_2.04_linux.tar.gz) = bc0f6351fac4198ab969251342c4e453064b07512a2d06825a93c75daf86b06469c9971f35fbadad872d23368dc546019d8d174e07ceaad6e10007f562fdeffd -Size (astyle_2.04_linux.tar.gz) = 156974 bytes -SHA1 (patch-src_astyle__main.cpp) = be94921cda22bd0c2037625e0b127b93bbd8a598 +SHA1 (astyle_2.05.1_linux.tar.gz) = b2ccedbb49f7f892afd6a9a59a67b57c36c41df3 +RMD160 (astyle_2.05.1_linux.tar.gz) = fc3bc88bc18a6d7177f3e645fda7cc79c497a968 +SHA512 (astyle_2.05.1_linux.tar.gz) = 853bf84cb196f2300ca00fb7f18fe336764f1205ae0674a75c1a019bf734495d8fb3d9b6aca0ea258b6632921fb268906128c1afb80596532489749cd2cbe495 +Size (astyle_2.05.1_linux.tar.gz) = 152765 bytes diff --git a/devel/astyle/patches/patch-src_astyle__main.cpp b/devel/astyle/patches/patch-src_astyle__main.cpp deleted file mode 100644 index ed967876da111..0000000000000 --- a/devel/astyle/patches/patch-src_astyle__main.cpp +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-src_astyle__main.cpp,v 1.2 2014/08/13 21:11:07 wiz Exp $ - -Fix build on NetBSD. -https://sourceforge.net/p/astyle/bugs/299/ - ---- src/astyle_main.cpp.orig 2013-11-01 20:31:48.000000000 +0000 -+++ src/astyle_main.cpp -@@ -2671,7 +2671,11 @@ utf16_t* ASLibrary::convertUtf8ToUtf16(c - size_t inLeft = strlen(utf8In) + 1; // converts the ending NULL - char* utf16Conv = reinterpret_cast(utf16Out); - size_t outLeft = utf16Len; -+#ifdef __NetBSD__ -+ size_t iconvval = iconv(iconvh, (const char **)&utf8Conv, &inLeft, &utf16Conv, &outLeft); -+#else - size_t iconvval = iconv(iconvh, &utf8Conv, &inLeft, &utf16Conv, &outLeft); -+#endif - /////////////////////////////////////////////////////// - bool showStats = false; - if (showStats && (inLeft != 0 || outLeft != 0)) -@@ -2713,7 +2717,11 @@ char* ASLibrary::convertUtf16ToUtf8(cons - size_t inLeft = (utf16len(utf16In) + 1) * sizeof(utf16_t); // converts the ending NULL - char* utf8Conv = utf8Out; - size_t outLeft = utf8Len; -+#ifdef __NetBSD__ -+ size_t iconvval = iconv(iconvh, (const char **)&utf16Conv, &inLeft, &utf8Conv, &outLeft); -+#else - size_t iconvval = iconv(iconvh, &utf16Conv, &inLeft, &utf8Conv, &outLeft); -+#endif - /////////////////////////////////////////////////////// - bool showStats = false; - if (showStats && (inLeft != 0 || outLeft != 0))