[PR PATCH] adwaita-icon-theme: fix build cycle involving cmake, gtk+3, and fftw

[PR PATCH] adwaita-icon-theme: fix build cycle involving cmake, gtk+3, and fftw

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 1415 bytes --]

There is a new 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: 997 bytes --]

From e541f61b4517344e9ec8ebfdaa0a6bc4137653e5 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: fix build cycle involving cmake, gtk+3,
 and fftw

Fix build cycle described in the form of fftw -> cmake -> qt6-base -> gtk+3 ->
adwaita-icon-theme -> gtk4 -> ... -> fftw -> cmake

See: #48853
---
 srcpkgs/adwaita-icon-theme/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 2f227b62f30f2c..b7898102a485c1 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 gtk-update-icon-cache"
 depends="librsvg"
 short_desc="Theme consisting of a set of icons for GTK+"
 maintainer="icp <pangolin@vivaldi.net>"

Re: adwaita-icon-theme: fix build cycle involving cmake, gtk+3, and fftw

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 230 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/48858#issuecomment-1955103051

Comment:
I don't think we want more things to rely on gtk2, as it will be removed eventually

Re: adwaita-icon-theme: fix build cycle involving cmake, gtk+3, and fftw

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 321 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/48858#issuecomment-1955117020

Comment:
Alternatively, fftw can be made to use cmake-bootstrap. (this is what `build_style=cmake` uses)
However, `PATH="$PATH:/usr/libexec/xbps-src/bin"` needs to get explicitly defined.

Re: adwaita-icon-theme: fix build cycle involving cmake, gtk+3, and fftw

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 400 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/48858#issuecomment-1955117020

Comment:
Alternatively, fftw (and maybe other non-`build_style=cmake` packages that makedepends on `cmake`) can be made to use cmake-bootstrap. (this is what `build_style=cmake` uses)
However, `PATH="$PATH:/usr/libexec/xbps-src/bin"` needs to get explicitly defined.

Re: adwaita-icon-theme: fix build cycle involving cmake, gtk+3, and fftw

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 448 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/48858#issuecomment-1955117020

Comment:
Alternatively, fftw (and maybe other non-`build_style=cmake` packages that makedepends on `cmake`) can be made to use cmake-bootstrap. (this is what `build_style=cmake` uses)
However, `PATH="$PATH:/usr/libexec/xbps-src/bin"` needs to get explicitly defined.

Maybe a `build_helper=cmake` could be added?

Re: [PR PATCH] [Updated] adwaita-icon-theme: fix build cycle involving cmake, gtk+3, and fftw

[oreo639]

[-- 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>"

Re: [PR PATCH] [Updated] adwaita-icon-theme: fix build cycle involving cmake, gtk+3, and fftw

[oreo639]

[-- 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: 2428 bytes --]

From 24b627d3904e4b4532a33b7ba374cb1e4bc7183c 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

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>"

Re: [PR PATCH] [Updated] adwaita-icon-theme: fix build cycle involving cmake, gtk+3, and fftw

[oreo639]

[-- 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: 1906 bytes --]

From 35a72007c1b3d97411eaab5f8cce804fc325a022 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

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 <pangolin@vivaldi.net>"

Re: [PR PATCH] [Closed]: adwaita-icon-theme: remove gtk-update-icon-cache makedep

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1254 bytes --]

There's a closed pull request on the void-packages repository

adwaita-icon-theme: remove gtk-update-icon-cache makedep
https://github.com/void-linux/void-packages/pull/48858

Description:
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
-->

Re: adwaita-icon-theme: remove gtk-update-icon-cache makedep

[sgn]

[-- Attachment #1: Type: text/plain, Size: 399 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/48858#issuecomment-1962210600

Comment:
For `build_helper=cmake`, I think we don't need. Just put `/usr/libexec/xbps-src/bin` into the end of `PATH`. if `cmake-bootstrap` is installed, it's picked up from there, if both `cmake` and `cmake-bootstrap` is installed, it will be picked up from `/usr/bin`.

Re: adwaita-icon-theme: remove gtk-update-icon-cache makedep

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 304 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/48858#issuecomment-1962212293

Comment:
> Just put `/usr/libexec/xbps-src/bin` into the end of `PATH`. if `cmake-bootstrap` is installed

Where would be the right place to check that out of curiosity?

Re: adwaita-icon-theme: remove gtk-update-icon-cache makedep

[sgn]

[-- Attachment #1: Type: text/plain, Size: 261 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/48858#issuecomment-1962232012

Comment:
No, I meant we should always append `/usr/libexec/xbps-src/bin` into `PATH` regardless of installation of `cmake-bootstrap`

Re: adwaita-icon-theme: remove gtk-update-icon-cache makedep

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 158 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/48858#issuecomment-1962284930

Comment:
Alright, thanks.