Date: Tue, 22 Dec 2015 14:44:14 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404237 - in head/textproc/sigil: . files Message-ID: <201512221444.tBMEiEp8039462@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Tue Dec 22 14:44:14 2015 New Revision: 404237 URL: https://svnweb.freebsd.org/changeset/ports/404237 Log: - Update to 0.9.1 PR: 205225 Submitted by: Ports Fury Approved by: mat (mentor) Differential Revision: D4615 Added: head/textproc/sigil/files/patch-src__SourceUpdates__AnchorUpdates.cpp (contents, props changed) Deleted: head/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt Modified: head/textproc/sigil/Makefile head/textproc/sigil/distinfo head/textproc/sigil/pkg-descr head/textproc/sigil/pkg-plist Modified: head/textproc/sigil/Makefile ============================================================================== --- head/textproc/sigil/Makefile Tue Dec 22 14:33:37 2015 (r404236) +++ head/textproc/sigil/Makefile Tue Dec 22 14:44:14 2015 (r404237) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sigil -PORTVERSION= 0.8.6 +PORTVERSION= 0.9.1 CATEGORIES= textproc MAINTAINER= ports@FreeBSD.org @@ -10,48 +10,27 @@ COMMENT= WYSIWYG ePub editor LICENSE= GPLv3 # or any later version -BUILD_DEPENDS= ${LOCALBASE}/include/utf8.h:${PORTSDIR}/devel/utf8cpp LIB_DEPENDS= libminizip.so:${PORTSDIR}/archivers/minizip \ - libboost_thread.so:${PORTSDIR}/devel/boost-libs \ - libpcre16.so:${PORTSDIR}/devel/pcre \ - libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \ - libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 + libpcre.so:${PORTSDIR}/devel/pcre \ + libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell USE_GITHUB= yes -GH_ACCOUNT= user-none +GH_ACCOUNT= Sigil-Ebook GH_PROJECT= Sigil -USES= cmake compiler:c++11-lib desktop-file-utils dos2unix \ - ninja pkgconfig python:run shebangfix -USE_QT5= qmake_build buildtools_build linguisttools_build \ - concurrent gui network printsupport svg webkit \ - widgets xml xmlpatterns -EXCLUDE= BoostParts Xerces hunspell minizip pcre utf8-cpp zlib -EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude src/,} -DOS2UNIX_FILES= src/FlightCrew/CMakeLists.txt -SHEBANG_FILES= src/Sigil/Resource_Files/plugin_launchers/python/*.py - -OPTIONS_DEFINE= DEBUG -DEBUG_CFLAGS_OFF= -DNDEBUG # tidyLib - -.include <bsd.port.pre.mk> - -post-patch: - @${REINPLACE_CMD} -e 's|../utf8-cpp|${LOCALBASE}/include|' \ - ${WRKSRC}/src/FlightCrew/CMakeLists.txt -# Gentoo: sigil tries to copy non-needed qt libs for deb package, safe -# to ignore this completely - @${REINPLACE_CMD} -e '/set( QT_LIBS/d' \ - ${WRKSRC}/src/Sigil/CMakeLists.txt -.if ${CHOSEN_COMPILER_TYPE} == gcc -# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html - @${REINPLACE_CMD} -i .gch.bak \ - -e '/precompiled_header/d' \ - -e '/add_depend.*PCH/d' \ - ${WRKSRC}/src/FlightCrew/CMakeLists.txt -.endif +USES= cmake compiler:c++11-lib desktop-file-utils pkgconfig \ + python:3 shebangfix +SHEBANG_FILES= src/Resource_Files/plugin_launchers/python/*.py \ + src/Resource_Files/python3lib/*.py +USE_QT5= concurrent gui network printsupport svg webkit widgets \ + xml xmlpatterns \ + buildtools_build linguisttools_build qmake_build \ + imageformats_run +CMAKE_ARGS= -DUSE_SYSTEM_LIBS:BOOL=ON \ + -DINSTALL_BUNDLED_DICTS:BOOL=OFF +USE_LDCONFIG= ${PREFIX}/lib/sigil post-install: - ${STRIP_CMD} ${STAGEDIR}${DATADIR}/${PORTNAME}-real + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/sigil/*.so -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/textproc/sigil/distinfo ============================================================================== --- head/textproc/sigil/distinfo Tue Dec 22 14:33:37 2015 (r404236) +++ head/textproc/sigil/distinfo Tue Dec 22 14:44:14 2015 (r404237) @@ -1,2 +1,2 @@ -SHA256 (user-none-Sigil-0.8.6_GH0.tar.gz) = 5f89b47abbf0a7befa4e776083db5426456f8ef1ef50bd168dc98d621fb2ad26 -SIZE (user-none-Sigil-0.8.6_GH0.tar.gz) = 19394568 +SHA256 (Sigil-Ebook-Sigil-0.9.1_GH0.tar.gz) = 7ef13ae9f570ac51aa8d80890ff31bcdf8d1b488c1c4bbb315f1ca4b75237a63 +SIZE (Sigil-Ebook-Sigil-0.9.1_GH0.tar.gz) = 17451106 Added: head/textproc/sigil/files/patch-src__SourceUpdates__AnchorUpdates.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sigil/files/patch-src__SourceUpdates__AnchorUpdates.cpp Tue Dec 22 14:44:14 2015 (r404237) @@ -0,0 +1,14 @@ +--- src/SourceUpdates/AnchorUpdates.cpp.orig 2015-11-04 13:52:16 UTC ++++ src/SourceUpdates/AnchorUpdates.cpp +@@ -19,10 +19,10 @@ + ** + *************************************************************************/ + ++#include "Misc/EmbeddedPython.h" + #include <memory> + #include <functional> + +-#include "Misc/EmbeddedPython.h" + #include <QtCore/QtCore> + #include <QtCore/QString> + #include <QtCore/QHash> Modified: head/textproc/sigil/pkg-descr ============================================================================== --- head/textproc/sigil/pkg-descr Tue Dec 22 14:33:37 2015 (r404236) +++ head/textproc/sigil/pkg-descr Tue Dec 22 14:44:14 2015 (r404237) @@ -1,24 +1,21 @@ -Sigil is a multi-platform WYSIWYG ebook editor. It is designed to edit books -in ePub format. -* Free and open source software under GPLv3 -* Multi-platform: runs on Windows, FreeBSD, Linux and Mac -* Full Unicode support: everything you see in Sigil is in UTF-16 -* Full EPUB spec support -* WYSIWYG editing -* Multiple Views: Book View, Code View and Split View -* Metadata editor with full support for all possible metadata entries -(more than 200) with full descriptions for each -* Table Of Contents editor -* Multi-level TOC support -* Book View fully supports the display of any XHTML document possible -under the OPS spec -* SVG support -* Basic XPGT support -* Advanced automatic conversion of all imported documents to Unicode -* Currently imports TXT, HTML and EPUB files; more will be added with time -* Embedded HTML Tidy; all imported documents are thoroughly cleaned; - changing views cleans the document so no matter how much you screw - up your code, it will fix it (usually) -* An actually usable user interface +Sigil is a multi-platform EPUB ebook editor with the following features: + + * Free and open source software under GPLv3 + * Multi-platform + * Full UTF-16 support + * EPUB 2 spec support with limited EPUB 3 support + * Multiple Views: Book View, Code View and Preview View + * WYSIWYG editing in Book View + * Complete control over directly editing EPUB syntax in Code View + * Table of Contents generator with multi-level heading support + * Metadata editor + * User interface translated into many languages + * Spell checking with default and user configurable dictionaries + * Full Regular Expression (PCRE) support for Find & Replace + * Supports import of EPUB and HTML files, images, and style sheets + * Documents can be validated for EPUB compliance with the integrated + * All imported files have their formatting corrected, and your editing + can be optionally cleaned + * Plugins! WWW: http://sigil-ebook.com/ Modified: head/textproc/sigil/pkg-plist ============================================================================== --- head/textproc/sigil/pkg-plist Tue Dec 22 14:33:37 2015 (r404236) +++ head/textproc/sigil/pkg-plist Tue Dec 22 14:44:14 2015 (r404237) @@ -1,24 +1,10 @@ bin/sigil +lib/sigil/libsigilgumbo.so +lib/sigil/sigil share/applications/sigil.desktop share/pixmaps/sigil.png %%DATADIR%%/examples/clip_entries.ini %%DATADIR%%/examples/search_entries.ini -%%DATADIR%%/hunspell_dictionaries/About.txt -%%DATADIR%%/hunspell_dictionaries/de_DE.aff -%%DATADIR%%/hunspell_dictionaries/de_DE.dic -%%DATADIR%%/hunspell_dictionaries/en_GB.aff -%%DATADIR%%/hunspell_dictionaries/en_GB.dic -%%DATADIR%%/hunspell_dictionaries/en_US.aff -%%DATADIR%%/hunspell_dictionaries/en_US.dic -%%DATADIR%%/hunspell_dictionaries/es.aff -%%DATADIR%%/hunspell_dictionaries/es.dic -%%DATADIR%%/hunspell_dictionaries/fr.aff -%%DATADIR%%/hunspell_dictionaries/fr.dic -%%DATADIR%%/hunspell_dictionaries/hyph_de_DE.dic -%%DATADIR%%/hunspell_dictionaries/hyph_en_GB.dic -%%DATADIR%%/hunspell_dictionaries/hyph_en_US.dic -%%DATADIR%%/hunspell_dictionaries/hyph_es.dic -%%DATADIR%%/hunspell_dictionaries/hyph_fr.dic %%DATADIR%%/plugin_launchers/python/bookcontainer.py %%DATADIR%%/plugin_launchers/python/compatibility_utils.py %%DATADIR%%/plugin_launchers/python/epub_utils.py @@ -26,16 +12,32 @@ share/pixmaps/sigil.png %%DATADIR%%/plugin_launchers/python/launcher.py %%DATADIR%%/plugin_launchers/python/opf_parser.py %%DATADIR%%/plugin_launchers/python/outputcontainer.py +%%DATADIR%%/plugin_launchers/python/pluginhunspell.py %%DATADIR%%/plugin_launchers/python/preferences.py %%DATADIR%%/plugin_launchers/python/quickparser.py +%%DATADIR%%/plugin_launchers/python/sigil_bs4/AUTHORS.txt +%%DATADIR%%/plugin_launchers/python/sigil_bs4/COPYING.txt +%%DATADIR%%/plugin_launchers/python/sigil_bs4/__init__.py +%%DATADIR%%/plugin_launchers/python/sigil_bs4/builder/__init__.py +%%DATADIR%%/plugin_launchers/python/sigil_bs4/builder/_html5lib.py +%%DATADIR%%/plugin_launchers/python/sigil_bs4/builder/_htmlparser.py +%%DATADIR%%/plugin_launchers/python/sigil_bs4/builder/_lxml.py +%%DATADIR%%/plugin_launchers/python/sigil_bs4/dammit.py +%%DATADIR%%/plugin_launchers/python/sigil_bs4/diagnose.py +%%DATADIR%%/plugin_launchers/python/sigil_bs4/element.py +%%DATADIR%%/plugin_launchers/python/sigil_bs4/sigil_custom_changes_to_bs4-4.4.0.patch.txt +%%DATADIR%%/plugin_launchers/python/sigil_gumbo_bs4_adapter.py +%%DATADIR%%/plugin_launchers/python/sigil_gumboc.py +%%DATADIR%%/plugin_launchers/python/sigil_gumboc_tags.py %%DATADIR%%/plugin_launchers/python/unipath.py %%DATADIR%%/plugin_launchers/python/validationcontainer.py %%DATADIR%%/plugin_launchers/python/validationresult.py %%DATADIR%%/plugin_launchers/python/wrapper.py -%%DATADIR%%/sigil-real +%%DATADIR%%/python3lib/opf_newparser.py +%%DATADIR%%/python3lib/sanitycheck.py +%%DATADIR%%/python3lib/xmlprocessor.py %%DATADIR%%/translations/sigil_bg.qm %%DATADIR%%/translations/sigil_ca.qm -%%DATADIR%%/translations/sigil_cmn.qm %%DATADIR%%/translations/sigil_cs.qm %%DATADIR%%/translations/sigil_da_DK.qm %%DATADIR%%/translations/sigil_de.qm @@ -49,11 +51,8 @@ share/pixmaps/sigil.png %%DATADIR%%/translations/sigil_he.qm %%DATADIR%%/translations/sigil_hu_HU.qm %%DATADIR%%/translations/sigil_id_ID.qm -%%DATADIR%%/translations/sigil_is.qm %%DATADIR%%/translations/sigil_it.qm %%DATADIR%%/translations/sigil_ja.qm -%%DATADIR%%/translations/sigil_kk.qm -%%DATADIR%%/translations/sigil_km.qm %%DATADIR%%/translations/sigil_ko.qm %%DATADIR%%/translations/sigil_lv_LV.qm %%DATADIR%%/translations/sigil_nl.qm @@ -63,12 +62,11 @@ share/pixmaps/sigil.png %%DATADIR%%/translations/sigil_ro_RO.qm %%DATADIR%%/translations/sigil_ru.qm %%DATADIR%%/translations/sigil_sk.qm -%%DATADIR%%/translations/sigil_sv.qm +%%DATADIR%%/translations/sigil_sr.qm %%DATADIR%%/translations/sigil_tr_TR.qm %%DATADIR%%/translations/sigil_ug.qm %%DATADIR%%/translations/sigil_uk.qm %%DATADIR%%/translations/sigil_uk_UA.qm %%DATADIR%%/translations/sigil_vi.qm -%%DATADIR%%/translations/sigil_vi_VN.qm %%DATADIR%%/translations/sigil_zh_CN.qm %%DATADIR%%/translations/sigil_zh_TW.qm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512221444.tBMEiEp8039462>