"Benj. Mako Hill" <m...@atdot.cc> writes:
> Hello Kanru (and others!)
>
> Thanks everyone for your work so far to get Sigil into Debian. I've
> noticed that it's been a few months since this bug was updated.
>
> I'm willing to put in an evening of work or two to help package
> dependencies or do other work to get this package uploaded. Do you
> have a repository where you are working? What, in particular, needs to
> be changed?
Thank you for bring this up again! I feel so bad that I cannot complete
this package quickly.
It seems I had created a collab-maint repository[1] but haven't pushed
anything yet, because of some non-free part that I don't want to put on
alioth. My local repository was purged accidentally in my last disk
cleanup, fortunately emacs backup and notes was kept so I can rebuild
the repository and publish it this weekend.
Sigil uses so many convenience copy of libraries (three zip libraries!)
so in order to package Sigil one have to package the dependencies first.
A while ago Pino sent to me two patches that make Sigil to use system
boost and zlib library, attached for reference.
Remaining dependencies are
*** ZipArchive
- http://www.artpol-software.com/
- http://bugs.debian.org/614183
*** FlightCrew
- http://code.google.com/p/flightcrew/
- http://bugs.debian.org/602781
[1]: http://git.debian.org/?p=collab-maint/sigil.git;a=summary
Cheers,
--
Kanru
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,9 +54,18 @@
# This disables the building of the test runner app for FlightCrew
set( NO_TEST_EXE 1 )
+find_package( Boost COMPONENTS date_time filesystem program_options regex system thread )
+
add_subdirectory( src/tidyLib )
add_subdirectory( src/ZipArchive )
-add_subdirectory( src/BoostParts )
+if( Boost_FOUND )
+ 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} )
+else()
+ add_subdirectory( src/BoostParts )
+ set( BOOST_LIBS BoostParts )
+ set( BOOST_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src/BoostParts )
+endif()
add_subdirectory( src/Xerces )
add_subdirectory( src/XercesExtensions )
add_subdirectory( src/zlib )
--- a/src/FlightCrew/CMakeLists.txt
+++ b/src/FlightCrew/CMakeLists.txt
@@ -50,7 +50,7 @@
# creating PCH's for MSVC and GCC on Linux
include( ${CMAKE_SOURCE_DIR}/cmake_extras/CustomPCH.cmake )
-set( ALL_INCLUDES ${BoostParts_SOURCE_DIR}
+set( ALL_INCLUDES ${BOOST_INCLUDE_DIRS}
${Xerces_SOURCE_DIR}
${zipios_SOURCE_DIR} )
set( GCC_PCH_TARGET gccPCH_fc )
@@ -65,7 +65,7 @@
include_directories( ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
../zipios
- ../BoostParts
+ ${BOOST_INCLUDE_DIRS}
../Xerces
../XercesExtensions
../utf8-cpp
@@ -82,7 +82,7 @@
add_library( ${PROJECT_NAME} ${SOURCES} )
endif()
-target_link_libraries( ${PROJECT_NAME} zipios BoostParts XercesExtensions )
+target_link_libraries( ${PROJECT_NAME} zipios ${BOOST_LIBS} XercesExtensions )
#############################################################################
--- a/src/Sigil/CMakeLists.txt
+++ b/src/Sigil/CMakeLists.txt
@@ -281,7 +281,7 @@
# creating PCH's for MSVC and GCC on Linux
include( ${CMAKE_SOURCE_DIR}/cmake_extras/CustomPCH.cmake )
-set( ALL_INCLUDES ${BoostParts_SOURCE_DIR}
+set( ALL_INCLUDES ${BOOST_INCLUDE_DIRS}
${Xerces_SOURCE_DIR}
${XercesExtensions_SOURCE_DIR}
${ZipArchive_SOURCE_DIR}
@@ -357,7 +357,7 @@
# and the headers for the linked-to libraries
include_directories( ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${BoostParts_SOURCE_DIR}
+ ${BOOST_INCLUDE_DIRS}
${Xerces_SOURCE_DIR}
${XercesExtensions_SOURCE_DIR}
${ZipArchive_SOURCE_DIR}
@@ -377,7 +377,7 @@
add_executable( ${PROJECT_NAME} WIN32 ${ALL_SOURCES} )
endif()
-target_link_libraries( ${PROJECT_NAME} tidyLib ZipArchive BoostParts Xerces XercesExtensions FlightCrew ${QT_LIBRARIES} )
+target_link_libraries( ${PROJECT_NAME} tidyLib ZipArchive ${BOOST_LIBS} Xerces XercesExtensions FlightCrew ${QT_LIBRARIES} )
#############################################################################
--- a/src/XercesExtensions/CMakeLists.txt
+++ b/src/XercesExtensions/CMakeLists.txt
@@ -17,7 +17,7 @@
# and the headers for the linked-to libraries
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}
../Xerces
- ../BoostParts )
+ ${BOOST_INCLUDE_DIRS} )
link_directories ( ${PROJECT_BINARY_DIR}/lib )
--- a/src/zipios/CMakeLists.txt
+++ b/src/zipios/CMakeLists.txt
@@ -16,7 +16,7 @@
# We need to pick up the stdafx.h file
# and the headers for the linked-to libraries
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}
- ${BoostParts_SOURCE_DIR}
+ ${BOOST_INCLUDE_DIRS}
${zlib_SOURCE_DIR}
${zlib_BINARY_DIR}
)
@@ -25,7 +25,7 @@
add_library( ${PROJECT_NAME} ${SOURCES} )
-target_link_libraries( ${PROJECT_NAME} zlib BoostParts )
+target_link_libraries( ${PROJECT_NAME} zlib ${BOOST_LIBS} )
#############################################################################
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,11 @@
set( NO_TEST_EXE 1 )
find_package( Boost COMPONENTS date_time filesystem program_options regex system thread )
+find_package( ZLIB )
+if( NOT ZLIB_FOUND )
+ add_subdirectory( src/zlib )
+endif()
add_subdirectory( src/tidyLib )
add_subdirectory( src/ZipArchive )
if( Boost_FOUND )
@@ -68,7 +72,6 @@
endif()
add_subdirectory( src/Xerces )
add_subdirectory( src/XercesExtensions )
-add_subdirectory( src/zlib )
add_subdirectory( src/zipios )
add_subdirectory( src/FlightCrew )
add_subdirectory( src/Sigil )
--- a/src/zipios/CMakeLists.txt
+++ b/src/zipios/CMakeLists.txt
@@ -11,21 +11,32 @@
project( zipios )
+find_package( ZLIB )
+
file( GLOB_RECURSE 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}
${BOOST_INCLUDE_DIRS}
- ${zlib_SOURCE_DIR}
- ${zlib_BINARY_DIR}
)
+if( ZLIB_FOUND )
+ include_directories( ${ZLIB_INCLUDE_DIRS} )
+else()
+ include_directories( ${zlib_SOURCE_DIR} ${zlib_BINARY_DIR} )
+endif()
+
link_directories ( ${PROJECT_BINARY_DIR}/lib )
add_library( ${PROJECT_NAME} ${SOURCES} )
-target_link_libraries( ${PROJECT_NAME} zlib ${BOOST_LIBS} )
+target_link_libraries( ${PROJECT_NAME} ${BOOST_LIBS} )
+if( ZLIB_FOUND )
+ target_link_libraries( ${PROJECT_NAME} ${ZLIB_LIBRARIES} )
+else()
+ target_link_libraries( ${PROJECT_NAME} zlib )
+endif()
#############################################################################
