Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package guix for openSUSE:Factory checked in
at 2025-08-27 21:34:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/guix (Old)
and /work/SRC/openSUSE:Factory/.guix.new.30751 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "guix"
Wed Aug 27 21:34:43 2025 rev:23 rq:1301507 version:1.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/guix/guix.changes 2025-03-04
18:32:39.170104002 +0100
+++ /work/SRC/openSUSE:Factory/.guix.new.30751/guix.changes 2025-08-27
21:35:47.737478944 +0200
@@ -1,0 +2,6 @@
+Tue Aug 26 16:04:41 UTC 2025 - Jaime Marquínez Ferrándiz
<jaime.marquinez.ferran...@fastmail.net>
+
+- Add dependencies on makeinfo and po4a
+- Add fix_compilation_on_gcc_15.patch
+
+-------------------------------------------------------------------
New:
----
fix_compilation_on_gcc_15.patch
----------(New B)----------
New:- Add dependencies on makeinfo and po4a
- Add fix_compilation_on_gcc_15.patch
----------(New E)----------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ guix.spec ++++++
--- /var/tmp/diff_new_pack.ItUwQL/_old 2025-08-27 21:35:48.897527375 +0200
+++ /var/tmp/diff_new_pack.ItUwQL/_new 2025-08-27 21:35:48.901527541 +0200
@@ -46,6 +46,8 @@
Source20: run_guix_daemon.sh
Source21: run_guix_publish.sh
Source22: %{name}-user.conf
+# PATCH-FIX-UPSTREAM
https://codeberg.org/guix/guix/commit/7b66b41ce5cee48b14eb6cce3bb4b26f5b058652
+Patch1: fix_compilation_on_gcc_15.patch
BuildRequires: gcc-c++
BuildRequires: gnutls-guile
BuildRequires: guile-charting
@@ -60,7 +62,9 @@
# this is actually just to make guile-git working
BuildRequires: libgcrypt-devel
BuildRequires: libgit2-devel
+BuildRequires: makeinfo
BuildRequires: pkgconfig
+BuildRequires: po4a
BuildRequires: shepherd
BuildRequires: systemd-rpm-macros
BuildRequires: sysuser-tools
@@ -91,7 +95,7 @@
As a GNU distribution it contains only free software.
%prep
-%setup -q
+%autosetup -p1
# install service file to _unitdir
sed -i 's@\$(libdir)/systemd/system@%{_unitdir}@' Makefile.in
mkdir -p gnu/packages/bootstrap/{i686,x86_64,mips64el,armhf,aarch64}-linux
++++++ fix_compilation_on_gcc_15.patch ++++++
Index: guix-1.4.0/nix/libstore/store-api.hh
===================================================================
--- guix-1.4.0.orig/nix/libstore/store-api.hh
+++ guix-1.4.0/nix/libstore/store-api.hh
@@ -4,6 +4,7 @@
#include "serialise.hh"
#include <string>
+#include <cstdint>
#include <map>
#include <memory>
Index: guix-1.4.0/nix/libstore/build.cc
===================================================================
--- guix-1.4.0.orig/nix/libstore/build.cc
+++ guix-1.4.0/nix/libstore/build.cc
@@ -91,7 +91,7 @@ typedef std::shared_ptr<Goal> GoalPtr;
typedef std::weak_ptr<Goal> WeakGoalPtr;
struct CompareGoalPtrs {
- bool operator() (const GoalPtr & a, const GoalPtr & b);
+ bool operator() (const GoalPtr & a, const GoalPtr & b) const;
};
/* Set of goals. */
@@ -189,7 +189,7 @@ protected:
};
-bool CompareGoalPtrs::operator() (const GoalPtr & a, const GoalPtr & b) {
+bool CompareGoalPtrs::operator() (const GoalPtr & a, const GoalPtr & b) const {
string s1 = a->key();
string s2 = b->key();
return s1 < s2;
