commit: 9d5cf21a1ba1c177b39a06ef673ccc8a6fd1744e Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sun Aug 29 20:35:08 2021 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sun Aug 29 20:37:33 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d5cf21a
gui-libs/gtk: Add patch to avoid sassc dependency Closes: https://bugs.gentoo.org/810889 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> ...-Fix-detection-for-pre-compiled-css-files.patch | 29 ++++++++++++++++++++++ gui-libs/gtk/gtk-4.4.0.ebuild | 4 +++ 2 files changed, 33 insertions(+) diff --git a/gui-libs/gtk/files/4.4.0-build-Fix-detection-for-pre-compiled-css-files.patch b/gui-libs/gtk/files/4.4.0-build-Fix-detection-for-pre-compiled-css-files.patch new file mode 100644 index 00000000000..1292e85cefa --- /dev/null +++ b/gui-libs/gtk/files/4.4.0-build-Fix-detection-for-pre-compiled-css-files.patch @@ -0,0 +1,29 @@ +From 552a4b2c82f41c1dbba410b825673cf67d089b68 Mon Sep 17 00:00:00 2001 +From: Kalev Lember <klem...@redhat.com> +Date: Mon, 23 Aug 2021 15:38:46 +0200 +Subject: [PATCH] build: Fix detection for pre-compiled css files + +The default theme changed from Adwaita to Default and this tripped up +the logic to detect if the tarball builds contain pre-built css files or +not. Fix this by looking at pre-compiled css files in themes/Default/ +instead of themes/Adwaita/. +--- + gtk/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gtk/meson.build b/gtk/meson.build +index fa66764c50..bfb5105fe5 100644 +--- a/gtk/meson.build ++++ b/gtk/meson.build +@@ -842,7 +842,7 @@ gtk_gresources_xml = configure_file(output: 'gtk.gresources.xml', + + theme_deps = [] + # For git checkouts, but not for tarballs... +-if not fs.exists('theme/Adwaita/Adwaita.css') ++if not fs.exists('theme/Default/Default-light.css') + # ... build the theme files + sassc = find_program('sassc', required: false) + if not sassc.found() +-- +2.31.1 + diff --git a/gui-libs/gtk/gtk-4.4.0.ebuild b/gui-libs/gtk/gtk-4.4.0.ebuild index 231c1298890..f0a65fdf2fe 100644 --- a/gui-libs/gtk/gtk-4.4.0.ebuild +++ b/gui-libs/gtk/gtk-4.4.0.ebuild @@ -90,6 +90,10 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${PV}-build-Fix-detection-for-pre-compiled-css-files.patch +) + src_configure() { local emesonargs=( # GDK backends
