[SM-Commit] GIT changes to master grimoire by Pol Vinogradov (8c5aa0980872a639942c0608be538816dfc138d4)

Pol Vinogradov scm at sourcemage.org
Wed Sep 1 19:52:36 EDT 2010


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

 doc/fbreader/DEPENDS   |    5 ++++-
 doc/fbreader/DETAILS   |    4 ++--
 doc/fbreader/HISTORY   |    5 +++++
 doc/fbreader/PRE_BUILD |    4 +++-
 4 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 8c5aa0980872a639942c0608be538816dfc138d4
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    doc/fbreader: updated to 0.12.10 plus some fixes

diff --git a/doc/fbreader/DEPENDS b/doc/fbreader/DEPENDS
index cb532a7..c5e68dc 100755
--- a/doc/fbreader/DEPENDS
+++ b/doc/fbreader/DEPENDS
@@ -7,5 +7,8 @@ if [[ $UI == qt ]]; then
 fi &&
 if [[ $UI == gtk2 ]]; then
   depends gtk+2
+fi &&
+depends sqlite &&
+if [[ $FBREADER_SCM == y ]];then
+  depends subversion
 fi
-
diff --git a/doc/fbreader/DETAILS b/doc/fbreader/DETAILS
index abbece0..d542abf 100755
--- a/doc/fbreader/DETAILS
+++ b/doc/fbreader/DETAILS
@@ -10,11 +10,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-scm
    SOURCE_URL[0]=svn_https://only.mawhrin.net/repos/stuff/trunk:$SPELL-scm
    SOURCE_IGNORE=volatile
 else
-         VERSION=0.11.2
+         VERSION=0.12.10
           SOURCE=$SPELL-sources-$VERSION.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.fbreader.org/$SOURCE
-     SOURCE_HASH=sha512:cb11eb27c90b0698d6ecbfcdecebae996c59abb1cb102ff4b90cd961d7f1cbebec9ad6b6870d9761157b2757d2c0bedabf09f5a80c56c4fc36b0a4ab1a9ab971
+     SOURCE_HASH=sha512:b764d63133feece68e19128f09111303f87aef01a17dcd103def99a84f5392b82c5d1461f604024a587fd631a390b7c169aa2eac40c9d0643ed823f14577685f
 fi
         WEB_SITE=http://www.fbreader.org/
          ENTERED=20060615
diff --git a/doc/fbreader/HISTORY b/doc/fbreader/HISTORY
index b2400c3..5837404 100644
--- a/doc/fbreader/HISTORY
+++ b/doc/fbreader/HISTORY
@@ -1,3 +1,8 @@
+2010-09-01 Pol Vinogradov <vin.public at gmail.com>
+	* DETAILS: Updated to 0.12.10
+	* DEPENDS: added sqlite and subversion for scm branch
+	* PRE_BUILD: added fix for function declaration
+
 2009-12-05 Pol Vinogradov <vin.public at gmail.com>
 	* DETAILS: Updated to 0.11.2
 
diff --git a/doc/fbreader/PRE_BUILD b/doc/fbreader/PRE_BUILD
index 6c9c1fe..520faab 100755
--- a/doc/fbreader/PRE_BUILD
+++ b/doc/fbreader/PRE_BUILD
@@ -7,4 +7,6 @@ if [ "$UI" = "qt" ]; then
 fi &&
 if [ "$UI" = "gtk2" ]; then
   echo "UI_TYPE = gtk" >> makefiles/target.mk
-fi
+fi &&
+
+sed -i 's/Library::Library \&Library/Library \&Library/' fbreader/src/library/Library.cpp



More information about the SM-Commit mailing list