[Lunar-commits] <moonbase> fbreader: add patch to compile with gcc 4.5.1.

[Florin Braescu]

commit 5a242ded244e652c08fc03b413b275fd8863dff6
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Sun Oct 24 10:03:21 2010 +0300

    fbreader: add patch to compile with gcc 4.5.1.
    
    Thanks to brebs for the submission.
---
 doc-tools/fbreader/BUILD   |   25 +++++++++++++++--------
 doc-tools/fbreader/DEPENDS |    7 +++--
 doc-tools/fbreader/DETAILS |   46 ++++++++++++++++++++++++++-----------------
 3 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/doc-tools/fbreader/BUILD b/doc-tools/fbreader/BUILD
index 185c14c..cdb2ace 100644
--- a/doc-tools/fbreader/BUILD
+++ b/doc-tools/fbreader/BUILD
@@ -1,11 +1,18 @@
 (
-  sedit "s/#TARGET_ARCH = desktop/TARGET_ARCH = desktop/" makefiles/target.mk &&
-  sedit "s/#UI_TYPE = gtk/UI_TYPE = gtk/" makefiles/target.mk &&
-  sedit "s/TARGET_ARCH = win32/#TARGET_ARCH = win32/" makefiles/target.mk &&
-  sedit "s/UI_TYPE = win32/#UI_TYPE = win32/" makefiles/target.mk &&
-  make INSTALLDIR=/usr &&
-  prepare_install &&
-  make INSTALLDIR=/usr install &&
-  ln -sf /usr/bin/FBReader /usr/bin/fbreader
-  
+
+  # Compile with gcc 4.5.1
+  patch_it $SOURCE_CACHE/$SOURCE2 1  &&
+
+  # Sensible browser default, based on http://koji.fedoraproject.org/koji/packageinfo?packageID=5070
+  sedit "s:mozilla:firefox:" fbreader/data/default/external.desktop.xml  &&
+
+  # From http://repos.archlinux.org/wsvn/community/fbreader/trunk/PKGBUILD
+  export TARGET_ARCH=desktop  &&
+  export UI_TYPE=gtk  &&
+  export TARGET_STATUS=release  &&
+
+  default_build  &&
+
+  ln -sfn /usr/bin/FBReader /usr/bin/fbreader
+
 ) > $C_FIFO 2>&1
diff --git a/doc-tools/fbreader/DEPENDS b/doc-tools/fbreader/DEPENDS
index cc50844..fa0c86d 100644
--- a/doc-tools/fbreader/DEPENDS
+++ b/doc-tools/fbreader/DEPENDS
@@ -1,4 +1,5 @@
-depends liblinebreak
-depends expat 
-depends enca 
+depends fribidi
+depends curl
 depends gtk+-2
+depends liblinebreak
+depends sqlite
diff --git a/doc-tools/fbreader/DETAILS b/doc-tools/fbreader/DETAILS
index 5f9cfeb..e4bb30d 100644
--- a/doc-tools/fbreader/DETAILS
+++ b/doc-tools/fbreader/DETAILS
@@ -1,26 +1,36 @@
           MODULE=fbreader
          VERSION=0.12.10
           SOURCE=$MODULE-sources-$VERSION.tgz
-      SOURCE_URL=http://www.fbreader.org/
+         SOURCE2=fbreader-0.12.10-gcc45.patch
+      SOURCE_URL=http://www.fbreader.org
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:982f526c9325fc4eaea3c01370580846c4cce7cc
-        WEB_SITE=http://www.fbreader.org/
+     SOURCE2_VFY=sha1:4547fc9ce7f4f82e24c20a8781b828f66f9820a4
+        WEB_SITE=http://www.fbreader.org
          ENTERED=20060124
-         UPDATED=20100624
-           SHORT="e-book reader"
+         UPDATED=20101024
+           SHORT="An e-book reader, supporting many formats"
 
-PSAFE=no
 cat << EOF
-This e-book reader currently supports the following formats:
-
-fb2 e-book format
-html format (tables not currently supported)
-plucker format
-Palmdoc
-zTxt (Weasel format)
-plain text format
-
-Direct reading from tar, zip and gzip archives. (Multiple books in one archive
-are supported). Supported encodings: utf-8, us-ascii, windows-1251,
-windows-1252, koi8-r, ibm866, iso-8859-*, Big5, GBK. Automatic encoding
-detection is supported.
+FBReader is an e-book reader, with the following main features:
+* Supports several formats: fb2, HTML, CHM, plucker, Palmdoc, zTxt
+  (Weasel), TCR (psion), RTF, OEB, OpenReader, mobipocket, plain text.
+* Direct reading from tar, zip, gzip and bzip2 archives. (Multiple
+  books in one archive are supported.)
+* Automatic library building.
+* Automatic encoding detection is supported.
+* Automatically generated contents table.
+* Embedded images support.
+* Footnotes/hyperlinks support.
+* Position indicator.
+* Keeps the last open book and the last read positions for all opened
+  books between runs.
+* List of last-opened books.
+* Automatic hyphenations. Liang's algorithm is used. The same
+  algorithm is used in TeX, and TeX hyphenation patterns are used in
+  FBReader. Patterns for Czech, English, Esperanto, French, German and
+  Russian are included in the current version.
+* Text search.
+* Full-screen mode.
+* Screen rotation by 90, 180 and 270 degrees.
 EOF