Skip to content

Commit fa2aae2

Browse files
committed
addpkg(x11/meld): 3.22.2
Closes #18900 (that bug was described as "with the general intention of running meld", and this is a newer way and a newer version of meld than that)
1 parent f5adac3 commit fa2aae2

File tree

2 files changed

+42
-0
lines changed

2 files changed

+42
-0
lines changed

x11-packages/meld/build.sh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
TERMUX_PKG_HOMEPAGE=https://meldmerge.org/
2+
TERMUX_PKG_DESCRIPTION="A visual diff and merge tool targeted at developers"
3+
TERMUX_PKG_LICENSE="GPL-2.0"
4+
TERMUX_PKG_MAINTAINER="@termux"
5+
TERMUX_PKG_VERSION="3.22.2"
6+
TERMUX_PKG_SRCURL=https://download.gnome.org/sources/meld/${TERMUX_PKG_VERSION%.*}/meld-${TERMUX_PKG_VERSION}.tar.xz
7+
TERMUX_PKG_SHA256=46a0a713fbcd1b153b377a1e0757c8ce255c9822467658eacfbd89b1e92316ef
8+
TERMUX_PKG_AUTO_UPDATE=true
9+
TERMUX_PKG_DEPENDS="gsettings-desktop-schemas, glib, gtk3, gtksourceview4, libcairo, pango, pycairo, pygobject, python"
10+
TERMUX_PKG_BUILD_DEPENDS="gettext"
11+
TERMUX_PKG_PLATFORM_INDEPENDENT=true
12+
# The "byte-compile" build setting will go away in the next release
13+
# It does not actually turn off byte compiling because Termux has recent Meson
14+
# (https://gitlab.gnome.org/GNOME/meld/-/commit/361ac82ce94dd46d0eed0e9239c34a8e3d13cd2e)
15+
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
16+
-Dbyte-compile=false
17+
"
18+
19+
termux_step_pre_configure() {
20+
termux_setup_glib_cross_pkg_config_wrapper
21+
}
22+
23+
# It is really strange that this is necessary. The reason that meson is installing this
24+
# into $TERMUX_PREFIX/local/lib/python3.12/dist-packages instead of $TERMUX_PREFIX/lib/python3.12/site-packages
25+
# is not clear. Other distros do not seem to have this problem.
26+
termux_step_post_make_install() {
27+
mkdir -p "$TERMUX_PREFIX/lib/python$TERMUX_PYTHON_VERSION/site-packages"
28+
mv "$TERMUX_PREFIX/local/lib/python$TERMUX_PYTHON_VERSION/dist-packages/$TERMUX_PKG_NAME" \
29+
"$TERMUX_PREFIX/lib/python$TERMUX_PYTHON_VERSION/site-packages/"
30+
rm -rf "$TERMUX_PREFIX/local"
31+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/bin/meld
2+
+++ b/bin/meld
3+
@@ -141,7 +141,7 @@ try:
4+
locale.bindtextdomain(locale_domain, str(locale_dir))
5+
locale.bind_textdomain_codeset(locale_domain, 'UTF-8')
6+
locale.textdomain(locale_domain)
7+
-except AttributeError as e:
8+
+except (AttributeError,OSError) as e:
9+
# Python builds linked without libintl (i.e., OSX) don't have
10+
# bindtextdomain(), which causes Gtk.Builder translations to fail.
11+
print(

0 commit comments

Comments
 (0)