sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (8b6a5a206a0eae7da154ed81e189c8d75ff616a8)
- From: Florian Franzmann <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8b6a5a206a0eae7da154ed81e189c8d75ff616a8)
- Date: Sun, 16 Dec 2018 19:00:33 +0000
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:
ChangeLog |
3 +
editors/sc-im/0001-link-against-zlib-if-libxlsxwriter-is-detected.patch |
25 ++++++++++
editors/sc-im/DEPENDS |
16 +++---
editors/sc-im/HISTORY |
6 ++
editors/sc-im/PRE_BUILD |
5 +-
libs/libxlsxwriter/BUILD |
1
libs/libxlsxwriter/DEPENDS |
2
libs/libxlsxwriter/DETAILS |
14 +++++
libs/libxlsxwriter/HISTORY |
3 +
9 files changed, 66 insertions(+), 9 deletions(-)
New commits:
commit 8b6a5a206a0eae7da154ed81e189c8d75ff616a8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
editors/sc-im: add optional dependency on libzip
commit c839911cd5c825938b8f178b9a296aa592fc8ceb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
editors/sc-im: optionally depend on libxlsxwriter
commit 3fd634893185ba7f0ca771418d9c71b8e1fe8fa7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/libxlsxwriter: new spell, a C library for writing Excel files
diff --git a/ChangeLog b/ChangeLog
index 8e442e7..247787a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2018-12-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * libs/libxlsxwriter: new spell, a C library for writing Excel files
+
2018-12-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* libs/capnproto: new spell, a serialization library for C++
* devel/rr: new spell, a lightweight tool for recording, replaying and
diff --git
a/editors/sc-im/0001-link-against-zlib-if-libxlsxwriter-is-detected.patch
b/editors/sc-im/0001-link-against-zlib-if-libxlsxwriter-is-detected.patch
new file mode 100644
index 0000000..94a4b18
--- /dev/null
+++ b/editors/sc-im/0001-link-against-zlib-if-libxlsxwriter-is-detected.patch
@@ -0,0 +1,25 @@
+From affc72b043d5056c95721bec485dc1a1790ee536 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Sun, 16 Dec 2018 19:47:36 +0100
+Subject: [PATCH] link against zlib if libxlsxwriter is detected
+
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index dd49467..518ed1f 100755
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -75,7 +75,7 @@ endif
+ # NOTE: libxlsxwriter is required for xlsx file export support
+ ifneq (,$(wildcard /usr/include/xlsxwriter.h))
+ CFLAGS += -DXLSX_EXPORT
+- LDLIBS += -lxlsxwriter
++ LDLIBS += -lxlsxwriter -lz
+ endif
+ ifneq (,$(wildcard /usr/local/include/xlsxwriter.h))
+ CFLAGS += -DXLSX_EXPORT
+--
+2.20.1
+
diff --git a/editors/sc-im/DEPENDS b/editors/sc-im/DEPENDS
index cca5f90..15973b4 100755
--- a/editors/sc-im/DEPENDS
+++ b/editors/sc-im/DEPENDS
@@ -1,18 +1,18 @@
depends ncurses &&
depends TEXT-EDITOR &&
depends PAGER &&
-#optional_depends libxlsxwriter \
-# "" \
-# "" \
-# "for xlsx file export support" &&
+optional_depends libxlsxwriter \
+ "" \
+ "" \
+ "for xlsx file export support" &&
optional_depends gnuplot \
"" \
"" \
"for plotting support" &&
-#optional_depends libzip \
-# "" \
-# "" \
-# "for xlsx file import support" &&
+optional_depends libzip \
+ "" \
+ "" \
+ "for xlsx file import support" &&
optional_depends lua51 \
"" \
"" \
diff --git a/editors/sc-im/HISTORY b/editors/sc-im/HISTORY
index b033641..74915a3 100644
--- a/editors/sc-im/HISTORY
+++ b/editors/sc-im/HISTORY
@@ -1,3 +1,9 @@
+2018-12-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, PRE_BUILD,
+ 0001-link-against-zlib-if-libxlsxwriter-is-detected.patch:
optionally
+ depend on libxlsxwriter
+ * DEPENDS: add optional dependency on libzip
+
2018-12-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, PRE_BUILD, DEPENDS, DETAILS: spell created
diff --git a/editors/sc-im/PRE_BUILD b/editors/sc-im/PRE_BUILD
index f24c7c3..cd13a8e 100755
--- a/editors/sc-im/PRE_BUILD
+++ b/editors/sc-im/PRE_BUILD
@@ -1,4 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-sedit 's:/usr/local:/usr:' src/Makefile
+sedit 's:/usr/local:/usr:' src/Makefile &&
+if is_depends_enabled $SPELL libxlsxwriter; then
+ patch -p1 <
"$SPELL_DIRECTORY/0001-link-against-zlib-if-libxlsxwriter-is-detected.patch"
+fi
diff --git a/libs/libxlsxwriter/BUILD b/libs/libxlsxwriter/BUILD
new file mode 100755
index 0000000..e013b8d
--- /dev/null
+++ b/libs/libxlsxwriter/BUILD
@@ -0,0 +1 @@
+cmake_build
diff --git a/libs/libxlsxwriter/DEPENDS b/libs/libxlsxwriter/DEPENDS
new file mode 100755
index 0000000..a4945a5
--- /dev/null
+++ b/libs/libxlsxwriter/DEPENDS
@@ -0,0 +1,2 @@
+depends zlib &&
+depends cmake
diff --git a/libs/libxlsxwriter/DETAILS b/libs/libxlsxwriter/DETAILS
new file mode 100755
index 0000000..f74859b
--- /dev/null
+++ b/libs/libxlsxwriter/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=libxlsxwriter
+ VERSION=0.8.4
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=https://github.com/jmcnamara/${SPELL}/archive/RELEASE_${VERSION}.tar.gz
+
SOURCE_HASH=sha512:b4de99605c9f3b8d7038e7ac49979bdb1998016e04e474008a4f086f5f42e072ab977a70f408b0a348f1ae1ce999a3d9d415961288797ab6ae56d84767f2c5c4
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-RELEASE_${VERSION}"
+ WEB_SITE="https://libxlsxwriter.github.io";
+ LICENSE[0]=BSD
+ ENTERED=20181216
+ SHORT="a C library that can be used to write Excel 2007 and XLSX
files"
+cat << EOF
+Libxlsxwriter is a C library that can be used to write text, numbers,
+formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.
+EOF
diff --git a/libs/libxlsxwriter/HISTORY b/libs/libxlsxwriter/HISTORY
new file mode 100644
index 0000000..51759c9
--- /dev/null
+++ b/libs/libxlsxwriter/HISTORY
@@ -0,0 +1,3 @@
+2018-12-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS: spell created
+
- [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8b6a5a206a0eae7da154ed81e189c8d75ff616a8), Florian Franzmann, 12/16/2018
Archive powered by MHonArc 2.6.24.