aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2020-07-08 18:05:22 +0200
committerLeo <thinkabit.ukim@gmail.com>2020-07-08 16:20:43 +0000
commitf19fe5cb88d2f7d9777290678085b7b805bccb4c (patch)
tree89d3a7fa6076f504ad470022df1e50e55ff76a56
parent926021ca9b23a30460ad9b632835e46c93c3ac08 (diff)
downloadaports-f19fe5cb88d2f7d9777290678085b7b805bccb4c.tar.gz
aports-f19fe5cb88d2f7d9777290678085b7b805bccb4c.tar.bz2
aports-f19fe5cb88d2f7d9777290678085b7b805bccb4c.tar.xz
community/gnome-music: upgrade to 3.36.4.1
-rw-r--r--community/gnome-music/APKBUILD8
-rw-r--r--community/gnome-music/dont-require-py3-gettext-support.patch29
2 files changed, 31 insertions, 6 deletions
diff --git a/community/gnome-music/APKBUILD b/community/gnome-music/APKBUILD
index 3e6ed2d80f..8160412b22 100644
--- a/community/gnome-music/APKBUILD
+++ b/community/gnome-music/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gnome-music
-pkgver=3.36.4
+pkgver=3.36.4.1
pkgrel=0
pkgdesc="Music is the new GNOME music playing application"
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
libmediaart-dev py3-cairo-dev itstool"
checkdepends="desktop-file-utils appstream-glib"
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"
build() {
@@ -36,5 +36,5 @@ package() {
DESTDIR="$pkgdir" ninja -C output install
}
-sha512sums="23d369baad9b196d350167f44f4af96594c13c9150f65005c1b16e0b7dc29621d0ebe8c5a570d559b7fe09460de7c7708c858345b7a22bc78f682505a56b10e6 gnome-music-3.36.4.tar.xz
-0437214912794981cdb6df4309f34b40b65ec4412cc0ec9a384da07e22a0c1d3cc8272e2a210f1e614f0e9a9767d96b83624ad1f1f82bd3445ff62c8f1234dc9 dont-require-py3-gettext-support.patch"
+sha512sums="8b6b4a8a44158a724de82855ba781dd6ceb53a30a35160f477721a385a841697f9a7c97cdba9a5bcc5b36834d55c034eb4c892907d550205dc5b7f7af56133ca gnome-music-3.36.4.1.tar.xz
+94ca23927797c4077fa7c4b2fc236ef50257e1a2c6359c99a8d5a84ba169820e4a4b4f3d6389013baf1915893db5835e3a8dee688fce76ac25faab2677959afd dont-require-py3-gettext-support.patch"
diff --git a/community/gnome-music/dont-require-py3-gettext-support.patch b/community/gnome-music/dont-require-py3-gettext-support.patch
index 2a90039088..b3d543384a 100644
--- a/community/gnome-music/dont-require-py3-gettext-support.patch
+++ b/community/gnome-music/dont-require-py3-gettext-support.patch
@@ -1,13 +1,38 @@
+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
-index 13f8aeb..043490f 100755
+index 908df023..ef6ed6bb 100755
--- a/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():
"""Sets application internationalization."""
- locale.bindtextdomain('@application_id@', LOCALE_DIR)
- 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.textdomain('@application_id@')
+--
+GitLab
+