[oe-commits] org.oe.dev fbreader:

Thu Apr 26 02:10:59 UTC 2007

fbreader: 
- Fix do_install to honor READER_ARCH
- Remove left-over help-file from previous version from 480x640-buildfix.patch

Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: 6e9a597ab80676c2cac3fa35399c5405e38a0a33
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6e9a597ab80676c2cac3fa35399c5405e38a0a33
Files:
1
packages/fbreader/fbreader-0.8.2a/480x640-buildfix.patch
packages/fbreader/fbreader_0.8.2a.bb
Diffs:

#
# mt diff -r1f2605948f7eb21849df3fa9e494cafcd2801b20 -r6e9a597ab80676c2cac3fa35399c5405e38a0a33
#
# 
# 
# patch "packages/fbreader/fbreader-0.8.2a/480x640-buildfix.patch"
#  from [40f8c10a42d21246d32d87bef5cc7fea9b92d3c1]
#    to [3f4a4be8db195ee7b26ddc37c94affeeb6bf51cf]
# 
# patch "packages/fbreader/fbreader_0.8.2a.bb"
#  from [1c6626ef45dc5c8e13c886d18cf2e9edf2a99016]
#    to [d186c3a474b964b86a2aea54192bf9bb090cdde0]
# 
============================================================

--- packages/fbreader/fbreader-0.8.2a/480x640-buildfix.patch	40f8c10a42d21246d32d87bef5cc7fea9b92d3c1
+++ packages/fbreader/fbreader-0.8.2a/480x640-buildfix.patch	3f4a4be8db195ee7b26ddc37c94affeeb6bf51cf
@@ -42,44 +42,3 @@ diff -Nurd fbreader-0.7.4q.orig/fbreader
 +	<style id="29" partial="true" name="Definition" italic="true"/>
 +	<style id="30" partial="true" name="Definition Description" italic="true"/>
 +</DefaultStyles>
-diff -Nurd fbreader-0.7.4q.orig/fbreader/data/help/HowToStart.brownish.480x640.fb2 fbreader-0.7.4q/fbreader/data/help/HowToStart.brownish.480x640.fb2
---- fbreader-0.7.4q.orig/fbreader/data/help/HowToStart.brownish.480x640.fb2	1970-01-01 00:00:00.000000000 +0000
-+++ fbreader-0.7.4q/fbreader/data/help/HowToStart.brownish.480x640.fb2	2007-04-24 00:05:51.000000000 +0000
-@@ -0,0 +1,37 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>How to start</book-title> <lang>en</lang></title-info></description>
-+<body>
-+<title><p>How to start</p></title>
-+<p>FBReader is an e-book reader that supports several formats: <code>fb2</code>, <code>plucker</code>, <code>palmDoc</code>, <code>zTxt</code> (a.k.a. <code>weasel</code> format), <code>html</code>, <code>rtf</code>, <code>oeb</code> and <code>plain text</code>. FBReader also supports direct reading from <code>zip</code>, <code>tar</code> and <code>gzip</code> archives.</p>
-+<p>FBReader looks for <code>fb2</code> books in directories listed in the <code>Book Path</code> option. First of all you need to set this path. Open the options dialog (just click on <image l:href="#settings.png"/> in the toolbar) and change the value of <code>Book Path</code> option in the <code>General</code> tab. This option contains the list of directories containing <code>*.fb2</code> or archive files. Directories in the list are separated by colons.</p>
-+<p>Start <code>book selection dialog</code> (click on <image l:href="#books.png"/>), select a book from the list and read it.</p>
-+<p>To read a file in another format, you need to add it to the library. Start <code>add to library dialog</code> (<image l:href="#addbook.png"/>), select a file and edit the file information. Next time you can open this file using <code>book selection dialog</code> (<image l:href="#books.png"/>).</p>
-+</body>
-+<binary content-type="image/png" id="settings.png">
-+iVBORw0KGgoAAAANSUhEUgAAABAAAAAPEAYAAAC945NsAAAABmJLR0T/////
-+//8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAjUlEQVQ4y72V3Q3AIAiE
-+e42rOYszOYvDXZ9IWxID4s+9GAnKJ2cU10/kdVRA0qHWat1ZMudSvvN71YZ6
-+Y6/CAFKQJMl3HAWZ7oDWKEgYQO4KAABxEBPA8tgCCXdglceW0ugCAdEnlrg3
-+3+yA1+Ne4V6+G8ALMiu3Bd6ObAPQIFoCNgqy7CGKWqVSz/+GD2hhfA/LrEW8
-+AAAAAElFTkSuQmCC
-+====
-+</binary>
-+<binary content-type="image/png" id="books.png">
-+iVBORw0KGgoAAAANSUhEUgAAABAAAAAPEAYAAAC945NsAAAABmJLR0T/////
-+//8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAApElEQVQ4y+2UPQ6AMAiF
-+qXH2CJ7HtVv3JhzKxN3NtefxCL1AnUgNCUH8W/Rt0JLvAWkBjAphGABKOZrX
-+5Kzgrut7xJrPeV3HscbznBKAc7xOyjdXwTF6f6QOERGxFD4pp4Glcw6epmXZ
-+x5phut9qE9BAPJZWI01KXYEkAvNOCSQBbzMgdWrVaQPWTh+bwFX9Br5ngJ4v
-+fc2vGeBgyp/+iq3iYNIG2+BvhA4vPaAAAAAASUVORK5CYII=
-+====
-+</binary>
-+<binary content-type="image/png" id="addbook.png">
-+iVBORw0KGgoAAAANSUhEUgAAABAAAAAPEAYAAAC945NsAAAABmJLR0T/////
-+//8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAl0lEQVQ4y2NgIAAiIjw8
-+GBj+/ydWnFTASMhiPj45ubQ0hPinT48ezZqF4K9YsWMHAwMjIwOZgIlUi5OT
-+AwMp9TUyYMEVpOg+pbbFOEMAZhGtLCToAHqDUQfQ1AEHDkASNYwelCHAQrkR
-+mD4mVt7BgZFx6IXA3Lnr1zMwYC+CHRxQ+dh8jG4e0SGAz2JKANwgQrUbtS2G
-+AQDUKU1FNtQ7mgAAAABJRU5ErkJggg==
-+====
-+</binary>
-+</FictionBook>
============================================================
--- packages/fbreader/fbreader_0.8.2a.bb	1c6626ef45dc5c8e13c886d18cf2e9edf2a99016
+++ packages/fbreader/fbreader_0.8.2a.bb	d186c3a474b964b86a2aea54192bf9bb090cdde0
@@ -1,18 +1,18 @@ DEPENDS = "gtk+ enca expat bzip2 libgpew
 DESCRIPTION = "FBreader is an ebook reader"
 LICENSE = "GPL2"
 HOMEPAGE = "http://only.mawhrin.net/fbreader/"
 SECTION = "x11/utils"
 PRIORITY = "optional"
 DEPENDS = "gtk+ enca expat bzip2 libgpewidget"
-PR = "r2"
+PR = "r3"
 
 # The RESOLUTION is defined at compile time which makes
 # this package MACHINE specific.
 PACKAGE_ARCH_${PN} = "${MACHINE}"
 
 SRC_URI = "http://only.mawhrin.net/fbreader/fbreader-sources-${PV}.tgz \
-	file://fbreader-0.8.2a_buildsys_oe.patch;patch=1 \
-	file://480x640-buildfix.patch;patch=1"
+	   file://fbreader-0.8.2a_buildsys_oe.patch;patch=1 \
+	   file://480x640-buildfix.patch;patch=1"
 
 # Set the defaults
 READER_RESOLUTION = "240x320"
@@ -39,10 +39,12 @@ do_configure() {
 	echo "TARGET_STATUS = ${READER_STATUS}" >> makefiles/target.mk
 	
 	cd fbreader/data/help
+	
+	# FIXME: Add native _480x640 file with propper linebreaks
 	ln -s MiniHelp.240x320.fb2 MiniHelp.openzaurus_480x640.fb2
 }
 
 do_install () {
-        cd fbreader/openzaurus; oe_runmake .builddir RESOLUTION=${RESOLUTION}
+        cd fbreader/${READER_ARCH}; oe_runmake .builddir RESOLUTION=${RESOLUTION}
 	cp -r data/* ${D}
 }




