[PR PATCH] Diffuse branch

[PR PATCH] Diffuse branch

[drichline]

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

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

https://github.com/drichline/void-packages diffuse-branch
https://github.com/void-linux/void-packages/pull/43560

Diffuse branch
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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, x86_64-glibc


A patch file from https://github.com/void-linux/void-packages/pull/43560.patch is attached

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

From df3d599bb459c0c205f9e62578ef9fad63cc9d8e Mon Sep 17 00:00:00 2001
From: Dakota Richline <drichline@protonmail.com>
Date: Fri, 7 Apr 2023 16:46:02 -0400
Subject: [PATCH 1/2] diffuse: update to 0.8.1

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

diff --git a/srcpkgs/diffuse/template b/srcpkgs/diffuse/template
index 1924b7fab7e8..7c4ef659778e 100644
--- a/srcpkgs/diffuse/template
+++ b/srcpkgs/diffuse/template
@@ -1,6 +1,6 @@
 # Template file for 'diffuse'
 pkgname=diffuse
-version=0.7.7
+version=0.8.1
 revision=1
 build_style=meson
 hostmakedepends="gettext"
@@ -11,4 +11,4 @@ maintainer="Dakota Richline <drichline@protonmail.com>"
 license="GPL-2.0-only, FSFAP"
 homepage="https://github.com/MightyCreak/diffuse"
 distfiles="https://github.com/MightyCreak/diffuse/archive/refs/tags/v${version}.tar.gz"
-checksum=175d8315b489c26fe5bef12769a0edc1560d384025bb1e001c8cc901b4c9e789
+checksum=f4dc40d2771853bc38fd714cb069cc965d9e2e4ed517822abdd5a54c851392ec

From a24ee09583d987c2a5265f0037fda82c5fe6bfe3 Mon Sep 17 00:00:00 2001
From: Dakota Richline <drichline@protonmail.com>
Date: Thu, 20 Apr 2023 21:35:13 -0400
Subject: [PATCH 2/2] diffuse: update to 0.8.2

---
 srcpkgs/diffuse/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/diffuse/template b/srcpkgs/diffuse/template
index 7c4ef659778e..b36d968d2472 100644
--- a/srcpkgs/diffuse/template
+++ b/srcpkgs/diffuse/template
@@ -1,14 +1,14 @@
 # Template file for 'diffuse'
 pkgname=diffuse
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext"
-makedepends="python3-cairo-devel python3-gobject-devel"
+makedepends="python3-cairo-devel python3-gobject-devel glib-devel"
 depends="gtk+3 python3-gobject python3-cairo"
 short_desc="Graphical tool for merging and comparing text files"
 maintainer="Dakota Richline <drichline@protonmail.com>"
 license="GPL-2.0-only, FSFAP"
 homepage="https://github.com/MightyCreak/diffuse"
 distfiles="https://github.com/MightyCreak/diffuse/archive/refs/tags/v${version}.tar.gz"
-checksum=f4dc40d2771853bc38fd714cb069cc965d9e2e4ed517822abdd5a54c851392ec
+checksum=2e21012d319bbb445d00ee6616080214c56fa50c92a7da653a83a7a8efb4e56a

Re: [PR PATCH] [Updated] Diffuse branch

[drichline]

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

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

https://github.com/drichline/void-packages diffuse-branch
https://github.com/void-linux/void-packages/pull/43560

Diffuse branch
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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, x86_64-glibc


A patch file from https://github.com/void-linux/void-packages/pull/43560.patch is attached

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

From df3d599bb459c0c205f9e62578ef9fad63cc9d8e Mon Sep 17 00:00:00 2001
From: Dakota Richline <drichline@protonmail.com>
Date: Fri, 7 Apr 2023 16:46:02 -0400
Subject: [PATCH 1/2] diffuse: update to 0.8.1

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

diff --git a/srcpkgs/diffuse/template b/srcpkgs/diffuse/template
index 1924b7fab7e8..7c4ef659778e 100644
--- a/srcpkgs/diffuse/template
+++ b/srcpkgs/diffuse/template
@@ -1,6 +1,6 @@
 # Template file for 'diffuse'
 pkgname=diffuse
-version=0.7.7
+version=0.8.1
 revision=1
 build_style=meson
 hostmakedepends="gettext"
@@ -11,4 +11,4 @@ maintainer="Dakota Richline <drichline@protonmail.com>"
 license="GPL-2.0-only, FSFAP"
 homepage="https://github.com/MightyCreak/diffuse"
 distfiles="https://github.com/MightyCreak/diffuse/archive/refs/tags/v${version}.tar.gz"
-checksum=175d8315b489c26fe5bef12769a0edc1560d384025bb1e001c8cc901b4c9e789
+checksum=f4dc40d2771853bc38fd714cb069cc965d9e2e4ed517822abdd5a54c851392ec

From a24ee09583d987c2a5265f0037fda82c5fe6bfe3 Mon Sep 17 00:00:00 2001
From: Dakota Richline <drichline@protonmail.com>
Date: Thu, 20 Apr 2023 21:35:13 -0400
Subject: [PATCH 2/2] diffuse: update to 0.8.2

---
 srcpkgs/diffuse/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/diffuse/template b/srcpkgs/diffuse/template
index 7c4ef659778e..b36d968d2472 100644
--- a/srcpkgs/diffuse/template
+++ b/srcpkgs/diffuse/template
@@ -1,14 +1,14 @@
 # Template file for 'diffuse'
 pkgname=diffuse
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext"
-makedepends="python3-cairo-devel python3-gobject-devel"
+makedepends="python3-cairo-devel python3-gobject-devel glib-devel"
 depends="gtk+3 python3-gobject python3-cairo"
 short_desc="Graphical tool for merging and comparing text files"
 maintainer="Dakota Richline <drichline@protonmail.com>"
 license="GPL-2.0-only, FSFAP"
 homepage="https://github.com/MightyCreak/diffuse"
 distfiles="https://github.com/MightyCreak/diffuse/archive/refs/tags/v${version}.tar.gz"
-checksum=f4dc40d2771853bc38fd714cb069cc965d9e2e4ed517822abdd5a54c851392ec
+checksum=2e21012d319bbb445d00ee6616080214c56fa50c92a7da653a83a7a8efb4e56a

Re: [PR PATCH] [Updated] Diffuse branch

[drichline]

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

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

https://github.com/drichline/void-packages diffuse-branch
https://github.com/void-linux/void-packages/pull/43560

Diffuse branch
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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, x86_64-glibc


A patch file from https://github.com/void-linux/void-packages/pull/43560.patch is attached

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

From df3d599bb459c0c205f9e62578ef9fad63cc9d8e Mon Sep 17 00:00:00 2001
From: Dakota Richline <drichline@protonmail.com>
Date: Fri, 7 Apr 2023 16:46:02 -0400
Subject: [PATCH 1/2] diffuse: update to 0.8.1

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

diff --git a/srcpkgs/diffuse/template b/srcpkgs/diffuse/template
index 1924b7fab7e8..7c4ef659778e 100644
--- a/srcpkgs/diffuse/template
+++ b/srcpkgs/diffuse/template
@@ -1,6 +1,6 @@
 # Template file for 'diffuse'
 pkgname=diffuse
-version=0.7.7
+version=0.8.1
 revision=1
 build_style=meson
 hostmakedepends="gettext"
@@ -11,4 +11,4 @@ maintainer="Dakota Richline <drichline@protonmail.com>"
 license="GPL-2.0-only, FSFAP"
 homepage="https://github.com/MightyCreak/diffuse"
 distfiles="https://github.com/MightyCreak/diffuse/archive/refs/tags/v${version}.tar.gz"
-checksum=175d8315b489c26fe5bef12769a0edc1560d384025bb1e001c8cc901b4c9e789
+checksum=f4dc40d2771853bc38fd714cb069cc965d9e2e4ed517822abdd5a54c851392ec

From d350c53c18884b6e7af5d2abe5864351183fbb2f Mon Sep 17 00:00:00 2001
From: Dakota Richline <drichline@protonmail.com>
Date: Thu, 20 Apr 2023 21:45:14 -0400
Subject: [PATCH 2/2] diffuse: update to 0.8.2

---
 srcpkgs/diffuse/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/diffuse/template b/srcpkgs/diffuse/template
index 7c4ef659778e..b36d968d2472 100644
--- a/srcpkgs/diffuse/template
+++ b/srcpkgs/diffuse/template
@@ -1,14 +1,14 @@
 # Template file for 'diffuse'
 pkgname=diffuse
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext"
-makedepends="python3-cairo-devel python3-gobject-devel"
+makedepends="python3-cairo-devel python3-gobject-devel glib-devel"
 depends="gtk+3 python3-gobject python3-cairo"
 short_desc="Graphical tool for merging and comparing text files"
 maintainer="Dakota Richline <drichline@protonmail.com>"
 license="GPL-2.0-only, FSFAP"
 homepage="https://github.com/MightyCreak/diffuse"
 distfiles="https://github.com/MightyCreak/diffuse/archive/refs/tags/v${version}.tar.gz"
-checksum=f4dc40d2771853bc38fd714cb069cc965d9e2e4ed517822abdd5a54c851392ec
+checksum=2e21012d319bbb445d00ee6616080214c56fa50c92a7da653a83a7a8efb4e56a

Re: [PR PATCH] [Updated] Diffuse branch

[drichline]

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

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

https://github.com/drichline/void-packages diffuse-branch
https://github.com/void-linux/void-packages/pull/43560

Diffuse branch
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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, x86_64-glibc


A patch file from https://github.com/void-linux/void-packages/pull/43560.patch is attached

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

From 7892c39dec405f6ff2cb01821f2a44c8d2522034 Mon Sep 17 00:00:00 2001
From: Dakota Richline <drichline@protonmail.com>
Date: Thu, 20 Apr 2023 21:47:54 -0400
Subject: [PATCH] diffuse: update to 0.8.2

---
 srcpkgs/diffuse/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/diffuse/template b/srcpkgs/diffuse/template
index 7c4ef659778e..b36d968d2472 100644
--- a/srcpkgs/diffuse/template
+++ b/srcpkgs/diffuse/template
@@ -1,14 +1,14 @@
 # Template file for 'diffuse'
 pkgname=diffuse
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext"
-makedepends="python3-cairo-devel python3-gobject-devel"
+makedepends="python3-cairo-devel python3-gobject-devel glib-devel"
 depends="gtk+3 python3-gobject python3-cairo"
 short_desc="Graphical tool for merging and comparing text files"
 maintainer="Dakota Richline <drichline@protonmail.com>"
 license="GPL-2.0-only, FSFAP"
 homepage="https://github.com/MightyCreak/diffuse"
 distfiles="https://github.com/MightyCreak/diffuse/archive/refs/tags/v${version}.tar.gz"
-checksum=f4dc40d2771853bc38fd714cb069cc965d9e2e4ed517822abdd5a54c851392ec
+checksum=2e21012d319bbb445d00ee6616080214c56fa50c92a7da653a83a7a8efb4e56a

Re: [PR REVIEW] Diffuse branch

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43560#discussion_r1173328042

Comment:
```suggestion
hostmakedepends="gettext pkg-config"
```

Re: [PR PATCH] [Updated] Diffuse branch

[drichline]

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

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

https://github.com/drichline/void-packages diffuse-branch
https://github.com/void-linux/void-packages/pull/43560

Diffuse branch
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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, x86_64-glibc


A patch file from https://github.com/void-linux/void-packages/pull/43560.patch is attached

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

From 7892c39dec405f6ff2cb01821f2a44c8d2522034 Mon Sep 17 00:00:00 2001
From: Dakota Richline <drichline@protonmail.com>
Date: Thu, 20 Apr 2023 21:47:54 -0400
Subject: [PATCH 1/2] diffuse: update to 0.8.2

---
 srcpkgs/diffuse/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/diffuse/template b/srcpkgs/diffuse/template
index 7c4ef659778e..b36d968d2472 100644
--- a/srcpkgs/diffuse/template
+++ b/srcpkgs/diffuse/template
@@ -1,14 +1,14 @@
 # Template file for 'diffuse'
 pkgname=diffuse
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext"
-makedepends="python3-cairo-devel python3-gobject-devel"
+makedepends="python3-cairo-devel python3-gobject-devel glib-devel"
 depends="gtk+3 python3-gobject python3-cairo"
 short_desc="Graphical tool for merging and comparing text files"
 maintainer="Dakota Richline <drichline@protonmail.com>"
 license="GPL-2.0-only, FSFAP"
 homepage="https://github.com/MightyCreak/diffuse"
 distfiles="https://github.com/MightyCreak/diffuse/archive/refs/tags/v${version}.tar.gz"
-checksum=f4dc40d2771853bc38fd714cb069cc965d9e2e4ed517822abdd5a54c851392ec
+checksum=2e21012d319bbb445d00ee6616080214c56fa50c92a7da653a83a7a8efb4e56a

From 17cbc5fa1bee699b40fc19a0ab30f2ea282d92d5 Mon Sep 17 00:00:00 2001
From: Dakota Richline <drichline@protonmail.com>
Date: Wed, 26 Apr 2023 19:51:04 -0400
Subject: [PATCH 2/2] diffuse: update to 0.8.2

---
 srcpkgs/diffuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/diffuse/template b/srcpkgs/diffuse/template
index b36d968d2472..420c4a30d410 100644
--- a/srcpkgs/diffuse/template
+++ b/srcpkgs/diffuse/template
@@ -3,7 +3,7 @@ pkgname=diffuse
 version=0.8.2
 revision=1
 build_style=meson
-hostmakedepends="gettext"
+hostmakedepends="gettext pkg-config"
 makedepends="python3-cairo-devel python3-gobject-devel glib-devel"
 depends="gtk+3 python3-gobject python3-cairo"
 short_desc="Graphical tool for merging and comparing text files"

Re: [PR REVIEW] Diffuse branch

[drichline]

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

New review comment by drichline on void-packages repository

https://github.com/void-linux/void-packages/pull/43560#discussion_r1178499851

Comment:
Thank you. The arm builds are still failing because of a missing `glib-compile-resources`; I'm not sure what else to try since `glib-devel` is already in the makedepends

Re: [PR REVIEW] Diffuse branch

[drichline]

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

New review comment by drichline on void-packages repository

https://github.com/void-linux/void-packages/pull/43560#discussion_r1178499851

Comment:
Thank you. The arm builds are still failing because of a missing `glib-compile-resources`; I'm not sure what else to try since `glib-devel` is already added to the makedepends

Re: [PR REVIEW] Diffuse branch

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43560#discussion_r1178519277

Comment:
add glib-devel to hostmakedepends too

Re: [PR PATCH] [Updated] Diffuse branch

[drichline]

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

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

https://github.com/drichline/void-packages diffuse-branch
https://github.com/void-linux/void-packages/pull/43560

Diffuse branch
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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, x86_64-glibc


A patch file from https://github.com/void-linux/void-packages/pull/43560.patch is attached

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

From 7892c39dec405f6ff2cb01821f2a44c8d2522034 Mon Sep 17 00:00:00 2001
From: Dakota Richline <drichline@protonmail.com>
Date: Thu, 20 Apr 2023 21:47:54 -0400
Subject: [PATCH 1/3] diffuse: update to 0.8.2

---
 srcpkgs/diffuse/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/diffuse/template b/srcpkgs/diffuse/template
index 7c4ef659778e..b36d968d2472 100644
--- a/srcpkgs/diffuse/template
+++ b/srcpkgs/diffuse/template
@@ -1,14 +1,14 @@
 # Template file for 'diffuse'
 pkgname=diffuse
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
 hostmakedepends="gettext"
-makedepends="python3-cairo-devel python3-gobject-devel"
+makedepends="python3-cairo-devel python3-gobject-devel glib-devel"
 depends="gtk+3 python3-gobject python3-cairo"
 short_desc="Graphical tool for merging and comparing text files"
 maintainer="Dakota Richline <drichline@protonmail.com>"
 license="GPL-2.0-only, FSFAP"
 homepage="https://github.com/MightyCreak/diffuse"
 distfiles="https://github.com/MightyCreak/diffuse/archive/refs/tags/v${version}.tar.gz"
-checksum=f4dc40d2771853bc38fd714cb069cc965d9e2e4ed517822abdd5a54c851392ec
+checksum=2e21012d319bbb445d00ee6616080214c56fa50c92a7da653a83a7a8efb4e56a

From 17cbc5fa1bee699b40fc19a0ab30f2ea282d92d5 Mon Sep 17 00:00:00 2001
From: Dakota Richline <drichline@protonmail.com>
Date: Wed, 26 Apr 2023 19:51:04 -0400
Subject: [PATCH 2/3] diffuse: update to 0.8.2

---
 srcpkgs/diffuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/diffuse/template b/srcpkgs/diffuse/template
index b36d968d2472..420c4a30d410 100644
--- a/srcpkgs/diffuse/template
+++ b/srcpkgs/diffuse/template
@@ -3,7 +3,7 @@ pkgname=diffuse
 version=0.8.2
 revision=1
 build_style=meson
-hostmakedepends="gettext"
+hostmakedepends="gettext pkg-config"
 makedepends="python3-cairo-devel python3-gobject-devel glib-devel"
 depends="gtk+3 python3-gobject python3-cairo"
 short_desc="Graphical tool for merging and comparing text files"

From 850c60ba454b489e8d569616e3b4336f5696e7df Mon Sep 17 00:00:00 2001
From: Dakota Richline <drichline@protonmail.com>
Date: Wed, 26 Apr 2023 20:58:40 -0400
Subject: [PATCH 3/3] diffuse: update to 0.8.2

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

diff --git a/srcpkgs/diffuse/template b/srcpkgs/diffuse/template
index 420c4a30d410..f947869f9321 100644
--- a/srcpkgs/diffuse/template
+++ b/srcpkgs/diffuse/template
@@ -3,8 +3,8 @@ pkgname=diffuse
 version=0.8.2
 revision=1
 build_style=meson
-hostmakedepends="gettext pkg-config"
-makedepends="python3-cairo-devel python3-gobject-devel glib-devel"
+hostmakedepends="gettext pkg-config glib-devel"
+makedepends="python3-cairo-devel python3-gobject-devel"
 depends="gtk+3 python3-gobject python3-cairo"
 short_desc="Graphical tool for merging and comparing text files"
 maintainer="Dakota Richline <drichline@protonmail.com>"

Re: [PR REVIEW] Diffuse branch

[drichline]

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

New review comment by drichline on void-packages repository

https://github.com/void-linux/void-packages/pull/43560#discussion_r1178526578

Comment:
Many thanks, I should've tried that first. I'm still pretty new to building/troubleshooting source packages

Re: Diffuse branch

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43560#issuecomment-1528906372

Comment:
squash this into one commit please

Re: [PR PATCH] [Updated] Diffuse branch

[drichline]

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

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

https://github.com/drichline/void-packages diffuse-branch
https://github.com/void-linux/void-packages/pull/43560

Diffuse branch
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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, x86_64-glibc


A patch file from https://github.com/void-linux/void-packages/pull/43560.patch is attached

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

From 1aec89623b87295ea4d536ce306bf467a813c0a5 Mon Sep 17 00:00:00 2001
From: Dakota Richline <drichline@protonmail.com>
Date: Sat, 29 Apr 2023 20:43:42 -0400
Subject: [PATCH] diffuse: update to 0.8.2

---
 srcpkgs/diffuse/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/diffuse/template b/srcpkgs/diffuse/template
index 7c4ef659778e..f947869f9321 100644
--- a/srcpkgs/diffuse/template
+++ b/srcpkgs/diffuse/template
@@ -1,9 +1,9 @@
 # Template file for 'diffuse'
 pkgname=diffuse
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=meson
-hostmakedepends="gettext"
+hostmakedepends="gettext pkg-config glib-devel"
 makedepends="python3-cairo-devel python3-gobject-devel"
 depends="gtk+3 python3-gobject python3-cairo"
 short_desc="Graphical tool for merging and comparing text files"
@@ -11,4 +11,4 @@ maintainer="Dakota Richline <drichline@protonmail.com>"
 license="GPL-2.0-only, FSFAP"
 homepage="https://github.com/MightyCreak/diffuse"
 distfiles="https://github.com/MightyCreak/diffuse/archive/refs/tags/v${version}.tar.gz"
-checksum=f4dc40d2771853bc38fd714cb069cc965d9e2e4ed517822abdd5a54c851392ec
+checksum=2e21012d319bbb445d00ee6616080214c56fa50c92a7da653a83a7a8efb4e56a

Re: [PR PATCH] [Merged]: Diffuse branch

[abenson]

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

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

Diffuse branch
https://github.com/void-linux/void-packages/pull/43560

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

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

<!--
#### 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, x86_64-glibc

[PR PATCH] Diffuse branch

[drichline]

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

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

https://github.com/drichline/void-packages diffuse-branch
https://github.com/void-linux/void-packages/pull/40538

Diffuse branch
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

A patch file from https://github.com/void-linux/void-packages/pull/40538.patch is attached

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

From 018b257e1dc75b3f0db30f1f2d94370003fb8a1f Mon Sep 17 00:00:00 2001
From: Dakota Richline <43507179+drichline@users.noreply.github.com>
Date: Sat, 15 Oct 2022 14:37:55 -0400
Subject: [PATCH 1/2] New package: diffuse-0.7.5

---
 srcpkgs/diffuse/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/diffuse/template

diff --git a/srcpkgs/diffuse/template b/srcpkgs/diffuse/template
new file mode 100644
index 000000000000..5f05301ad2e3
--- /dev/null
+++ b/srcpkgs/diffuse/template
@@ -0,0 +1,14 @@
+# Template file for 'diffuse'
+pkgname=diffuse
+version=0.7.5
+revision=1
+build_style=meson
+hostmakedepends="gettext"
+makedepends="python3-cairo-devel python3-gobject-devel"
+depends="gtk+3 python3-gobject python3-cairo"
+short_desc="Graphical tool for merging and comparing text files"
+maintainer="Dakota Richline <drichline@protonmail.com>"
+license="GPL-2.0-only, FSFAP"
+homepage="https://github.com/MightyCreak/diffuse"
+distfiles="https://github.com/MightyCreak/diffuse/archive/refs/tags/v${version}.tar.gz"
+checksum=df34a7b2842956dc397d8e72f4d744dc50d403b515c5611f54bd137f3554eeb3

From b1e552df131880688ad9c801e115a631e3e8a2ea Mon Sep 17 00:00:00 2001
From: Dakota Richline <43507179+drichline@users.noreply.github.com>
Date: Tue, 15 Nov 2022 02:22:18 -0500
Subject: [PATCH 2/2] diffuse: update to 0.7.7

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

diff --git a/srcpkgs/diffuse/template b/srcpkgs/diffuse/template
index 5f05301ad2e3..1924b7fab7e8 100644
--- a/srcpkgs/diffuse/template
+++ b/srcpkgs/diffuse/template
@@ -1,6 +1,6 @@
 # Template file for 'diffuse'
 pkgname=diffuse
-version=0.7.5
+version=0.7.7
 revision=1
 build_style=meson
 hostmakedepends="gettext"
@@ -11,4 +11,4 @@ maintainer="Dakota Richline <drichline@protonmail.com>"
 license="GPL-2.0-only, FSFAP"
 homepage="https://github.com/MightyCreak/diffuse"
 distfiles="https://github.com/MightyCreak/diffuse/archive/refs/tags/v${version}.tar.gz"
-checksum=df34a7b2842956dc397d8e72f4d744dc50d403b515c5611f54bd137f3554eeb3
+checksum=175d8315b489c26fe5bef12769a0edc1560d384025bb1e001c8cc901b4c9e789