Skip to Content.
Sympa Menu

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

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 (2af4cd9454954044ca11a81f5051c34b00bc035d)
  • Date: Mon, 30 Jan 2012 21:54:45 -0600

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

doc/fbreader/DETAILS | 1 +
doc/fbreader/HISTORY | 4 ++++
doc/fbreader/PRE_BUILD | 5 +++++
3 files changed, 10 insertions(+)

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

doc/fbreader: added fix to build with latest glib2, fixed scm branch
downloading

diff --git a/doc/fbreader/DETAILS b/doc/fbreader/DETAILS
index dcc1f96..8cccb7e 100755
--- a/doc/fbreader/DETAILS
+++ b/doc/fbreader/DETAILS
@@ -10,6 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-scm
SOURCE_URL[0]=svn_https://only.mawhrin.net/repos/stuff/trunk:$SPELL-scm
SOURCE_HINTS[0]="no-check-certificate"
SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
else
VERSION=0.12.10
SOURCE=$SPELL-sources-$VERSION.tgz
diff --git a/doc/fbreader/HISTORY b/doc/fbreader/HISTORY
index 2ec8d84..fff0b3e 100644
--- a/doc/fbreader/HISTORY
+++ b/doc/fbreader/HISTORY
@@ -1,3 +1,7 @@
+2012-01-30 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: added FORCE_DOWNLOAD=on to scm branch
+ * PRE_BUILD: fixed build with latest glib2
+
2012-01-14 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS, DEPENDS, PREPARE: converted to prepare_select_branch
function, added SOURCE_HINTS[0]="no-check-certificate"
diff --git a/doc/fbreader/PRE_BUILD b/doc/fbreader/PRE_BUILD
index 60904fd..5e77872 100755
--- a/doc/fbreader/PRE_BUILD
+++ b/doc/fbreader/PRE_BUILD
@@ -9,6 +9,11 @@ if [ "$UI" = "gtk2" ]; then
echo "UI_TYPE = gtk" >> makefiles/target.mk
fi &&

+if is_depends_enabled fribidi glib2; then
+ sed -i "s:gtk+-2.0:gtk+-2.0 glib-2.0:g" makefiles/arch/desktop.mk &&
+ sed -i "s:subdir.mk:gtksubdir.mk:" zlibrary/text/Makefile
+fi &&
+
sed -i 's/Library::Library \&Library/Library \&Library/'
fbreader/src/library/Library.cpp &&

if [[ "$FBREADER_BRANCH" == "scm" ]];then



  • [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (2af4cd9454954044ca11a81f5051c34b00bc035d), Pol Vinogradov, 01/30/2012

Archive powered by MHonArc 2.6.24.

Top of Page