This is an automated email from the git hooks/post-receive script.

guix_mirror_bot pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 4ce2267e4f5 gnu: eom: Update to 1.28.1.
4ce2267e4f5 is described below

commit 4ce2267e4f5c244e24b129c4e7526dc4ec0e557e
Author: FuncProgLinux <[email protected]>
AuthorDate: Sun Nov 1 00:58:44 2026 -0600

    gnu: eom: Update to 1.28.1.
    
    * gnu/packages/mate.scm (eom): Update to 1.28.1.
    [source]: Add 'eom-fix-girepository.patch'.
    * gnu/packages/patches/eom-fix-girepository.patch: New file.
    
    Signed-off-by: Andreas Enge <[email protected]>
    Merges: guix/guix#12245
---
 gnu/local.mk                                    |  1 +
 gnu/packages/mate.scm                           |  5 +++--
 gnu/packages/patches/eom-fix-girepository.patch | 29 +++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 5b86351e382..faefb3b4fa7 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -291,6 +291,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/engineering.scm                 \
   %D%/packages/enlightenment.scm               \
   %D%/packages/entr.scm                                \
+  %D%/packages/patches/eom-fix-girepository.patch \
   %D%/packages/erlang.scm                      \
   %D%/packages/erlang-xyz.scm                  \
   %D%/packages/esolangs.scm                    \
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index d3d1d9ec438..e8259e5dbb6 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -1786,7 +1786,7 @@ can be used as backgrounds in the MATE Desktop 
environment.")
 (define-public eom
   (package
     (name "eom")
-    (version "1.28.0")
+    (version "1.28.1")
     (source
      (origin
        (method git-fetch)
@@ -1795,7 +1795,8 @@ can be used as backgrounds in the MATE Desktop 
environment.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "13976l5dpg2ji2qn55q34bp2mj578877y2y8cnk8vgkz9fpgqx9s"))))
+        (base32 "0mszgl352rmd1r900vncw9kns1jc8id59k89pkwjpdqjgp7vrhyq"))
+       (patches (search-patches "eom-fix-girepository.patch"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs (list autoconf
                          autoconf-archive
diff --git a/gnu/packages/patches/eom-fix-girepository.patch 
b/gnu/packages/patches/eom-fix-girepository.patch
new file mode 100644
index 00000000000..1e9ec5afb76
--- /dev/null
+++ b/gnu/packages/patches/eom-fix-girepository.patch
@@ -0,0 +1,29 @@
+Fix girepository conflict with libpeas
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -118,9 +118,16 @@ if test "$found_introspection" = "yes"; then
+       AC_DEFINE([HAVE_INTROSPECTION], [1], [Define to enable GObject 
Introspection])
+ 
+       # Check for girepository-2.0 API (moved to glib in version 1.80+)
+-      PKG_CHECK_EXISTS([girepository-2.0],
+-              [AC_DEFINE([HAVE_GIREPOSITORY_2], [1], [Using girepository-2.0 
API])],
+-              [])
++      # We can only use girepository-2.0 if libpeas also uses it, otherwise 
we get conflicts
++      PKG_CHECK_EXISTS([girepository-2.0], [
++              # Check if libpeas requires girepository-2.0
++              if pkg-config --print-requires libpeas-1.0 | grep -q 
"girepository-2.0"; then
++                      AC_DEFINE([HAVE_GIREPOSITORY_2], [1], [Using 
girepository-2.0 API])
++                      have_girepository_2=yes
++              else
++                      have_girepository_2=no
++              fi
++      ], [have_girepository_2=no])
+ else
+       have_introspection=no
+ fi
+@@ -234,3 +241,4 @@ fi
+ GObject Introspection.......: ${have_introspection}
++GIRepository 2.0............: ${have_girepository_2:-no}
+ Native Language support.....: ${USE_NLS}
+ Thumbnailer.................: ${eom_thumbnailer}

Reply via email to