Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (be54f55efcdee01146cc0e41aa34c9f7415b8abf)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (be54f55efcdee01146cc0e41aa34c9f7415b8abf)
  • Date: Fri, 30 Mar 2012 05:48:34 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

doc/ebook-tools/HISTORY | 4 ++++
doc/ebook-tools/PRE_BUILD | 3 +++
doc/ebook-tools/cm.diff | 13 +++++++++++++
3 files changed, 20 insertions(+)

New commits:
commit be54f55efcdee01146cc0e41aa34c9f7415b8abf
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ebook-tools - fix build with libzip-0.10.x

diff --git a/doc/ebook-tools/HISTORY b/doc/ebook-tools/HISTORY
index 1e89c13..5a1a595 100644
--- a/doc/ebook-tools/HISTORY
+++ b/doc/ebook-tools/HISTORY
@@ -1,3 +1,7 @@
+2012-03-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * cm.diff, PRE_BUILD: added
+ fix build with libzip-0.10.x
+
2011-09-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.2.1
licence = MIT
diff --git a/doc/ebook-tools/PRE_BUILD b/doc/ebook-tools/PRE_BUILD
new file mode 100755
index 0000000..8d5f7a4
--- /dev/null
+++ b/doc/ebook-tools/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/cm.diff
diff --git a/doc/ebook-tools/cm.diff b/doc/ebook-tools/cm.diff
new file mode 100644
index 0000000..88d8119
--- /dev/null
+++ b/doc/ebook-tools/cm.diff
@@ -0,0 +1,13 @@
+diff -uNr ebook-tools-0.2.1.orig/cmake/FindLibZip.cmake
ebook-tools-0.2.1/cmake/FindLibZip.cmake
+--- ebook-tools-0.2.1.orig/cmake/FindLibZip.cmake 2008-04-06
19:16:33.000000000 +0200
++++ ebook-tools-0.2.1/cmake/FindLibZip.cmake 2012-03-30 12:39:59.000000000
+0200
+@@ -28,7 +28,8 @@
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibZip DEFAULT_MSG LIBZIP_LIBRARY
LIBZIP_INCLUDE_DIR)
+
+ # ensure that they are cached
+- set(LIBZIP_INCLUDE_DIR ${LIBZIP_INCLUDE_DIR} CACHE INTERNAL "The libzip
include path")
++ set(LIBZIP_INCLUDE_DIR ${LIBZIP_INCLUDE_DIR} /usr/lib/libzip/include
CACHE INTERNAL
++"The libzip include path")
+ set(LIBZIP_LIBRARY ${LIBZIP_LIBRARY} CACHE INTERNAL "The libraries
needed to use libzip")
+
+ endif (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (be54f55efcdee01146cc0e41aa34c9f7415b8abf), Treeve Jelbert, 03/30/2012

Archive powered by MHonArc 2.6.24.

Top of Page