From owner-svn-ports-head@freebsd.org Mon May 8 20:10:25 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA168D625F2; Mon, 8 May 2017 20:10:25 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 994A11898; Mon, 8 May 2017 20:10:25 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v48KAORp021907; Mon, 8 May 2017 20:10:24 GMT (envelope-from rm@FreeBSD.org) Received: (from rm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v48KAONm021903; Mon, 8 May 2017 20:10:24 GMT (envelope-from rm@FreeBSD.org) Message-Id: <201705082010.v48KAONm021903@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rm set sender to rm@FreeBSD.org using -f From: Ruslan Makhmatkhanov Date: Mon, 8 May 2017 20:10:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r440457 - in head/deskutils/zim: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 May 2017 20:10:26 -0000 Author: rm Date: Mon May 8 20:10:24 2017 New Revision: 440457 URL: https://svnweb.freebsd.org/changeset/ports/440457 Log: deskutils/zim: update to 0.66 - add patch to fix build in poudriere changelog: https://lists.launchpad.net/zim-wiki/msg04303.html Added: head/deskutils/zim/files/ head/deskutils/zim/files/patch-zim_newfs_____init____.py (contents, props changed) Modified: head/deskutils/zim/Makefile head/deskutils/zim/distinfo Modified: head/deskutils/zim/Makefile ============================================================================== --- head/deskutils/zim/Makefile Mon May 8 20:10:00 2017 (r440456) +++ head/deskutils/zim/Makefile Mon May 8 20:10:24 2017 (r440457) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= zim -PORTVERSION= 0.65 +PORTVERSION= 0.66 CATEGORIES= deskutils python MASTER_SITES= http://www.zim-wiki.org/downloads/ @@ -12,13 +12,13 @@ COMMENT= Desktop wiki editor LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.txt +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg \ xdg-open:devel/xdg-utils \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 NO_ARCH= yes - -USES= desktop-file-utils gettext python:2 shared-mime-info +USES= desktop-file-utils gettext python:-2.7 shared-mime-info USE_GNOME= pygtk2 USE_PYTHON= autoplist distutils INSTALLS_ICONS= yes @@ -48,8 +48,5 @@ post-patch: s|share/man|man| ; \ /.skip_xdg_cmd = /s|0|1|' \ ${WRKSRC}/setup.py - @${REINPLACE_CMD} -e \ - 's|decode('utf-8')|decode('utf-8','replace')|g' \ - ${WRKSRC}/zim/utils.py .include Modified: head/deskutils/zim/distinfo ============================================================================== --- head/deskutils/zim/distinfo Mon May 8 20:10:00 2017 (r440456) +++ head/deskutils/zim/distinfo Mon May 8 20:10:24 2017 (r440457) @@ -1,2 +1,3 @@ -SHA256 (zim-0.65.tar.gz) = 5442f3334395a2beafc5b9a2bbec2e53e38270d4bad696b5c4053dd51dc1ed96 -SIZE (zim-0.65.tar.gz) = 1899614 +TIMESTAMP = 1494271021 +SHA256 (zim-0.66.tar.gz) = e8b53948097f211972713252f3a89b2957e3a63f55eb53587e2474dfc4cbf6c4 +SIZE (zim-0.66.tar.gz) = 2020216 Added: head/deskutils/zim/files/patch-zim_newfs_____init____.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/zim/files/patch-zim_newfs_____init____.py Mon May 8 20:10:24 2017 (r440457) @@ -0,0 +1,17 @@ +--- zim/newfs/__init__.py.orig 2017-05-08 19:57:42 UTC ++++ zim/newfs/__init__.py +@@ -6,12 +6,14 @@ + + import sys + import os ++import logging + + FS_CASE_SENSITIVE = (os.name != 'nt') #: file system case-sensitive yes or no + + FS_SUPPORT_NON_LOCAL_FILE_SHARES = (os.name == 'nt') #: Support \\host\share paths yes or no + + FS_ENCODING = sys.getfilesystemencoding() #: file system encoding for paths ++logger = logging.getLogger('zim.newfs') + if FS_ENCODING.upper() in ( + 'ASCII', 'US-ASCII', 'ANSI_X3.4-1968', 'ISO646-US', # some aliases for ascii + 'LATIN1', 'ISO-8859-1', 'ISO_8859-1', 'ISO_8859-1:1987', # aliases for latin1