aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClayton Craft <clayton@craftyguy.net>2021-11-14 22:09:17 -0800
committerLeo <thinkabit.ukim@gmail.com>2021-11-15 13:47:18 +0000
commit29431e97e82e01bd8a7fa71b4aede64c76d4055d (patch)
tree6b37e16b4702fac3627ed6b05dbe6f24c24c954b
parent0ddca80697d8321d3b005f746444e66ff010739e (diff)
downloadaports-29431e97e82e01bd8a7fa71b4aede64c76d4055d.tar.gz
aports-29431e97e82e01bd8a7fa71b4aede64c76d4055d.tar.bz2
aports-29431e97e82e01bd8a7fa71b4aede64c76d4055d.tar.xz
community/meld: add patch for using gettext
-rw-r--r--community/meld/0001-Use-gettext-module.patch27
-rw-r--r--community/meld/APKBUILD7
2 files changed, 32 insertions, 2 deletions
diff --git a/community/meld/0001-Use-gettext-module.patch b/community/meld/0001-Use-gettext-module.patch
new file mode 100644
index 0000000000..afd1942f7e
--- /dev/null
+++ b/community/meld/0001-Use-gettext-module.patch
@@ -0,0 +1,27 @@
+From bd58063d17a23fbce5aa62635247d0b4629c4a76 Mon Sep 17 00:00:00 2001
+From: Clayton Craft <clayton@craftyguy.net>
+Date: Sun, 14 Nov 2021 22:07:55 -0800
+Subject: [PATCH] Use gettext module
+
+---
+ bin/meld | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bin/meld b/bin/meld
+index a3883d1d..05d49ee9 100755
+--- a/bin/meld
++++ b/bin/meld
+@@ -121,8 +121,8 @@ try:
+ libintl.bind_textdomain_codeset(locale_domain, 'UTF-8')
+ del libintl
+ else:
+- locale.bindtextdomain(locale_domain, locale_dir)
+- locale.bind_textdomain_codeset(locale_domain, 'UTF-8')
++ gettext.bindtextdomain(locale_domain, locale_dir)
++ gettext.bind_textdomain_codeset(locale_domain, 'UTF-8')
+ except AttributeError as e:
+ # Python builds linked without libintl (i.e., OSX) don't have
+ # bindtextdomain(), which causes Gtk.Builder translations to fail.
+--
+2.33.1
+
diff --git a/community/meld/APKBUILD b/community/meld/APKBUILD
index 1f7801f6c9..3f5d665941 100644
--- a/community/meld/APKBUILD
+++ b/community/meld/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: August Klein <amatcoder@gmail.com>
pkgname=meld
pkgver=3.20.4
-pkgrel=0
+pkgrel=1
pkgdesc="A visual diff and merge tool"
url="https://meldmerge.org"
arch="noarch !s390x !mips !mips64" # missing gtksourceview
@@ -13,7 +13,9 @@ depends="dconf gtksourceview gsettings-desktop-schemas py3-gobject3
makedepends="intltool itstool libxml2-utils"
checkdepends="py3-pytest xvfb-run gtk-update-icon-cache"
subpackages="$pkgname-lang $pkgname-doc"
-source="https://download.gnome.org/sources/meld/${pkgver%.*}/meld-$pkgver.tar.xz"
+source="https://download.gnome.org/sources/meld/${pkgver%.*}/meld-$pkgver.tar.xz
+ 0001-Use-gettext-module.patch
+ "
prepare() {
default_prepare
@@ -37,4 +39,5 @@ package() {
sha512sums="
e7b5c07e68972e7e8e4d396140fa2ee627609728533269f1bc52e9339e89a58f0949a1e8ec7b7847eec3eff5a67ea0bd5e07ad8002d2c640d173f9b0c4aa724e meld-3.20.4.tar.xz
+9f108b93c5b17822b59f3095985d6b52286a4bdfc8806478f9150eb095948ea1a37d864e7da7da0724a5adfeb7d8b9b07be37de716bf3fca9ad96c0f46caeaf5 0001-Use-gettext-module.patch
"