From 99b0d72f4aebdc69e1352f652fed3d65c47c0ba9 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Mon, 12 Apr 2021 12:56:04 +0200 Subject: testing/getting-things-gnome: upgrade to 0.5 --- testing/getting-things-gnome/APKBUILD | 15 ++++----- .../dont-require-py3-gettext.patch | 37 ---------------------- 2 files changed, 6 insertions(+), 46 deletions(-) delete mode 100644 testing/getting-things-gnome/dont-require-py3-gettext.patch diff --git a/testing/getting-things-gnome/APKBUILD b/testing/getting-things-gnome/APKBUILD index 6eaf81af22e..e392ec2f68a 100644 --- a/testing/getting-things-gnome/APKBUILD +++ b/testing/getting-things-gnome/APKBUILD @@ -1,20 +1,18 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=getting-things-gnome -_commit=75ac270d0322fd33e3e926ad847009adc13ac1b5 -pkgver=20200622 -pkgrel=1 +pkgver=0.5 +pkgrel=0 pkgdesc="A personal tasks and TODO-list items organizier for GNOME, inspired by the Getting Things Done methodology" url="https://wiki.gnome.org/Apps/GTG" arch="noarch" license="GPL-3.0-or-later" -depends="python3 py3-xdg py3-dbus py3-gobject3 py3-liblarch" +depends="python3 py3-xdg py3-dbus py3-gobject3 py3-liblarch py3-lxml" makedepends="py3-setuptools gettext meson" checkdepends="py3-nose py3-pyflakes py3-mock py3-pycodestyle xvfb-run" subpackages="$pkgname-doc $pkgname-lang" -source="$pkgname-$pkgver.tar.gz::https://github.com/getting-things-gnome/gtg/archive/$_commit.tar.gz - dont-require-py3-gettext.patch" -builddir="$srcdir/gtg-$_commit" +source="$pkgname-$pkgver.tar.gz::https://github.com/getting-things-gnome/gtg/archive/v$pkgver.tar.gz" +builddir="$srcdir/gtg-$pkgver" build() { abuild-meson output @@ -29,5 +27,4 @@ package() { DESTDIR="$pkgdir" meson install --no-rebuild -C output } -sha512sums="012f58689e6dfe5b411ff13cec594ae9c6e19eeef27464d482a4dd839f97511fed883d0708c4a58be248056dcd424488a43f58edf637edad9905b3d609fa2c9f getting-things-gnome-20200622.tar.gz -71ebc9626cc3545774cab5e6b5147d67456c40219cab8eb29b9c05640b6eb847ce58b3a4b2ad49c8da9a2ea547426d33546eafe2f2a54776fc94a6600868a45d dont-require-py3-gettext.patch" +sha512sums="631f5343301d7d72211398152fa081c0fa15154babc7ec900f13a39a2677d0edaf4fea534a83284207e8019926c9108dc1d8f25bdbeae85ef0665dfe1c7b768a getting-things-gnome-0.5.tar.gz" diff --git a/testing/getting-things-gnome/dont-require-py3-gettext.patch b/testing/getting-things-gnome/dont-require-py3-gettext.patch deleted file mode 100644 index c3a5a76db3f..00000000000 --- a/testing/getting-things-gnome/dont-require-py3-gettext.patch +++ /dev/null @@ -1,37 +0,0 @@ -Upstream: Pending, https://github.com/getting-things-gnome/gtg/pull/387 -From a03b68f636f21a92922aff9be2b3b728a4bcd52f Mon Sep 17 00:00:00 2001 -From: Rasmus Thomsen -Date: Thu, 2 Jul 2020 09:27:37 +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. ---- - GTG/gtg.in | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/GTG/gtg.in b/GTG/gtg.in -index a4ea12df..ea310186 100755 ---- a/GTG/gtg.in -+++ b/GTG/gtg.in -@@ -99,8 +99,17 @@ if __name__ == "__main__": - - # Set up UI i18n - LOCALE_DIR = '@localedir@' -- locale.bindtextdomain('gtg', LOCALE_DIR) -- locale.textdomain('gtg') -+ -+ try: -+ locale.bindtextdomain('gtg', LOCALE_DIR) -+ locale.textdomain('gtg') -+ except AttributeError as e: -+ # Python built without gettext support doesn't have bindtextdomain() -+ # and textdomain(), so gracefully fail here. -+ print( -+ "Couldn't bind the translation domain. Some translations won't " -+ "work.\n{}".format(e)) -+ - gettext.bindtextdomain('gtg', LOCALE_DIR) - gettext.textdomain('gtg') - -- cgit v1.2.3