Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package astyle for openSUSE:Factory checked in at 2023-05-24 20:23:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/astyle (Old) and /work/SRC/openSUSE:Factory/.astyle.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "astyle" Wed May 24 20:23:13 2023 rev:15 rq:1088831 version:3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/astyle/astyle.changes 2019-11-06 13:53:18.907974908 +0100 +++ /work/SRC/openSUSE:Factory/.astyle.new.1533/astyle.changes 2023-05-24 20:23:29.308582387 +0200 @@ -1,0 +2,24 @@ +Wed May 24 09:24:33 UTC 2023 - Antoine Belvire <antoine.belv...@opensuse.org> + +- Update to 3.3: + * The source code has been refactored to no longer use the std namespace + globally. + * Some features of "modern C++" are now supported, ie. lambda function + arguments and array initializers with braces. + * Two new options to remove superfluous whitespace and empty lines were + added: "squeeze-ws" and "squeeze-lines=#" (parameter value is the number of + empty lines to keep). + * Two new options to add or remove whitespace around square brackets were + added: "pad-brackets" and "unpad-brackets". +- Changes of 3.2: + * Use C++11 feature. + * New option "style=webkit": Similar to the Stroustrup brace style except the + 'else' keyword is attached to the previous closing bracket. + * Various bugs fixes, especially causing reformatting the code in repeated + runs. + * Deprecated options have been removed. +- Install man page. +- Add astyle-3.3-std.patch: Fix build. +- Refresh spec file. + +------------------------------------------------------------------- Old: ---- astyle_3.1_linux.tar.gz New: ---- astyle-3.3-std.patch astyle-3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ astyle.spec ++++++ --- /var/tmp/diff_new_pack.1hp2kb/_old 2023-05-24 20:23:29.812585393 +0200 +++ /var/tmp/diff_new_pack.1hp2kb/_new 2023-05-24 20:23:29.816585417 +0200 @@ -1,7 +1,7 @@ # # spec file for package astyle # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,17 @@ Name: astyle -Version: 3.1 +Version: 3.3 Release: 0 Summary: Source Code Indenter, Formatter, and Beautifier for C, C++, C# and Java License: MIT -Url: http://astyle.sourceforge.net/ -Source: http://downloads.sourceforge.net/project/%{name}/%{name}/%{name}%20%{version}/%{name}_%{version}_linux.tar.gz +URL: https://astyle.sourceforge.net/ +Source: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +BuildRequires: dos2unix BuildRequires: gcc-c++ BuildRequires: java-devel +# PATCH-FIX-UPSTREAM astyle-3.3-std.patch -- Fix build (gl#saalen/astyle!2) +Patch: astyle-3.3-std.patch %description Artistic Style is a source code indenter, formatter, and beautifier for the C, @@ -39,31 +42,28 @@ This package contains Java bindings for %{name}. %prep -%setup -q -n %{name} +%autosetup -p2 +dos2unix -v README.md doc/styles.css %build -if [ \! -x $JAVA_HOME/bin/javac ] && echo $JAVA_HOME | grep jre ; then - echo WTF IS SETTING \$JAVA_HOME TO JRE \!? - JAVA_HOME=$(echo $JAVA_HOME | sed -e s/jre/java/g) -fi -export CFLAGS="%{optflags} -I $JAVA_HOME/include/linux" -export CXXFLAGS="%{optflags}" -make -C build/gcc astyled %{?_smp_mflags} -# javaall = java + javadebug -make -C build/gcc java %{?_smp_mflags} +%set_build_flags +%make_build -C build/gcc astyled +%make_build -C build/gcc java %install -install -Dpm 0755 build/gcc/bin/%{name}d \ - %{buildroot}%{_bindir}/%{name} +install -Dpm 0755 build/gcc/bin/%{name}d %{buildroot}%{_bindir}/%{name} chmod -x doc/* *.md install -d -m 0755 %{buildroot}%{_libdir} -install -m 0644 build/gcc/bin/libastylej.so.* %{buildroot}%{_libdir} -(cd %{buildroot}%{_libdir}; ln -s libastylej.so.* libastylej.so) +cp --preserve=links build/gcc/bin/libastylej.so.* %{buildroot}%{_libdir} +install -D -m 0644 man/%{name}.1 -t %{buildroot}%{_mandir}/man1/ + +%ldconfig_scriptlets -n lib%{name}j3 %files -%defattr(-,root,root) -%doc LICENSE.md README.md doc/ +%license LICENSE.md +%doc README.md doc/ %{_bindir}/%{name} +%{_mandir}/man1/%{name}.1%{?ext_man} %files -n lib%{name}j3 %{_libdir}/*.so* ++++++ astyle-3.3-std.patch ++++++ >From c03fe1133f1270d0ad47f0daf20836e6d53ce36d Mon Sep 17 00:00:00 2001 From: Antoine Belvire <antoine.belv...@opensuse.org> Date: Wed, 24 May 2023 10:38:10 +0000 Subject: [PATCH] Add missing std namespace Fixes build on Linux. --- AStyle/src/astyle_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AStyle/src/astyle_main.cpp b/AStyle/src/astyle_main.cpp index d5c40bf..ae9243a 100644 --- a/AStyle/src/astyle_main.cpp +++ b/AStyle/src/astyle_main.cpp @@ -1504,7 +1504,7 @@ std::string ASConsole::getNumberFormat(int num, size_t /*lcid*/) const // The C locale should be set but not the C++. // This function is not necessary if the C++ locale is set. // The locale().name() return value is not portable to all compilers. - assert(locale().name() == "C"); + assert(std::locale().name() == "C"); #endif // get the locale info -- GitLab
