diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-06-28 13:14:25 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-06-28 14:38:43 +0200 |
commit | 19596719570c7740b06fb3bcd0e97c16eb6161f3 (patch) | |
tree | 425b0230bb2652f0d158edea1e3b52e2796fa65f /recipes/fbreader | |
parent | 9925d751e4d1e26496fb0b28d7b834424dd9e973 (diff) |
fbreader: add 0.12.10
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/fbreader')
-rw-r--r-- | recipes/fbreader/fbreader-0.12.10/Makefile.patch | 22 | ||||
-rw-r--r-- | recipes/fbreader/fbreader-0.12.10/gcc45.patch | 12 | ||||
-rw-r--r-- | recipes/fbreader/fbreader_0.12.10.bb | 44 |
3 files changed, 78 insertions, 0 deletions
diff --git a/recipes/fbreader/fbreader-0.12.10/Makefile.patch b/recipes/fbreader/fbreader-0.12.10/Makefile.patch new file mode 100644 index 0000000000..0e498c7125 --- /dev/null +++ b/recipes/fbreader/fbreader-0.12.10/Makefile.patch @@ -0,0 +1,22 @@ +diff -uri fbreader-0.12.1.orig/fbreader/Makefile fbreader-0.12.1/fbreader/Makefile +--- fbreader-0.12.1.orig/fbreader/Makefile 2009-12-13 09:03:11.000000000 +0100 ++++ fbreader-0.12.1/fbreader/Makefile 2009-12-14 17:18:47.548638783 +0100 +@@ -37,7 +37,6 @@ + @install $(TARGET) $(DESTDIR)$(BINDIR)/FBReader + @install -d $(FBSHAREDIR) + @install -d $(FBSHAREDIR)/help +- @./scripts/install_help.sh $(VARIANT) $(FBSHAREDIR)/help + @install -d $(FBSHAREDIR)/network + @install -m 0644 $(wildcard data/network/*.xml) $(FBSHAREDIR)/network + @install -d $(FBSHAREDIR)/network/certificates +@@ -58,8 +57,8 @@ + @install -d $(FBSHAREDIR)/resources + @install -m 0644 $(wildcard data/resources/*.xml) $(FBSHAREDIR)/resources + @install -d $(DESTDIR)$(APPIMAGEDIR_REAL) +- @install -m 0644 $(wildcard data/icons/toolbar/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL) +- @install -m 0644 $(wildcard data/icons/filetree/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL) ++ @install -m 0644 $(wildcard data/icons/toolbar/$(TARGET_ARCH)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL) ++ @install -m 0644 $(wildcard data/icons/filetree/$(TARGET_ARCH)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL) + @install -m 0644 $(wildcard data/icons/booktree/new/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL) + @make -C $(TARGET_ARCH) RESOLUTION=$(RESOLUTION) install + diff --git a/recipes/fbreader/fbreader-0.12.10/gcc45.patch b/recipes/fbreader/fbreader-0.12.10/gcc45.patch new file mode 100644 index 0000000000..86bc0b9d9e --- /dev/null +++ b/recipes/fbreader/fbreader-0.12.10/gcc45.patch @@ -0,0 +1,12 @@ +from http://bugs.gentoo.org/show_bug.cgi?id=317189 +--- fbreader-0.12.10-orig/fbreader/src/library/Library.cpp 2010-04-01 15:14:24.000000000 +0200 ++++ fbreader-0.12.10/fbreader/src/library/Library.cpp 2010-04-13 13:34:06.000000000 +0200 +@@ -39,7 +39,7 @@ + shared_ptr<Library> Library::ourInstance; + const size_t Library::MaxRecentListSize = 10; + +-Library::Library &Library::Instance() { ++Library &Library::Instance() { + if (ourInstance.isNull()) { + ourInstance = new Library(); + } diff --git a/recipes/fbreader/fbreader_0.12.10.bb b/recipes/fbreader/fbreader_0.12.10.bb new file mode 100644 index 0000000000..f507c5f52c --- /dev/null +++ b/recipes/fbreader/fbreader_0.12.10.bb @@ -0,0 +1,44 @@ +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 liblinebreak libfribidi" + +SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \ +file://Makefile.patch \ +file://gcc45.patch" + +# Set the defaults +READER_RESOLUTION ?= "1024x600" +READER_ARCH ?= "desktop" +READER_UI ?= "gtk" +READER_STATUS ?= "release" + +# because of defaults overriden in machine config +PACKAGE_ARCH_om-gta01 = "${MACHINE_ARCH}" +PACKAGE_ARCH_om-gta02 = "${MACHINE_ARCH}" + +FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary ${libdir}/zlibrary" +FILES_${PN}-dbg += "${libdir}/zlibrary/ui/.debug/" + +CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=${prefix}" +EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' LDFLAGS='${LDFLAGS}' 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_UI}" >> makefiles/target.mk + echo "TARGET_STATUS = ${READER_STATUS}" >> makefiles/target.mk +} + +do_install() { + oe_runmake install DESTDIR=${D} RESOLUTION=${READER_RESOLUTION} +} + +SRC_URI[md5sum] = "da9ec4721efdb0ec0aaa182bff16ad82" +SRC_URI[sha256sum] = "328aec454db80e225aa0b5c31adef74bf62a14357482947e87e9731686b3c624" |