Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (d2a914e794385e82f20365893c2e392757ff48aa)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (d2a914e794385e82f20365893c2e392757ff48aa)
  • Date: Mon, 12 Jan 2015 06:15:25 -0600

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

doc/fbreader/HISTORY | 4 ++++
doc/fbreader/PRE_BUILD | 5 ++++-
2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit d2a914e794385e82f20365893c2e392757ff48aa
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

doc/fbreader: made use of shared libunibreak

diff --git a/doc/fbreader/HISTORY b/doc/fbreader/HISTORY
index 3cfe393..5e59a84 100644
--- a/doc/fbreader/HISTORY
+++ b/doc/fbreader/HISTORY
@@ -1,3 +1,7 @@
+2015-01-12 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD: added sed to link against shared libunibreak,
+ not static liblinebreak.a from the libunibreak distribution
+
2015-01-10 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS: liblinebreak -> libunibreak

diff --git a/doc/fbreader/PRE_BUILD b/doc/fbreader/PRE_BUILD
index 5e77872..6d91540 100755
--- a/doc/fbreader/PRE_BUILD
+++ b/doc/fbreader/PRE_BUILD
@@ -18,4 +18,7 @@ sed -i 's/Library::Library \&Library/Library \&Library/'
fbreader/src/library/Li

if [[ "$FBREADER_BRANCH" == "scm" ]];then
sed -i "s/ccache gcc/gcc/" makefiles/arch/desktop.mk
-fi
+fi &&
+
+sed -i 's;linebreak;unibreak;g' makefiles/config.mk \
+ zlibrary/text/Makefile



  • [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (d2a914e794385e82f20365893c2e392757ff48aa), Pol Vinogradov, 01/12/2015

Archive powered by MHonArc 2.6.24.

Top of Page