Update to 0.7.4

* Use Qt5 instead of Qt4
* Use internal hunspell to avoid runtime error

Changelog:
Sigil 0.7.4 2013.10.27
    - Use numeric entity for non-breaking spaces (nbsp) instead of named
      entity. Fixes issues where files without a doctype won't open properly.

Sigil 0.7.3 2013.08.03
    - Fix issue 2309: Compile failure due to case issue on m_lastFolderOpen.
    - Fix issue 2269: "Conflicts with:" always in English.
    - Fix issue 2186: Sigil 0.7.2 crashes on "Add existing files".
    - Fix issue 2232: The nbsp characters in UTF-8 files are converted to normal spaces.
    - Fix issue 2201: Save does not prompt for filename if filename not set
      after cancelling save operation.
    - Fix issue 2193: Incorrect country code used for Serbia.
    - Implement issue 2199: Mac, Don't open empty book by default.

Sigil 0.7.2 2013.04.14
    - Implement issue 2129: Enhance archive filename encoding handling.
    - Implement issue 2128: Warnings for non-ASCII characters in filenames.
    - Implement issue 2113: Preview should zoom separately from other views.
    - Implement issue 1997: Tool to Add Cover image and file automatically.
    - Implement issue 1993: Find & Replace should have a Marked Text option.
    - Implement issue 2083: Enhance invalid OPF recovery.
    - Implement issue 2082: Improve performance of Book Browser refresh.
    - Fix issue 2170: Spellcheck should remember position after changing word.
    - Fix issue 2148: Don't delete cover image in "Delete unused media files".
    - Fix issue 2147: Doubleclick in Delete Files dialog can cause crash.
    - Fix issue 2143: Bulk rename with just a number for filename does not use correct number of 0s.
    - Fix issue 2121: Wait cursor shows when dialog is open while saving or opening.
    - Fix issue 2107: Heading not accepted due to split at end of file.
    - Fix issue 2110: Insert Special Character inserts wrong code for nnbsp.
    - Fix issue 2021: Importing UTF-16 encoded files results in empty file.
    - Fix issue 2088: Ctrl-click on text files does not work in Code View.
    - Fix Issue 2071: Anchor dialog has disabled text field.
    - Fix Issue 2077: Rename dialog incorrectly sized.
    - Fix issue 2081: Book Browser tooltips are not updated when semantics change or for cover images.
    - Fix issue 2080: OPF meta title not updated correctly for Add Semantic.
    - Fix issue 2079: UI Language dropdown does not show language names for entries containing _.

Sigil 0.7.1 2013.03.03
    - Implement issue 2058: Code View should be able to show resizable image.
    - Implement issue 2038: Spellcheck "change selected word to" should remember sorting order.
    - Implement issue 2043: Spellcheck should allow case-insensitive sorting.
    - Implement issue 2029: Save and open should warn if HTML files are not well formed.
    - Implement issue 2009: Add semantic tags to filenames in reports.
    - Implement issue 2028: Special characters should work in non-html files.
    - Implement issue 2027: Upgrade Boost to Boost 1.53.0.
    - Fix issue 2069: Work around for archives where filenames are not utf-8 encoded.
    - Fix issue 2068: ZIP general purpose bit 11 (utf-8) filename not set.
    - Fix issue 2061: Language code using wrong character to separate country code.
    - Fix issue 2057: Text selected across lines using Ctrl-F cannot be found with Find.
    - Fix issue 2036: Mark for Index can insert HTML tags into code making it invalid.
    - Fix issue 2041: Preview does not sync cursor after using Sigil for a while.
    - Fix issue 2030: The   character is incorrectly converted to space on open.
    - Fix issue 2035: Index Editor entries with nbsp character don't match text.
    - Fix issue 2016: Find with wrap off and All HTML Files still wraps on last file.
    - Fix issue 2001: Spellcheck does not always highlight a word the first time.
    - Fix issue 2017: Clips pasted into some windows does not work correctly.
    - Fix issue 2008: Index adds extra comma in some cases.

Sigil 0.7.0 2013.02.17
    - Implement issue 1983: Set the tooltips of files in Book Browser to the filename.
    - Implement issue 1965: Allow opening files that are missing container.xml.
    - Implement issue 1975: HTML TOC and Index should use CSS files instead of inline stylesheet.
    - Implement issue 1968: Bookmark location in editing window.
    - Implement issue 1963: Table Of Contents window should default to expanded when opened or refreshed.
    - Implement issue 1953: Allow entering a list of new words into dictionary preferences.
    - Implement issue 1952: Add shortcut for Copy HTML file.
    - Implement issue 1951: Doubleclick on Image Report file should find next use of image.
    - Implement issue 1949: Add support for multiple active user dictionaries.
    - Implement issue 1947: Spellcheck dialog to manage all misspelled words at once.
    - Implement issue 62: Add document's css styles to menu.
    - Implement issue 1945: Allow editing of CSS while displaying page.
    - Implement issue 1661: Report list of all different characters in the book.
    - Implement issue 1746: Add Report for Links and Footnotes.
    - Implement issue 1941: Add Find & Replace option to wrap or not wrap searches.
    - Implement issue 1940: Update Insert Image to Insert File to support insert of audio/video.
    - Implement issue 1938: Update Delete Image files to Delete Media files to include audio/video.
    - Implement issue 1937: Add Report for All Files.
    - Implement issue 1936: Add Clip Bar toolbar with buttons for Clips and shortcuts for Clips.
    - Implement issue 1931: Change to QRegularExpression for most regexes.
    - Implement issue 1185: Edit Table of Contents without needing Generate TOC.
    - Implement issue 1929: Add support for playing audio and video files.
    - Implement issue 917: Sigil should support audio and video tags.
    - Implement issue 1928: Add well-formed check to HTML File Report.
    - Implement issue 1864: Allow Metadata Editor dialog to stay open while editing.
    - Implement issue 1871: Code View context menu should show clips even if word is misspelled.
    - Implement issue 1870: Saved Searches should use mode settings from Find & Replace.
    - Implement issue 1927: Add support for basic replacement Clips (e.g. span) in Book View.
    - Implement issue 20: Embedded fonts support.
    - Implement issue 1926: Upgrade to Qt5.
    - Implement issue 1924: Add dockable Clips window to select clips.
    - Implement issue 1925: Don't force well formed checks unless absolutely necessary.
    - Implement issue 1843: Preview should be real-time display of Code View.
    - Fix issue 1989: Problem with nested index entries.
    - Fix issue 1964: Correcting a word using spellcheck does not make file go to "not saved" state.
    - Fix issue 1961: Generate TOC should not create IDs for headings when it only points to filenames.
    - Fix issue 1857: CSS Highlighting inline styles inconsistent.
    - Fix issue 1946: Highlight misspelled words checkbox should be available in Preferences.
    - Fix issue 1943: Reports can crash if file has non well-formed xml.
    - Fix issue 1883: TOC window does not jump to right location for some entries.
    - Fix issue 1906: "Delete unused image files" deleting background images.
    - Fix issue 1874: Using Delete Unused Stylesheet Classes deletes pseudo-elements.
    - Fix issue 1939: CSS parser does not match wildcard selectors consistently.
    - Fix issue 1935: Improve speed of Index Editor autofill by removing progress dialog.
    - Fix issue 1891: Opening the Saved Searches expands all groups.
    - Fix issue 1934: Go To Style does not work with CSS filenames that have spaces in them.
    - Fix issue 1933: No message is displayed if Go To Style can't find a style.
    - Fix issue 1932: Replace All needs to be run twice in some cases.
    - Fix issue 1930: Fix Metadata language dropdown selection incorrect matching.
    - Fix issue 1775: Sigil-0.6.0 edit very slow with Thai e-Pub.
    - Fix issue 1764: Sigil crashes on KDE after rearranging text sections.
    - Fix issue 1720: Book View highlights text apparently randomly.
    - Fix issue 1923: CSS validation should use EPUB 2 profile.
    - Fix issue 1922: Invalid EPUB warning dialog is not long enough.
    - Fix issue 1918: Support import of tab separated entries for Index Editor.
    - Fix issue 1917: Keep selection when deleting unused images if an HTML file was selected.
    - Fix issue 1916: Allow Go To Style to work for link type text/x-oeb1-css.
    - Fix issue 1869: Backspace in Preferences - Shortcuts causes crash.
    - Fix issue 1818: Hyperlink of URL with & causes invalid code.
    - Fix issue 1824: Cursor position changes when saving the book.

4 files changed, 30 insertions, 42 deletions

diff --git a/editors/Sigil/Makefile b/editors/Sigil/Makefile
index aeaf108d92b..dfea3bfa280 100644
--- a/editors/Sigil/Makefile
+++ b/editors/Sigil/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2013/11/20 20:04:37 adam Exp $
+# $NetBSD: Makefile,v 1.51 2013/12/13 14:46:10 ryoon Exp $
 #
 
-DISTNAME=	Sigil-0.6.2-Code
+DISTNAME=	Sigil-0.7.4-Code
 PKGNAME=	${DISTNAME:S/-Code//}
-PKGREVISION=	9
 CATEGORIES=	editors
 MASTER_SITES=	http://sigil.googlecode.com/files/
 EXTRACT_SUFX=	.zip
@@ -17,10 +16,18 @@ MAKE_JOBS_SAFE=	NO
 
 WRKSRC=		${WRKDIR}
 
+Qt5_DIR=	${BUILDLINK_PREFIX.qt5-qtbase}/qt5
+ALL_ENV+=	Qt5_DIR=${Qt5_DIR}
+
+BUILDLINK_TRANSFORM+=	opt:-O2:-O0
+MAKE_ENV+=	CXX_FLAGS="-g"
+
 USE_LANGUAGES=	c c++
 USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config
 
+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
@@ -35,8 +42,10 @@ _WRAP_EXTRA_ARGS.CXX+=	-std=c++0x
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
-.include "../../textproc/hunspell/buildlink3.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
+#.include "../../textproc/hunspell/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
+.include "../../x11/qt5-qtwebkit/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/Sigil/PLIST b/editors/Sigil/PLIST
index 86817b317f6..e957a21cb59 100644
--- a/editors/Sigil/PLIST
+++ b/editors/Sigil/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2012/12/05 15:28:29 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/12/13 14:46:10 ryoon Exp $
 bin/sigil
 share/applications/sigil.desktop
 share/pixmaps/sigil.png
@@ -20,28 +20,37 @@ 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/translations/sigil_ca.qm
 share/sigil/translations/sigil_cs.qm
 share/sigil/translations/sigil_da_DK.qm
 share/sigil/translations/sigil_de.qm
 share/sigil/translations/sigil_el_GR.qm
 share/sigil/translations/sigil_en.qm
-share/sigil/translations/sigil_es_ES.qm
+share/sigil/translations/sigil_es.qm
+share/sigil/translations/sigil_fi.qm
 share/sigil/translations/sigil_fr.qm
 share/sigil/translations/sigil_gl.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_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 532be9fa52a..8943689ba9f 100644
--- a/editors/Sigil/distinfo
+++ b/editors/Sigil/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.23 2013/10/20 20:25:23 wiz Exp $
+$NetBSD: distinfo,v 1.24 2013/12/13 14:46:10 ryoon Exp $
 
-SHA1 (Sigil-0.6.2-Code.zip) = 416b067ad9b17efd44e0df42bf7015a44da78497
-RMD160 (Sigil-0.6.2-Code.zip) = 07b83eeda40a1c2e2b6e8ff1725d1ff440c2135a
-Size (Sigil-0.6.2-Code.zip) = 13047687 bytes
-SHA1 (patch-src_Sigil_CMakeLists.txt) = 39961eea901fd617f63676a3b5b1fbf4171f4a38
+SHA1 (Sigil-0.7.4-Code.zip) = 12f1557511b197374e07f4f6a9ed07ae6d23dd67
+RMD160 (Sigil-0.7.4-Code.zip) = 0f3ce21fb46d7f9f4832381a15d0398511f59956
+Size (Sigil-0.7.4-Code.zip) = 12845485 bytes
 SHA1 (patch-src_minizip_ioapi.c) = 1530d95061aad350888a37ab3215ddbf9aee72ca
diff --git a/editors/Sigil/patches/patch-src_Sigil_CMakeLists.txt b/editors/Sigil/patches/patch-src_Sigil_CMakeLists.txt
deleted file mode 100644
index b852d6abdd7..00000000000
--- a/editors/Sigil/patches/patch-src_Sigil_CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-src_Sigil_CMakeLists.txt,v 1.3 2013/10/20 20:25:23 wiz Exp $
-
-FlightCrew pulls in pthread_cancel via
-/usr/include/c++/bits/gthr-default.h
-/usr/include/g++/bits/gthr.h
-/usr/include/g++/ext/atomicity.h
-/usr/include/g++/bits/basic_string.h
-/usr/include/g++/string
-/usr/include/g++/random
-/usr/include/g++/bits/stl_algo.h
-/usr/include/g++/algorithm
-/usr/pkgsrc/editors/Sigil/work/.buildlink/include/boost/utility/swap.hpp
-/usr/pkgsrc/editors/Sigil/work/.buildlink/include/boost/tuple/detail/tuple_basic.hpp
-/usr/pkgsrc/editors/Sigil/work/.buildlink/include/boost/tuple/tuple.hpp
-/usr/pkgsrc/editors/Sigil/work/src/FlightCrew/stdafx.h
-/usr/pkgsrc/editors/Sigil/work/src/FlightCrew/Result.cpp
-so link against libpthread.
-
---- src/Sigil/CMakeLists.txt.orig	2012-12-06 20:02:06.000000000 +0000
-+++ src/Sigil/CMakeLists.txt
-@@ -626,7 +626,7 @@ else()
-     add_executable( ${PROJECT_NAME} WIN32 ${ALL_SOURCES} )
- endif()
- 
--target_link_libraries( ${PROJECT_NAME} ${HUNSPELL_LIBRARIES} ${PCRE_LIBRARIES} tidyLib ${MINIZIP_LIBRARIES} ${BOOST_LIBS} ${XERCES_LIBRARIES} ${XERCESEXTENSIONS_LIBRARIES} ${FLIGHTCREW_LIBRARIES} ${QT_LIBRARIES} )
-+target_link_libraries( ${PROJECT_NAME} ${HUNSPELL_LIBRARIES} ${PCRE_LIBRARIES} tidyLib ${MINIZIP_LIBRARIES} ${BOOST_LIBS} ${XERCES_LIBRARIES} ${XERCESEXTENSIONS_LIBRARIES} ${FLIGHTCREW_LIBRARIES} ${QT_LIBRARIES} -lpthread)
- 
- #############################################################################
-