diff options
Diffstat (limited to 'development/meld3')
| -rw-r--r-- | development/meld3/meld3.SlackBuild | 10 | ||||
| -rw-r--r-- | development/meld3/meld3.info | 8 | ||||
| -rw-r--r-- | development/meld3/python3.9.patch | 26 |
3 files changed, 38 insertions, 6 deletions
diff --git a/development/meld3/meld3.SlackBuild b/development/meld3/meld3.SlackBuild index 223ee86417..9eed58d294 100644 --- a/development/meld3/meld3.SlackBuild +++ b/development/meld3/meld3.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=meld3 SRCNAM=meld -VERSION=${VERSION:-3.22.3} -BUILD=${BUILD:-1} +VERSION=${VERSION:-3.23.0} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -77,6 +77,12 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Thanks to fourtysixandtwo +patch -p1 < $CWD/python3.9.patch + +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages + mkdir build cd build CFLAGS="$SLKCFLAGS" \ diff --git a/development/meld3/meld3.info b/development/meld3/meld3.info index f28a36b9e6..d39b557cf8 100644 --- a/development/meld3/meld3.info +++ b/development/meld3/meld3.info @@ -1,10 +1,10 @@ PRGNAM="meld3" -VERSION="3.22.3" +VERSION="3.23.0" HOMEPAGE="http://meldmerge.org/" -DOWNLOAD="https://download.gnome.org/sources/meld/3.22/meld-3.22.3.tar.xz" -MD5SUM="8dc9da40caa2a0fd1097af77d3b87abd" +DOWNLOAD="https://download.gnome.org/sources/meld/3.23/meld-3.23.0.tar.xz" +MD5SUM="7deb9ff8ee1841d989f6c300773c264f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gtksourceview4" +REQUIRES="gtksourceview4 python3-meson-opt" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/development/meld3/python3.9.patch b/development/meld3/python3.9.patch new file mode 100644 index 0000000000..8763f64006 --- /dev/null +++ b/development/meld3/python3.9.patch @@ -0,0 +1,26 @@ +--- meld-3.23.0/meld/actiongutter.py.orig 2025-05-15 19:50:55.488897719 +0700 ++++ meld-3.23.0/meld/actiongutter.py 2025-05-15 19:52:15.430943358 +0700 +@@ -215,8 +215,8 @@ + def motion_event( + self, + controller: Gtk.EventControllerMotion, +- x: float | None = None, +- y: float | None = None, ++ x: "float | None" = None, ++ y: "float | None" = None, + ): + if x is None or y is None: + # Missing coordinates are leave events +--- meld-3.23.0/meld/chunkmap.py.orig 2025-05-15 19:52:22.395511767 +0700 ++++ meld-3.23.0/meld/chunkmap.py 2025-05-15 19:52:40.767606420 +0700 +@@ -258,8 +258,8 @@ + def motion_event( + self, + controller: Gtk.EventControllerMotion, +- x: float | None = None, +- y: float | None = None, ++ x: "float | None" = None, ++ y: "float | None" = None, + ): + if self._have_grab: + self._scroll_fraction(y, animate=False) |