diff options
Diffstat (limited to 'packages/fbreader')
-rw-r--r-- | packages/fbreader/fbreader-0.8.2a/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/fbreader/fbreader-0.8.2a/480x640-buildfix.patch | 44 | ||||
-rw-r--r-- | packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch | 50 | ||||
-rw-r--r-- | packages/fbreader/fbreader_0.7.4q.bb | 6 | ||||
-rw-r--r-- | packages/fbreader/fbreader_0.8.2a.bb | 58 | ||||
-rw-r--r-- | packages/fbreader/files/zaurus-VGA.patch | 13 |
6 files changed, 168 insertions, 3 deletions
diff --git a/packages/fbreader/fbreader-0.8.2a/.mtn2git_empty b/packages/fbreader/fbreader-0.8.2a/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/fbreader/fbreader-0.8.2a/.mtn2git_empty diff --git a/packages/fbreader/fbreader-0.8.2a/480x640-buildfix.patch b/packages/fbreader/fbreader-0.8.2a/480x640-buildfix.patch new file mode 100644 index 0000000000..fba1f614db --- /dev/null +++ b/packages/fbreader/fbreader-0.8.2a/480x640-buildfix.patch @@ -0,0 +1,44 @@ +diff -Nurd fbreader-0.7.4q.orig/fbreader/data/default/styles.gpe480x640.xml fbreader-0.7.4q/fbreader/data/default/styles.gpe480x640.xml +--- fbreader-0.7.4q.orig/fbreader/data/default/styles.gpe480x640.xml 1970-01-01 00:00:00.000000000 +0000 ++++ fbreader-0.7.4q/fbreader/data/default/styles.gpe480x640.xml 2007-04-24 00:02:38.000000000 +0000 +@@ -0,0 +1,40 @@ ++<DefaultStyles> ++ <base family="Sans" fontSize="16"/> ++ <style id="0" name="Regular Paragraph" firstLineIndentDelta="15" allowHyphenations="true"/> ++ <style id="1" name="Title" fontSizeDelta="10" bold="true" spaceBefore="2" spaceAfter="7" alignment="center" allowHyphenations="false"/> ++ <style id="3" name="Poem Title" fontSizeDelta="2" bold="true" spaceBefore="6" spaceAfter="6" leftIndent="40" allowHyphenations="false"/> ++ <style id="2" name="Section Title" fontSizeDelta="6" bold="true" spaceAfter="5" alignment="center" allowHyphenations="false"/> ++ <style id="31" name="Header 1" fontSizeDelta="6" bold="true" spaceAfter="5" alignment="center" allowHyphenations="false"/> ++ <style id="32" name="Header 2" fontSizeDelta="6" bold="true" spaceAfter="5" alignment="center" allowHyphenations="false"/> ++ <style id="5" name="Annotation" fontSizeDelta="-2" firstLineIndentDelta="15" allowHyphenations="true"/> ++ <style id="6" name="Epigraph" fontSizeDelta="-2" italic="true" leftIndent="80" allowHyphenations="true"/> ++ <style id="4" name="Subtitle" bold="true" allowHyphenations="true"/> ++ <style id="33" name="Header 3" bold="true" allowHyphenations="true"/> ++ <style id="34" name="Header 4" bold="true" allowHyphenations="true"/> ++ <style id="13" name="Author" leftIndent="20" allowHyphenations="false"/> ++ <style id="14" name="Date" leftIndent="40" allowHyphenations="false"/> ++ <style id="7" name="Stanza" spaceBefore="6" spaceAfter="6" alignment="left" allowHyphenations="false"/> ++ <style id="8" name="Verse" leftIndent="20" alignment="left" allowHyphenations="false"/> ++ <style id="10" name="Image" spaceBefore="8" alignment="center"/> ++ <style id="23" name="Contents Table" spaceAfter="7" leftIndent="15" firstLineIndentDelta="-15" alignment="left"/> ++ <style id="24" name="Author in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/> ++ <style id="25" name="Book in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/> ++ <style id="26" name="Recent Book List" spaceAfter="3" leftIndent="15" firstLineIndentDelta="-15" alignment="left" lineSpacing="1.2"/> ++ <style id="9" name="Preformatted text" italic="true" alignment="left" allowHyphenations="false"/> ++ ++ <style id="12" partial="true" name="Cite" italic="true"/> ++ <style id="15" partial="true" name="Hyperlink" allowHyphenations="false" isHyperlink="true"/> ++ <style id="16" partial="true" name="Footnote" fontSizeDelta="-6" vShift="10" allowHyphenations="false" isHyperlink="true"/> ++ <style id="17" partial="true" name="Emphasis" italic="true"/> ++ <style id="18" partial="true" name="Strong" bold="true"/> ++ <style id="35" name="Header 5" bold="true"/> ++ <style id="36" name="Header 6" bold="true"/> ++ <style id="19" partial="true" name="Subscript" fontSizeDelta="-4" vShift="-4" allowHyphenations="false"/> ++ <style id="20" partial="true" name="Superscript" fontSizeDelta="-4" vShift="10" allowHyphenations="false"/> ++ <style id="21" partial="true" name="Code" italic="true" allowHyphenations="false"/> ++ <style id="22" partial="true" name="StrikeThrough"/> ++ <style id="27" partial="true" name="Italic" italic="true"/> ++ <style id="28" partial="true" name="Bold" bold="true"/> ++ <style id="29" partial="true" name="Definition" italic="true"/> ++ <style id="30" partial="true" name="Definition Description" italic="true"/> ++</DefaultStyles> diff --git a/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch b/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch new file mode 100644 index 0000000000..858a713125 --- /dev/null +++ b/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch @@ -0,0 +1,50 @@ +diff -Nur fbreader-0.8.2a.orig/makefiles/arch/openzaurus.mk fbreader-0.8.2a/makefiles/arch/openzaurus.mk +--- fbreader-0.8.2a.orig/makefiles/arch/openzaurus.mk 2007-04-17 18:53:46.000000000 +0000 ++++ fbreader-0.8.2a/makefiles/arch/openzaurus.mk 2007-04-24 00:57:17.000000000 +0000 +@@ -17,7 +17,7 @@ + RM = rm -rvf + RM_QUIET = rm -rf + QTINCLUDE = -I $(INCPATH)/qt2 +-GTKINCLUDE = -I$(LIBPATH)/glib-2.0/include -I$(LIBPATH)/gtk-2.0/include -I$(INCPATH)/glib-2.0 -I$(INCPATH)/gtk-2.0 -I$(INCPATH)/pango-1.0 -I$(INCPATH)/atk-1.0 ++GTKINCLUDE = -I$(LIBPATH)/glib-2.0/include -I$(LIBPATH)/gtk-2.0/include -I$(INCPATH)/cairo -I$(INCPATH)/glib-2.0 -I$(INCPATH)/gtk-2.0 -I$(INCPATH)/pango-1.0 -I$(INCPATH)/atk-1.0 + MOC = $(TOOLSPATH)/moc + CC = $(TOOLSPATH)/arm-linux-gcc + AR = $(TOOLSPATH)/arm-linux-ar rsu +@@ -28,10 +28,10 @@ + ARCHIVER_LIB = -lbz2 + + ifeq "$(UI_TYPE)" "opie" +- UILIBS = -lqte -lqpe ++ UILIBS = -lqt-mt + else +- UILIBS = -lgpewidget -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 ++ UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget + endif + +-CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG -DQWS -fno-exceptions -fno-rtti -march=armv4 -mtune=xscale --param large-function-growth=2000 --param inline-unit-growth=200 -Wall -Wno-ctor-dtor-privacy -W -Winline +-LDFLAGS = -Wl,-rpath,$(LIBDIR) ++CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG -DQWS -fno-exceptions -fno-rtti $(OE_CFLAGS) ++LDFLAGS = -Wl,-rpath,$(LIBDIR) -Wl,-rpath,$(LIBPATH) +diff -Nur fbreader-0.8.2a.orig/makefiles/target.mk fbreader-0.8.2a/makefiles/target.mk +--- fbreader-0.8.2a.orig/makefiles/target.mk 2007-04-17 18:53:46.000000000 +0000 ++++ fbreader-0.8.2a/makefiles/target.mk 2007-04-24 00:58:30.000000000 +0000 +@@ -1,6 +1,5 @@ +-#TARGET_ARCH = openzaurus +-#UI_TYPE = opie +-#UI_TYPE = gpe ++TARGET_ARCH = openzaurus ++UI_TYPE = gpe + + #TARGET_ARCH = opensimpad-0.9.0 + #UI_TYPE = opie +@@ -17,8 +16,8 @@ + #UI_TYPE = qt + #UI_TYPE = qt4 + +-TARGET_ARCH = win32 +-UI_TYPE = win32 ++#TARGET_ARCH = win32 ++#UI_TYPE = win32 + + #TARGET_ARCH = pocketpc + #UI_TYPE = win32 diff --git a/packages/fbreader/fbreader_0.7.4q.bb b/packages/fbreader/fbreader_0.7.4q.bb index b209370f19..bcea83a4a1 100644 --- a/packages/fbreader/fbreader_0.7.4q.bb +++ b/packages/fbreader/fbreader_0.7.4q.bb @@ -3,10 +3,10 @@ LICENSE = "GPL2" HOMEPAGE = "http://only.mawhrin.net/fbreader/" SECTION = "x11/utils" PRIORITY = "optional" -DEPENDS = "gtk+ enca expat bzip2" -PR = "r0" +DEPENDS = "gtk+ enca expat bzip2 libgpewidget" +PR = "r1" -SRC_URI = "http://only.mawhrin.net/fbreader/fbreader-sources-${PV}.tgz \ +SRC_URI = "http://only.mawhrin.net/fbreader/obsolete/fbreader-sources-${PV}.tgz \ file://fbreader-0.7.4q_buildsys_oe.patch;patch=1" FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary" diff --git a/packages/fbreader/fbreader_0.8.2a.bb b/packages/fbreader/fbreader_0.8.2a.bb new file mode 100644 index 0000000000..2419ccf4ae --- /dev/null +++ b/packages/fbreader/fbreader_0.8.2a.bb @@ -0,0 +1,58 @@ +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 = "r4" + +# The RESOLUTION is defined at compile time which makes +# this package MACHINE specific. +PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}" + +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" + +SRC_URI_append_spitz = "\ + file://zaurus-VGA.patch;patch=1" + +SRC_URI_append_akita = "\ + file://zaurus-VGA.patch;patch=1" + +# Set the defaults +READER_RESOLUTION = "240x320" +READER_ARCH = "openzaurus" +READER_GUI = "gpe" +READER_STATUS = "release" + +# Set device specific overrides +READER_RESOLUTION_fic-gta01 = "480x640" +READER_RESOLUTION_spitz = "640x480" +READER_RESOLUTION_akita = "640x480" + +FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary" + +CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=/usr" +EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' OE_CFLAGS='${CXXFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'" + +inherit pkgconfig + +do_configure() { + cd ${WORKDIR}/${PN}-${PV} + mv makefiles/target.mk makefiles/target.mk.orig + + echo "TARGET_ARCH = ${READER_ARCH}" > makefiles/target.mk + echo "UI_TYPE = ${READER_GUI}" >> makefiles/target.mk + 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/${READER_ARCH}; oe_runmake .builddir RESOLUTION=${READER_RESOLUTION} + cp -r data/* ${D} +} diff --git a/packages/fbreader/files/zaurus-VGA.patch b/packages/fbreader/files/zaurus-VGA.patch new file mode 100644 index 0000000000..5ba7d91b9d --- /dev/null +++ b/packages/fbreader/files/zaurus-VGA.patch @@ -0,0 +1,13 @@ +--- fbreader-0.8.2a/fbreader/data/default/styles.gpe640x480.xml.orig 2007-06-24 23:55:56.000000000 +0000 ++++ fbreader-0.8.2a/fbreader/data/default/styles.gpe640x480.xml 2007-06-24 23:56:22.000000000 +0000 +@@ -1,8 +1,8 @@ + <?xml version="1.0" encoding="UTF-8"?> + <DefaultStyles> +- <base family="Sans" fontSize="16"/> ++ <base family="Sans" fontSize="8"/> + <style id="0" name="Regular Paragraph" firstLineIndentDelta="22" allowHyphenations="true"/> +- <style id="1" name="Title" fontSizeDelta="10" bold="true" spaceBefore="2" spaceAfter="7" alignment="center" allowHyphenations="false"/> ++ <style id="1" name="Title" fontSizeDelta="5" bold="true" spaceBefore="2" spaceAfter="7" alignment="center" allowHyphenations="false"/> + <style id="3" name="Poem Title" fontSizeDelta="2" bold="true" spaceBefore="6" spaceAfter="6" leftIndent="40" allowHyphenations="false"/> + <style id="2" name="Section Title" fontSizeDelta="6" bold="true" spaceAfter="5" alignment="center" allowHyphenations="false"/> + <style id="31" name="Header 1" fontSizeDelta="6" bold="true" spaceAfter="5" alignment="center" allowHyphenations="false"/> |