[PR PATCH] meld: update to 3.22.0.

[PR PATCH] meld: update to 3.22.0.

[icp1994]

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

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

https://github.com/icp1994/void-packages meld
https://github.com/void-linux/void-packages/pull/39249

meld: update to 3.22.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86_64

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

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

From f9f63f356fb6e4cb4603035c4205083f0e58cd77 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 11 Sep 2022 01:54:55 +0530
Subject: [PATCH] meld: update to 3.22.0.

---
 srcpkgs/meld/template | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index e37fd1bb7925..b36e87c64790 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,21 +1,22 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.4
-revision=2
-build_style=python3-module
-configure_args="--disable-schemas-compile"
-hostmakedepends="pkg-config intltool python3-distro itstool
- gtk-update-icon-cache libxml2-python3"
-depends="python3-gobject gsettings-desktop-schemas gtksourceview
+version=3.22.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config itstool gettext appstream-glib"
+makedepends="python3-devel gtk+3-devel glib-devel gtksourceview4-devel python3-gobject-devel"
+depends="python3-gobject python3-cairo gsettings-desktop-schemas gtksourceview4
  desktop-file-utils hicolor-icon-theme"
+checkdepends="${depends} python3-pytest"
 short_desc="Visual diff and merge tool"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
-homepage="http://meldmerge.org/"
+homepage="https://meld.app"
+changelog="https://gitlab.gnome.org/GNOME/meld/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
+checksum=3fc107c98ef6e75358ffd2b0d14c85ddb48fe14a11e939a94322faaa8e90c40d
 
-post_install() {
-	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
-		$DESTDIR/usr/share/icons/hicolor/icon-theme.cache
+do_check() {
+	ninja -C build test
+	python3 -m pytest test
 }

Re: [PR PATCH] [Updated] meld: update to 3.22.0.

[icp1994]

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

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

https://github.com/icp1994/void-packages meld
https://github.com/void-linux/void-packages/pull/39249

meld: update to 3.22.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86_64

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

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

From dc89753110b037bee5df44913bc8cd47969c4afb Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 11 Sep 2022 01:54:55 +0530
Subject: [PATCH] meld: update to 3.22.0.

---
 srcpkgs/meld/template | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index e37fd1bb7925..e140ef58eb25 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,21 +1,22 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.4
-revision=2
-build_style=python3-module
-configure_args="--disable-schemas-compile"
-hostmakedepends="pkg-config intltool python3-distro itstool
- gtk-update-icon-cache libxml2-python3"
-depends="python3-gobject gsettings-desktop-schemas gtksourceview
+version=3.22.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config itstool gettext appstream-glib glib-devel"
+makedepends="python3-devel gtk+3-devel glib-devel gtksourceview4-devel python3-gobject-devel"
+depends="python3-gobject python3-cairo gsettings-desktop-schemas gtksourceview4
  desktop-file-utils hicolor-icon-theme"
+checkdepends="${depends} python3-pytest"
 short_desc="Visual diff and merge tool"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
-homepage="http://meldmerge.org/"
+homepage="https://meld.app"
+changelog="https://gitlab.gnome.org/GNOME/meld/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
+checksum=3fc107c98ef6e75358ffd2b0d14c85ddb48fe14a11e939a94322faaa8e90c40d
 
-post_install() {
-	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
-		$DESTDIR/usr/share/icons/hicolor/icon-theme.cache
+do_check() {
+	ninja -C build test
+	python3 -m pytest test
 }

Re: meld: update to 3.22.0.

[icp1994]

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

New comment by icp1994 on void-packages repository

https://github.com/void-linux/void-packages/pull/39249#issuecomment-1243949446

Comment:
I don't think I can do something about that failure.

Re: [PR PATCH] [Updated] meld: update to 3.22.0.

[icp1994]

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

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

https://github.com/icp1994/void-packages meld
https://github.com/void-linux/void-packages/pull/39249

meld: update to 3.22.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86_64

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

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

From 1472f5b0d0e6925711d53e486b9c362c9a530055 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 11 Sep 2022 01:54:55 +0530
Subject: [PATCH] meld: update to 3.22.0.

---
 srcpkgs/meld/template | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index e37fd1bb7925..b69e8946d3ee 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,21 +1,22 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.4
-revision=2
-build_style=python3-module
-configure_args="--disable-schemas-compile"
-hostmakedepends="pkg-config intltool python3-distro itstool
- gtk-update-icon-cache libxml2-python3"
-depends="python3-gobject gsettings-desktop-schemas gtksourceview
+version=3.22.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config itstool gettext appstream-glib glib-devel"
+makedepends="python3-devel gtk+3-devel gtksourceview4-devel python3-gobject-devel"
+depends="python3-gobject python3-cairo gsettings-desktop-schemas gtksourceview4
  desktop-file-utils hicolor-icon-theme"
+checkdepends="${depends} python3-pytest"
 short_desc="Visual diff and merge tool"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
-homepage="http://meldmerge.org/"
+homepage="https://meld.app"
+changelog="https://gitlab.gnome.org/GNOME/meld/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
+checksum=3fc107c98ef6e75358ffd2b0d14c85ddb48fe14a11e939a94322faaa8e90c40d
 
-post_install() {
-	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
-		$DESTDIR/usr/share/icons/hicolor/icon-theme.cache
+do_check() {
+	ninja -C build test
+	python3 -m pytest test
 }

Re: [PR REVIEW] meld: update to 3.22.0.

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/39249#discussion_r970390244

Comment:
```suggestion
post_check() {
	python3 -m pytest test
```
does this work? the default `do_check()` should work, probably

Re: [PR PATCH] [Updated] meld: update to 3.22.0.

[icp1994]

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

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

https://github.com/icp1994/void-packages meld
https://github.com/void-linux/void-packages/pull/39249

meld: update to 3.22.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86_64

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

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

From 27b7be7baae1d5f4746ed7936072f50628ed6093 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 11 Sep 2022 01:54:55 +0530
Subject: [PATCH] meld: update to 3.22.0.

---
 srcpkgs/meld/template | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index e37fd1bb7925..3132435449f4 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,21 +1,21 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.4
-revision=2
-build_style=python3-module
-configure_args="--disable-schemas-compile"
-hostmakedepends="pkg-config intltool python3-distro itstool
- gtk-update-icon-cache libxml2-python3"
-depends="python3-gobject gsettings-desktop-schemas gtksourceview
+version=3.22.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config itstool gettext appstream-glib glib-devel"
+makedepends="python3-devel gtk+3-devel gtksourceview4-devel python3-gobject-devel"
+depends="python3-gobject python3-cairo gsettings-desktop-schemas gtksourceview4
  desktop-file-utils hicolor-icon-theme"
+checkdepends="${depends} python3-pytest"
 short_desc="Visual diff and merge tool"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
-homepage="http://meldmerge.org/"
+homepage="https://meld.app"
+changelog="https://gitlab.gnome.org/GNOME/meld/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=f48e10eec606f687a87061e78668f6bb40e63e032175c4c7033636b65a157d13
+checksum=3fc107c98ef6e75358ffd2b0d14c85ddb48fe14a11e939a94322faaa8e90c40d
 
-post_install() {
-	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
-		$DESTDIR/usr/share/icons/hicolor/icon-theme.cache
+post_check() {
+	python3 -m pytest test
 }

Re: [PR REVIEW] meld: update to 3.22.0.

[icp1994]

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

New review comment by icp1994 on void-packages repository

https://github.com/void-linux/void-packages/pull/39249#discussion_r971108079

Comment:
yep, that works fine

Re: [PR PATCH] [Closed]: meld: update to 3.22.0.

[icp1994]

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

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

meld: update to 3.22.0.
https://github.com/void-linux/void-packages/pull/39249

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

#### Local build testing
- I built this PR locally for my native architecture, x86_64

Re: meld: update to 3.22.0.

[icp1994]

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

New comment by icp1994 on void-packages repository

https://github.com/void-linux/void-packages/pull/39249#issuecomment-1249753016

Comment:
https://github.com/void-linux/void-packages/commit/a3e43925f092a03b3ca917b2c8c7039fccd9ee9f oh well...