Update to 0.5.0

* Add dependency to pcre and hunspell.
* Use external libraries (CMakeLists.txt etc. from upstream HEAD)

Changelog:
Sigil 0.5 2012.01.21
    - Implement issue 533 and 1079: allow user to select which level(s) of <h> to include.
    - Fix issue 788: Error saving when the folder the file was in was renamed
      outside Sigil.
    - Fix issue 998: Don't select file extension on rename in book browser.
    - Fix issue 1111: Failure to rename to same name with case change.
    - Implement issue 205: Drag and drop for images to book and code views.
    - Fix issue 1019: issues with opf-namespace declaration.
    - Inline spell check with right click replace in Code View.
    - Fix issue 1064: Issues with editing epubs with differing html extensions.
      Take mimetype into account when opening the file to help determine how to
      deal with the file.
    - Fix issue 1055, 1038, 1006: Focus switching causes unwanted cursor jumping
      in split view. Don't auto sync cursor position between views.
    - Implement issue 375: Add image selection dialog for inserting existing
      images into book and code views.
    - Add menu items for setting heading, adding new items, show / hide toolbars.
    - Organize menu.
    - Fix issue 803: Print prints immediately, no dialog box.
    - Implement 245: Unify zoom levels (book, text, image) and store the levels.
    - i18n capability. Build and load translation files.
    - Add keyboard shortcut manager so user can change the keyboard shortcuts. Fixes 966.
    - Add preference dialog. Closes 206, 718.
    - Refactor Find & Replace into a widget that appears below the editor. Closes issues:
      961, 579.
    - Windows Installer: Add Sigil as a handler for EPUB and HTML files so that jump lists
      will work and it will always show up on the 'Open With...' menu.
    - Fix issue 1033, 1034: Implement scroll to fragment for Code View and fix scrolling for
      book view.
    - Fix issue 1032: Remove '=' from the list of valid characters for ids.
    - Fix issue 1001: Valid IDs are now formed by replacing invalid characters with
      underscores. Colon removed from the list of valid characters.
    - Fix issue 1014: Sigil was erroneously assuming that fragment ids would be unique
      across the entire book, whereas they're only required to be unique within a
      particular xhtml document. New code implemented to cover those situations where
      this assumption is wrong.
    - Fix issue 1015: Fix issues with cursor positioning in Split View.
    - Fix issue 1022: Added support for Adobe's page-map.xml pagination extension. (Must
      use this exact filename).
    - Implement issue 183: Use a PCRE regular expression engine instead of QRegExp.
      Also fixes issue 498: regex '^' (start of line) broken.
    - Implement issue 168: Allow selection of multiple Meta Editor properties.
    - Allow for deleting multiple metadata items.
    - Implement issue 368: Pressing enter key on item in book browser should open item.
    - Fix issue 1005: Regression from change to ensure metdata element has dc namespace.

10 files changed, 339 insertions, 23 deletions

diff --git a/editors/Sigil/Makefile b/editors/Sigil/Makefile
index ffab5fb4748..29cff066745 100644
--- a/editors/Sigil/Makefile
+++ b/editors/Sigil/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2012/01/13 10:55:00 obache Exp $
+# $NetBSD: Makefile,v 1.23 2012/01/26 15:43:20 ryoon Exp $
 #
 
-DISTNAME=	Sigil-0.4.2-Code
+DISTNAME=	Sigil-0.5.0-Code
 PKGNAME=	${DISTNAME:S/-Code//}
-PKGREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	http://sigil.googlecode.com/files/
 EXTRACT_SUFX=	.zip
@@ -22,13 +21,6 @@ WRKSRC=		${WRKDIR}
 USE_LANGUAGES=	c c++
 USE_CMAKE=	yes
 
-SUBST_CLASSES+=		d2u
-SUBST_STAGE.d2u=	post-extract
-SUBST_MESSAGE.d2u=	Removing CR end-of-line markers.
-SUBST_FILES.d2u=	*txt
-SUBST_FILES.d2u+=	src/ZipArchive/*cpp
-SUBST_FILTER_CMD.d2u=	${TR} -d '\r'
-
 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
@@ -42,6 +34,8 @@ _WRAP_EXTRA_ARGS.CXX+=	-std=c++0x
 .include "../../textproc/xerces-c/buildlink3.mk"
 .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 "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/editors/Sigil/PLIST b/editors/Sigil/PLIST
index 201418cb83a..ce61b49090b 100644
--- a/editors/Sigil/PLIST
+++ b/editors/Sigil/PLIST
@@ -1,4 +1,28 @@
-@comment $NetBSD: PLIST,v 1.3 2011/10/13 10:42:01 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/01/26 15:43:20 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/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/translations/sigil_cs.qm
+share/sigil/translations/sigil_da_DK.qm
+share/sigil/translations/sigil_de.qm
+share/sigil/translations/sigil_es_ES.qm
+share/sigil/translations/sigil_fr.qm
+share/sigil/translations/sigil_it.qm
+share/sigil/translations/sigil_ja.qm
+share/sigil/translations/sigil_nl.qm
+share/sigil/translations/sigil_pl.qm
+share/sigil/translations/sigil_pt_BR.qm
+share/sigil/translations/sigil_ru.qm
+share/sigil/translations/sigil_sk.qm
+share/sigil/translations/sigil_tr_TR.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 bc8215e8db2..2724336c6ce 100644
--- a/editors/Sigil/distinfo
+++ b/editors/Sigil/distinfo
@@ -1,10 +1,16 @@
-$NetBSD: distinfo,v 1.14 2012/01/16 21:05:01 ryoon Exp $
+$NetBSD: distinfo,v 1.15 2012/01/26 15:43:20 ryoon Exp $
 
-SHA1 (Sigil-0.4.2-Code.zip) = 67464f521c1b11641812b6959549a842546b4f8d
-RMD160 (Sigil-0.4.2-Code.zip) = c0834a04cdc67f8d066e4a66c43973a6013866e0
-Size (Sigil-0.4.2-Code.zip) = 10104606 bytes
-SHA1 (patch-CMakeLists.txt) = 1e7691d8c318b8d8bb9f76462cc50325fad387d7
+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 (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
index 4c26085b7c6..71c8840d683 100644
--- a/editors/Sigil/patches/patch-CMakeLists.txt
+++ b/editors/Sigil/patches/patch-CMakeLists.txt
@@ -1,20 +1,97 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2011/10/14 09:49:06 ryoon Exp $
+$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	2011-10-14 18:30:31 +0000
+--- CMakeLists.txt.orig	2012-01-21 00:31:22.000000000 +0000
 +++ CMakeLists.txt
-@@ -55,10 +55,10 @@ set( NO_TEST_EXE 1 )
+@@ -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/ZipArchive )
 -add_subdirectory( src/BoostParts )
 -add_subdirectory( src/Xerces )
-+#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 )
-+#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
new file mode 100644
index 00000000000..d2fb3250a40
--- /dev/null
+++ b/editors/Sigil/patches/patch-src_FlightCrew_CMakeLists.txt
@@ -0,0 +1,50 @@
+$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_Sigil_CMakeLists.txt b/editors/Sigil/patches/patch-src_Sigil_CMakeLists.txt
new file mode 100644
index 00000000000..e172cdd1b3a
--- /dev/null
+++ b/editors/Sigil/patches/patch-src_Sigil_CMakeLists.txt
@@ -0,0 +1,78 @@
+$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
new file mode 100644
index 00000000000..26281fa4232
--- /dev/null
+++ b/editors/Sigil/patches/patch-src_Sigil_Exporters_ExportEPUB.cpp
@@ -0,0 +1,15 @@
+$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
new file mode 100644
index 00000000000..d67a423e4d9
--- /dev/null
+++ b/editors/Sigil/patches/patch-src_Sigil_Importers_ImportOEBPS.cpp
@@ -0,0 +1,24 @@
+$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
new file mode 100644
index 00000000000..4b0acedd50c
--- /dev/null
+++ b/editors/Sigil/patches/patch-src_XercesExtensions_CMakeLists.txt
@@ -0,0 +1,33 @@
+$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
new file mode 100644
index 00000000000..7b9d5f4e1e7
--- /dev/null
+++ b/editors/Sigil/patches/patch-src_utf8-cpp_utf8_core.h
@@ -0,0 +1,15 @@
+$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
+ {