Skip to Content.
Sympa Menu

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

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 (16c4d967c12244ccbbd804b6f191a892891b4aef)
  • Date: Sat, 14 Jan 2012 18:15:53 -0600

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

doc/fbreader/DEPENDS | 2 +-
doc/fbreader/DETAILS | 5 +++--
doc/fbreader/HISTORY | 5 +++++
doc/fbreader/PREPARE | 9 ++-------
doc/fbreader/PRE_BUILD | 6 +++++-
5 files changed, 16 insertions(+), 11 deletions(-)

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

doc/fbreader: converted branch selection to prepare_select_branch, added
various fixes to scm branch build

diff --git a/doc/fbreader/DEPENDS b/doc/fbreader/DEPENDS
index ab08d04..8c06048 100755
--- a/doc/fbreader/DEPENDS
+++ b/doc/fbreader/DEPENDS
@@ -6,6 +6,6 @@ if [[ $UI == gtk2 ]]; then
depends gtk+2
fi &&
depends sqlite &&
-if [[ $FBREADER_SCM == y ]];then
+if [[ "$FBREADER_BRANCH" == "scm" ]];then
depends subversion
fi
diff --git a/doc/fbreader/DETAILS b/doc/fbreader/DETAILS
index d542abf..dcc1f96 100755
--- a/doc/fbreader/DETAILS
+++ b/doc/fbreader/DETAILS
@@ -1,6 +1,6 @@
SPELL=fbreader
-if [[ $FBREADER_SCM == y ]];then
-if [[ $FBREADER_SCM_AUTO == y ]];then
+if [[ "$FBREADER_BRANCH" == "scm" ]];then
+if [[ "$FBREADER_AUTOUPDATE" == "y" ]];then
VERSION=$(date +%Y%m%d)
else
VERSION=scm
@@ -8,6 +8,7 @@ fi
SOURCE=$SPELL-scm.tar.bz2
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
else
VERSION=0.12.10
diff --git a/doc/fbreader/HISTORY b/doc/fbreader/HISTORY
index 378dc88..2ec8d84 100644
--- a/doc/fbreader/HISTORY
+++ b/doc/fbreader/HISTORY
@@ -1,3 +1,8 @@
+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"
+ * PRE_BUILD: added fix for scm branch
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS,CONFIGURE: removed qt-x11 as gui option

diff --git a/doc/fbreader/PREPARE b/doc/fbreader/PREPARE
index ed0d809..98d27e4 100755
--- a/doc/fbreader/PREPARE
+++ b/doc/fbreader/PREPARE
@@ -1,7 +1,2 @@
-config_query FBREADER_SCM "Do you want SCM version" "n" &&
-if [[ "${FBREADER_SCM}" == "y" ]]
-then
-config_query FBREADER_SCM_AUTO \
- "Automaticaly update the spell on sorcery queue/system-update?" \
- "n"
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/doc/fbreader/PRE_BUILD b/doc/fbreader/PRE_BUILD
index 520faab..60904fd 100755
--- a/doc/fbreader/PRE_BUILD
+++ b/doc/fbreader/PRE_BUILD
@@ -9,4 +9,8 @@ if [ "$UI" = "gtk2" ]; then
echo "UI_TYPE = gtk" >> makefiles/target.mk
fi &&

-sed -i 's/Library::Library \&Library/Library \&Library/'
fbreader/src/library/Library.cpp
+sed -i 's/Library::Library \&Library/Library \&Library/'
fbreader/src/library/Library.cpp &&
+
+if [[ "$FBREADER_BRANCH" == "scm" ]];then
+ sed -i "s/ccache gcc/gcc/" makefiles/arch/desktop.mk
+fi



  • [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (16c4d967c12244ccbbd804b6f191a892891b4aef), Pol Vinogradov, 01/14/2012

Archive powered by MHonArc 2.6.24.

Top of Page