Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ac86e2b647b3e98cc94b96a4aad98382be17175d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ac86e2b647b3e98cc94b96a4aad98382be17175d)
  • Date: Sun, 17 Dec 2023 10:55:45 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

devel/nlohmann_json/DETAILS | 6
devel/nlohmann_json/HISTORY | 4
devel/nlohmann_json/PRE_BUILD | 3
devel/nlohmann_json/patches/nlohmann_json-3.11.2-gcc13.patch | 76
-----------
windowmanagers/wayfire/DEPENDS | 1
windowmanagers/wayfire/HISTORY | 3
6 files changed, 11 insertions(+), 82 deletions(-)

New commits:
commit ac86e2b647b3e98cc94b96a4aad98382be17175d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

wayfire - depends nlohmann_json

commit ebed828e19e13d8604bc2900e7ee1d690dbf8907
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

nlohmann_json: => 3.11.3

diff --git a/devel/nlohmann_json/DETAILS b/devel/nlohmann_json/DETAILS
index e28b175..fade7e8 100755
--- a/devel/nlohmann_json/DETAILS
+++ b/devel/nlohmann_json/DETAILS
@@ -1,9 +1,9 @@
source "${GRIMOIRE}/CMAKE_FUNCTIONS"
SPELL=nlohmann_json
SPELLX=json
- VERSION=3.11.2
- SOURCE=$SPELLX-$VERSION.tar.xz
-
SOURCE_HASH=sha256:d69f9deb6a75e2580465c6c4c5111b89c4dc2fa94e3a85fcd2ffcd9a143d9273
+ VERSION=3.11.3
+
SOURCE_HASH=sha512:7df19b621de34f08d5d5c0a25e8225975980841ef2e48536abcf22526ed7fb99f88ad954a2cb823115db59ccc88d1dbe74fe6c281b5644b976b33fb78db9d717
+ SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
WEB_SITE=https://github.com/nlohmann/json
SOURCE_URL[0]=$WEB_SITE/archive/v${VERSION}.tar.gz
diff --git a/devel/nlohmann_json/HISTORY b/devel/nlohmann_json/HISTORY
index da0a0e1..78c2ed0 100644
--- a/devel/nlohmann_json/HISTORY
+++ b/devel/nlohmann_json/HISTORY
@@ -1,3 +1,7 @@
+2023-12-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.11.3
+ * PRE_BUILD patches/*: deleted
+
2023-03-06 Conner Clere <xenanthropy AT sourcemage.org>
* DETAILS: version 3.11.2, convert to cmake build
switch source verification to hash
diff --git a/devel/nlohmann_json/PRE_BUILD b/devel/nlohmann_json/PRE_BUILD
deleted file mode 100755
index 0cab101..0000000
--- a/devel/nlohmann_json/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-apply_patch_dir patches
diff --git a/devel/nlohmann_json/patches/nlohmann_json-3.11.2-gcc13.patch
b/devel/nlohmann_json/patches/nlohmann_json-3.11.2-gcc13.patch
deleted file mode 100644
index 5205e67..0000000
--- a/devel/nlohmann_json/patches/nlohmann_json-3.11.2-gcc13.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-https://github.com/nlohmann/json/issues/3927
-https://github.com/nlohmann/json/pull/3895
-
-From a5b09d50b786638ed9deb09ef13860a3cb64eb6b Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyich AT gmail.com>
-Date: Tue, 20 Dec 2022 22:08:12 +0000
-Subject: [PATCH] custom allocators: define missing 'rebind' type
-
-`gcc-13` added an assert to standard headers to make sure custom
-allocators have intended implementation of rebind type instead
-of inherited rebind. gcc change:
- https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7
-
-Without the fix build fails on this week's `gcc-13` as:
-
- In file included from
<<NIX>>-gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:34,
- from
<<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/basic_string.h:39,
- from <<NIX>>-gcc-13.0.0/include/c++/13.0.0/string:54,
- from
<<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/locale_classes.h:40,
- from <<NIX>>-gcc-13.0.0/include/c++/13.0.0/locale:41,
- from tests/src/unit-regression2.cpp:19:
- <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h: In
instantiation of 'struct
std::__allocator_traits_base::__rebind<my_allocator<unsigned char>, unsigned
char, void>':
- <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:94:11:
required by substitution of 'template<class _Alloc, class _Up> using
std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc,
_Up>::type [with _Alloc = my_allocator<unsigned char>; _Up = unsigned char]'
- <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:228:8:
required by substitution of 'template<class _Alloc> template<class _Tp> using
std::allocator_traits< <template-parameter-1-1> >::rebind_alloc =
std::__alloc_rebind<_Alloc, _Tp> [with _Tp = unsigned char; _Alloc =
my_allocator<unsigned char>]'
- <<NIX>>-gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:126:65:
required from 'struct __gnu_cxx::__alloc_traits<my_allocator<unsigned char>,
unsigned char>::rebind<unsigned char>'
- <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:88:21:
required from 'struct std::_Vector_base<unsigned char, my_allocator<unsigned
char> >'
- <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:423:11:
required from 'class std::vector<unsigned char, my_allocator<unsigned char> >'
- tests/src/unit-regression2.cpp:807:63: required from here
- <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:70:31: error:
static assertion failed: allocator_traits<A>::rebind_alloc<A::value_type>
must be A
- 70 | _Tp>::value,
- | ^~~~~
-
-The change adds trivial `rebind` definition with expected return type
-and satisfies conversion requirements.
---- a/tests/src/unit-allocator.cpp
-+++ b/tests/src/unit-allocator.cpp
-@@ -20,11 +20,20 @@ struct bad_allocator : std::allocator<T>
- {
- using std::allocator<T>::allocator;
-
-+ bad_allocator() = default;
-+ template<class U> bad_allocator(const bad_allocator<U>& /*unused*/) { }
-+
- template<class... Args>
- void construct(T* /*unused*/, Args&& ... /*unused*/)
- {
- throw std::bad_alloc();
- }
-+
-+ template <class U>
-+ struct rebind
-+ {
-+ using other = bad_allocator<U>;
-+ };
- };
- } // namespace
-
---- a/tests/src/unit-regression2.cpp
-+++ b/tests/src/unit-regression2.cpp
-@@ -187,6 +187,15 @@ class my_allocator : public std::allocator<T>
- {
- public:
- using std::allocator<T>::allocator;
-+
-+ my_allocator() = default;
-+ template<class U> my_allocator(const my_allocator<U>& /*unused*/) { }
-+
-+ template <class U>
-+ struct rebind
-+ {
-+ using other = my_allocator<U>;
-+ };
- };
-
- /////////////////////////////////////////////////////////////////////
-
diff --git a/windowmanagers/wayfire/DEPENDS b/windowmanagers/wayfire/DEPENDS
index fe9eddc..e32c35c 100755
--- a/windowmanagers/wayfire/DEPENDS
+++ b/windowmanagers/wayfire/DEPENDS
@@ -11,6 +11,7 @@ depends libpng &&
depends libxkbcommon &&
depends libxml2 &&
depends mesa &&
+depends nlohmann_json &&
depends pango &&
depends pixman &&
depends seatd &&
diff --git a/windowmanagers/wayfire/HISTORY b/windowmanagers/wayfire/HISTORY
index 15059f6..f681d9e 100644
--- a/windowmanagers/wayfire/HISTORY
+++ b/windowmanagers/wayfire/HISTORY
@@ -1,3 +1,6 @@
+2023-12-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add nlohmann_json
+
2023-12-16 Treeve Jelbert <treeve AT sourcemage.org>
* PRE_BUILD: added, to fix build, per upstream




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ac86e2b647b3e98cc94b96a4aad98382be17175d), Treeve Jelbert, 12/17/2023

Archive powered by MHonArc 2.6.24.

Top of Page