From 5748450808a4ff7aaa44daa27d92c425f859883c Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Sun, 26 May 2024 20:41:12 -0700 Subject: [PATCH] remove nlohmann-json (#1297) (#1298) (cherry picked from commit bf0cfa9d1e861ec3c73c27109bd72b0e7743be46) Co-authored-by: Poscat --- .../libappimageupdate/libappimageupdate.spec | 2 +- anda/lib/nlohmann-json/anda.hcl | 5 - anda/lib/nlohmann-json/nlohmann-json.spec | 104 ------------------ anda/lib/nlohmann-json/update.rhai | 1 - 4 files changed, 1 insertion(+), 111 deletions(-) delete mode 100644 anda/lib/nlohmann-json/anda.hcl delete mode 100644 anda/lib/nlohmann-json/nlohmann-json.spec delete mode 100644 anda/lib/nlohmann-json/update.rhai diff --git a/anda/lib/libappimageupdate/libappimageupdate.spec b/anda/lib/libappimageupdate/libappimageupdate.spec index f2be4a8dd8..cb5f2d506f 100644 --- a/anda/lib/libappimageupdate/libappimageupdate.spec +++ b/anda/lib/libappimageupdate/libappimageupdate.spec @@ -23,7 +23,7 @@ BuildRequires: cmake3 BuildRequires: cpr-devel BuildRequires: gcc-c++ BuildRequires: libappimage-devel curl-devel libX11-devel zlib-devel fuse-devel librsvg2-devel cairo-devel git-core -BuildRequires: nlohmann-json-devel +BuildRequires: json-devel BuildRequires: pkgconfig(libgcrypt) BuildRequires: pkgconfig(gpgme) BuildRequires: pkgconfig(Qt5) diff --git a/anda/lib/nlohmann-json/anda.hcl b/anda/lib/nlohmann-json/anda.hcl deleted file mode 100644 index 90d7b3a597..0000000000 --- a/anda/lib/nlohmann-json/anda.hcl +++ /dev/null @@ -1,5 +0,0 @@ -project pkg { - rpm { - spec = "nlohmann-json.spec" - } -} diff --git a/anda/lib/nlohmann-json/nlohmann-json.spec b/anda/lib/nlohmann-json/nlohmann-json.spec deleted file mode 100644 index ebe2564a1b..0000000000 --- a/anda/lib/nlohmann-json/nlohmann-json.spec +++ /dev/null @@ -1,104 +0,0 @@ -%global debug_package %{nil} - -Name: nlohmann-json -Version: 3.11.3 -Release: 1%{?dist} - -Summary: JSON for Modern C++ (c++11) ("single header file") - - -%define desc %{expand: -There are myriads of JSON libraries out there, and each may even have its -reason to exist. Our class had these design goals: -- intuitive syntax. -- Trivial integration. -- Serious testing} - -License: MIT -Url: https://github.com/nlohmann/json - -Source: https://github.com/nlohmann/json/archive/refs/tags/v%{version}.tar.gz - -BuildRequires: cmake gcc-c++ - -%description -%{desc} - -%package devel -Summary: JSON for Modern C++ (c++11) ("single header file") -Group: Development/C++ - -%description devel -%{desc} - -This package contains the single header C++ file and CMake dependency files. - -%prep -%autosetup -n json-%{version} - -%build -%cmake - - -%install -%cmake_install - -%files devel -%doc README.md -%license LICENSE.MIT -%{_includedir}/nlohmann -%{_datadir}/cmake/nlohmann_json/ -%{_datadir}/pkgconfig/nlohmann_json.pc - -%changelog -* Mon Dec 26 2022 Cappy Ishihara - 3.11.2-1.um37 -- Rebuild for Terra, dependency of libappimageupdate - -* Fri Dec 10 2021 Ilya Kurdyukov 3.10.4-alt1.1 -- Fixed build for Elbrus. - -* Mon Nov 15 2021 Paul Wolneykien 3.10.4-alt1 -- new version 3.10.4 - -* Thu Sep 16 2021 Ivan A. Melnikov 3.10.2-alt2 -- Disable slower tests on %%mips and riscv64 to avoid timeouts. - -* Tue Sep 14 2021 Paul Wolneykien 3.10.2-alt1 -- Updated to v3.10.2. - -* Wed Apr 28 2021 Arseny Maslennikov 3.8.0-alt3.1 -- NMU: spec: adapted to new cmake macros. - -* Thu Sep 10 2020 Ivan A. Melnikov 3.8.0-alt3 -- Skip test-unicode on mips*, as it timeouts. - -* Fri Jul 03 2020 Paul Wolneykien 3.8.0-alt2 -- Added the test data bundle. -- Fix: Run the tests with CMake. -- Skip the cmake_fetch_content test. - -* Thu Jul 02 2020 Paul Wolneykien 3.8.0-alt1 -- Freshed up to v3.8.0. - -* Tue Mar 31 2020 Paul Wolneykien 3.7.2-alt2 -- Run the auto-tests. -- Package CMake dependency files. -- This is now an arch package'nlohmann-json' providing nlohmann-json-devel - and replacing json-cpp. -- Fixed project lincense: MIT. - -* Tue Mar 31 2020 Paul Wolneykien 3.7.2-alt1 -- Upstream version 3.7.2. -- Also install %%_includedir/nlohmann/json.hpp symlink. - -* Mon Nov 26 2018 Pavel Vainerman 3.4.0-alt1 -- new version - -* Sun Mar 19 2017 Pavel Vainerman 2.1.1-alt1 -- new version - -* Tue Nov 08 2016 Pavel Vainerman 2.0.7-alt1 -- new version - -* Sun Oct 30 2016 Pavel Vainerman 2.0.6-alt0.1 -- initial commit diff --git a/anda/lib/nlohmann-json/update.rhai b/anda/lib/nlohmann-json/update.rhai deleted file mode 100644 index 3357c0919d..0000000000 --- a/anda/lib/nlohmann-json/update.rhai +++ /dev/null @@ -1 +0,0 @@ -rpm.version(gh("nlohmann/json"));