From 35a72007c1b3d97411eaab5f8cce804fc325a022 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 20 Feb 2024 12:51:14 -0800 Subject: [PATCH] adwaita-icon-theme: remove gtk-update-icon-cache makedep Fix build cycle in the form of fftw -> cmake -> qt6-base -> gtk+3 -> adwaita-icon-theme -> gtk4 -> ... -> fftw -> cmake See: #48853 --- .../remove-gtk-update-icon-cache.patch | 20 +++++++++++++++++++ srcpkgs/adwaita-icon-theme/template | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/adwaita-icon-theme/patches/remove-gtk-update-icon-cache.patch diff --git a/srcpkgs/adwaita-icon-theme/patches/remove-gtk-update-icon-cache.patch b/srcpkgs/adwaita-icon-theme/patches/remove-gtk-update-icon-cache.patch new file mode 100644 index 00000000000000..599a78fdba7950 --- /dev/null +++ b/srcpkgs/adwaita-icon-theme/patches/remove-gtk-update-icon-cache.patch @@ -0,0 +1,20 @@ +gtk-update-icon-cache is only needed here when installing locally +and gets skipped when installing to a destdir + +--- a/meson.build ++++ b/meson.build +@@ -45,14 +45,3 @@ else + ) + endif + +-gtk_update_icon_cache = find_program( +- 'gtk4-update-icon-cache', +- 'gtk-update-icon-cache', +- required : true, +-) +-meson.add_install_script( +- gtk_update_icon_cache, +- '-qtf', +- get_option('prefix') / adwaita_dir, +- skip_if_destdir: true, +-) diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template index 2f227b62f30f2c..127faa7eb40dc0 100644 --- a/srcpkgs/adwaita-icon-theme/template +++ b/srcpkgs/adwaita-icon-theme/template @@ -3,7 +3,7 @@ pkgname=adwaita-icon-theme version=45.0 revision=1 build_style=meson -hostmakedepends="pkg-config gtk4-update-icon-cache" +hostmakedepends="pkg-config" depends="librsvg" short_desc="Theme consisting of a set of icons for GTK+" maintainer="icp "