Browse Source
development/meld3: Fix regression on python 3.9 support.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
pull/299/head
Willy Sudiarto Raharjo
8 months ago
No known key found for this signature in database
GPG Key ID: 3F617144D7238786
2 changed files with
30 additions and
1 deletions
-
development/meld3/meld3.SlackBuild
-
development/meld3/python3.9.patch
|
|
|
@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) |
|
|
|
PRGNAM=meld3 |
|
|
|
SRCNAM=meld |
|
|
|
VERSION=${VERSION:-3.23.0} |
|
|
|
BUILD=${BUILD:-1} |
|
|
|
BUILD=${BUILD:-2} |
|
|
|
TAG=${TAG:-_SBo} |
|
|
|
PKGTYPE=${PKGTYPE:-tgz} |
|
|
|
|
|
|
|
@ -77,6 +77,9 @@ 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 |
|
|
|
|
|
|
|
|
|
|
|
@ -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) |
