public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Michal Schorm <mschorm@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/cinnamon] rawhide: Add 'pkgconfig(girepository-2.0)' BuildRequires for GIRepository library
Date: Sun, 26 Jul 2026 14:03:43 GMT	[thread overview]
Message-ID: <178507462307.1.8749323120015172952.rpms-cinnamon-27e68c0dacd5@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/cinnamon
            Branch : rawhide
            Commit : 27e68c0dacd5363b32b0645316ebacd30b8508e8
            Author : Michal Schorm <mschorm@redhat.com>
            Date   : 2026-07-26T14:08:24+02:00
            Stats  : +3/-3 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/cinnamon/c/27e68c0dacd5363b32b0645316ebacd30b8508e8?branch=rawhide

            Log:
            Add 'pkgconfig(girepository-2.0)' BuildRequires for GIRepository library

Since GLib 2.80, the GObject Introspection ecosystem is split across
two packages:

- 'glib2-devel' provides 'pkgconfig(girepository-2.0)' — the
  GIRepository library API. The upstream 'meson.build' (lines 40-46)
  uses 'girepository-2.0' when cjs >= 139.9 (which is the case here,
  'cjs_version' is 140.0):
  https://github.com/linuxmint/cinnamon/blob/6.7.4-unstable/meson.build#L40-L46

- 'gobject-introspection-devel' provides
  'pkgconfig(gobject-introspection-1.0)' — the build tools
  ('g-ir-scanner', 'g-ir-compiler') needed by gnome.generate_gir():
  https://github.com/linuxmint/cinnamon/blob/6.7.4-unstable/src/meson.build#L222
  https://github.com/linuxmint/cinnamon/blob/6.7.4-unstable/src/st/meson.build#L223

'glib2-devel' does NOT pull in 'gobject-introspection-devel', so
both BuildRequires are needed independently:
- 'pkgconfig(girepository-2.0)' for the library (new, added here)
- 'pkgconfig(gobject-introspection-1.0)' for the tools (existing,
  kept — but drop the stale '>= 1.38.0' version constraint and the
  now-unused '%{gobject_introspection_version}' macro)

Drop the stale '>= 1.38.0' version constraint from the runtime
Requires on 'gobject-introspection' — the soname-based auto-requires
already ensures the right version at install time.

Linux Mint's 'debian/control' line 17 still lists
'libgirepository1.0-dev' (the old API), but they pin 'cjs >= 4.8'
which is below the 139.9 threshold, so their build takes the old
codepath:
https://github.com/linuxmint/cinnamon/blob/6.7.4-unstable/debian/control#L17

Co-Authored-By: Claude AI <noreply@anthropic.com>

---
diff --git a/cinnamon.spec b/cinnamon.spec
index fde9eda..4db0b4c 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -3,7 +3,6 @@
 %global cjs_version 140.0
 %global cinnamon_desktop_version 6.7.1
 %global cinnamon_translations_version 6.7.0
-%global gobject_introspection_version 1.38.0
 %global muffin_version 6.7.1
 
 %global __python %{__python3}
@@ -43,7 +42,8 @@ BuildRequires:  pkgconfig(lib%{name}-menu-3.0)
 BuildRequires:  pkgconfig(libsecret-1)
 BuildRequires:  pkgconfig(libxdo)
 BuildRequires:  pkgconfig(%{name}-desktop) >= %{cinnamon_desktop_version}
-BuildRequires:  pkgconfig(gobject-introspection-1.0) >= %{gobject_introspection_version}
+BuildRequires:  pkgconfig(girepository-2.0)
+BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(libnm)
 BuildRequires:  pkgconfig(pam)
 BuildRequires:  pkgconfig(polkit-agent-1)
@@ -64,7 +64,7 @@ Requires:       gnome-menus%{?_isa} >= 3.0.0-2
 
 # wrapper script used to restart old GNOME session if run --replace
 # from the command line
-Requires:       gobject-introspection%{?_isa} >= %{gobject_introspection_version}
+Requires:       gobject-introspection%{?_isa}
 
 # needed for loading SVG's via gdk-pixbuf
 Requires:       librsvg2%{?_isa}

                 reply	other threads:[~2026-07-26 14:03 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178507462307.1.8749323120015172952.rpms-cinnamon-27e68c0dacd5@fedoraproject.org \
    --to=mschorm@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox