summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2021-08-29 13:35:08 -0700
committerMatt Turner <mattst88@gentoo.org>2021-08-29 13:37:33 -0700
commit9d5cf21a1ba1c177b39a06ef673ccc8a6fd1744e (patch)
tree91767b2166b07b968a4ad12e1192713227bca733
parentsys-apps/systemd: Stabilize 249.2 amd64, #808887 (diff)
downloadgentoo-9d5cf21a.tar.gz
gentoo-9d5cf21a.tar.bz2
gentoo-9d5cf21a.zip
gui-libs/gtk: Add patch to avoid sassc dependency
Closes: https://bugs.gentoo.org/810889 Signed-off-by: Matt Turner <mattst88@gentoo.org>
-rw-r--r--gui-libs/gtk/files/4.4.0-build-Fix-detection-for-pre-compiled-css-files.patch29
-rw-r--r--gui-libs/gtk/gtk-4.4.0.ebuild4
2 files changed, 33 insertions, 0 deletions
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 000000000000..1292e85cefa1
--- /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 <klember@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 231c12988900..f0a65fdf2fe6 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