public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Jan Grulich <jgrulich@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/libadwaita] rawhide: Upstream backport: fix sassc requirement for tarball builds
Date: Tue, 04 Aug 2026 14:57:27 GMT	[thread overview]
Message-ID: <178585544724.1.5947734329475038731.rpms-libadwaita-b3289f5e2f6d@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/libadwaita
Branch : rawhide
Commit : b3289f5e2f6d4e6a62a99bcd905fc99d070ff795
Author : Jan Grulich <jgrulich@redhat.com>
Date   : 2026-08-04T16:57:03+02:00
Stats  : +32/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/libadwaita/c/b3289f5e2f6d4e6a62a99bcd905fc99d070ff795?branch=rawhide

Log:
Upstream backport: fix sassc requirement for tarball builds

---
diff --git a/fix-sassc-requirement-for-tarball-builds.patch b/fix-sassc-requirement-for-tarball-builds.patch
new file mode 100644
index 0000000..7b00f65
--- /dev/null
+++ b/fix-sassc-requirement-for-tarball-builds.patch
@@ -0,0 +1,29 @@
+From 954ef6ce80838b7e96cfc7f43287e99238c9639c Mon Sep 17 00:00:00 2001
+From: Jan Grulich <jgrulich@redhat.com>
+Date: Tue, 4 Aug 2026 16:13:26 +0200
+Subject: [PATCH] Fix sassc requirement for tarball builds
+
+The meson build checks for base.css to determine if pre-generated CSS
+is available, but the tarball ships gtk.css instead. This causes sassc
+to be required even for tarball builds where the compiled stylesheet
+is already present. Fix the check to look for gtk.css.
+---
+ src/stylesheet/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/stylesheet/meson.build b/src/stylesheet/meson.build
+index 023ebf7b7..1acc22ee4 100644
+--- a/src/stylesheet/meson.build
++++ b/src/stylesheet/meson.build
+@@ -3,7 +3,7 @@ fs = import('fs')
+ stylesheet_deps = []
+ 
+ # For git checkouts, but not for tarballs...
+-if not fs.exists('base.css')
++if not fs.exists('gtk.css')
+   sassc = find_program('sassc', required: false)
+   if not sassc.found()
+     subproject('sassc', default_options: ['warning_level=0', 'werror=false'])
+-- 
+GitLab
+

diff --git a/libadwaita.spec b/libadwaita.spec
index 12f1c74..cacae53 100644
--- a/libadwaita.spec
+++ b/libadwaita.spec
@@ -12,6 +12,9 @@ License:        LGPL-2.1-or-later AND MIT
 URL:            https://gitlab.gnome.org/GNOME/libadwaita
 Source0:        https://download.gnome.org/sources/%{name}/%{gnome_major_minor_version}/%{name}-%{gnome_tarball_version}.tar.xz
 
+# https://gitlab.gnome.org/GNOME/libadwaita/-/merge_requests/1802
+Patch0:         fix-sassc-requirement-for-tarball-builds.patch
+
 %gnome_check_version
 
 BuildRequires:  desktop-file-utils
@@ -21,7 +24,6 @@ BuildRequires:  gi-docgen
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.63.0
 BuildRequires:  vala
-BuildRequires:  /usr/bin/sassc
 BuildRequires:  pkgconfig(appstream)
 BuildRequires:  pkgconfig(fribidi)
 BuildRequires:  pkgconfig(glib-2.0) >= %{glib_version}

                 reply	other threads:[~2026-08-04 14:57 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=178585544724.1.5947734329475038731.rpms-libadwaita-b3289f5e2f6d@fedoraproject.org \
    --to=jgrulich@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