FreeBSD Bugzilla – Attachment 164081 Details for
Bug 205225
[PATCH] textproc/sigil: Update to version 0.9.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
textproc_sigil.diff
textproc_sigil.diff (text/plain), 11.37 KB, created by
tkato432
on 2015-12-10 18:44:37 UTC
(
hide
)
Description:
textproc_sigil.diff
Filename:
MIME Type:
Creator:
tkato432
Created:
2015-12-10 18:44:37 UTC
Size:
11.37 KB
patch
obsolete
>diff -urN /usr/ports/textproc/sigil/Makefile textproc/sigil/Makefile >--- /usr/ports/textproc/sigil/Makefile 2015-10-20 05:13:54.427775000 +0900 >+++ textproc/sigil/Makefile 2015-12-11 00:00:00.000000000 +0900 >@@ -2,56 +2,36 @@ > # $FreeBSD: head/textproc/sigil/Makefile 399684 2015-10-19 14:50:52Z amdmi3 $ > > PORTNAME= sigil >-PORTVERSION= 0.8.6 >+PORTVERSION= 0.9.1 > CATEGORIES= textproc >+MASTER_SITES= GH > > MAINTAINER= ports@FreeBSD.org > 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> >diff -urN /usr/ports/textproc/sigil/distinfo textproc/sigil/distinfo >--- /usr/ports/textproc/sigil/distinfo 2015-08-24 03:49:51.237016000 +0900 >+++ textproc/sigil/distinfo 2015-12-11 00:00:00.000000000 +0900 >@@ -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 >diff -urN /usr/ports/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt textproc/sigil/files/patch-src_Sigil_CMakeLists.txt >--- /usr/ports/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt 2015-08-24 03:49:51.238083000 +0900 >+++ textproc/sigil/files/patch-src_Sigil_CMakeLists.txt 1970-01-01 09:00:00.000000000 +0900 >@@ -1,18 +0,0 @@ >-See ports/180350: if archivers/libzip is installed there's a conflict because >-/usr/local/include ends up being included before the minizip directory inside >-the port. >---- src/Sigil/CMakeLists.txt.orig 2015-04-12 15:08:13 UTC >-+++ src/Sigil/CMakeLists.txt >-@@ -606,11 +606,11 @@ include_directories( BEFORE >- ${HUNSPELL_INCLUDE_DIRS} >- ${PCRE_INCLUDE_DIRS} >- ${tidyLib_SOURCE_DIR} >-- ${MINIZIP_INCLUDE_DIRS} >- ${ZLIB_INCLUDE_DIRS} >- ${XERCESEXTENSIONS_INCLUDE_DIRS} >- ${XERCES_INCLUDE_DIRS} >- ${BOOST_INCLUDE_DIRS} >-+ ${MINIZIP_INCLUDE_DIRS} >- ${CMAKE_CURRENT_SOURCE_DIR} >- ${CMAKE_CURRENT_BINARY_DIR} ) >- >diff -urN /usr/ports/textproc/sigil/files/patch-src__SourceUpdates__AnchorUpdates.cpp textproc/sigil/files/patch-src__SourceUpdates__AnchorUpdates.cpp >--- /usr/ports/textproc/sigil/files/patch-src__SourceUpdates__AnchorUpdates.cpp 1970-01-01 09:00:00.000000000 +0900 >+++ textproc/sigil/files/patch-src__SourceUpdates__AnchorUpdates.cpp 2015-12-11 00:00:00.000000000 +0900 >@@ -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> >diff -urN /usr/ports/textproc/sigil/pkg-descr textproc/sigil/pkg-descr >--- /usr/ports/textproc/sigil/pkg-descr 2015-08-24 03:49:51.237461000 +0900 >+++ textproc/sigil/pkg-descr 2015-12-11 00:00:00.000000000 +0900 >@@ -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/ >diff -urN /usr/ports/textproc/sigil/pkg-plist textproc/sigil/pkg-plist >--- /usr/ports/textproc/sigil/pkg-plist 2015-08-24 03:49:51.227258000 +0900 >+++ textproc/sigil/pkg-plist 2015-12-11 00:00:00.000000000 +0900 >@@ -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 @@ > %%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 @@ > %%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 @@ > %%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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 205225
: 164081