Skip to content
Snippets Groups Projects
Commit f19fe5cb authored by Rasmus Thomsen's avatar Rasmus Thomsen Committed by Leo
Browse files

community/gnome-music: upgrade to 3.36.4.1

parent 926021ca
2 merge requests!11958community/rclone: upgrade to 1.52.3,!10086community/gnome-music: upgrade to 3.36.4.1
# Contributor: Rasmus Thomsen <oss@cogitri.dev> # Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gnome-music pkgname=gnome-music
pkgver=3.36.4 pkgver=3.36.4.1
pkgrel=0 pkgrel=0
pkgdesc="Music is the new GNOME music playing application" pkgdesc="Music is the new GNOME music playing application"
url="https://wiki.gnome.org/Apps/Music" url="https://wiki.gnome.org/Apps/Music"
...@@ -14,7 +14,7 @@ makedepends="meson gnome-online-accounts-dev libdazzle-dev gtk+3.0-dev libsoup-d ...@@ -14,7 +14,7 @@ makedepends="meson gnome-online-accounts-dev libdazzle-dev gtk+3.0-dev libsoup-d
libmediaart-dev py3-cairo-dev itstool" libmediaart-dev py3-cairo-dev itstool"
checkdepends="desktop-file-utils appstream-glib" checkdepends="desktop-file-utils appstream-glib"
subpackages="$pkgname-lang $pkgname-doc $pkgname-dbg" subpackages="$pkgname-lang $pkgname-doc $pkgname-dbg"
source="https://download.gnome.org/sources/gnome-music/${pkgver%.*}/gnome-music-$pkgver.tar.xz source="https://download.gnome.org/sources/gnome-music/${pkgver%.*.*}/gnome-music-$pkgver.tar.xz
dont-require-py3-gettext-support.patch" dont-require-py3-gettext-support.patch"
build() { build() {
...@@ -36,5 +36,5 @@ package() { ...@@ -36,5 +36,5 @@ package() {
DESTDIR="$pkgdir" ninja -C output install DESTDIR="$pkgdir" ninja -C output install
} }
sha512sums="23d369baad9b196d350167f44f4af96594c13c9150f65005c1b16e0b7dc29621d0ebe8c5a570d559b7fe09460de7c7708c858345b7a22bc78f682505a56b10e6 gnome-music-3.36.4.tar.xz sha512sums="8b6b4a8a44158a724de82855ba781dd6ceb53a30a35160f477721a385a841697f9a7c97cdba9a5bcc5b36834d55c034eb4c892907d550205dc5b7f7af56133ca gnome-music-3.36.4.1.tar.xz
0437214912794981cdb6df4309f34b40b65ec4412cc0ec9a384da07e22a0c1d3cc8272e2a210f1e614f0e9a9767d96b83624ad1f1f82bd3445ff62c8f1234dc9 dont-require-py3-gettext-support.patch" 94ca23927797c4077fa7c4b2fc236ef50257e1a2c6359c99a8d5a84ba169820e4a4b4f3d6389013baf1915893db5835e3a8dee688fce76ac25faab2677959afd dont-require-py3-gettext-support.patch"
Upstream: Pending, https://gitlab.gnome.org/GNOME/gnome-music/-/merge_requests/735
From ba805cfb52bbef3c3b458d6bfdd9769f6082139c Mon Sep 17 00:00:00 2001
From: Rasmus Thomsen <oss@cogitri.dev>
Date: Wed, 8 Jul 2020 18:03:31 +0200
Subject: [PATCH] Gracefully handle locale.{bind,}textdomain not being
available
When python is built without gettext support these functions aren't
available and as such GTG fails to start without this change.
---
gnome-music.in | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/gnome-music.in b/gnome-music.in diff --git a/gnome-music.in b/gnome-music.in
index 13f8aeb..043490f 100755 index 908df023..ef6ed6bb 100755
--- a/gnome-music.in --- a/gnome-music.in
+++ b/gnome-music.in +++ b/gnome-music.in
@@ -105,8 +105,6 @@ def set_log_level(): @@ -87,8 +87,15 @@ def set_exception_hook():
def set_internationalization(): def set_internationalization():
"""Sets application internationalization.""" """Sets application internationalization."""
- locale.bindtextdomain('@application_id@', LOCALE_DIR) - locale.bindtextdomain('@application_id@', LOCALE_DIR)
- locale.textdomain('@application_id@') - locale.textdomain('@application_id@')
+ try:
+ locale.bindtextdomain('@application_id@', LOCALE_DIR)
+ locale.textdomain('@application_id@')
+ except AttributeError as e:
+ # Python built without gettext support doesn't have bindtextdomain()
+ # and textdomain()
+ print("Couldn't bind the gettext translation domain. Some translations"
+ " won't work.\n{}".format(e))
+
gettext.bindtextdomain('@application_id@', LOCALE_DIR) gettext.bindtextdomain('@application_id@', LOCALE_DIR)
gettext.textdomain('@application_id@') gettext.textdomain('@application_id@')
--
GitLab
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment