Date: Wed, 16 Dec 2020 10:30:38 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r558220 - head/deskutils/calibre/files Message-ID: <202012161030.0BGAUcoN024083@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Wed Dec 16 10:30:37 2020 New Revision: 558220 URL: https://svnweb.freebsd.org/changeset/ports/558220 Log: Remove some patches to build files not needed anymore with the update to py-sip 5.5.0 in r558168. No functional change, so no PORTREVISION bump. Modified: head/deskutils/calibre/files/patch-setup_build.py Modified: head/deskutils/calibre/files/patch-setup_build.py ============================================================================== --- head/deskutils/calibre/files/patch-setup_build.py Wed Dec 16 10:12:15 2020 (r558219) +++ head/deskutils/calibre/files/patch-setup_build.py Wed Dec 16 10:30:37 2020 (r558220) @@ -1,14 +1,6 @@ --- setup/build.py.orig 2020-12-12 08:56:45 UTC +++ setup/build.py -@@ -487,6 +487,7 @@ project-factory = "pyqtbuild:PyQtProject" - - [tool.sip.project] - sip-files-dir = "." -+sip-module = "PyQt5.sip" - - [tool.sip.bindings.pictureflow] - headers = {ext.headers} -@@ -495,6 +496,7 @@ exceptions = {needs_exceptions} +@@ -495,6 +495,7 @@ exceptions = {needs_exceptions} include-dirs = {ext.inc_dirs} qmake-QT = ["widgets"] sip-file = "{os.path.basename(sipf)}" @@ -16,19 +8,3 @@ ''') shutil.copy2(sipf, src_dir) -@@ -523,6 +525,15 @@ sip-file = "{os.path.basename(sipf)}" - cwd = os.getcwd() - try: - os.chdir(os.path.join(src_dir, 'build')) -+ if ext.needs_exceptions: -+ # bug in sip-build -+ for q in walk('.'): -+ if os.path.basename(q) in ('Makefile',): -+ with open(q, 'r+') as f: -+ raw = f.read() -+ raw = raw.replace('-fno-exceptions', '-fexceptions') -+ f.seek(0), f.truncate() -+ f.write(raw) - self.check_call([self.env.make] + ([] if iswindows else ['-j%d'%(os.cpu_count() or 1)])) - e = 'pyd' if iswindows else 'so' - m = glob.glob(f'{ext.name}/{ext.name}.*{e}')
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012161030.0BGAUcoN024083>