[PATCH] Fix Linux compilation

[GoogleCodeExporter]

Compilation on Linux is broken due to case-sensitivity errors in a few #include 
directives and a missing #include <stdlib.h>

Attached is a patch.

Original issue reported on code.google.com by saltyho...@gmail.com on 27 Feb 2012 at 11:39

Attachments:

• 0001-Fix-Linux-compilation.patch

[GoogleCodeExporter]

Still my fedora 15 box has compilation errors:
In file included from 
/scratch/rpmbuild/BUILD/sigil-0.5.3.1/src/Sigil/ViewEditors/Searchable.h:27:0,
                 from /scratch/rpmbuild/BUILD/sigil-0.5.3.1/src/Sigil/ViewEditors/ViewEditor.h:29,
                 from /scratch/rpmbuild/BUILD/sigil-0.5.3.1/src/Sigil/BookManipulation/XhtmlDoc.h:31,
                 from /scratch/rpmbuild/BUILD/sigil-0.5.3.1/src/Sigil/ResourceObjects/XMLResource.h:27,
                 from /scratch/rpmbuild/BUILD/sigil-0.5.3.1/src/Sigil/ResourceObjects/OPFResource.h:29,
                 from /scratch/rpmbuild/BUILD/sigil-0.5.3.1/src/Sigil/Tabs/TabManager.cpp:24:
/scratch/rpmbuild/BUILD/sigil-0.5.3.1/src/Sigil/PCRE/SPCRE.h:94:5: error: 
'pcre16' does not name a type
/scratch/rpmbuild/BUILD/sigil-0.5.3.1/src/Sigil/PCRE/SPCRE.h:100:5: error: 
'pcre16_extra' does not name a type
In file included from 
/scratch/rpmbuild/BUILD/sigil-0.5.3.1/src/Sigil/ViewEditors/Searchable.h:27:0,
                 from /scratch/rpmbuild/BUILD/sigil-0.5.3.1/src/Sigil/ViewEditors/ViewEditor.h:29,
                 from /scratch/rpmbuild/BUILD/sigil-0.5.3.1/src/Sigil/BookManipulation/XhtmlDoc.h:31,
                 from /scratch/rpmbuild/BUILD/sigil-0.5.3.1/src/Sigil/ResourceObjects/XMLResource.h:27,
                 from /scratch/rpmbuild/BUILD/sigil-0.5.3.1/src/Sigil/ResourceObjects/OPFResource.h:29,
                 from /scratch/rpmbuild/BUILD/sigil-0.5.3.1/src/Sigil/Tabs/TabManager.cpp:24:
/scratch/rpmbuild/BUILD/sigil-0.5.3.1/src/Sigil/PCRE/SPCRE.h:153:5: error: 
'pcre16' does not name a type
/scratch/rpmbuild/BUILD/sigil-0.5.3.1/src/Sigil/PCRE/SPCRE.h:155:5: error: 
'pcre16_extra' does not name a type
make[2]: *** [src/Sigil/CMakeFiles/sigil.dir/Tabs/TabManager.cpp.o] Error 1
make[1]: *** [src/Sigil/CMakeFiles/sigil.dir/all] Error 2
make: *** [all] Error 2

Original comment by bruno.ta...@gmail.com on 27 Feb 2012 at 4:20

[GoogleCodeExporter]

To comment#1:
I don't think you can compile current Sigil git HEAD against pcre-8.12 on FC15, 
from git log:
commit 6ce573fe7ca6a3c2c1236878031a03bb6fab5f6f
Author: John Schember <john@nachtimwald.com>
Date:   Sun Feb 26 00:02:24 2012 -0500

    - Update PCRE to 8.30.
      - Make PCRE 8.30 with UTF-16 support the minimum required version.
      - Bundled PCRE uses PCRE's JIT for faster searching.
      - Modify Regex search code to use UTF-16 instead of UTF-8 for all
        searches. This brings search in line with the view components being
        able to display UTF-16 characters.

so for now you'll have to use the pcre-8.30 bundled with Sigil (just uninstall 
pcre-devel from your build environment/chroot and Sigil will use the bundled 
copy automatically).

FWIW, compiling against system-provided pcre-8.30 in Fedora rawhide will give 
the same error, CMakeLists.txt needs to be changed:
diff -u sigil-git/CMakeLists.txt.orig sigil-0.5.3/CMakeLists.txt
--- sigil-git/CMakeLists.txt.orig     2012-02-28 08:02:54.860545608 +0200
+++ sigil-git/CMakeLists.txt  2012-02-28 08:03:08.536313360 +0200
@@ -60,7 +60,7 @@
     pkg_check_modules( XERCES xerces-c>=3.1 )
     pkg_check_modules( HUNSPELL hunspell )
     if ( NOT APPLE )
-        pkg_check_modules( PCRE libpcre )
+        pkg_check_modules( PCRE libpcre16 )
     endif()
     find_package( XercesExtensions )
     find_package( FlightCrew )

Original comment by ahmadsam...@gmail.com on 28 Feb 2012 at 6:16

[GoogleCodeExporter]

I uninstalled pcre-devel and the compilation has completed without errors.
Thank you for your comment.

Original comment by bruno.ta...@gmail.com on 28 Feb 2012 at 12:31

[GoogleCodeExporter]

Original comment by john@nachtimwald.com on 29 Feb 2012 at 1:02

• Changed state: Fixed

[GoogleCodeExporter]

Original comment by meme90...@gmail.com on 28 Mar 2012 at 3:53

• Added labels: Milestone-0.6.0

[GoogleCodeExporter]

Marking obsolete as this was not against a version but alpha source.

Original comment by daveheil...@gmail.com on 2 Jun 2012 at 7:16

• Changed state: Obsolete
• Removed labels: Milestone-0.6.0