From d5e2c3f9e62187d069e22f72755960f792ae5ffd Mon Sep 17 00:00:00 2001 From: ryoon Date: Wed, 2 Mar 2016 23:08:22 +0000 Subject: Update to 0.9.3 * Disable debug build Changelog: The engine is written completely and get EPUB 3 support. --- editors/Sigil/Makefile | 27 +++++++--- editors/Sigil/PLIST | 60 ++++++++++++++++------ editors/Sigil/distinfo | 18 +++---- .../Sigil/patches/patch-3rdparty_minizip_ioapi.c | 21 ++++++++ .../patch-src_Sigil_BookManipulation_Headings.cpp | 13 ----- .../patch-src_Sigil_Importers_ImportHTML.cpp | 12 ----- ...patch-src_Sigil_SourceUpdates_AnchorUpdates.cpp | 12 ----- .../patch-src_Sigil_SourceUpdates_LinkUpdates.cpp | 12 ----- ...ch-src_Sigil_SourceUpdates_UniversalUpdates.cpp | 12 ----- .../patch-src_Sigil_SourceUpdates_WordUpdates.cpp | 13 ----- editors/Sigil/patches/patch-src_minizip_ioapi.c | 21 -------- 11 files changed, 92 insertions(+), 129 deletions(-) create mode 100644 editors/Sigil/patches/patch-3rdparty_minizip_ioapi.c delete mode 100644 editors/Sigil/patches/patch-src_Sigil_BookManipulation_Headings.cpp delete mode 100644 editors/Sigil/patches/patch-src_Sigil_Importers_ImportHTML.cpp delete mode 100644 editors/Sigil/patches/patch-src_Sigil_SourceUpdates_AnchorUpdates.cpp delete mode 100644 editors/Sigil/patches/patch-src_Sigil_SourceUpdates_LinkUpdates.cpp delete mode 100644 editors/Sigil/patches/patch-src_Sigil_SourceUpdates_UniversalUpdates.cpp delete mode 100644 editors/Sigil/patches/patch-src_Sigil_SourceUpdates_WordUpdates.cpp delete mode 100644 editors/Sigil/patches/patch-src_minizip_ioapi.c (limited to 'editors/Sigil') diff --git a/editors/Sigil/Makefile b/editors/Sigil/Makefile index 3c9d27f1773..71231a946ec 100644 --- a/editors/Sigil/Makefile +++ b/editors/Sigil/Makefile @@ -1,33 +1,48 @@ -# $NetBSD: Makefile,v 1.76 2016/01/06 10:46:51 adam Exp $ +# $NetBSD: Makefile,v 1.77 2016/03/02 23:08:22 ryoon Exp $ -DISTNAME= Sigil-0.8.7 -PKGREVISION= 2 +DISTNAME= Sigil-0.9.3 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_GITHUB:=Sigil-Ebook/} +GITHUB_PROJECT= Sigil +GITHUB_TAG= ${PKGVERSION_NOREV} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://sigil-ebook.com/ COMMENT= Multi-platform WYSIWYG ebook editor (for the ePub format) LICENSE= gnu-gpl-v3 -MAKE_JOBS_SAFE= NO +#MAKE_JOBS_SAFE= NO + +DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk +DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml +DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six +DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib +DEPENDS+= ${PYPKGPREFIX}-regex-[0-9]*:../../textproc/py-regex +DEPENDS+= ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow +DEPENDS+= ${PYPKGPREFIX}-cssselect-[0-9]*:../../textproc/py-cssselect +DEPENDS+= ${PYPKGPREFIX}-cssutils-[0-9]*:../../textproc/py-cssutils +DEPENDS+= ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet Qt5_DIR= ${BUILDLINK_PREFIX.qt5-qtbase}/qt5 ALL_ENV+= Qt5_DIR=${Qt5_DIR} BUILDLINK_TRANSFORM+= opt:-O2:-O0 -MAKE_ENV+= CXX_FLAGS="-g" +#MAKE_ENV+= CXX_FLAGS="-g" USE_LANGUAGES= c c++ USE_CMAKE= yes USE_TOOLS+= pkg-config -CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug +#CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug BUILDLINK_TRANSFORM+= l:BoostParts:boost_date_time:boost_filesystem:boost_regex:boost_system:boost_thread:boost_program_options BUILDLINK_TRANSFORM+= l:Xerces:xerces-c BUILDLINK_TRANSFORM+= l:zlib:z +#LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/sigil +#LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib + +PYTHON_VERSIONS_INCOMPATIBLE= 27 REPLACE_PYTHON+= src/Sigil/Resource_Files/plugin_launchers/python/*.py .include "../../mk/compiler.mk" diff --git a/editors/Sigil/PLIST b/editors/Sigil/PLIST index 80fc08b10a8..9e57dfc5bd0 100644 --- a/editors/Sigil/PLIST +++ b/editors/Sigil/PLIST @@ -1,10 +1,29 @@ -@comment $NetBSD: PLIST,v 1.11 2015/02/07 13:19:21 wiz Exp $ +@comment $NetBSD: PLIST,v 1.12 2016/03/02 23:08:22 ryoon Exp $ bin/sigil +lib/sigil/libhunspell.${RUBY_DLEXT} +lib/sigil/libsigilgumbo.${RUBY_DLEXT} +lib/sigil/sigil share/applications/sigil.desktop share/pixmaps/sigil.png share/sigil/examples/clip_entries.ini share/sigil/examples/search_entries.ini share/sigil/hunspell_dictionaries/About.txt +share/sigil/hunspell_dictionaries/COPYING_GPLv2.txt +share/sigil/hunspell_dictionaries/COPYING_GPLv3.txt +share/sigil/hunspell_dictionaries/COPYING_LGPL_v2.0.txt +share/sigil/hunspell_dictionaries/COPYING_LGPL_v2.1.txt +share/sigil/hunspell_dictionaries/README.txt +share/sigil/hunspell_dictionaries/README_de_DE_frami.txt +share/sigil/hunspell_dictionaries/README_en_GB.txt +share/sigil/hunspell_dictionaries/README_en_US.txt +share/sigil/hunspell_dictionaries/README_es_ANY.txt +share/sigil/hunspell_dictionaries/README_extension_owner.txt +share/sigil/hunspell_dictionaries/README_fr.txt +share/sigil/hunspell_dictionaries/README_hyph_de.txt +share/sigil/hunspell_dictionaries/README_hyph_en_GB.txt +share/sigil/hunspell_dictionaries/README_hyph_en_US.txt +share/sigil/hunspell_dictionaries/README_hyph_es_ANY.txt +share/sigil/hunspell_dictionaries/README_hyph_fr.txt share/sigil/hunspell_dictionaries/de_DE.aff share/sigil/hunspell_dictionaries/de_DE.dic share/sigil/hunspell_dictionaries/en_GB.aff @@ -20,6 +39,7 @@ share/sigil/hunspell_dictionaries/hyph_en_GB.dic share/sigil/hunspell_dictionaries/hyph_en_US.dic share/sigil/hunspell_dictionaries/hyph_es.dic share/sigil/hunspell_dictionaries/hyph_fr.dic +share/sigil/hunspell_dictionaries/license.txt share/sigil/plugin_launchers/python/bookcontainer.py share/sigil/plugin_launchers/python/compatibility_utils.py share/sigil/plugin_launchers/python/epub_utils.py @@ -27,16 +47,35 @@ share/sigil/plugin_launchers/python/inputcontainer.py share/sigil/plugin_launchers/python/launcher.py share/sigil/plugin_launchers/python/opf_parser.py share/sigil/plugin_launchers/python/outputcontainer.py +share/sigil/plugin_launchers/python/pluginhunspell.py share/sigil/plugin_launchers/python/preferences.py share/sigil/plugin_launchers/python/quickparser.py +share/sigil/plugin_launchers/python/sigil_bs4/AUTHORS.txt +share/sigil/plugin_launchers/python/sigil_bs4/COPYING.txt +share/sigil/plugin_launchers/python/sigil_bs4/__init__.py +share/sigil/plugin_launchers/python/sigil_bs4/builder/__init__.py +share/sigil/plugin_launchers/python/sigil_bs4/builder/_html5lib.py +share/sigil/plugin_launchers/python/sigil_bs4/builder/_htmlparser.py +share/sigil/plugin_launchers/python/sigil_bs4/builder/_lxml.py +share/sigil/plugin_launchers/python/sigil_bs4/dammit.py +share/sigil/plugin_launchers/python/sigil_bs4/diagnose.py +share/sigil/plugin_launchers/python/sigil_bs4/element.py +share/sigil/plugin_launchers/python/sigil_bs4/sigil_custom_changes_to_bs4-4.4.0.patch.txt +share/sigil/plugin_launchers/python/sigil_gumbo_bs4_adapter.py +share/sigil/plugin_launchers/python/sigil_gumboc.py +share/sigil/plugin_launchers/python/sigil_gumboc_tags.py share/sigil/plugin_launchers/python/unipath.py share/sigil/plugin_launchers/python/validationcontainer.py share/sigil/plugin_launchers/python/validationresult.py share/sigil/plugin_launchers/python/wrapper.py -share/sigil/sigil-real -share/sigil/translations/sigil_bg.qm +share/sigil/polyfills/MathJax.js +share/sigil/python3lib/navgenerator.py +share/sigil/python3lib/ncxgenerator.py +share/sigil/python3lib/opf_newparser.py +share/sigil/python3lib/sanitycheck.py +share/sigil/python3lib/updatechecker.py +share/sigil/python3lib/xmlprocessor.py share/sigil/translations/sigil_ca.qm -share/sigil/translations/sigil_cmn.qm share/sigil/translations/sigil_cs.qm share/sigil/translations/sigil_da_DK.qm share/sigil/translations/sigil_de.qm @@ -50,26 +89,15 @@ share/sigil/translations/sigil_gl.qm share/sigil/translations/sigil_he.qm share/sigil/translations/sigil_hu_HU.qm share/sigil/translations/sigil_id_ID.qm -share/sigil/translations/sigil_is.qm share/sigil/translations/sigil_it.qm share/sigil/translations/sigil_ja.qm -share/sigil/translations/sigil_kk.qm -share/sigil/translations/sigil_km.qm share/sigil/translations/sigil_ko.qm -share/sigil/translations/sigil_lv_LV.qm share/sigil/translations/sigil_nl.qm share/sigil/translations/sigil_pl.qm -share/sigil/translations/sigil_pt.qm share/sigil/translations/sigil_pt_BR.qm -share/sigil/translations/sigil_ro_RO.qm share/sigil/translations/sigil_ru.qm share/sigil/translations/sigil_sk.qm -share/sigil/translations/sigil_sv.qm +share/sigil/translations/sigil_sr.qm share/sigil/translations/sigil_tr_TR.qm -share/sigil/translations/sigil_ug.qm -share/sigil/translations/sigil_uk.qm -share/sigil/translations/sigil_uk_UA.qm -share/sigil/translations/sigil_vi.qm -share/sigil/translations/sigil_vi_VN.qm share/sigil/translations/sigil_zh_CN.qm share/sigil/translations/sigil_zh_TW.qm diff --git a/editors/Sigil/distinfo b/editors/Sigil/distinfo index bb3bdb8d25d..4a5e0a862cd 100644 --- a/editors/Sigil/distinfo +++ b/editors/Sigil/distinfo @@ -1,13 +1,7 @@ -$NetBSD: distinfo,v 1.33 2016/01/13 23:55:42 joerg Exp $ +$NetBSD: distinfo,v 1.34 2016/03/02 23:08:22 ryoon Exp $ -SHA1 (Sigil-0.8.7.tar.gz) = bc0b2f7fc741d2392823120ddf652b820ce682a0 -RMD160 (Sigil-0.8.7.tar.gz) = 48494b5ea61194ddb76a7eae53ea308546d441e7 -SHA512 (Sigil-0.8.7.tar.gz) = 24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652 -Size (Sigil-0.8.7.tar.gz) = 19394061 bytes -SHA1 (patch-src_Sigil_BookManipulation_Headings.cpp) = 1c932c0cbcf01c87bbcfc53413eb9c7060ec903c -SHA1 (patch-src_Sigil_Importers_ImportHTML.cpp) = 5c9340eddfd26b045734f09768029f163d40c537 -SHA1 (patch-src_Sigil_SourceUpdates_AnchorUpdates.cpp) = 33f57b457cbec464b0428f3c4a62232abfccf2c4 -SHA1 (patch-src_Sigil_SourceUpdates_LinkUpdates.cpp) = 3d628d458909017f974a39a885acba4e5aca0cdf -SHA1 (patch-src_Sigil_SourceUpdates_UniversalUpdates.cpp) = f99956c9e3b4a281f459e45cc5a8a955de80b357 -SHA1 (patch-src_Sigil_SourceUpdates_WordUpdates.cpp) = db78170e0e094988dec3be55cc41ceed1e4ba745 -SHA1 (patch-src_minizip_ioapi.c) = 0a227daf214ceeb1fe8483aeed700fce05b21ccd +SHA1 (Sigil-0.9.3.tar.gz) = 312b7e45491256dac64370ed009e77470ef276e6 +RMD160 (Sigil-0.9.3.tar.gz) = 8f68a281306d7579f09bd6c5c45aec70bb5524a7 +SHA512 (Sigil-0.9.3.tar.gz) = c3463e0b16188b9d15f2f00e2b4fb8c565c0281cde144b840e49dbf7026462251d44ad8b5ae4b0ac8f88569ce73c6a9bcd781864283f3b5b8b25be7962b0f9b1 +Size (Sigil-0.9.3.tar.gz) = 18095814 bytes +SHA1 (patch-3rdparty_minizip_ioapi.c) = a68dead89687529b7022cda3bc8a079e5f5c1459 diff --git a/editors/Sigil/patches/patch-3rdparty_minizip_ioapi.c b/editors/Sigil/patches/patch-3rdparty_minizip_ioapi.c new file mode 100644 index 00000000000..84e0a5fac0e --- /dev/null +++ b/editors/Sigil/patches/patch-3rdparty_minizip_ioapi.c @@ -0,0 +1,21 @@ +$NetBSD: patch-3rdparty_minizip_ioapi.c,v 1.1 2016/03/02 23:08:22 ryoon Exp $ + +Fix linking on NetBSD and DragonFly BSD, where fopen, fseek, and ftello +are 64-bit filesize safe. +https://github.com/nmoinvaz/minizip/pull/20 + +--- 3rdparty/minizip/ioapi.c.orig 2016-01-30 15:39:54.000000000 +0000 ++++ 3rdparty/minizip/ioapi.c +@@ -14,6 +14,12 @@ + #define _CRT_SECURE_NO_WARNINGS + #endif + ++#if defined(__NetBSD__) || defined(__DragonFly__) ++#define fopen64 fopen ++#define fseeko64 fseek ++#define ftello64 ftello ++#endif ++ + #include "ioapi.h" + + voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode) diff --git a/editors/Sigil/patches/patch-src_Sigil_BookManipulation_Headings.cpp b/editors/Sigil/patches/patch-src_Sigil_BookManipulation_Headings.cpp deleted file mode 100644 index fba9622b75d..00000000000 --- a/editors/Sigil/patches/patch-src_Sigil_BookManipulation_Headings.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_Sigil_BookManipulation_Headings.cpp,v 1.1 2016/01/13 23:55:42 joerg Exp $ - ---- src/Sigil/BookManipulation/Headings.cpp.orig 2016-01-12 20:35:47.000000000 +0000 -+++ src/Sigil/BookManipulation/Headings.cpp -@@ -35,7 +35,7 @@ - #include "sigil_constants.h" - - using boost::make_tuple; -- -+using namespace boost::placeholders; - - // The maximum allowed distance (in lines) that a heading - // can be located from a body tag and still diff --git a/editors/Sigil/patches/patch-src_Sigil_Importers_ImportHTML.cpp b/editors/Sigil/patches/patch-src_Sigil_Importers_ImportHTML.cpp deleted file mode 100644 index 51b21414fc6..00000000000 --- a/editors/Sigil/patches/patch-src_Sigil_Importers_ImportHTML.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-src_Sigil_Importers_ImportHTML.cpp,v 1.1 2016/01/13 23:55:42 joerg Exp $ - ---- src/Sigil/Importers/ImportHTML.cpp.orig 2016-01-12 20:49:21.000000000 +0000 -+++ src/Sigil/Importers/ImportHTML.cpp -@@ -46,6 +46,7 @@ - #include "sigil_constants.h" - #include "sigil_exception.h" - -+using namespace boost::placeholders; - using boost::tie; - - // Constructor; diff --git a/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_AnchorUpdates.cpp b/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_AnchorUpdates.cpp deleted file mode 100644 index 67734f6fbfb..00000000000 --- a/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_AnchorUpdates.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-src_Sigil_SourceUpdates_AnchorUpdates.cpp,v 1.1 2016/01/13 23:55:42 joerg Exp $ - ---- src/Sigil/SourceUpdates/AnchorUpdates.cpp.orig 2016-01-12 20:10:20.000000000 +0000 -+++ src/Sigil/SourceUpdates/AnchorUpdates.cpp -@@ -40,6 +40,7 @@ using boost::make_tuple; - using boost::shared_ptr; - using boost::tie; - using boost::tuple; -+using namespace boost::placeholders; - - void AnchorUpdates::UpdateAllAnchorsWithIDs(const QList &html_resources) - { diff --git a/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_LinkUpdates.cpp b/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_LinkUpdates.cpp deleted file mode 100644 index dba43efa855..00000000000 --- a/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_LinkUpdates.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-src_Sigil_SourceUpdates_LinkUpdates.cpp,v 1.1 2016/01/13 23:55:42 joerg Exp $ - ---- src/Sigil/SourceUpdates/LinkUpdates.cpp.orig 2016-01-12 20:31:45.000000000 +0000 -+++ src/Sigil/SourceUpdates/LinkUpdates.cpp -@@ -34,6 +34,7 @@ - #include "SourceUpdates/LinkUpdates.h" - - using boost::shared_ptr; -+using namespace boost::placeholders; - - static QString HTML_XML_NAMESPACE = "http://www.w3.org/1999/xhtml"; - diff --git a/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_UniversalUpdates.cpp b/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_UniversalUpdates.cpp deleted file mode 100644 index d5cdb29e7d4..00000000000 --- a/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_UniversalUpdates.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-src_Sigil_SourceUpdates_UniversalUpdates.cpp,v 1.1 2016/01/13 23:55:42 joerg Exp $ - ---- src/Sigil/SourceUpdates/UniversalUpdates.cpp.orig 2016-01-12 20:32:59.000000000 +0000 -+++ src/Sigil/SourceUpdates/UniversalUpdates.cpp -@@ -47,6 +47,7 @@ - #include "SourceUpdates/UniversalUpdates.h" - - using boost::make_tuple; -+using namespace boost::placeholders; - using boost::shared_ptr; - using boost::tie; - using boost::tuple; diff --git a/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_WordUpdates.cpp b/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_WordUpdates.cpp deleted file mode 100644 index f48f9d5ca71..00000000000 --- a/editors/Sigil/patches/patch-src_Sigil_SourceUpdates_WordUpdates.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_Sigil_SourceUpdates_WordUpdates.cpp,v 1.1 2016/01/13 23:55:42 joerg Exp $ - ---- src/Sigil/SourceUpdates/WordUpdates.cpp.orig 2016-01-12 20:32:16.000000000 +0000 -+++ src/Sigil/SourceUpdates/WordUpdates.cpp -@@ -29,6 +29,8 @@ - #include "ResourceObjects/HTMLResource.h" - #include "SourceUpdates/WordUpdates.h" - -+using namespace boost::placeholders; -+ - void WordUpdates::UpdateWordInAllFiles(const QList &html_resources, const QString old_word, QString new_word) - { - QtConcurrent::blockingMap(html_resources, boost::bind(UpdateWordsInOneFile, _1, old_word, new_word)); diff --git a/editors/Sigil/patches/patch-src_minizip_ioapi.c b/editors/Sigil/patches/patch-src_minizip_ioapi.c deleted file mode 100644 index f0eddcbe4d3..00000000000 --- a/editors/Sigil/patches/patch-src_minizip_ioapi.c +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-src_minizip_ioapi.c,v 1.3 2015/02/09 12:57:41 wiz Exp $ - -Fix linking on NetBSD and DragonFly BSD, where fopen, fseek, and ftello -are 64-bit filesize safe. -https://github.com/nmoinvaz/minizip/pull/20 - ---- src/minizip/ioapi.c.orig 2014-10-12 14:45:14.000000000 +0000 -+++ src/minizip/ioapi.c -@@ -14,6 +14,12 @@ - #define _CRT_SECURE_NO_WARNINGS - #endif - -+#if defined(__NetBSD__) || defined(__DragonFly__) -+#define fopen64 fopen -+#define fseeko64 fseek -+#define ftello64 ftello -+#endif -+ - #include "ioapi.h" - - voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode) -- cgit v1.2.3