From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] adwaita-icon-theme: fix build cycle involving cmake, gtk+3, and fftw
Date: Tue, 20 Feb 2024 22:55:00 +0100 [thread overview]
Message-ID: <20240220215501.07700250E7@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-48858@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1420 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages cycle
https://github.com/void-linux/void-packages/pull/48858
adwaita-icon-theme: fix build cycle involving cmake, gtk+3, and fftw
Fix build cycle described in the form of cmake -> qt6 -> gtk+3 -> adwaita-icon-theme -> gtk4 -> ... -> fftw -> cmake
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
cc: @sgn
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/48858.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cycle-48858.patch --]
[-- Type: text/x-diff, Size: 2449 bytes --]
From 1918f440e31e6c9254e89b52289b53642c33bfc1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 20 Feb 2024 12:51:14 -0800
Subject: [PATCH] adwaita-icon-theme: remove gtk-update-icon-cache makedep and
fix build cycle
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 +-
srcpkgs/fftw/template | 3 ++-
3 files changed, 23 insertions(+), 2 deletions(-)
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 <pangolin@vivaldi.net>"
diff --git a/srcpkgs/fftw/template b/srcpkgs/fftw/template
index 9ef60208a5b0c2..20864eacf34649 100644
--- a/srcpkgs/fftw/template
+++ b/srcpkgs/fftw/template
@@ -2,7 +2,8 @@
pkgname=fftw
version=3.3.10
revision=2
-hostmakedepends="libtool automake cmake"
+build_helper="cmake"
+hostmakedepends="libtool automake"
makedepends="libgomp-devel"
short_desc="Library for computing the discrete Fourier transform (DFT)"
maintainer="Orphaned <orphan@voidlinux.org>"
next prev parent reply other threads:[~2024-02-20 21:55 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-20 21:05 [PR PATCH] " oreo639
2024-02-20 21:10 ` classabbyamp
2024-02-20 21:20 ` oreo639
2024-02-20 21:21 ` oreo639
2024-02-20 21:23 ` oreo639
2024-02-20 21:55 ` oreo639 [this message]
2024-02-20 21:55 ` [PR PATCH] [Updated] " oreo639
2024-02-20 21:56 ` oreo639
2024-02-20 23:37 ` [PR PATCH] [Closed]: adwaita-icon-theme: remove gtk-update-icon-cache makedep sgn
2024-02-24 1:50 ` sgn
2024-02-24 1:56 ` oreo639
2024-02-24 3:14 ` sgn
2024-02-24 7:24 ` oreo639
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=20240220215501.07700250E7@inbox.vuxu.org \
--to=oreo639@users.noreply.github.com \
--cc=ml@inbox.vuxu.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;
as well as URLs for NNTP newsgroup(s).