[PR PATCH] xinput_calibrator: update to 0.8.0, fix distfile

[PR PATCH] xinput_calibrator: update to 0.8.0, fix distfile

[meator]

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

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

https://github.com/meator/void-packages xinput_calibrator
https://github.com/void-linux/void-packages/pull/52337

xinput_calibrator: update to 0.8.0, fix distfile
<!-- Uncomment relevant sections and delete options which are not applicable -->
related to #52319

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### 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/52337.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xinput_calibrator-52337.patch --]
[-- Type: text/x-diff, Size: 1360 bytes --]

From f387a11f7dc3cad669915f12686e83504dc9caef Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Tue, 24 Sep 2024 15:22:46 +0200
Subject: [PATCH] xinput_calibrator: update to 0.8.0, fix distfile

---
 srcpkgs/xinput_calibrator/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xinput_calibrator/template b/srcpkgs/xinput_calibrator/template
index f2b8a1a30f4837..b1288e9d922bd8 100644
--- a/srcpkgs/xinput_calibrator/template
+++ b/srcpkgs/xinput_calibrator/template
@@ -1,7 +1,7 @@
 # Template file for 'xinput_calibrator'
 pkgname=xinput_calibrator
-version=0.7.5
-revision=3
+version=0.8.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXrandr-devel libXi-devel"
@@ -9,8 +9,8 @@ short_desc="Utility to calibrate X input devices"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="X11"
 homepage="http://www.freedesktop.org/wiki/Software/xinput_calibrator"
-distfiles="http://github.com/downloads/tias/xinput_calibrator/$pkgname-$version.tar.gz"
-checksum=baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971
+distfiles="https://xorg.freedesktop.org/archive/individual/app/xinput_calibrator-${version}.tar.xz"
+checksum=0508bf9705c0945f746b8c81bfc8d583a347dd067b58fa76b1aed4225e4b8b40
 
 post_install() {
 	vlicense COPYING LICENSE

Re: [PR REVIEW] xinput_calibrator: update to 0.8.0, fix distfile

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/52337#discussion_r1774087978

Comment:
switch to meson?

Re: [PR REVIEW] xinput_calibrator: update to 0.8.0, fix distfile

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/52337#discussion_r1774088141

Comment:
https

Re: [PR REVIEW] xinput_calibrator: update to 0.8.0, fix distfile

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/52337#discussion_r1774088738

Comment:
changelog: https://gitlab.freedesktop.org/xorg/app/xinput-calibrator/-/raw/master/Changelog

Re: [PR REVIEW] xinput_calibrator: update to 0.8.0, fix distfile

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/52337#discussion_r1774088738

Comment:
changelog: https://gitlab.freedesktop.org/xorg/app/xinput-calibrator/-/raw/master/Changelog

Re: [PR REVIEW] xinput_calibrator: update to 0.8.0, fix distfile

[meator]

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

New review comment by meator on void-packages repository

https://github.com/void-linux/void-packages/pull/52337#discussion_r1774716056

Comment:
Ah, I haven't noticed that [they have added Meson](https://lists.x.org/archives/xorg-announce/2024-July/003522.html).

Re: [PR PATCH] [Updated] xinput_calibrator: update to 0.8.0, fix distfile

[meator]

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

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

https://github.com/meator/void-packages xinput_calibrator
https://github.com/void-linux/void-packages/pull/52337

xinput_calibrator: update to 0.8.0, fix distfile
<!-- Uncomment relevant sections and delete options which are not applicable -->
related to #52319

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### 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/52337.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xinput_calibrator-52337.patch --]
[-- Type: text/x-diff, Size: 1443 bytes --]

From dfd33802eb4ffaea98944391743b3502d33b7abf Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Tue, 24 Sep 2024 15:22:46 +0200
Subject: [PATCH] xinput_calibrator: update to 0.8.0, fix distfile

---
 srcpkgs/xinput_calibrator/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xinput_calibrator/template b/srcpkgs/xinput_calibrator/template
index f2b8a1a30f4837..ccf8bbe88d65a8 100644
--- a/srcpkgs/xinput_calibrator/template
+++ b/srcpkgs/xinput_calibrator/template
@@ -1,16 +1,16 @@
 # Template file for 'xinput_calibrator'
 pkgname=xinput_calibrator
-version=0.7.5
-revision=3
-build_style=gnu-configure
+version=0.8.0
+revision=1
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libXrandr-devel libXi-devel"
 short_desc="Utility to calibrate X input devices"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="X11"
-homepage="http://www.freedesktop.org/wiki/Software/xinput_calibrator"
-distfiles="http://github.com/downloads/tias/xinput_calibrator/$pkgname-$version.tar.gz"
-checksum=baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971
+homepage="https://www.freedesktop.org/wiki/Software/xinput_calibrator"
+distfiles="https://xorg.freedesktop.org/archive/individual/app/xinput_calibrator-${version}.tar.xz"
+checksum=0508bf9705c0945f746b8c81bfc8d583a347dd067b58fa76b1aed4225e4b8b40
 
 post_install() {
 	vlicense COPYING LICENSE

Re: [PR PATCH] [Updated] xinput_calibrator: update to 0.8.0, fix distfile

[meator]

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

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

https://github.com/meator/void-packages xinput_calibrator
https://github.com/void-linux/void-packages/pull/52337

xinput_calibrator: update to 0.8.0, fix distfile
<!-- Uncomment relevant sections and delete options which are not applicable -->
related to #52319

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### 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/52337.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xinput_calibrator-52337.patch --]
[-- Type: text/x-diff, Size: 2203 bytes --]

From 16ba82428fbc9a72ef586e6f78bcef31f39eee69 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Tue, 24 Sep 2024 15:22:46 +0200
Subject: [PATCH] xinput_calibrator: update to 0.8.0, fix distfile

---
 .../patches/no-update-desktopdb.patch                | 11 +++++++++++
 srcpkgs/xinput_calibrator/template                   | 12 ++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/xinput_calibrator/patches/no-update-desktopdb.patch

diff --git a/srcpkgs/xinput_calibrator/patches/no-update-desktopdb.patch b/srcpkgs/xinput_calibrator/patches/no-update-desktopdb.patch
new file mode 100644
index 00000000000000..cdc1090f4fcbe9
--- /dev/null
+++ b/srcpkgs/xinput_calibrator/patches/no-update-desktopdb.patch
@@ -0,0 +1,11 @@
+Desktop database update is handled by update-desktopdb XBPS trigger already.
+--- a/meson.build
++++ b/meson.build
+@@ -110,7 +110,3 @@
+     'scripts/xinput_calibrator.xpm',
+     install_dir: get_option('datadir') / 'pixmaps'
+ )
+-
+-gnome.post_install(
+-    update_desktop_database: true,
+-)
diff --git a/srcpkgs/xinput_calibrator/template b/srcpkgs/xinput_calibrator/template
index f2b8a1a30f4837..ccf8bbe88d65a8 100644
--- a/srcpkgs/xinput_calibrator/template
+++ b/srcpkgs/xinput_calibrator/template
@@ -1,16 +1,16 @@
 # Template file for 'xinput_calibrator'
 pkgname=xinput_calibrator
-version=0.7.5
-revision=3
-build_style=gnu-configure
+version=0.8.0
+revision=1
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libXrandr-devel libXi-devel"
 short_desc="Utility to calibrate X input devices"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="X11"
-homepage="http://www.freedesktop.org/wiki/Software/xinput_calibrator"
-distfiles="http://github.com/downloads/tias/xinput_calibrator/$pkgname-$version.tar.gz"
-checksum=baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971
+homepage="https://www.freedesktop.org/wiki/Software/xinput_calibrator"
+distfiles="https://xorg.freedesktop.org/archive/individual/app/xinput_calibrator-${version}.tar.xz"
+checksum=0508bf9705c0945f746b8c81bfc8d583a347dd067b58fa76b1aed4225e4b8b40
 
 post_install() {
 	vlicense COPYING LICENSE

Re: [PR REVIEW] xinput_calibrator: update to 0.8.0, fix distfile

[meator]

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

New review comment by meator on void-packages repository

https://github.com/void-linux/void-packages/pull/52337#discussion_r1774741005

Comment:
I had to add a patch because of this, but it's working.

Re: [PR PATCH] [Merged]: xinput_calibrator: update to 0.8.0, fix distfile

[classabbyamp]

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

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

xinput_calibrator: update to 0.8.0, fix distfile
https://github.com/void-linux/void-packages/pull/52337

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
related to #52319

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### 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
-->