Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nuspell for openSUSE:Factory checked
in at 2023-09-17 19:28:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nuspell (Old)
and /work/SRC/openSUSE:Factory/.nuspell.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nuspell"
Sun Sep 17 19:28:43 2023 rev:8 rq:1111325 version:5.1.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/nuspell/nuspell.changes 2022-12-07
17:35:28.940709092 +0100
+++ /work/SRC/openSUSE:Factory/.nuspell.new.1766/nuspell.changes
2023-09-17 19:28:51.940655908 +0200
@@ -1,0 +2,7 @@
+Thu Sep 7 20:47:07 UTC 2023 - Atri Bhattacharya <badshah...@gmail.com>
+
+- Update to version 5.1.3:
+ * The documentation generated by Doxygen no longer shows the
+ inline namespace used for versioning of the ABI.
+
+-------------------------------------------------------------------
Old:
----
nuspell-5.1.2.tar.gz
New:
----
nuspell-5.1.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nuspell.spec ++++++
--- /var/tmp/diff_new_pack.CHs7GS/_old 2023-09-17 19:28:53.732719778 +0200
+++ /var/tmp/diff_new_pack.CHs7GS/_new 2023-09-17 19:28:53.744720206 +0200
@@ -1,7 +1,7 @@
#
# spec file for package nuspell
#
-# Copyright (c) 2022 SUSE LLC
+# 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
@@ -23,7 +23,7 @@
%define gcc_ver 10
%endif
Name: nuspell
-Version: 5.1.2
+Version: 5.1.3
Release: 0
Summary: A spell checker library and command-line tool
License: LGPL-3.0-or-later
++++++ nuspell-5.1.2.tar.gz -> nuspell-5.1.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/.github/workflows/cmake.yml
new/nuspell-5.1.3/.github/workflows/cmake.yml
--- old/nuspell-5.1.2/.github/workflows/cmake.yml 2022-09-29
13:57:55.000000000 +0200
+++ new/nuspell-5.1.3/.github/workflows/cmake.yml 2023-08-27
18:09:53.000000000 +0200
@@ -22,7 +22,9 @@
CXXFLAGS: ${{ matrix.cxxflags }}
steps:
- uses: actions/checkout@v3
- with: { submodules: true }
+
+ - name: Install dependencies
+ run: sudo apt-get update && sudo apt-get install catch2
- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only
required if you are using a single-configuration generator such as make.
@@ -44,25 +46,20 @@
steps:
- uses: actions/checkout@v3
- with: { submodules: true }
- name: Bring runner env vars to workflows
shell: bash
run: |
echo "local_app_data=$LOCALAPPDATA" >> $GITHUB_ENV
echo "vcpkg_root=$VCPKG_INSTALLATION_ROOT" >> $GITHUB_ENV
- vcpkg search icu | awk '$1=="icu"{ print "icu_ver="$2 }' >> $GITHUB_ENV
- uses: actions/cache@v3
with:
# use backslashes in path here for Windows.
path: ${{ env.local_app_data }}\vcpkg\archives
- key: windows-vcpkg-cache-${{ env.icu_ver }}
+ key: windows-vcpkg-cache-${{ hashFiles('vcpkg.json') }}
restore-keys: windows-vcpkg-cache-
- - name: Pull Vcpkg dependencies
- run: vcpkg install icu getopt --triplet=x64-windows
-
- name: Configure CMake
run: cmake -B ${{github.workspace}}/build
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
env:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/.gitmodules
new/nuspell-5.1.3/.gitmodules
--- old/nuspell-5.1.2/.gitmodules 2022-09-29 13:57:55.000000000 +0200
+++ new/nuspell-5.1.3/.gitmodules 2023-08-27 18:09:53.000000000 +0200
@@ -1,3 +0,0 @@
-[submodule "external/Catch2"]
- path = external/Catch2
- url = https://github.com/catchorg/Catch2.git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/CHANGELOG.md
new/nuspell-5.1.3/CHANGELOG.md
--- old/nuspell-5.1.2/CHANGELOG.md 2022-09-29 13:57:55.000000000 +0200
+++ new/nuspell-5.1.3/CHANGELOG.md 2023-08-27 18:09:53.000000000 +0200
@@ -6,6 +6,21 @@
The format is based on [Keep a
Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic
Versioning](https://semver.org/spec/v2.0.0.html).
+## [5.1.3] - 2023-08-27
+### Added
+- Added Vcpkg manifest file called `vcpkg.json` for easier development and
+ testing, mainly on Windows.
+
+### Changed
+- The build-only and test-only dependency Catch2 is now pulled with
+ `FetchContent` if first it is not found with `find_package`. The Git
submodule
+ is no longer used.
+
+### Fixed
+- The documentation generated by Doxygen no longer shows the inline namespace
+ used for versioning of the ABI. It was not of interest to users of the
+ library.
+
## [5.1.2] - 2022-09-29
### Changed
- Rewrite internal testing tool verify and improve it to support testing
@@ -252,7 +267,8 @@
- Spelling error detection (checking) is closely matching Hunspell
- Support for spelling error correction (suggestions)
-[Unreleased]: https://github.com/nuspell/nuspell/compare/v5.1.2...HEAD
+[Unreleased]: https://github.com/nuspell/nuspell/compare/v5.1.3...HEAD
+[5.1.3]: https://github.com/nuspell/nuspell/compare/v5.1.2...v5.1.3
[5.1.2]: https://github.com/nuspell/nuspell/compare/v5.1.1...v5.1.2
[5.1.1]: https://github.com/nuspell/nuspell/compare/v5.1.0...v5.1.1
[5.1.0]: https://github.com/nuspell/nuspell/compare/v5.0.1...v5.1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/CMakeLists.txt
new/nuspell-5.1.3/CMakeLists.txt
--- old/nuspell-5.1.2/CMakeLists.txt 2022-09-29 13:57:55.000000000 +0200
+++ new/nuspell-5.1.3/CMakeLists.txt 2023-08-27 18:09:53.000000000 +0200
@@ -1,6 +1,9 @@
-cmake_minimum_required(VERSION 3.8)
-project(nuspell VERSION 5.1.2)
-set(PROJECT_HOMEPAGE_URL "https://nuspell.github.io/";)
+cmake_minimum_required(VERSION 3.12)
+project(nuspell
+ VERSION 5.1.3
+ DESCRIPTION "Nuspell spellchecking library"
+ HOMEPAGE_URL https://nuspell.github.io/
+ LANGUAGES CXX)
option(BUILD_SHARED_LIBS "Build as shared library" ON)
option(BUILD_TESTING "Build the testing tree." ON)
@@ -31,48 +34,31 @@
return()
endif()
-function(find_catch2_from_source)
- set(Catch2_FOUND Catch2-NOTFOUND PARENT_SCOPE)
- set(catch_cmake_lists
- ${PROJECT_SOURCE_DIR}/external/Catch2/CMakeLists.txt)
- if (NOT EXISTS ${catch_cmake_lists})
- find_package(Git)
- if (NOT Git_FOUND)
- return()
- endif()
- execute_process(
- COMMAND ${GIT_EXECUTABLE} submodule update --init Catch2
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/external
- RESULT_VARIABLE git_submodule_error
- ERROR_QUIET)
- if (git_submodule_error OR NOT EXISTS ${catch_cmake_lists})
- return()
- endif()
+macro(fetch_catch2)
+ include(FetchContent)
+ FetchContent_Declare(Catch2
+ GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+ GIT_TAG 62fd660583d3ae7a7886930b413c3c570e89786c #v2.13.9
+ )
+ FetchContent_GetProperties(Catch2)
+ if(NOT catch2_POPULATED)
+ FetchContent_Populate(Catch2)
+ add_subdirectory(${catch2_SOURCE_DIR} ${catch2_BINARY_DIR})
+ list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/contrib)
endif()
- add_subdirectory(external/Catch2)
- list(APPEND CMAKE_MODULE_PATH
- ${PROJECT_SOURCE_DIR}/external/Catch2/contrib)
- set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" PARENT_SCOPE)
- set(Catch2_FOUND 1 PARENT_SCOPE)
-endfunction()
+endmacro()
if (BUILD_TESTING)
enable_testing()
find_package(Catch2 2.3.0 QUIET)
if (NOT Catch2_FOUND)
- find_catch2_from_source()
- endif()
- if (Catch2_FOUND)
- add_subdirectory(external/hunspell/hunspell)
- add_subdirectory(tests)
- else()
- message(WARNING "Can not find Catch2, tests will be disabled")
+ fetch_catch2()
endif()
+ add_subdirectory(external/hunspell/hunspell)
+ add_subdirectory(tests)
endif()
-#set(pkgconf_public_libs "")
-set(pkgconf_public_requires icu-uc)
configure_file(nuspell.pc.in nuspell.pc @ONLY)
#configure_file(NuspellConfig.cmake NuspellConfig.cmake COPYONLY)
write_basic_package_version_file(NuspellConfigVersion.cmake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/README.md new/nuspell-5.1.3/README.md
--- old/nuspell-5.1.2/README.md 2022-09-29 13:57:55.000000000 +0200
+++ new/nuspell-5.1.3/README.md 2023-08-27 18:09:53.000000000 +0200
@@ -26,9 +26,10 @@
Build-only dependencies:
- C++ 17 compiler with support for `std::filesystem`, e.g. GCC >= v9
- - CMake >= v3.8
+ - CMake >= v3.12
- Catch2 >= v2.3.0 (It is only needed when building the tests. If it is not
- available as a system package, the the Git submodule will be used.)
+ available as a system package, the CMake will download it using
+ `FetchContent`.)
- Getopt (It is needed only on Windows + MSVC and only when the CLI tool or
the tests are built. It is available in vcpkg. Other platforms provide
it out of the box.)
@@ -102,9 +103,9 @@
1. Install Visual Studio 2017 or newer. Alternatively, you can use
Visual Studio Build Tools.
2. Install Git for Windows and Cmake.
-3. Install vcpkg in some folder, e.g. in `c:\vcpkg`.
-4. Run `vcpkg install icu getopt --triplet=x64-windows`.
-5. Run the commands bellow.
+3. Install Vcpkg in some folder, e.g. in `c:\vcpkg`.
+4. Run the commands bellow. Vcpkg will work in manifest mode and it will
+ automatically install the dependencies.
<!-- end list -->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/nuspell.pc.in
new/nuspell-5.1.3/nuspell.pc.in
--- old/nuspell-5.1.2/nuspell.pc.in 2022-09-29 13:57:55.000000000 +0200
+++ new/nuspell-5.1.3/nuspell.pc.in 2023-08-27 18:09:53.000000000 +0200
@@ -4,9 +4,9 @@
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
Name: @PROJECT_NAME@
-Description: Nuspell spellchecking library
+Description: @PROJECT_DESCRIPTION@
URL: @PROJECT_HOMEPAGE_URL@
Version: @PROJECT_VERSION@
-Libs: -L${libdir} -lnuspell @pkgconf_public_libs@
-Requires: @pkgconf_public_requires@
+Libs: -L${libdir} -lnuspell
+Requires: icu-uc
Cflags: -I${includedir}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/src/nuspell/CMakeLists.txt
new/nuspell-5.1.3/src/nuspell/CMakeLists.txt
--- old/nuspell-5.1.2/src/nuspell/CMakeLists.txt 2022-09-29
13:57:55.000000000 +0200
+++ new/nuspell-5.1.3/src/nuspell/CMakeLists.txt 2023-08-27
18:09:53.000000000 +0200
@@ -1,4 +1,5 @@
add_library(nuspell
+ defines.hxx
aff_data.cxx aff_data.hxx
checker.cxx checker.hxx
suggester.cxx suggester.hxx
@@ -14,7 +15,7 @@
generate_export_header(nuspell)
set(nuspell_headers aff_data.hxx checker.hxx suggester.hxx dictionary.hxx
- finder.hxx structures.hxx unicode.hxx
+ finder.hxx structures.hxx unicode.hxx defines.hxx
${CMAKE_CURRENT_BINARY_DIR}/nuspell_export.h)
set_target_properties(nuspell PROPERTIES
PUBLIC_HEADER "${nuspell_headers}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/src/nuspell/aff_data.cxx
new/nuspell-5.1.3/src/nuspell/aff_data.cxx
--- old/nuspell-5.1.2/src/nuspell/aff_data.cxx 2022-09-29 13:57:55.000000000
+0200
+++ new/nuspell-5.1.3/src/nuspell/aff_data.cxx 2023-08-27 18:09:53.000000000
+0200
@@ -1,4 +1,4 @@
-/* Copyright 2016-2022 Dimitrij Mijoski
+/* Copyright 2016-2023 Dimitrij Mijoski
*
* This file is part of Nuspell.
*
@@ -39,7 +39,7 @@
* verison. Look up on the Internet to see what is it for (ABI versioning
* mostly). Client code should never mention this inline namespace.
*/
-inline namespace v5 {
+NUSPELL_BEGIN_INLINE_NAMESPACE
auto Encoding::normalize_name() -> void
{
@@ -1037,5 +1037,5 @@
}
return in.eof() && success; // success if we reached eof
}
-} // namespace v5
+NUSPELL_END_INLINE_NAMESPACE
} // namespace nuspell
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/src/nuspell/aff_data.hxx
new/nuspell-5.1.3/src/nuspell/aff_data.hxx
--- old/nuspell-5.1.2/src/nuspell/aff_data.hxx 2022-09-29 13:57:55.000000000
+0200
+++ new/nuspell-5.1.3/src/nuspell/aff_data.hxx 2023-08-27 18:09:53.000000000
+0200
@@ -1,4 +1,4 @@
-/* Copyright 2016-2022 Dimitrij Mijoski
+/* Copyright 2016-2023 Dimitrij Mijoski
*
* This file is part of Nuspell.
*
@@ -26,7 +26,7 @@
#include <unicode/locid.h>
namespace nuspell {
-inline namespace v5 {
+NUSPELL_BEGIN_INLINE_NAMESPACE
class Encoding {
std::string name;
@@ -169,6 +169,6 @@
return false;
}
};
-} // namespace v5
+NUSPELL_END_INLINE_NAMESPACE
} // namespace nuspell
#endif // NUSPELL_AFF_DATA_HXX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/src/nuspell/checker.cxx
new/nuspell-5.1.3/src/nuspell/checker.cxx
--- old/nuspell-5.1.2/src/nuspell/checker.cxx 2022-09-29 13:57:55.000000000
+0200
+++ new/nuspell-5.1.3/src/nuspell/checker.cxx 2023-08-27 18:09:53.000000000
+0200
@@ -1,4 +1,4 @@
-/* Copyright 2016-2022 Dimitrij Mijoski
+/* Copyright 2016-2023 Dimitrij Mijoski
*
* This file is part of Nuspell.
*
@@ -23,7 +23,7 @@
using namespace std;
namespace nuspell {
-inline namespace v5 {
+NUSPELL_BEGIN_INLINE_NAMESPACE
template <class L>
class At_Scope_Exit {
@@ -2005,5 +2005,5 @@
}
return {};
}
-} // namespace v5
+NUSPELL_END_INLINE_NAMESPACE
} // namespace nuspell
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/src/nuspell/checker.hxx
new/nuspell-5.1.3/src/nuspell/checker.hxx
--- old/nuspell-5.1.2/src/nuspell/checker.hxx 2022-09-29 13:57:55.000000000
+0200
+++ new/nuspell-5.1.3/src/nuspell/checker.hxx 2023-08-27 18:09:53.000000000
+0200
@@ -1,4 +1,4 @@
-/* Copyright 2016-2022 Dimitrij Mijoski
+/* Copyright 2016-2023 Dimitrij Mijoski
*
* This file is part of Nuspell.
*
@@ -22,7 +22,7 @@
#include "aff_data.hxx"
namespace nuspell {
-inline namespace v5 {
+NUSPELL_BEGIN_INLINE_NAMESPACE
enum Affixing_Mode {
FULL_WORD,
@@ -347,6 +347,6 @@
return word_flags.contains(afx.flag);
}
-} // namespace v5
+NUSPELL_END_INLINE_NAMESPACE
} // namespace nuspell
#endif // NUSPELL_CHECKER_HXX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/src/nuspell/defines.hxx
new/nuspell-5.1.3/src/nuspell/defines.hxx
--- old/nuspell-5.1.2/src/nuspell/defines.hxx 1970-01-01 01:00:00.000000000
+0100
+++ new/nuspell-5.1.3/src/nuspell/defines.hxx 2023-08-27 18:09:53.000000000
+0200
@@ -0,0 +1,25 @@
+/* Copyright 2016-2023 Dimitrij Mijoski
+ *
+ * This file is part of Nuspell.
+ *
+ * Nuspell is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Nuspell is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Nuspell. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NUSPELL_DEFINES_HXX
+#define NUSPELL_DEFINES_HXX
+
+#define NUSPELL_BEGIN_INLINE_NAMESPACE inline namespace v5 {
+#define NUSPELL_END_INLINE_NAMESPACE }
+
+#endif // NUSPELL_DEFINES_HXX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/src/nuspell/dictionary.cxx
new/nuspell-5.1.3/src/nuspell/dictionary.cxx
--- old/nuspell-5.1.2/src/nuspell/dictionary.cxx 2022-09-29
13:57:55.000000000 +0200
+++ new/nuspell-5.1.3/src/nuspell/dictionary.cxx 2023-08-27
18:09:53.000000000 +0200
@@ -1,4 +1,4 @@
-/* Copyright 2016-2022 Dimitrij Mijoski
+/* Copyright 2016-2023 Dimitrij Mijoski
*
* This file is part of Nuspell.
*
@@ -26,7 +26,7 @@
using namespace std;
namespace nuspell {
-inline namespace v5 {
+NUSPELL_BEGIN_INLINE_NAMESPACE
Dictionary::Dictionary(std::istream& aff, std::istream& dic)
{
@@ -160,5 +160,5 @@
return;
suggest_priv(word, out);
}
-} // namespace v5
+NUSPELL_END_INLINE_NAMESPACE
} // namespace nuspell
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/src/nuspell/dictionary.hxx
new/nuspell-5.1.3/src/nuspell/dictionary.hxx
--- old/nuspell-5.1.2/src/nuspell/dictionary.hxx 2022-09-29
13:57:55.000000000 +0200
+++ new/nuspell-5.1.3/src/nuspell/dictionary.hxx 2023-08-27
18:09:53.000000000 +0200
@@ -1,4 +1,4 @@
-/* Copyright 2016-2022 Dimitrij Mijoski
+/* Copyright 2016-2023 Dimitrij Mijoski
*
* This file is part of Nuspell.
*
@@ -29,7 +29,7 @@
#include <filesystem>
namespace nuspell {
-inline namespace v5 {
+NUSPELL_BEGIN_INLINE_NAMESPACE
/**
* @brief The only important public exception
@@ -67,6 +67,6 @@
-> void;
};
-} // namespace v5
+NUSPELL_END_INLINE_NAMESPACE
} // namespace nuspell
#endif // NUSPELL_DICTIONARY_HXX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/src/nuspell/finder.cxx
new/nuspell-5.1.3/src/nuspell/finder.cxx
--- old/nuspell-5.1.2/src/nuspell/finder.cxx 2022-09-29 13:57:55.000000000
+0200
+++ new/nuspell-5.1.3/src/nuspell/finder.cxx 2023-08-27 18:09:53.000000000
+0200
@@ -1,4 +1,4 @@
-/* Copyright 2016-2022 Dimitrij Mijoski
+/* Copyright 2016-2023 Dimitrij Mijoski
*
* This file is part of Nuspell.
*
@@ -37,7 +37,7 @@
using namespace std;
namespace nuspell {
-inline namespace v5 {
+NUSPELL_BEGIN_INLINE_NAMESPACE
namespace fs = std::filesystem;
@@ -431,5 +431,5 @@
return dict;
}
-} // namespace v5
+NUSPELL_END_INLINE_NAMESPACE
} // namespace nuspell
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/src/nuspell/finder.hxx
new/nuspell-5.1.3/src/nuspell/finder.hxx
--- old/nuspell-5.1.2/src/nuspell/finder.hxx 2022-09-29 13:57:55.000000000
+0200
+++ new/nuspell-5.1.3/src/nuspell/finder.hxx 2023-08-27 18:09:53.000000000
+0200
@@ -1,4 +1,4 @@
-/* Copyright 2016-2022 Dimitrij Mijoski
+/* Copyright 2016-2023 Dimitrij Mijoski
*
* This file is part of Nuspell.
*
@@ -24,6 +24,7 @@
#ifndef NUSPELL_FINDER_HXX
#define NUSPELL_FINDER_HXX
+#include "defines.hxx"
#include "nuspell_export.h"
#include <filesystem>
@@ -40,7 +41,7 @@
NUSPELL_MSVC_PRAGMA_WARNING(disable : 4251)
namespace nuspell {
-inline namespace v5 {
+NUSPELL_BEGIN_INLINE_NAMESPACE
NUSPELL_EXPORT auto
append_default_dir_paths(std::vector<std::filesystem::path>& paths) -> void;
@@ -109,7 +110,7 @@
auto get_dictionary_path(const fs_path& dict) const -> fs_path;
};
-} // namespace v5
+NUSPELL_END_INLINE_NAMESPACE
} // namespace nuspell
NUSPELL_MSVC_PRAGMA_WARNING(pop)
#endif // NUSPELL_FINDER_HXX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/src/nuspell/structures.hxx
new/nuspell-5.1.3/src/nuspell/structures.hxx
--- old/nuspell-5.1.2/src/nuspell/structures.hxx 2022-09-29
13:57:55.000000000 +0200
+++ new/nuspell-5.1.3/src/nuspell/structures.hxx 2023-08-27
18:09:53.000000000 +0200
@@ -1,4 +1,4 @@
-/* Copyright 2018-2022 Dimitrij Mijoski
+/* Copyright 2018-2023 Dimitrij Mijoski
*
* This file is part of Nuspell.
*
@@ -34,7 +34,7 @@
#include <vector>
namespace nuspell {
-inline namespace v5 {
+NUSPELL_BEGIN_INLINE_NAMESPACE
template <class It>
class Subrange {
@@ -1832,6 +1832,6 @@
}
return ret;
}
-} // namespace v5
+NUSPELL_END_INLINE_NAMESPACE
} // namespace nuspell
#endif // NUSPELL_STRUCTURES_HXX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/src/nuspell/suggester.cxx
new/nuspell-5.1.3/src/nuspell/suggester.cxx
--- old/nuspell-5.1.2/src/nuspell/suggester.cxx 2022-09-29 13:57:55.000000000
+0200
+++ new/nuspell-5.1.3/src/nuspell/suggester.cxx 2023-08-27 18:09:53.000000000
+0200
@@ -1,4 +1,4 @@
-/* Copyright 2016-2022 Dimitrij Mijoski
+/* Copyright 2016-2023 Dimitrij Mijoski
*
* This file is part of Nuspell.
*
@@ -23,7 +23,7 @@
using namespace std;
namespace nuspell {
-inline namespace v5 {
+NUSPELL_BEGIN_INLINE_NAMESPACE
auto static insert_sug_first(const string& word, List_Strings& out)
{
@@ -1138,5 +1138,5 @@
expanded_list.push_back(move(expanded));
}
}
-} // namespace v5
+NUSPELL_END_INLINE_NAMESPACE
} // namespace nuspell
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/src/nuspell/suggester.hxx
new/nuspell-5.1.3/src/nuspell/suggester.hxx
--- old/nuspell-5.1.2/src/nuspell/suggester.hxx 2022-09-29 13:57:55.000000000
+0200
+++ new/nuspell-5.1.3/src/nuspell/suggester.hxx 2023-08-27 18:09:53.000000000
+0200
@@ -1,4 +1,4 @@
-/* Copyright 2016-2022 Dimitrij Mijoski
+/* Copyright 2016-2023 Dimitrij Mijoski
*
* This file is part of Nuspell.
*
@@ -22,7 +22,7 @@
#include "checker.hxx"
namespace nuspell {
-inline namespace v5 {
+NUSPELL_BEGIN_INLINE_NAMESPACE
struct NUSPELL_EXPORT Suggester : public Checker {
@@ -92,6 +92,6 @@
-> void;
};
-} // namespace v5
+NUSPELL_END_INLINE_NAMESPACE
} // namespace nuspell
#endif // NUSPELL_SUGGESTER_HXX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/src/nuspell/unicode.hxx
new/nuspell-5.1.3/src/nuspell/unicode.hxx
--- old/nuspell-5.1.2/src/nuspell/unicode.hxx 2022-09-29 13:57:55.000000000
+0200
+++ new/nuspell-5.1.3/src/nuspell/unicode.hxx 2023-08-27 18:09:53.000000000
+0200
@@ -1,4 +1,4 @@
-/* Copyright 2021-2022 Dimitrij Mijoski
+/* Copyright 2021-2023 Dimitrij Mijoski
*
* This file is part of Nuspell.
*
@@ -17,13 +17,15 @@
*/
#ifndef NUSPELL_UNICODE_HXX
#define NUSPELL_UNICODE_HXX
+#include "defines.hxx"
+
#include <string>
#include <string_view>
#include <unicode/utf16.h>
#include <unicode/utf8.h>
namespace nuspell {
-inline namespace v5 {
+NUSPELL_BEGIN_INLINE_NAMESPACE
// UTF-8, work on malformed
@@ -378,6 +380,6 @@
valid_u8_write_cp_and_advance(buf, i, cp);
return i;
}
-} // namespace v5
+NUSPELL_END_INLINE_NAMESPACE
} // namespace nuspell
#endif // NUSPELL_UNICODE_HXX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/src/nuspell/utils.cxx
new/nuspell-5.1.3/src/nuspell/utils.cxx
--- old/nuspell-5.1.2/src/nuspell/utils.cxx 2022-09-29 13:57:55.000000000
+0200
+++ new/nuspell-5.1.3/src/nuspell/utils.cxx 2023-08-27 18:09:53.000000000
+0200
@@ -1,4 +1,4 @@
-/* Copyright 2016-2022 Dimitrij Mijoski
+/* Copyright 2016-2023 Dimitrij Mijoski
*
* This file is part of Nuspell.
*
@@ -36,7 +36,7 @@
using namespace std;
namespace nuspell {
-inline namespace v5 {
+NUSPELL_BEGIN_INLINE_NAMESPACE
/**
* @internal
@@ -416,5 +416,5 @@
return ret;
}
-} // namespace v5
+NUSPELL_END_INLINE_NAMESPACE
} // namespace nuspell
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/src/nuspell/utils.hxx
new/nuspell-5.1.3/src/nuspell/utils.hxx
--- old/nuspell-5.1.2/src/nuspell/utils.hxx 2022-09-29 13:57:55.000000000
+0200
+++ new/nuspell-5.1.3/src/nuspell/utils.hxx 2023-08-27 18:09:53.000000000
+0200
@@ -1,4 +1,4 @@
-/* Copyright 2016-2022 Dimitrij Mijoski
+/* Copyright 2016-2023 Dimitrij Mijoski
*
* This file is part of Nuspell.
*
@@ -19,6 +19,7 @@
#ifndef NUSPELL_UTILS_HXX
#define NUSPELL_UTILS_HXX
+#include "defines.hxx"
#include "nuspell_export.h"
#include <string>
@@ -38,7 +39,7 @@
struct UConverter; // unicode/ucnv.h
namespace nuspell {
-inline namespace v5 {
+NUSPELL_BEGIN_INLINE_NAMESPACE
NUSPELL_DEPRECATED_EXPORT auto split_on_any_of(std::string_view s,
const char* sep,
@@ -166,6 +167,6 @@
{
return x.data() + x.size();
}
-} // namespace v5
+NUSPELL_END_INLINE_NAMESPACE
} // namespace nuspell
#endif // NUSPELL_UTILS_HXX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/src/tools/nuspell.cxx
new/nuspell-5.1.3/src/tools/nuspell.cxx
--- old/nuspell-5.1.2/src/tools/nuspell.cxx 2022-09-29 13:57:55.000000000
+0200
+++ new/nuspell-5.1.3/src/tools/nuspell.cxx 2023-08-27 18:09:53.000000000
+0200
@@ -1,4 +1,4 @@
-/* Copyright 2016-2022 Dimitrij Mijoski
+/* Copyright 2016-2023 Dimitrij Mijoski
*
* This file is part of Nuspell.
*
@@ -98,7 +98,7 @@
}
auto ver_str = "nuspell " PROJECT_VERSION R"(
-Copyright (C) 2016-2022 Dimitrij Mijoski
+Copyright (C) 2016-2023 Dimitrij Mijoski
License LGPLv3+: GNU LGPL version 3 or later
<http://gnu.org/licenses/lgpl.html>.
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/tests/catch_main.cxx
new/nuspell-5.1.3/tests/catch_main.cxx
--- old/nuspell-5.1.2/tests/catch_main.cxx 2022-09-29 13:57:55.000000000
+0200
+++ new/nuspell-5.1.3/tests/catch_main.cxx 2023-08-27 18:09:53.000000000
+0200
@@ -1,4 +1,4 @@
-/* Copyright 2017-2022 Dimitrij Mijoski
+/* Copyright 2017-2023 Dimitrij Mijoski
*
* This file is part of Nuspell.
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/tests/legacy_test.cxx
new/nuspell-5.1.3/tests/legacy_test.cxx
--- old/nuspell-5.1.2/tests/legacy_test.cxx 2022-09-29 13:57:55.000000000
+0200
+++ new/nuspell-5.1.3/tests/legacy_test.cxx 2023-08-27 18:09:53.000000000
+0200
@@ -1,4 +1,4 @@
-/* Copyright 2018-2022 Dimitrij Mijoski
+/* Copyright 2018-2023 Dimitrij Mijoski
*
* This file is part of Nuspell.
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/tests/unit_test.cxx
new/nuspell-5.1.3/tests/unit_test.cxx
--- old/nuspell-5.1.2/tests/unit_test.cxx 2022-09-29 13:57:55.000000000
+0200
+++ new/nuspell-5.1.3/tests/unit_test.cxx 2023-08-27 18:09:53.000000000
+0200
@@ -1,4 +1,4 @@
-/* Copyright 2021-2022 Dimitrij Mijoski
+/* Copyright 2021-2023 Dimitrij Mijoski
*
* This file is part of Nuspell.
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/tests/verify.cxx
new/nuspell-5.1.3/tests/verify.cxx
--- old/nuspell-5.1.2/tests/verify.cxx 2022-09-29 13:57:55.000000000 +0200
+++ new/nuspell-5.1.3/tests/verify.cxx 2023-08-27 18:09:53.000000000 +0200
@@ -1,4 +1,4 @@
-/* Copyright 2016-2022 Dimitrij Mijoski
+/* Copyright 2016-2023 Dimitrij Mijoski
*
* This file is part of Nuspell.
*
@@ -92,7 +92,7 @@
}
auto ver_str = "nuspell " PROJECT_VERSION R"(
-Copyright (C) 2016-2022 Dimitrij Mijoski
+Copyright (C) 2016-2023 Dimitrij Mijoski
License LGPLv3+: GNU LGPL version 3 or later
<http://gnu.org/licenses/lgpl.html>.
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nuspell-5.1.2/vcpkg.json new/nuspell-5.1.3/vcpkg.json
--- old/nuspell-5.1.2/vcpkg.json 1970-01-01 01:00:00.000000000 +0100
+++ new/nuspell-5.1.3/vcpkg.json 2023-08-27 18:09:53.000000000 +0200
@@ -0,0 +1,17 @@
+{
+ "builtin-baseline": "2f9972005f61f02fa3cda7fc062d1b834b534b8d",
+ "dependencies": [
+ {
+ "name": "catch2",
+ "version>=": "2.13.9"
+ },
+ {
+ "name": "getopt",
+ "version>=": "0#2"
+ },
+ {
+ "name": "icu",
+ "version>=": "69.1#18"
+ }
+ ]
+}
