diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/fbreader | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/fbreader')
-rw-r--r-- | recipes/fbreader/fbreader-0.8.2a/480x640-buildfix.patch | 44 | ||||
-rw-r--r-- | recipes/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch | 50 | ||||
-rw-r--r-- | recipes/fbreader/fbreader_0.7.3d.bb | 23 | ||||
-rw-r--r-- | recipes/fbreader/fbreader_0.7.4q.bb | 22 | ||||
-rw-r--r-- | recipes/fbreader/fbreader_0.8.2a.bb | 62 | ||||
-rw-r--r-- | recipes/fbreader/files/change-desktop.patch | 11 | ||||
-rw-r--r-- | recipes/fbreader/files/fbreader-0.7.3d_buildsys_oe.patch | 158 | ||||
-rw-r--r-- | recipes/fbreader/files/fbreader-0.7.4q_buildsys_oe.patch | 50 | ||||
-rw-r--r-- | recipes/fbreader/files/hack-makefile.patch | 24 | ||||
-rw-r--r-- | recipes/fbreader/files/set-target.patch | 14 | ||||
-rw-r--r-- | recipes/fbreader/files/zaurus-VGA.patch | 13 |
11 files changed, 471 insertions, 0 deletions
diff --git a/recipes/fbreader/fbreader-0.8.2a/480x640-buildfix.patch b/recipes/fbreader/fbreader-0.8.2a/480x640-buildfix.patch new file mode 100644 index 0000000000..fba1f614db --- /dev/null +++ b/recipes/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/recipes/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch b/recipes/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch new file mode 100644 index 0000000000..858a713125 --- /dev/null +++ b/recipes/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/recipes/fbreader/fbreader_0.7.3d.bb b/recipes/fbreader/fbreader_0.7.3d.bb new file mode 100644 index 0000000000..a326180997 --- /dev/null +++ b/recipes/fbreader/fbreader_0.7.3d.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "FBreader is an ebook reader" +LICENSE = "GPLv2" +HOMEPAGE = "http://only.mawhrin.net/fbreader/" +SECTION = "x11/utils" +PRIORITY = "optional" +DEPENDS = "gtk+ enca expat bzip2" +PR = "r1" + +SRC_URI = "http://only.mawhrin.net/fbreader/obsolete/fbreader-sources-${PV}.tgz \ + file://fbreader-0.7.3d_buildsys_oe.patch;patch=1" + +FILES_${PN} += "${datadir}/FBReader" + +CFLAGS_append = " RESOLUTION=240x320 INSTALLDIR=/usr" + +inherit autotools pkgconfig + +do_install_append() { + install -d ${D}${datadir}/applications + install -d ${D}${datadir}/pixmaps + install -m 0644 ${WORKDIR}/${PN}-${PV}/fbreader/openzaurus/gpe/fbreader.desktop ${D}${datadir}/applications/fbreader.desktop + install -m 0644 ${WORKDIR}/${PN}-${PV}/fbreader/icons/34x28/FBReader.png ${D}${datadir}/pixmaps/fbreader.png +} diff --git a/recipes/fbreader/fbreader_0.7.4q.bb b/recipes/fbreader/fbreader_0.7.4q.bb new file mode 100644 index 0000000000..de2bf358a4 --- /dev/null +++ b/recipes/fbreader/fbreader_0.7.4q.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "FBreader is an ebook reader" +LICENSE = "GPLv2" +HOMEPAGE = "http://only.mawhrin.net/fbreader/" +SECTION = "x11/utils" +PRIORITY = "optional" +DEPENDS = "gtk+ enca expat bzip2 libgpewidget" +PR = "r1" + +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" + +CFLAGS_append = " RESOLUTION=240x320 INSTALLDIR=/usr" +EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' OE_CFLAGS='${CXXFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'" + +inherit pkgconfig + +do_install () { + cd fbreader/openzaurus; oe_runmake .builddir RESOLUTION=240x320 + cp -r data/* ${D} +} diff --git a/recipes/fbreader/fbreader_0.8.2a.bb b/recipes/fbreader/fbreader_0.8.2a.bb new file mode 100644 index 0000000000..7d6a2b044c --- /dev/null +++ b/recipes/fbreader/fbreader_0.8.2a.bb @@ -0,0 +1,62 @@ +DESCRIPTION = "FBreader is an ebook reader" +HOMEPAGE = "http://www.fbreader.org" +SECTION = "x11/utils" +PRIORITY = "optional" +LICENSE = "GPLv2" +DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv" +PR = "r5" + +# The RESOLUTION is defined at compile time which makes +# this package MACHINE specific. +PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}" + +SRC_URI = "http://www.fbreader.org/obsolete/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" + +SRC_URI_append_htcuniversal = "\ + 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_om-gta01 = "480x640" +READER_RESOLUTION_spitz = "640x480" +READER_RESOLUTION_akita = "640x480" +READER_RESOLUTION_htcuniversal = "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/recipes/fbreader/files/change-desktop.patch b/recipes/fbreader/files/change-desktop.patch new file mode 100644 index 0000000000..875c7775fe --- /dev/null +++ b/recipes/fbreader/files/change-desktop.patch @@ -0,0 +1,11 @@ +--- fbreader-0.7.1b/fbreader/pdaxrom/usr/share/applications/FBReader.desktop.orig 2006-02-15 01:52:31.000000000 -0800 ++++ fbreader-0.7.1b/fbreader/pdaxrom/usr/share/applications/FBReader.desktop 2006-02-15 01:53:10.000000000 -0800 +@@ -2,7 +2,7 @@ + Name=FBReader + Comment=E-Book Reader + Exec=FBReader +-Icon=FBReader/FBReader.png ++Icon=fbreader.png + Terminal=0 + Type=Application + Categories=Application;Office;WordProcessor; diff --git a/recipes/fbreader/files/fbreader-0.7.3d_buildsys_oe.patch b/recipes/fbreader/files/fbreader-0.7.3d_buildsys_oe.patch new file mode 100644 index 0000000000..44efdd8583 --- /dev/null +++ b/recipes/fbreader/files/fbreader-0.7.3d_buildsys_oe.patch @@ -0,0 +1,158 @@ +diff -urd fbreader-0.7.3d_orig/fbreader/Makefile fbreader-0.7.3d/fbreader/Makefile +--- fbreader-0.7.3d_orig/fbreader/Makefile 2006-05-03 23:56:31.000000000 +0200 ++++ fbreader-0.7.3d/fbreader/Makefile 2006-05-04 12:02:42.000000000 +0200 +@@ -47,7 +47,7 @@ + @$(LD) $(LDFLAGS) -o $(TARGET) `find common -name *.o` $(TARGET_ARCH)/$(UI_TYPE)/*.o $(LIBS) + @echo " OK" + +-install: all .really-install ++install: .really-install + + .really-install: + @cd $(TARGET_ARCH); make install +Nur in fbreader-0.7.3d/fbreader: Makefile~. +diff -urd fbreader-0.7.3d_orig/fbreader/openzaurus/gpe/fbreader.desktop fbreader-0.7.3d/fbreader/openzaurus/gpe/fbreader.desktop +--- fbreader-0.7.3d_orig/fbreader/openzaurus/gpe/fbreader.desktop 2006-05-03 23:56:31.000000000 +0200 ++++ fbreader-0.7.3d/fbreader/openzaurus/gpe/fbreader.desktop 2006-05-05 09:42:06.000000000 +0200 +@@ -2,7 +2,7 @@ + Name=FBReader + Comment=E-Book Reader + Exec=FBReader +-Icon=fbreader/FBReader ++Icon=FBReader + Type=Application + Terminal=0 + Categories=Application;Utility +diff -urd fbreader-0.7.3d_orig/fbreader/openzaurus/Makefile fbreader-0.7.3d/fbreader/openzaurus/Makefile +--- fbreader-0.7.3d_orig/fbreader/openzaurus/Makefile 2006-05-03 23:56:31.000000000 +0200 ++++ fbreader-0.7.3d/fbreader/openzaurus/Makefile 2006-05-05 12:32:28.000000000 +0200 +@@ -1,5 +1,6 @@ + ROOTDIR = $(PWD)/../.. + include $(ROOTDIR)/makefiles/platforms.mk ++include $(ROOTDIR)/makefiles/config.mk + + ifeq "$(UI_TYPE)" "opie" + BASEDIR = data/opt/QtPalmtop +@@ -7,7 +8,7 @@ + APPDIR = $(BASEDIR)/apps/Applications + STYLE = $(RESOLUTION) + else # UI_TYPE == gpe +- BASEDIR = data/usr ++ BASEDIR = /usr + PICSDIR = $(BASEDIR)/share/pixmaps/fbreader + APPDIR = $(BASEDIR)/share/applications + STYLE = gpe$(RESOLUTION) +@@ -34,7 +35,23 @@ + @make .cleandir + + install: +- ++ @install -d $(DESTDIR)$(INSTALLDIR)/bin ++ @install -s ../FBReader $(DESTDIR)$(INSTALLDIR)/bin ++ @install -d $(DESTDIR)$(INSTALLDIR)/share/FBReader ++ @install -d $(DESTDIR)$(INSTALLDIR)/share/FBReader/formats/html ++ @install -m 0644 ../share/FBReader/formats/html/html.ent $(DESTDIR)$(INSTALLDIR)/share/FBReader/formats/html ++ @install -d $(DESTDIR)$(INSTALLDIR)/share/pixmaps/fbreader ++ @install -m 0644 ../icons/$(ICONSIZE)/FBReader.png $(DESTDIR)$(INSTALLDIR)/share/pixmaps/ ++ @install -m 0644 $(wildcard ../icons/$(ICONSIZE)/FBReader/*) $(DESTDIR)$(INSTALLDIR)/share/pixmaps/fbreader/ ++ @install -d $(DESTDIR)$(INSTALLDIR)/share/FBReader/encodings ++ @install -m 0644 $(wildcard ../share/FBReader/encodings/*) $(DESTDIR)$(INSTALLDIR)/share/FBReader/encodings ++ @install -m 0644 $(wildcard ../share/FBReader/*.zip) $(DESTDIR)$(INSTALLDIR)/share/FBReader ++ @install -d $(DESTDIR)$(INSTALLDIR)/share/FBReader/help ++ @install -m 0644 ../data/help/HowToStart.brownish.$(RESOLUTION).fb2 $(DESTDIR)$(INSTALLDIR)/share/FBReader/help/HowToStart.fb2 ++ @install -d $(DESTDIR)$(INSTALLDIR)/share/FBReader/default ++ @install -m 0644 ../data/default/keymap.pdaxrom.xml $(DESTDIR)$(INSTALLDIR)/share/FBReader/default/keymap.xml ++ @install -m 0644 ../data/default/styles.$(STYLE).xml $(DESTDIR)$(INSTALLDIR)/share/FBReader/default/styles.xml ++ + clean: .cleandir + @rm -f *.ipk + +Nur in fbreader-0.7.3d/fbreader/openzaurus: Makefile~. +diff -urd fbreader-0.7.3d_orig/makefiles/arch/openzaurus.mk fbreader-0.7.3d/makefiles/arch/openzaurus.mk +--- fbreader-0.7.3d_orig/makefiles/arch/openzaurus.mk 2006-05-03 23:56:31.000000000 +0200 ++++ fbreader-0.7.3d/makefiles/arch/openzaurus.mk 2006-05-05 12:05:29.000000000 +0200 +@@ -1,28 +1,28 @@ + include $(ROOTDIR)/makefiles/arch/dummy.mk + +-BASEDIR = /opt/openzaurus-3.5.4/usr/local/arm/oe +-TOOLSDIR = $(BASEDIR)/bin +-INCDIR = $(BASEDIR)/arm-linux/include +-LIBDIR = $(BASEDIR)/arm-linux/lib ++INSTALLDIR=/usr/ + +-RM = rm -rvf +-RM_QUIET = rm -rf +-QTINCLUDE = -I $(INCDIR)/qt2 +-GTKINCLUDE = -I$(LIBDIR)/glib-2.0/include -I$(LIBDIR)/gtk-2.0/include -I$(INCDIR)/glib-2.0 -I$(INCDIR)/gtk-2.0 -I$(INCDIR)/pango-1.0 -I$(INCDIR)/atk-1.0 +-MOC = $(TOOLSDIR)/moc +-CC = $(TOOLSDIR)/arm-linux-gcc +-AR = $(TOOLSDIR)/arm-linux-ar rsu +-LD = $(TOOLSDIR)/arm-linux-g++ ++CC = $(CCLD) $(TARGET_CFLAGS) ++AR = ar rsu ++LD = $(CXX) + +-EXPATLIBS = -lexpat +-ENCALIBS = -lenca +-BZIP2LIBS = -lbz2 ++DEPGEN = $(CC) -MM ++CFLAGS = -pipe $(DUMMY_SECTIONS) -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -DINSTALLDIR=\"$(INSTALLDIR)\" + +-ifeq "$(UI_TYPE)" "opie" +- UILIBS = -lqte -lqpe ++#MOC = moc-qt3 ++#QTINCLUDE = -I /usr/include/qt3 ++ ++GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0) ++ ++ifeq "$(UI_TYPE)" "qt" ++ 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 $(DUMMY_SECTIONS) -DINSTALLDIR=\"$(INSTALLDIR)\" -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 +-DEPGEN = $(CC) -MM ++EXPATLIBS = -lexpat ++ENCALIBS = -lenca ++BZIP2LIBS = -lbz2 ++ ++RM = rm -rvf ++RM_QUIET = rm -rf +diff -urd fbreader-0.7.3d_orig/makefiles/config.mk fbreader-0.7.3d/makefiles/config.mk +--- fbreader-0.7.3d_orig/makefiles/config.mk 2006-05-03 23:56:31.000000000 +0200 ++++ fbreader-0.7.3d/makefiles/config.mk 2006-05-04 10:13:13.000000000 +0200 +@@ -7,7 +7,7 @@ + CFLAGS += -DLIBICONV_PLUG + + ifeq "$(TARGET_STATUS)" "release" +- CFLAGS += -O3 ++ CFLAGS += -Os + LDFLAGS += -s + endif + ifeq "$(TARGET_STATUS)" "debug" +diff -urd fbreader-0.7.3d_orig/makefiles/target.mk fbreader-0.7.3d/makefiles/target.mk +--- fbreader-0.7.3d_orig/makefiles/target.mk 2006-05-03 23:56:31.000000000 +0200 ++++ fbreader-0.7.3d/makefiles/target.mk 2006-05-04 10:25:20.000000000 +0200 +@@ -1,6 +1,7 @@ +-#TARGET_ARCH = openzaurus ++TARGET_ARCH = openzaurus + #UI_TYPE = opie +-#UI_TYPE = gpe ++UI_TYPE = gpe ++RESOLUTION = 240x320 + + #TARGET_ARCH = opensimpad-0.9.0 + #UI_TYPE = opie +@@ -8,8 +9,8 @@ + #TARGET_ARCH = qvfb + #UI_TYPE = opie + +-TARGET_ARCH = maemo +-UI_TYPE = maemo ++#TARGET_ARCH = maemo ++#UI_TYPE = maemo + + #TARGET_ARCH = desktop + #UI_TYPE = gtk diff --git a/recipes/fbreader/files/fbreader-0.7.4q_buildsys_oe.patch b/recipes/fbreader/files/fbreader-0.7.4q_buildsys_oe.patch new file mode 100644 index 0000000000..530edc7f18 --- /dev/null +++ b/recipes/fbreader/files/fbreader-0.7.4q_buildsys_oe.patch @@ -0,0 +1,50 @@ +diff -ur fbreader-0.7.4q.org/makefiles/arch/openzaurus.mk fbreader-0.7.4q/makefiles/arch/openzaurus.mk +--- fbreader-0.7.4q.org/makefiles/arch/openzaurus.mk 2006-12-05 10:47:51.000000000 +0000 ++++ fbreader-0.7.4q/makefiles/arch/openzaurus.mk 2007-01-07 04:58:17.000000000 +0000 +@@ -15,7 +15,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 +@@ -26,10 +26,10 @@ + BZIP2LIBS = -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 -ur fbreader-0.7.4q.org/makefiles/target.mk fbreader-0.7.4q/makefiles/target.mk +--- fbreader-0.7.4q.org/makefiles/target.mk 2006-12-05 10:47:51.000000000 +0000 ++++ fbreader-0.7.4q/makefiles/target.mk 2007-01-07 04:16:20.000000000 +0000 +@@ -1,6 +1,6 @@ +-#TARGET_ARCH = openzaurus ++TARGET_ARCH = openzaurus + #UI_TYPE = opie +-#UI_TYPE = gpe ++UI_TYPE = gpe + + #TARGET_ARCH = opensimpad-0.9.0 + #UI_TYPE = opie +@@ -11,8 +11,8 @@ + #TARGET_ARCH = maemo + #UI_TYPE = maemo + +-TARGET_ARCH = desktop +-UI_TYPE = gtk ++#TARGET_ARCH = desktop ++#UI_TYPE = gtk + #UI_TYPE = qt + + #TARGET_ARCH = zaurus diff --git a/recipes/fbreader/files/hack-makefile.patch b/recipes/fbreader/files/hack-makefile.patch new file mode 100644 index 0000000000..3859363607 --- /dev/null +++ b/recipes/fbreader/files/hack-makefile.patch @@ -0,0 +1,24 @@ +--- fbreader-0.7.1b/makefiles/arch/desktop.mk.orig 2005-12-06 14:29:15.000000000 -0800 ++++ fbreader-0.7.1b/makefiles/arch/desktop.mk 2006-02-15 01:16:49.000000000 -0800 +@@ -1,16 +1,16 @@ + include $(ROOTDIR)/makefiles/arch/dummy.mk + +-INSTALLDIR=/usr/local ++INSTALLDIR=/usr + +-CC = gcc ++CC = $(CCLD) $(TARGET_CFLAGS) + AR = ar rsu +-LD = g++ ++LD = $(CXX) + + DEPGEN = $(CC) -MM + CFLAGS = -pipe $(DUMMY_SECTIONS) -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -DINSTALLDIR=\"$(INSTALLDIR)\" + +-MOC = moc-qt3 +-QTINCLUDE = -I /usr/include/qt3 ++#MOC = moc-qt3 ++#QTINCLUDE = -I /usr/include/qt3 + + GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0) + diff --git a/recipes/fbreader/files/set-target.patch b/recipes/fbreader/files/set-target.patch new file mode 100644 index 0000000000..504e44aae0 --- /dev/null +++ b/recipes/fbreader/files/set-target.patch @@ -0,0 +1,14 @@ + +--- fbreader-0.7.1b/makefiles/target.mk.orig 2005-12-06 14:29:15.000000000 -0800 ++++ fbreader-0.7.1b/makefiles/target.mk 2006-02-15 01:16:33.000000000 -0800 +@@ -10,8 +10,8 @@ + TARGET_ARCH = maemo + UI_TYPE = maemo + +-#TARGET_ARCH = desktop +-#UI_TYPE = gtk ++TARGET_ARCH = openzaurus ++UI_TYPE = gpe + #UI_TYPE = qt + + #TARGET_ARCH = zaurus diff --git a/recipes/fbreader/files/zaurus-VGA.patch b/recipes/fbreader/files/zaurus-VGA.patch new file mode 100644 index 0000000000..5ba7d91b9d --- /dev/null +++ b/recipes/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"/> |