[PR PATCH] gtk4: disable sysprof

[PR PATCH] gtk4: disable sysprof

[paper42]

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

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages gtk4-no-sysprof
https://github.com/void-linux/void-packages/pull/32882

gtk4: disable sysprof
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32882.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gtk4-no-sysprof-32882.patch --]
[-- Type: text/x-diff, Size: 1063 bytes --]

From 4b49474d5a1c080520ce2293092a6fff1daab113 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 8 Sep 2021 23:36:37 +0200
Subject: [PATCH] gtk4: disable sysprof

---
 srcpkgs/gtk4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 6a40b731ad17..7494ff102dd1 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk4'
 pkgname=gtk4
 version=4.4.0
-revision=1
+revision=2
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
@@ -38,7 +38,7 @@ desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
 desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11"
 
 pre_build() {
 	# help gi-docgen find gi files on cross

Re: gtk4: disable sysprof

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32882#issuecomment-916360511

Comment:
```
=> gtk4-demo-4.4.0_2: running pkg_install ...
mv: cannot stat '/destdir//gtk4-4.4.0/usr/bin/gtk4-demo': No such file or directory
=> ERROR: gtk4-demo-4.4.0_2: pkg_install: 'mv ${DESTDIR}/$files ${PKGDESTDIR}/${_targetdir}' exited with 1
```

sysprof is messing something else >.<

Re: [PR PATCH] [Updated] gtk4: disable sysprof

[paper42]

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

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages gtk4-no-sysprof
https://github.com/void-linux/void-packages/pull/32882

gtk4: disable sysprof
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32882.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gtk4-no-sysprof-32882.patch --]
[-- Type: text/x-diff, Size: 3963 bytes --]

From 1750468c87295d2407484a904ef4a0e0badda73c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 8 Sep 2021 23:36:37 +0200
Subject: [PATCH] gtk4: disable sysprof

---
 srcpkgs/gtk4/patches/fix-sysprof.patch | 23 -----------------------
 srcpkgs/gtk4/template                  | 13 +++++--------
 2 files changed, 5 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/gtk4/patches/fix-sysprof.patch

diff --git a/srcpkgs/gtk4/patches/fix-sysprof.patch b/srcpkgs/gtk4/patches/fix-sysprof.patch
deleted file mode 100644
index 76a86d16cc80..000000000000
--- a/srcpkgs/gtk4/patches/fix-sysprof.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/gtk/meson.build
-+++ b/gtk/meson.build
-@@ -1001,6 +1001,7 @@ gtk_deps = [
-   epoxy_dep,
-   libm,
-   graphene_dep,
-+  libsysprof_dep,
- ]
- 
- if harfbuzz_dep.found() and pangoft_dep.found()
-diff --git a/tools/meson.build b/tools/meson.build
-index 1811b69..804e37f 100644
---- a/tools/meson.build
-+++ b/tools/meson.build
-@@ -30,7 +30,7 @@ gtk_tools = [
-                          'gtk-builder-tool-enumerate.c',
-                          'gtk-builder-tool-preview.c'], [libgtk_dep] ],
-   ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
--  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
-+  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep, libsysprof_dep ] ],
- ]
- 
- if os_unix
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 6a40b731ad17..bf4ba39965a1 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk4'
 pkgname=gtk4
 version=4.4.0
-revision=1
+revision=2
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
@@ -12,8 +12,7 @@ configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dintrospection=$(vopt_if gir enabled disabled)
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
- -Dvulkan=$(vopt_if vulkan enabled disabled)
- -Dsysprof=$(vopt_if sysprof enabled disabled)"
+ -Dvulkan=$(vopt_if vulkan enabled disabled)"
 hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
  pkg-config sassc gettext libxslt docbook-xsl
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
@@ -22,8 +21,7 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
  $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel')
  $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
- $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')
- $(vopt_if sysprof 'sysprof-devel json-glib-devel polkit-devel')"
+ $(vopt_if cloudproviders 'libcloudproviders-devel') $(vopt_if vulkan 'vulkan-loader Vulkan-Headers')"
 depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
 short_desc="GIMP ToolKit (v4)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -33,12 +31,11 @@ distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
 checksum=e0a1508f441686c3a20dfec48af533b19a4b2e017c18eaee31dccdb7d292505b
 
 # Package build options
-build_options="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
-desc_option_sysprof="Enable support for sysprof profiling"
 
-build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11 sysprof"
+build_options_default="broadway cloudproviders colord cups gir vulkan wayland x11"
 
 pre_build() {
 	# help gi-docgen find gi files on cross

Re: [PR PATCH] [Merged]: gtk4: disable sysprof

[paper42]

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

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

gtk4: disable sysprof
https://github.com/void-linux/void-packages/pull/32882

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->