| 1 |
commit: 9d5cf21a1ba1c177b39a06ef673ccc8a6fd1744e |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 29 20:35:08 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 29 20:37:33 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d5cf21a |
| 7 |
|
| 8 |
gui-libs/gtk: Add patch to avoid sassc dependency |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/810889 |
| 11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 12 |
|
| 13 |
...-Fix-detection-for-pre-compiled-css-files.patch | 29 ++++++++++++++++++++++ |
| 14 |
gui-libs/gtk/gtk-4.4.0.ebuild | 4 +++ |
| 15 |
2 files changed, 33 insertions(+) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..1292e85cefa |
| 20 |
--- /dev/null |
| 21 |
+++ b/gui-libs/gtk/files/4.4.0-build-Fix-detection-for-pre-compiled-css-files.patch |
| 22 |
@@ -0,0 +1,29 @@ |
| 23 |
+From 552a4b2c82f41c1dbba410b825673cf67d089b68 Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Kalev Lember <klember@××××××.com> |
| 25 |
+Date: Mon, 23 Aug 2021 15:38:46 +0200 |
| 26 |
+Subject: [PATCH] build: Fix detection for pre-compiled css files |
| 27 |
+ |
| 28 |
+The default theme changed from Adwaita to Default and this tripped up |
| 29 |
+the logic to detect if the tarball builds contain pre-built css files or |
| 30 |
+not. Fix this by looking at pre-compiled css files in themes/Default/ |
| 31 |
+instead of themes/Adwaita/. |
| 32 |
+--- |
| 33 |
+ gtk/meson.build | 2 +- |
| 34 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 35 |
+ |
| 36 |
+diff --git a/gtk/meson.build b/gtk/meson.build |
| 37 |
+index fa66764c50..bfb5105fe5 100644 |
| 38 |
+--- a/gtk/meson.build |
| 39 |
++++ b/gtk/meson.build |
| 40 |
+@@ -842,7 +842,7 @@ gtk_gresources_xml = configure_file(output: 'gtk.gresources.xml', |
| 41 |
+ |
| 42 |
+ theme_deps = [] |
| 43 |
+ # For git checkouts, but not for tarballs... |
| 44 |
+-if not fs.exists('theme/Adwaita/Adwaita.css') |
| 45 |
++if not fs.exists('theme/Default/Default-light.css') |
| 46 |
+ # ... build the theme files |
| 47 |
+ sassc = find_program('sassc', required: false) |
| 48 |
+ if not sassc.found() |
| 49 |
+-- |
| 50 |
+2.31.1 |
| 51 |
+ |
| 52 |
|
| 53 |
diff --git a/gui-libs/gtk/gtk-4.4.0.ebuild b/gui-libs/gtk/gtk-4.4.0.ebuild |
| 54 |
index 231c1298890..f0a65fdf2fe 100644 |
| 55 |
--- a/gui-libs/gtk/gtk-4.4.0.ebuild |
| 56 |
+++ b/gui-libs/gtk/gtk-4.4.0.ebuild |
| 57 |
@@ -90,6 +90,10 @@ BDEPEND=" |
| 58 |
) |
| 59 |
" |
| 60 |
|
| 61 |
+PATCHES=( |
| 62 |
+ "${FILESDIR}"/${PV}-build-Fix-detection-for-pre-compiled-css-files.patch |
| 63 |
+) |
| 64 |
+ |
| 65 |
src_configure() { |
| 66 |
local emesonargs=( |
| 67 |
# GDK backends |
Archives