mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-18 08:51:48 -05:00
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.
This commit is contained in:
parent
4d182aaf0f
commit
9f04e18065
3 changed files with 4 additions and 40 deletions
|
@ -1276,7 +1276,6 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/ghostscript-no-header-id.patch \
|
%D%/packages/patches/ghostscript-no-header-id.patch \
|
||||||
%D%/packages/patches/ghostscript-no-header-uuid.patch \
|
%D%/packages/patches/ghostscript-no-header-uuid.patch \
|
||||||
%D%/packages/patches/ghostscript-no-header-creationdate.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/gklib-suitesparse.patch \
|
||||||
%D%/packages/patches/glib-appinfo-watch.patch \
|
%D%/packages/patches/glib-appinfo-watch.patch \
|
||||||
%D%/packages/patches/glib-networking-gnutls-binding.patch \
|
%D%/packages/patches/glib-networking-gnutls-binding.patch \
|
||||||
|
|
|
@ -12027,7 +12027,7 @@ (define-public libgit2-glib
|
||||||
(define-public gitg
|
(define-public gitg
|
||||||
(package
|
(package
|
||||||
(name "gitg")
|
(name "gitg")
|
||||||
(version "41")
|
(version "44")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||||
|
@ -12035,8 +12035,7 @@ (define-public gitg
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0aa6djcf7rjw0q688mfy47k67bbjpnx6aw1xs94abfhgn6gipdkz"))
|
"0m135v2qm5kaa2jki0y2lbh0wa69bqfh9a4cm7db153v7smrj3jv"))))
|
||||||
(patches (search-patches "gitg-fix-positional-argument.patch"))))
|
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
|
@ -12060,6 +12059,7 @@ (define-public gitg
|
||||||
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))))
|
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))))
|
||||||
(inputs
|
(inputs
|
||||||
(list glib
|
(list glib
|
||||||
|
gpgme
|
||||||
gsettings-desktop-schemas
|
gsettings-desktop-schemas
|
||||||
gspell
|
gspell
|
||||||
gtk+
|
gtk+
|
||||||
|
@ -12068,6 +12068,7 @@ (define-public gitg
|
||||||
libdazzle
|
libdazzle
|
||||||
libgee
|
libgee
|
||||||
libgit2-glib
|
libgit2-glib
|
||||||
|
libhandy
|
||||||
libpeas
|
libpeas
|
||||||
libsecret
|
libsecret
|
||||||
libsoup-minimal-2
|
libsoup-minimal-2
|
||||||
|
|
|
@ -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
|
|
||||||
|
|
Loading…
Reference in a new issue