Update to 0.5.2

Tested on NetBSD/i386 5.99.64.

Changelog:
Sigil 0.5.2 2012.02.09
    - Fix issue 1253: Replace All in All HTML files adds extra blank lines in
      style section.
    - Fix issue 1251: Merge does not work if you previously used split chapter.
    - Fix issue 1249: Replace All in All HTML Files leaves cursor at the
      bottom.
    - Fix issue 1247: Cannot rename file extension in book browser and rename
      selected should default to first extension name.
    - Fix issue 1238: Deleting a file does not go to the next closest entry
      in book browser.
    - Fix issue 1236: Replace All in Current file does not center cursor.
    - Fix issue 1234: Switching from Code View to Split View and SplitCV to
      CV does not vertically center the cursor.
    - Fix issue 1237: Rename does not keep current selection in book browser.
    - Fix issue 1242: Metadata::FreeFormMetadata missing assignment line 360.
    - Fix issue 1235: Deleting one file does not give a warning dialog.
    - Fix issue 1129: Crash when importing existing image.

Sigil 0.5.1 2012.02.05
    - Issue 1225:
      * Add searching selected files.
      * Add search wrapping.
      * Replace in BV automatically goes to CV.
      * Fixed bug where in CV if you do a replace of a word and then replace
        all when there are the same words on the page, the page view wouldn't
        be refreshed.
      * Various fixes.
    - Add English translation file used for plural strings.
    - Implement issue 986: Automatically renumber playorder in TOC NCX.
    - Implement issue 1224: F&R modifications to update layout and add Regex Multiline.
    - Fix issue 1214: Dictionary files do not include hypen files or GB files.
    - Fix issue 1213: Find and Replace does not save file when F&R is already
      open and searching all HTML files.
    - Remove the ability to use F&R to replace text in BV as it is unfixable in
      its current state.
    - Fix issue 1215: Book View line/column incorrect in status bar.
    - Fix issue 1216: Re-opening a document already in a tab resets the cursor
      position back to the top.
    - Fix issue 1218: F&R cleanup.
    - Fix issue 1212: Remove opf namespace rewriting when opening a file because
      it ended up being more trouble than it was wroth.
    - Fix issue 1188: New Sigil Regex engine crashes when pressing "replace all",
      works fine on pushing "replace" over and over and over again.
    - Implement issue 269: Select more than one item in the Book Browser Column.
    - Implement issues 792: Add Shortcuts for next/previous HTML file with regard
      to reading order, and sync selection in book browser to open tab.
    - Implement issue 1135: New blank section must be automatically selected on book browser.
    - Implement issue 1148: Allow user to change the order of split view so book view or code
      view is first.
    - Implement issue 1168: Add ability to sort HTML files alphanumerically.
    - Implement issue 1174: Add new blank html section should insert section after selected file.
    - Implement issue 1181: Merge Previous when previous file is open in current tab requires
      refresh to see merged data.

11 files changed, 21 insertions, 357 deletions

diff --git a/editors/Sigil/Makefile b/editors/Sigil/Makefile
index b7ae2e63eca..807eadae479 100644
--- a/editors/Sigil/Makefile
+++ b/editors/Sigil/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2012/02/13 14:46:11 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2012/02/15 08:00:03 ryoon Exp $
 #
 
-DISTNAME=	Sigil-0.5.0-Code
+DISTNAME=	Sigil-0.5.2-Code
 PKGNAME=	${DISTNAME:S/-Code//}
-PKGREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://sigil.googlecode.com/files/
 EXTRACT_SUFX=	.zip
diff --git a/editors/Sigil/PLIST b/editors/Sigil/PLIST
index ce61b49090b..7824f8f1958 100644
--- a/editors/Sigil/PLIST
+++ b/editors/Sigil/PLIST
@@ -1,19 +1,27 @@
-@comment $NetBSD: PLIST,v 1.4 2012/01/26 15:43:20 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/02/15 08:00:03 ryoon Exp $
 bin/sigil
 share/applications/sigil.desktop
 share/pixmaps/sigil.png
 share/sigil/dictionaries/About.txt
-share/sigil/dictionaries/de_DE-frami.aff
-share/sigil/dictionaries/de_DE-frami.dic
+share/sigil/dictionaries/de_DE.aff
+share/sigil/dictionaries/de_DE.dic
+share/sigil/dictionaries/en_GB.aff
+share/sigil/dictionaries/en_GB.dic
 share/sigil/dictionaries/en_US.aff
 share/sigil/dictionaries/en_US.dic
-share/sigil/dictionaries/es_MX.aff
-share/sigil/dictionaries/es_MX.dic
-share/sigil/dictionaries/fr-moderne.aff
-share/sigil/dictionaries/fr-moderne.dic
+share/sigil/dictionaries/es.aff
+share/sigil/dictionaries/es.dic
+share/sigil/dictionaries/fr.aff
+share/sigil/dictionaries/fr.dic
+share/sigil/dictionaries/hyph_de_DE.dic
+share/sigil/dictionaries/hyph_en_GB.dic
+share/sigil/dictionaries/hyph_en_US.dic
+share/sigil/dictionaries/hyph_es.dic
+share/sigil/dictionaries/hyph_fr.dic
 share/sigil/translations/sigil_cs.qm
 share/sigil/translations/sigil_da_DK.qm
 share/sigil/translations/sigil_de.qm
+share/sigil/translations/sigil_en.qm
 share/sigil/translations/sigil_es_ES.qm
 share/sigil/translations/sigil_fr.qm
 share/sigil/translations/sigil_it.qm
diff --git a/editors/Sigil/distinfo b/editors/Sigil/distinfo
index 2724336c6ce..f2b2a19480c 100644
--- a/editors/Sigil/distinfo
+++ b/editors/Sigil/distinfo
@@ -1,16 +1,8 @@
-$NetBSD: distinfo,v 1.15 2012/01/26 15:43:20 ryoon Exp $
+$NetBSD: distinfo,v 1.16 2012/02/15 08:00:03 ryoon Exp $
 
-SHA1 (Sigil-0.5.0-Code.zip) = 4139602b0c39db72f6317f39c13b35cd0f86238d
-RMD160 (Sigil-0.5.0-Code.zip) = 737f34b95b165a7af6c72b44daf08103d47b6b26
-Size (Sigil-0.5.0-Code.zip) = 12396113 bytes
-SHA1 (patch-CMakeLists.txt) = 2a60748a6e1106814d151aca7ebc93b33be8d38b
-SHA1 (patch-src_FlightCrew_CMakeLists.txt) = 2c7cc2717a3f099f14d570c95b9d032920aabeb0
-SHA1 (patch-src_FlightCrew_Validators_Opf_ReachabilityAnalysis.cpp) = 0977053a34b81c27cfb2408c9da9b77b69c76854
-SHA1 (patch-src_Sigil_CMakeLists.txt) = d0be4fe85f0f48efd5ed5ca0b087ac021b42cb61
-SHA1 (patch-src_Sigil_Exporters_ExportEPUB.cpp) = 19fc68f3558f564509d0bc3508c18a634530419b
-SHA1 (patch-src_Sigil_Importers_ImportOEBPS.cpp) = 8965f6b3de3d7c56044cb342e2a0a66ec78bd9e2
-SHA1 (patch-src_XercesExtensions_CMakeLists.txt) = 295d99ffac4e65c9d96e8972318bb1cd45e0aef0
+SHA1 (Sigil-0.5.2-Code.zip) = 9088bbfcc681a8a55f58e966d8d8f65e307e1fd8
+RMD160 (Sigil-0.5.2-Code.zip) = a901ef78150c0ae96eece05e0683669d4dba30e6
+Size (Sigil-0.5.2-Code.zip) = 12842606 bytes
 SHA1 (patch-src_ZipArchive_DirEnumerator.cpp) = 1430a73cb771c77bd15fc32768a3accfd70ee28b
 SHA1 (patch-src_ZipArchive_ZipFile__stl.cpp) = d7db211cfd373a3d4ead90da67d0b9d445baa26f
 SHA1 (patch-src_ZipArchive_ZipPlatform__lnx.cpp) = 9d552417e86c77584b952bc07b06e75eaa02a68d
-SHA1 (patch-src_utf8-cpp_utf8_core.h) = 38ae594f64c0a55316aa0ec29571a01d440a1948
diff --git a/editors/Sigil/patches/patch-CMakeLists.txt b/editors/Sigil/patches/patch-CMakeLists.txt
deleted file mode 100644
index 71c8840d683..00000000000
--- a/editors/Sigil/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,97 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2012/01/26 15:43:20 ryoon Exp $
-
-* Use external libraries.
-  http://code.google.com/p/sigil/source/detail?r=ac1642d3df17ee958ab573e1cdb284d60bad6f9a
-
---- CMakeLists.txt.orig	2012-01-21 00:31:22.000000000 +0000
-+++ CMakeLists.txt
-@@ -46,21 +46,81 @@ set( CMAKE_OSX_DEPLOYMENT_TARGET "10.6" 
- 
- # 10.7 is the required minimum OS X version.
- set( CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk" )
--
--# Universal builds for mac
- set( CMAKE_OSX_ARCHITECTURES "x86_64" )
- 
- # This disables the building of the test runner app for FlightCrew
- set( NO_TEST_EXE 1 )
- 
-+if( NOT FORCE_BUNDLED_COPIES )
-+    find_package( Boost COMPONENTS date_time filesystem program_options regex system thread )
-+    find_package( ZLIB )
-+    find_package( PkgConfig )
-+    pkg_check_modules( ZIPARCHIVE ZipArchive>=4.1.1 )
-+    pkg_check_modules( XERCES xerces-c>=3.1 )
-+    pkg_check_modules( HUNSPELL hunspell )
-+    if ( NOT APPLE )
-+        pkg_check_modules( PCRE libpcre )
-+    endif()
-+endif()
-+
-+# We must use the bundled Tidy because there are Sigil
-+# specific changes to it.
- add_subdirectory( src/tidyLib )
--add_subdirectory( src/ZipArchive )
--add_subdirectory( src/BoostParts )
--add_subdirectory( src/Xerces )
-+
-+if( FORCE_BUNDLED_COPIES OR NOT ZIPARCHIVE_FOUND )
-+    add_subdirectory( src/ZipArchive )
-+    set( ZIPARCHIVE_LIBRARIES ZipArchive )
-+    set( ZIPARCHIVE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src/ZipArchive )
-+endif()
-+
-+if( FORCE_BUNDLED_COPIES OR NOT Boost_FOUND )
-+    add_subdirectory( src/BoostParts )
-+    # Set these so zipios doesn't complain.
-+    set( Boost_DATE_TIME_LIBRARY 1 )
-+    set( Boost_FILESYSTEM_LIBRARY 1 )
-+    set( Boost_PROGRAM_OPTIONS_LIBRARY 1 )
-+    set( Boost_REGEX_LIBRARY 1 )
-+    set( Boost_SYSTEM_LIBRARY 1 )
-+    set( Boost_THREAD_LIBRARY 1 )
-+    set( BOOST_LIBS BoostParts )
-+    set( BOOST_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src/BoostParts )
-+else()
-+    set( BOOST_LIBS ${Boost_DATE_TIME_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_REGEX_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} )
-+    set( BOOST_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} )
-+endif()
-+
-+if( FORCE_BUNDLED_COPIES OR NOT XERCES_FOUND )
-+    add_subdirectory( src/Xerces )
-+    set( XERCES_LIBRARIES Xerces )
-+    set( XERCES_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src/Xerces )
-+endif()
-+
-+# XercesExtensions is not an external project. It is part of FlightCrew
-+# and Sigil and it is not distributed as a standalone library.
- add_subdirectory( src/XercesExtensions )
--add_subdirectory( src/zlib )
-+set( XERCESEXTENSIONS_LIBRARIES XercesExtensions )
-+set( XERCESEXTENSIONS_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src/XercesExtensions )
-+
-+if( FORCE_BUNDLED_COPIES OR NOT ZLIB_FOUND )
-+    add_subdirectory( src/zlib )
-+endif()
-+
-+if( FORCE_BUNDLED_COPIES OR NOT PCRE_FOUND OR APPLE )
-+    add_subdirectory( src/pcre )
-+    set( PCRE_LIBRARIES pcre )
-+    set( PCRE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src/pcre )
-+endif()
-+
-+if( FORCE_BUNDLED_COPIES OR NOT HUNSPELL_FOUND )
-+    add_subdirectory( src/hunspell )
-+    set( HUNSPELL_LIBRARIES hunspell )
-+    set( HUNSPELL_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src/hunspell )
-+endif()
-+
-+# FlightCrew
- add_subdirectory( src/zipios )
--add_subdirectory( src/pcre )
--add_subdirectory( src/hunspell )
- add_subdirectory( src/FlightCrew )
-+set( FLIGHTCREW_LIBRARIES FlightCrew )
-+set( FLIGHTCREW_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src/FlightCrew )
-+
- add_subdirectory( src/Sigil )
diff --git a/editors/Sigil/patches/patch-src_FlightCrew_CMakeLists.txt b/editors/Sigil/patches/patch-src_FlightCrew_CMakeLists.txt
deleted file mode 100644
index d2fb3250a40..00000000000
--- a/editors/Sigil/patches/patch-src_FlightCrew_CMakeLists.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-src_FlightCrew_CMakeLists.txt,v 1.1 2012/01/26 15:43:20 ryoon Exp $
-
-http://code.google.com/p/sigil/source/detail?r=ac1642d3df17ee958ab573e1cdb284d60bad6f9a
-
---- src/FlightCrew/CMakeLists.txt.orig	2012-01-21 00:31:22.000000000 +0000
-+++ src/FlightCrew/CMakeLists.txt
-@@ -50,8 +50,8 @@ list( REMOVE_ITEM SOURCES ${to_remove} )
- 
- # creating PCH's for MSVC and GCC on Linux
- include( ${CMAKE_SOURCE_DIR}/cmake_extras/CustomPCH.cmake )
--set( ALL_INCLUDES ${BoostParts_SOURCE_DIR}
--                  ${Xerces_SOURCE_DIR}
-+set( ALL_INCLUDES ${BOOST_INCLUDE_DIRS}
-+                  ${XERCES_INCLUDE_DIRS}
-                   ${zipios_SOURCE_DIR} )
- set( GCC_PCH_TARGET gccPCH_fc )
- 
-@@ -65,9 +65,9 @@ precompiled_header( SOURCES ALL_INCLUDES
- include_directories( ${CMAKE_CURRENT_BINARY_DIR}
-                      ${CMAKE_CURRENT_SOURCE_DIR}
-                      ../zipios 
--                     ../BoostParts 
--                     ../Xerces
--                     ../XercesExtensions
-+                     ${BOOST_INCLUDE_DIRS} 
-+                     ${XERCES_INCLUDE_DIRS}
-+                     ${XERCESEXTENSIONS_INCLUDE_DIRS}
-                      ../utf8-cpp
-                    )
- 
-@@ -80,7 +80,7 @@ else()
-     add_library( ${PROJECT_NAME} ${SOURCES} )
- endif()
- 
--target_link_libraries( ${PROJECT_NAME} zipios BoostParts XercesExtensions )
-+target_link_libraries( ${PROJECT_NAME} zipios ${BOOST_LIBS} ${XERCESEXTENSIONS_LIBRARIES} )
- 
- #############################################################################
- 
-@@ -114,7 +114,9 @@ elseif( CMAKE_COMPILER_IS_GNUCXX )
- endif()
- 
- # needed for correct Xerces header inclusion
--add_definitions( -DXERCES_STATIC_LIBRARY )
-+if( FORCE_BUNDLED_COPIES OR NOT XERCES_FOUND )
-+    add_definitions( -DXERCES_STATIC_LIBRARY )
-+endif()
- 
- #############################################################################
- 
diff --git a/editors/Sigil/patches/patch-src_FlightCrew_Validators_Opf_ReachabilityAnalysis.cpp b/editors/Sigil/patches/patch-src_FlightCrew_Validators_Opf_ReachabilityAnalysis.cpp
deleted file mode 100644
index 3032f71a172..00000000000
--- a/editors/Sigil/patches/patch-src_FlightCrew_Validators_Opf_ReachabilityAnalysis.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-src_FlightCrew_Validators_Opf_ReachabilityAnalysis.cpp,v 1.1 2012/01/16 21:05:02 ryoon Exp $
-
---- src/FlightCrew/Validators/Opf/ReachabilityAnalysis.cpp.orig	2011-09-01 12:47:32.000000000 +0000
-+++ src/FlightCrew/Validators/Opf/ReachabilityAnalysis.cpp
-@@ -26,7 +26,9 @@
- #include <XmlUtils.h>
- #include "Misc/DetermineMimetype.h"
- #include "Misc/Utilities.h"
-+#include <boost/version.hpp>
- 
-+#if ( BOOST_VERSION < 104800 )
- namespace boost
- {
- 
-@@ -48,7 +50,7 @@ namespace filesystem3
- } // namespace filesystem3
- 
- } // namespace boost
--
-+#endif // BOOST_VERSION
- 
- namespace FlightCrew
- {
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 e172cdd1b3a..00000000000
--- a/editors/Sigil/patches/patch-src_Sigil_CMakeLists.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-src_Sigil_CMakeLists.txt,v 1.1 2012/01/26 15:43:20 ryoon Exp $
-
-http://code.google.com/p/sigil/source/detail?r=ac1642d3df17ee958ab573e1cdb284d60bad6f9a
-
---- src/Sigil/CMakeLists.txt.orig	2012-01-21 00:31:22.000000000 +0000
-+++ src/Sigil/CMakeLists.txt
-@@ -371,14 +371,14 @@ set_source_files_properties( Misc/Utilit
- 
- # creating PCH's for MSVC and GCC on Linux
- include( ${CMAKE_SOURCE_DIR}/cmake_extras/CustomPCH.cmake )
--set( ALL_INCLUDES ${BoostParts_SOURCE_DIR}
--                  ${Xerces_SOURCE_DIR} 
--                  ${XercesExtensions_SOURCE_DIR} 
--                  ${ZipArchive_SOURCE_DIR}
-+set( ALL_INCLUDES ${BOOST_INCLUDE_DIRS}
-+                  ${XERCES_INCLUDE_DIRS} 
-+                  ${XERCESEXTENSIONS_INCLUDE_DIRS} 
-+                  ${ZIPARCHIVE_INCLUDE_DIRS}
-                   ${tidyLib_SOURCE_DIR}
--                  ${pcre_SOURCE_DIR}
--                  ${hunspell_SOURCE_DIR}
--                  ${FlightCrew_SOURCE_DIR}
-+                  ${PCRE_INCLUDE_DIRS}
-+                  ${HUNSPELL_INCLUDE_DIRS}
-+                  ${FLIGHTCREW_INCLUDE_DIRS}
-                   ${QT_INCLUDES} )
- 
- set( PCH_NAME stdafx )
-@@ -458,14 +458,14 @@ endif()
- # and the headers for the linked-to libraries
- include_directories( ${CMAKE_CURRENT_BINARY_DIR} 
-                      ${CMAKE_CURRENT_SOURCE_DIR} 
--                     ${BoostParts_SOURCE_DIR}
--                     ${Xerces_SOURCE_DIR} 
--                     ${XercesExtensions_SOURCE_DIR} 
--                     ${ZipArchive_SOURCE_DIR}
-+                     ${BOOST_INCLUDE_DIRS}
-+                     ${XERCES_INCLUDE_DIRS} 
-+                     ${XERCESEXTENSIONS_INCLUDE_DIRS} 
-+                     ${ZIPARCHIVE_INCLUDE_DIRS}
-                      ${tidyLib_SOURCE_DIR}
--                     ${pcre_SOURCE_DIR}
--                     ${hunspell_SOURCE_DIR}
--                     ${FlightCrew_SOURCE_DIR} )
-+                     ${PCRE_INCLUDE_DIRS}
-+                     ${HUNSPELL_INCLUDE_DIRS}
-+                     ${FLIGHTCREW_INCLUDE_DIRS} )
- 
- #############################################################################
- 
-@@ -478,7 +478,7 @@ else()
-     add_executable( ${PROJECT_NAME} WIN32 ${ALL_SOURCES} )
- endif()
- 
--target_link_libraries( ${PROJECT_NAME} hunspell pcre tidyLib ZipArchive BoostParts Xerces XercesExtensions FlightCrew ${QT_LIBRARIES} )
-+target_link_libraries( ${PROJECT_NAME} ${HUNSPELL_LIBRARIES} ${PCRE_LIBRARIES} tidyLib ${ZIPARCHIVE_LIBRARIES} ${BOOST_LIBS} ${XERCES_LIBRARIES} ${XERCESEXTENSIONS_LIBRARIES} ${FLIGHTCREW_LIBRARIES} ${QT_LIBRARIES} )
- 
- #############################################################################
- 
-@@ -488,9 +488,15 @@ xcode_pch( ${PCH_NAME} )
- #############################################################################
- 
- # needed for correct static header inclusion
--add_definitions( -DXERCES_STATIC_LIBRARY )
--add_definitions( -DPCRE_STATIC )
--add_definitions( -DHUNSPELL_STATIC )
-+if( FORCE_BUNDLED_COPIES OR NOT XERCES_FOUND )
-+    add_definitions( -DXERCES_STATIC_LIBRARY )
-+endif()
-+if( FORCE_BUNDLED_COPIES OR NOT PCRE_FOUND )
-+    add_definitions( -DPCRE_STATIC )
-+endif()
-+if( FORCE_BUNDLED_COPIES OR NOT HUNSPELL_FOUND )
-+    add_definitions( -DHUNSPELL_STATIC )
-+endif()
- 
- # Speed up stirng building
- add_definitions( -DQT_USE_FAST_CONCATENATION )
diff --git a/editors/Sigil/patches/patch-src_Sigil_Exporters_ExportEPUB.cpp b/editors/Sigil/patches/patch-src_Sigil_Exporters_ExportEPUB.cpp
deleted file mode 100644
index 26281fa4232..00000000000
--- a/editors/Sigil/patches/patch-src_Sigil_Exporters_ExportEPUB.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_Sigil_Exporters_ExportEPUB.cpp,v 1.1 2012/01/26 15:43:20 ryoon Exp $
-
-http://code.google.com/p/sigil/source/detail?r=ac1642d3df17ee958ab573e1cdb284d60bad6f9a
-
---- src/Sigil/Exporters/ExportEPUB.cpp.orig	2012-01-21 00:31:22.000000000 +0000
-+++ src/Sigil/Exporters/ExportEPUB.cpp
-@@ -157,7 +157,7 @@ void ExportEPUB::SaveFolderAsEpubToLocat
- #ifdef Q_WS_WIN
-         std::string error_description = QString::fromStdWString( exception.GetErrorDescription() ).toStdString();
- #else
--        std::string error_description = QString::fromAscii( exception.GetErrorDescription().c_str() ).toStdString();
-+        std::string error_description = QString::fromAscii( exception.GetErrorDescription() ).toStdString();
- #endif
-         boost_throw( CZipExceptionWrapper()
-             << errinfo_zip_info_msg( error_description )
diff --git a/editors/Sigil/patches/patch-src_Sigil_Importers_ImportOEBPS.cpp b/editors/Sigil/patches/patch-src_Sigil_Importers_ImportOEBPS.cpp
deleted file mode 100644
index d67a423e4d9..00000000000
--- a/editors/Sigil/patches/patch-src_Sigil_Importers_ImportOEBPS.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_Sigil_Importers_ImportOEBPS.cpp,v 1.1 2012/01/26 15:43:20 ryoon Exp $
-
-http://code.google.com/p/sigil/source/detail?r=ac1642d3df17ee958ab573e1cdb284d60bad6f9a
-
---- src/Sigil/Importers/ImportOEBPS.cpp.orig	2012-01-21 00:31:22.000000000 +0000
-+++ src/Sigil/Importers/ImportOEBPS.cpp
-@@ -81,7 +81,7 @@ void ImportOEBPS::ExtractContainer()
-                 #ifdef Q_WS_WIN
-                 std::string filename = QString::fromStdWString( file_header->GetFileName() ).toStdString();
-                 #else
--                std::string filename = QString::fromAscii( file_header->GetFileName().c_str() ).toStdString();
-+                std::string filename = QString::fromAscii( file_header->GetFileName() ).toStdString();
-                 #endif
- 
-                 zip.Close(); 
-@@ -105,7 +105,7 @@ void ImportOEBPS::ExtractContainer()
- #ifdef Q_WS_WIN
-         std::string error_description = QString::fromStdWString( exception.GetErrorDescription() ).toStdString();
- #else
--        std::string error_description = QString::fromAscii( exception.GetErrorDescription().c_str() ).toStdString();
-+        std::string error_description = QString::fromAscii( exception.GetErrorDescription() ).toStdString();
- #endif
-         boost_throw( CZipExceptionWrapper()
-             << errinfo_zip_info_msg( error_description )
diff --git a/editors/Sigil/patches/patch-src_XercesExtensions_CMakeLists.txt b/editors/Sigil/patches/patch-src_XercesExtensions_CMakeLists.txt
deleted file mode 100644
index 4b0acedd50c..00000000000
--- a/editors/Sigil/patches/patch-src_XercesExtensions_CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-src_XercesExtensions_CMakeLists.txt,v 1.1 2012/01/26 15:43:20 ryoon Exp $
-
-http://code.google.com/p/sigil/source/detail?r=ac1642d3df17ee958ab573e1cdb284d60bad6f9a
-
---- src/XercesExtensions/CMakeLists.txt.orig	2012-01-21 00:31:22.000000000 +0000
-+++ src/XercesExtensions/CMakeLists.txt
-@@ -16,14 +16,14 @@ file( GLOB SOURCES *.cpp *.h ) 
- # We need to pick up the stdafx.h file
- # and the headers for the linked-to libraries
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR}
--                     ../Xerces
--                     ../BoostParts )
-+                     ${XERCES_INCLUDE_DIRS}
-+                     ${BOOST_INCLUDE_DIRS} )
- 
- link_directories ( ${PROJECT_BINARY_DIR}/lib ) 
- 
- add_library( ${PROJECT_NAME} ${SOURCES} )
- 
--target_link_libraries( ${PROJECT_NAME} Xerces )
-+target_link_libraries( ${PROJECT_NAME} ${XERCES_LIBRARIES} )
- 
- #############################################################################
- 
-@@ -49,5 +49,7 @@ elseif( CMAKE_COMPILER_IS_GNUCXX )
- endif()
- 
- # needed for correct Xerces header inclusion
--add_definitions( -DXERCES_STATIC_LIBRARY )
-+if( FORCE_BUNDLED_COPIES OR NOT XERCES_FOUND)
-+    add_definitions( -DXERCES_STATIC_LIBRARY )
-+endif()
- 
diff --git a/editors/Sigil/patches/patch-src_utf8-cpp_utf8_core.h b/editors/Sigil/patches/patch-src_utf8-cpp_utf8_core.h
deleted file mode 100644
index 7b9d5f4e1e7..00000000000
--- a/editors/Sigil/patches/patch-src_utf8-cpp_utf8_core.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_utf8-cpp_utf8_core.h,v 1.1 2012/01/26 15:43:20 ryoon Exp $
-
-http://code.google.com/p/sigil/source/detail?r=ac1642d3df17ee958ab573e1cdb284d60bad6f9a
-
---- src/utf8-cpp/utf8/core.h.orig	2012-01-21 00:31:22.000000000 +0000
-+++ src/utf8-cpp/utf8/core.h
-@@ -29,7 +29,7 @@ DEALINGS IN THE SOFTWARE.
- #define UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
- 
- #include <iterator>
--#include "../../BoostParts/boost/cstdint.hpp"
-+#include "boost/cstdint.hpp"
- 
- namespace utf8
- {