Update to meld-1.8.4.

This commit is contained in:
ajacoutot 2014-01-23 08:58:37 +00:00
parent 9ebb5e907b
commit 0734a7a0bc
3 changed files with 4 additions and 27 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.32 2013/12/15 07:56:43 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.33 2014/01/23 08:58:37 ajacoutot Exp $
COMMENT= graphical diff and merge tool
GNOME_VERSION= 1.8.3
GNOME_VERSION= 1.8.4
GNOME_PROJECT= meld
CATEGORIES= textproc x11

View File

@ -1,2 +1,2 @@
SHA256 (meld-1.8.3.tar.xz) = Qro0TKz+TFr69duKQ98sh37J5bjmZiG5Ly+eDcv2/tc=
SIZE (meld-1.8.3.tar.xz) = 415704
SHA256 (meld-1.8.4.tar.xz) = tG5XhjQ/I20gMDenrOjxsoFFpRo/hPpSfvz2L0e1uN4=
SIZE (meld-1.8.4.tar.xz) = 421332

View File

@ -1,23 +0,0 @@
$OpenBSD: patch-meld_filediff_py,v 1.1 2013/10/09 16:39:30 shadchin Exp $
OpenBSD does not support sem_open() yet
--- meld/filediff.py.orig Mon Oct 7 21:26:49 2013
+++ meld/filediff.py Mon Oct 7 21:27:32 2013
@@ -22,6 +22,7 @@ import io
import os
from gettext import gettext as _
import time
+import platform
from multiprocessing import Pool
from multiprocessing.pool import ThreadPool
@@ -63,7 +64,7 @@ class CachedSequenceMatcher(object):
def __init__(self):
if self.process_pool is None:
- if os.name == "nt":
+ if os.name == "nt" or platform.system() == "OpenBSD":
CachedSequenceMatcher.process_pool = ThreadPool(None)
else:
# maxtasksperchild is new in Python 2.7; this is for 2.6 compat