diff options
| author | ahoka <ahoka@pkgsrc.org> | 2009-01-18 12:31:07 +0000 |
|---|---|---|
| committer | ahoka <ahoka@pkgsrc.org> | 2009-01-18 12:31:07 +0000 |
| commit | cf3163aa63c201f19d102ec7393c5d2a8d9838e3 (patch) | |
| tree | 01e09634b64da719d81b2b8b9fbad3e33892ae78 /devel/meld | |
| parent | 9c3793b8ea00e06acd00383b40b908def18bb7b2 (diff) | |
| download | pkgsrc-cf3163aa63c201f19d102ec7393c5d2a8d9838e3.tar.gz | |
Remove the bogus requirement for python25, fix the offending line instead.
Diffstat (limited to 'devel/meld')
| -rw-r--r-- | devel/meld/Makefile | 4 | ||||
| -rw-r--r-- | devel/meld/distinfo | 3 | ||||
| -rw-r--r-- | devel/meld/patches/patch-ab | 13 |
3 files changed, 16 insertions, 4 deletions
diff --git a/devel/meld/Makefile b/devel/meld/Makefile index c1a8a7a0223..0d000a3ed71 100644 --- a/devel/meld/Makefile +++ b/devel/meld/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2009/01/04 18:00:59 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2009/01/18 12:31:07 ahoka Exp $ # DISTNAME= meld-1.2.1 @@ -24,8 +24,6 @@ MAKE_FLAGS+= localedir=${PREFIX}/${PKGLOCALEDIR}/locale MAKE_FLAGS+= PYTHON=${PYTHONBIN} MAKE_FILE= GNUmakefile PYTHON_PATCH_SCRIPTS= meld -# filediff.py: self.textview[1 if len(files) >= 2 else 0].grab_focus() -PYTHON_VERSIONS_ACCEPTED= 25 post-extract: # msgfmt complains about this in 1.2.1 diff --git a/devel/meld/distinfo b/devel/meld/distinfo index 55f2b93582a..0576630a6bf 100644 --- a/devel/meld/distinfo +++ b/devel/meld/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.5 2008/11/24 14:03:56 wiz Exp $ +$NetBSD: distinfo,v 1.6 2009/01/18 12:31:07 ahoka Exp $ SHA1 (meld-1.2.1.tar.bz2) = 8c50e2b03ebc175d771539043c9db3a128373ab8 RMD160 (meld-1.2.1.tar.bz2) = 4b38b786bbe1551a5434c54f00b77556e2f8f8b3 Size (meld-1.2.1.tar.bz2) = 699861 bytes SHA1 (patch-aa) = 49ff28a613055ead56f63e8dd5df09b986bcbea1 +SHA1 (patch-ab) = e0e2503e6a7160f3cd63d4e8caf6e6d8d2f56f0a diff --git a/devel/meld/patches/patch-ab b/devel/meld/patches/patch-ab new file mode 100644 index 00000000000..82160380d86 --- /dev/null +++ b/devel/meld/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2009/01/18 12:31:07 ahoka Exp $ + +--- filediff.py.orig 2008-10-22 19:48:30.000000000 +0200 ++++ filediff.py +@@ -568,7 +568,7 @@ class FileDiff(melddoc.MeldDoc, gnomegla + bnew.label = bold.label + self.bufferdata[i] = bnew + self.recompute_label() +- self.textview[1 if len(files) >= 2 else 0].grab_focus() ++ self.textview[len(files) >= 2].grab_focus() + self.scheduler.add_task( self._set_files_internal(files).next ) + + def _set_files_internal(self, files): |