[PR PATCH] gitg: update 44

[PR PATCH] gitg: update 44

[chrysos349]

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

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

https://github.com/chrysos349/void-packages gitg
https://github.com/void-linux/void-packages/pull/49084

gitg: update 44
split into a separate pr (https://github.com/void-linux/void-packages/pull/48762#issuecomment-1976502687).

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

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl x
  - armv7l x
  - armv6l-musl x

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

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

From 3ce78195ecf491a40d7f5e041cba1018e5fe4d7c Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 4 Mar 2024 16:48:58 +0300
Subject: [PATCH 1/2] libgit2-glib: update to 1.2.0

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

diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template
index 358f81b03d7802..cdc0366e2136e6 100644
--- a/srcpkgs/libgit2-glib/template
+++ b/srcpkgs/libgit2-glib/template
@@ -1,7 +1,7 @@
 # Template file for 'libgit2-glib'
 pkgname=libgit2-glib
-version=1.1.0
-revision=5
+version=1.2.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Libgit2-glib"
 changelog="https://gitlab.gnome.org/GNOME/libgit2-glib/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libgit2-glib/${version%.*}/libgit2-glib-${version}.tar.xz"
-checksum=c38dd7575daf8141e1e422333a575faf65f3c9210c08e83e981b88dd41bf1ef3
+checksum=1331dada838f4e1f591b26459d44126a325de762dc3cd26153a31afbdfe18190
 
 build_options="gir"
 build_options_default="gir"

From 46a3314f50f345d0b4df22d898342ba08bbdb5e2 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 4 Mar 2024 16:49:26 +0300
Subject: [PATCH 2/2] gitg: update to 44

---
 srcpkgs/gitg/patches/meson-0.61.patch | 33 ---------------------------
 srcpkgs/gitg/template                 | 17 +++++++-------
 2 files changed, 9 insertions(+), 41 deletions(-)
 delete mode 100644 srcpkgs/gitg/patches/meson-0.61.patch

diff --git a/srcpkgs/gitg/patches/meson-0.61.patch b/srcpkgs/gitg/patches/meson-0.61.patch
deleted file mode 100644
index 330d45fc5ad85b..00000000000000
--- a/srcpkgs/gitg/patches/meson-0.61.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c81e1579afe7f221371b6866c25f388f48747728 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 23 Jan 2022 14:54:31 +0100
-Subject: [PATCH] meson: fix build with meson 0.61
-
-i18n.merge_file doesn't accept positional arguments
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index a8b90fd1..2413531d 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -6,7 +6,6 @@ desktop_config = configuration_data()
- desktop_config.set('icon', application_id)
- desktop_config.set('binary', gitg_name)
- i18n.merge_file(
--  desktop,
-   type: 'desktop',
-   input: configure_file(
-     input: desktop + '.in.in',
-@@ -42,7 +41,6 @@ appdata_config = configuration_data()
- appdata_config.set('app-id', application_id)
- appdata_config.set('gettext', gitg_name)
- i18n.merge_file(
--  appdata,
-   type: 'xml',
-   input: configure_file(
-     input: appdata + '.in.in',
--- 
-2.34.1
-
diff --git a/srcpkgs/gitg/template b/srcpkgs/gitg/template
index fcaa0aae56b2d0..01c21c65309157 100644
--- a/srcpkgs/gitg/template
+++ b/srcpkgs/gitg/template
@@ -1,13 +1,14 @@
 # Template file for 'gitg'
 pkgname=gitg
-version=41
-revision=3
+version=44
+revision=1
 build_style=meson
-build_helper="qemu"
-hostmakedepends="gettext glib-devel gobject-introspection pkg-config vala"
-makedepends="libgee08-devel libglib-devel gtk+3-devel gspell-devel
- gtksourceview4-devel libgit2-glib-devel libpeas-devel libsecret-devel
- libxml2-devel libdazzle-devel json-glib-devel gsettings-desktop-schemas-devel"
+build_helper="gir qemu"
+hostmakedepends="desktop-file-utils gettext glib-devel gtk-update-icon-cache
+ pkg-config vala"
+makedepends="gpgme-devel gsettings-desktop-schemas-devel gspell-devel
+ gtksourceview4-devel libdazzle-devel libgee08-devel libgit2-glib-devel
+ libhandy1-devel libpeas-devel libsecret-devel"
 depends="git"
 short_desc="Git repository viewer for GTK+/GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -15,4 +16,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gitg"
 changelog="https://gitlab.gnome.org/GNOME/gitg/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=7fb61b9fb10fbaa548d23d7065babd72ad63e621de55840c065ce6e3986c4629
+checksum=342a31684dab9671cd341bd3e3ce665adcee0460c2a081ddc493cdbc03132530

Re: gitg: update 44

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/49084#issuecomment-1977606781

Comment:
Bump the libgit2-glib dependency version in `common/shlibs` https://github.com/void-linux/void-packages/blob/master/common/shlibs#L1336

e.g. replace `libgit2-glib-0.23.4_1` with `libgit2-glib-0.2.0_1`

Re: gitg: update 44

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/49084#issuecomment-1977606781

Comment:
Bump the libgit2-glib dependency version in `common/shlibs` https://github.com/void-linux/void-packages/blob/master/common/shlibs#L1336

e.g. replace `libgit2-glib-0.23.4_1` with `libgit2-glib-1.2.0_1`

Re: [PR PATCH] [Updated] gitg: update 44

[oreo639]

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

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

https://github.com/chrysos349/void-packages gitg
https://github.com/void-linux/void-packages/pull/49084

gitg: update 44
split into a separate pr (https://github.com/void-linux/void-packages/pull/48762#issuecomment-1976502687).

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

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl x
  - armv7l x
  - armv6l-musl x

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

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

From 56a4dbb82f46fb31ed847e10eb666b7d9347855a Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 4 Mar 2024 16:48:58 +0300
Subject: [PATCH 1/2] libgit2-glib: update to 1.2.0

---
 common/shlibs                 | 2 +-
 srcpkgs/libgit2-glib/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9cf16d09a85586..5a4a6c3571f86c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1333,7 +1333,7 @@ libunwind-setjmp.so.0 libunwind-1.5.0_3
 libmicrohttpd.so.12 libmicrohttpd-0.9.73_1
 libmicrodns.so.1 libmicrodns-0.2.0_1
 libgit2.so.1.6 libgit2-1.6.4_1
-libgit2-glib-1.0.so.0 libgit2-glib-0.23.4_1
+libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_1
 libagg.so.2 agg-2.5_1
 libzzip-0.so.13 zziplib-0.13.62_1
 libzzipfseeko-0.so.13 zziplib-0.13.62_1
diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template
index 358f81b03d7802..cdc0366e2136e6 100644
--- a/srcpkgs/libgit2-glib/template
+++ b/srcpkgs/libgit2-glib/template
@@ -1,7 +1,7 @@
 # Template file for 'libgit2-glib'
 pkgname=libgit2-glib
-version=1.1.0
-revision=5
+version=1.2.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Libgit2-glib"
 changelog="https://gitlab.gnome.org/GNOME/libgit2-glib/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libgit2-glib/${version%.*}/libgit2-glib-${version}.tar.xz"
-checksum=c38dd7575daf8141e1e422333a575faf65f3c9210c08e83e981b88dd41bf1ef3
+checksum=1331dada838f4e1f591b26459d44126a325de762dc3cd26153a31afbdfe18190
 
 build_options="gir"
 build_options_default="gir"

From bd6816347b2256f24e969dc082e1382f2dedbbea Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 4 Mar 2024 16:49:26 +0300
Subject: [PATCH 2/2] gitg: update to 44

---
 srcpkgs/gitg/patches/meson-0.61.patch | 33 ---------------------------
 srcpkgs/gitg/template                 | 17 +++++++-------
 2 files changed, 9 insertions(+), 41 deletions(-)
 delete mode 100644 srcpkgs/gitg/patches/meson-0.61.patch

diff --git a/srcpkgs/gitg/patches/meson-0.61.patch b/srcpkgs/gitg/patches/meson-0.61.patch
deleted file mode 100644
index 330d45fc5ad85b..00000000000000
--- a/srcpkgs/gitg/patches/meson-0.61.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c81e1579afe7f221371b6866c25f388f48747728 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 23 Jan 2022 14:54:31 +0100
-Subject: [PATCH] meson: fix build with meson 0.61
-
-i18n.merge_file doesn't accept positional arguments
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index a8b90fd1..2413531d 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -6,7 +6,6 @@ desktop_config = configuration_data()
- desktop_config.set('icon', application_id)
- desktop_config.set('binary', gitg_name)
- i18n.merge_file(
--  desktop,
-   type: 'desktop',
-   input: configure_file(
-     input: desktop + '.in.in',
-@@ -42,7 +41,6 @@ appdata_config = configuration_data()
- appdata_config.set('app-id', application_id)
- appdata_config.set('gettext', gitg_name)
- i18n.merge_file(
--  appdata,
-   type: 'xml',
-   input: configure_file(
-     input: appdata + '.in.in',
--- 
-2.34.1
-
diff --git a/srcpkgs/gitg/template b/srcpkgs/gitg/template
index fcaa0aae56b2d0..01c21c65309157 100644
--- a/srcpkgs/gitg/template
+++ b/srcpkgs/gitg/template
@@ -1,13 +1,14 @@
 # Template file for 'gitg'
 pkgname=gitg
-version=41
-revision=3
+version=44
+revision=1
 build_style=meson
-build_helper="qemu"
-hostmakedepends="gettext glib-devel gobject-introspection pkg-config vala"
-makedepends="libgee08-devel libglib-devel gtk+3-devel gspell-devel
- gtksourceview4-devel libgit2-glib-devel libpeas-devel libsecret-devel
- libxml2-devel libdazzle-devel json-glib-devel gsettings-desktop-schemas-devel"
+build_helper="gir qemu"
+hostmakedepends="desktop-file-utils gettext glib-devel gtk-update-icon-cache
+ pkg-config vala"
+makedepends="gpgme-devel gsettings-desktop-schemas-devel gspell-devel
+ gtksourceview4-devel libdazzle-devel libgee08-devel libgit2-glib-devel
+ libhandy1-devel libpeas-devel libsecret-devel"
 depends="git"
 short_desc="Git repository viewer for GTK+/GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -15,4 +16,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gitg"
 changelog="https://gitlab.gnome.org/GNOME/gitg/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=7fb61b9fb10fbaa548d23d7065babd72ad63e621de55840c065ce6e3986c4629
+checksum=342a31684dab9671cd341bd3e3ce665adcee0460c2a081ddc493cdbc03132530

Re: [PR PATCH] [Merged]: gitg: update 44

[oreo639]

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

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

gitg: update 44
https://github.com/void-linux/void-packages/pull/49084

Description:
split into a separate pr (https://github.com/void-linux/void-packages/pull/48762#issuecomment-1976502687).

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

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl x
  - armv7l x
  - armv6l-musl x