pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/editors/Sigil Sigil: look for python 3.7 by default (o...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f14e26a47283
branches:  trunk
changeset: 310746:f14e26a47283
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Jul 22 22:51:24 2018 +0000

description:
Sigil: look for python 3.7 by default (of the python 3.x versions)

While here, fix the REPLACE_PYTHON patterns.
Bump PKGREVISION.

diffstat:

 editors/Sigil/Makefile                     |   8 +++++---
 editors/Sigil/distinfo                     |   3 ++-
 editors/Sigil/patches/patch-CMakeLists.txt |  17 +++++++++++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diffs (58 lines):

diff -r 4c2891dbdc31 -r f14e26a47283 editors/Sigil/Makefile
--- a/editors/Sigil/Makefile    Sun Jul 22 22:43:11 2018 +0000
+++ b/editors/Sigil/Makefile    Sun Jul 22 22:51:24 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.109 2018/07/20 03:34:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.110 2018/07/22 22:51:24 wiz Exp $
 
 DISTNAME=      Sigil-0.9.9
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Sigil-Ebook/}
 GITHUB_PROJECT=        Sigil
@@ -38,7 +38,9 @@
 #LDFLAGS+=     ${COMPILER_RPATH_FLAG}${PREFIX}/lib
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
-REPLACE_PYTHON+=       src/Sigil/Resource_Files/plugin_launchers/python/*.py
+REPLACE_PYTHON+=       src/Resource_Files/*/*/*/*.py
+REPLACE_PYTHON+=       src/Resource_Files/*/*/*.py
+REPLACE_PYTHON+=       src/Resource_Files/*/*.py
 
 .include "../../textproc/xerces-c/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff -r 4c2891dbdc31 -r f14e26a47283 editors/Sigil/distinfo
--- a/editors/Sigil/distinfo    Sun Jul 22 22:43:11 2018 +0000
+++ b/editors/Sigil/distinfo    Sun Jul 22 22:51:24 2018 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.39 2018/01/28 15:40:10 wiz Exp $
+$NetBSD: distinfo,v 1.40 2018/07/22 22:51:24 wiz Exp $
 
 SHA1 (Sigil-0.9.9.tar.gz) = c38d39f47dd9b7dc761c79af835f8219e08ad147
 RMD160 (Sigil-0.9.9.tar.gz) = 5b4ab12baecbfecd30837a276b80cbff866622aa
 SHA512 (Sigil-0.9.9.tar.gz) = a860dcdf3abcd3adbff9d00a3d7f9eb547ebb20fa4aed77824501e5a75416c0f02a451a383efd94c06408f8f30525e00e57a43f232f03ebf114beae8a4eff8a5
 Size (Sigil-0.9.9.tar.gz) = 18675046 bytes
 SHA1 (patch-3rdparty_minizip_ioapi.c) = a68dead89687529b7022cda3bc8a079e5f5c1459
+SHA1 (patch-CMakeLists.txt) = c051261285dbbc3d2e2ab8b57ab678b4e4a45400
diff -r 4c2891dbdc31 -r f14e26a47283 editors/Sigil/patches/patch-CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/Sigil/patches/patch-CMakeLists.txt        Sun Jul 22 22:51:24 2018 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-CMakeLists.txt,v 1.6 2018/07/22 22:51:24 wiz Exp $
+
+Try finding python 3.7
+
+--- CMakeLists.txt.orig        2018-07-22 22:41:30.657122506 +0000
++++ CMakeLists.txt
+@@ -87,8 +87,8 @@ if ( WIN32 OR APPLE )
+     find_package(PythonInterp 3.5)
+     find_package (PythonLibs 3.5)
+ else()
+-    find_package(PythonInterp 3.4)
+-    find_package (PythonLibs 3.4)
++    find_package(PythonInterp 3.7)
++    find_package (PythonLibs 3.7)
+ endif()
+ 
+ # gumbo-parser it is our main xhtml/html5 parser.



Home | Main Index | Thread Index | Old Index