me
/
guix
Archived
1
0
Fork 0

gnu: gitg: Update to 44.

* gnu/packages/gnome.scm (gitg): Update to 44.
[source]: Remove “gitg-fix-positional-argument.patch”.
[inputs]: Add gpgme and libhandy.
* gnu/packages/patches/gitg-fix-positional-argument.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Unregister it.
master
Liliana Marie Prikler 2023-10-12 10:19:35 +02:00
parent 4d182aaf0f
commit 9f04e18065
No known key found for this signature in database
GPG Key ID: 442A84B8C70E2F87
3 changed files with 4 additions and 40 deletions

View File

@ -1276,7 +1276,6 @@ dist_patch_DATA = \
%D%/packages/patches/ghostscript-no-header-id.patch \
%D%/packages/patches/ghostscript-no-header-uuid.patch \
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
%D%/packages/patches/gitg-fix-positional-argument.patch \
%D%/packages/patches/gklib-suitesparse.patch \
%D%/packages/patches/glib-appinfo-watch.patch \
%D%/packages/patches/glib-networking-gnutls-binding.patch \

View File

@ -12027,7 +12027,7 @@ higher level porcelain stuff.")
(define-public gitg
(package
(name "gitg")
(version "41")
(version "44")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@ -12035,8 +12035,7 @@ higher level porcelain stuff.")
name "-" version ".tar.xz"))
(sha256
(base32
"0aa6djcf7rjw0q688mfy47k67bbjpnx6aw1xs94abfhgn6gipdkz"))
(patches (search-patches "gitg-fix-positional-argument.patch"))))
"0m135v2qm5kaa2jki0y2lbh0wa69bqfh9a4cm7db153v7smrj3jv"))))
(build-system meson-build-system)
(arguments
(list
@ -12060,6 +12059,7 @@ higher level porcelain stuff.")
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))))
(inputs
(list glib
gpgme
gsettings-desktop-schemas
gspell
gtk+
@ -12068,6 +12068,7 @@ higher level porcelain stuff.")
libdazzle
libgee
libgit2-glib
libhandy
libpeas
libsecret
libsoup-minimal-2

View File

@ -1,36 +0,0 @@
From 1978973b12848741b08695ec2020bac98584d636 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Mon, 24 Jan 2022 12:17:52 +0000
Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
data/meson.build:8:0: ERROR: Function does not take positional arguments.
data/meson.build:44:0: ERROR: Function does not take 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',
--
GitLab