From 31cec2ac2ea0533d0734c7d2214ea3d2aa8c13e9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 14 Nov 2012 13:34:27 +0100 Subject: fbreader: move to meta-gpe due to libgpewidget dependency Signed-off-by: Marcin Juszkiewicz --- .../fbreader/fbreader-0.12.10/Makefile.patch | 22 ++++++++++++ .../fbreader/fbreader-0.12.10/gcc45.patch | 20 +++++++++++ .../recipes-support/fbreader/fbreader_0.12.10.bb | 40 +++++++++++++++++++++ meta-gpe/recipes-support/fbreader/fbreader_git.bb | 41 ++++++++++++++++++++++ ...ation-of-the-icons-when-RESOLUTION-is-set.patch | 40 +++++++++++++++++++++ 5 files changed, 163 insertions(+) create mode 100644 meta-gpe/recipes-support/fbreader/fbreader-0.12.10/Makefile.patch create mode 100644 meta-gpe/recipes-support/fbreader/fbreader-0.12.10/gcc45.patch create mode 100644 meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb create mode 100644 meta-gpe/recipes-support/fbreader/fbreader_git.bb create mode 100644 meta-gpe/recipes-support/fbreader/files/0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch (limited to 'meta-gpe') diff --git a/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/Makefile.patch b/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/Makefile.patch new file mode 100644 index 0000000000..0e498c7125 --- /dev/null +++ b/meta-gpe/recipes-support/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/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/gcc45.patch b/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/gcc45.patch new file mode 100644 index 0000000000..00cba1023f --- /dev/null +++ b/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/gcc45.patch @@ -0,0 +1,20 @@ + Fix compilation with gcc 4.5 + + [FBreader Ticket #340] -- http://old.fbreader.org/mantis/view.php?id=340 + + Without that patch we have: + Compiling Library.o ...Library.cpp:42:1: error: 'Library::Library' names the constructor, not the type + + Upstream-Status: Accepted [Fixed in Version 0.14.0] + +--- 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::ourInstance; + const size_t Library::MaxRecentListSize = 10; + +-Library::Library &Library::Instance() { ++Library &Library::Instance() { + if (ourInstance.isNull()) { + ourInstance = new Library(); + } diff --git a/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb b/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb new file mode 100644 index 0000000000..4786846649 --- /dev/null +++ b/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "FBreader is an ebook reader" +HOMEPAGE = "http://www.fbreader.org" +SECTION = "x11/utils" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://fbreader/LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libfribidi curl" + +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" + +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" diff --git a/meta-gpe/recipes-support/fbreader/fbreader_git.bb b/meta-gpe/recipes-support/fbreader/fbreader_git.bb new file mode 100644 index 0000000000..937bdc8282 --- /dev/null +++ b/meta-gpe/recipes-support/fbreader/fbreader_git.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "FBreader is an ebook reader" +HOMEPAGE = "http://www.fbreader.org" +SECTION = "x11/utils" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://fbreader/LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libfribidi curl" +SRCREV = "2cf1ec0e306e1122dbed850bfa005cd59a6168ee" +PV = "0.99.5+gitr${SRCPV}" +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "git://github.com/geometer/FBReader.git;protocol=http;branch=master \ + file://0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch" + +# Set the defaults +READER_RESOLUTION ?= "1024x600" +READER_ARCH ?= "desktop" +READER_UI ?= "gtk" +READER_STATUS ?= "release" + +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}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'" +inherit pkgconfig + +S = "${WORKDIR}/git" + +do_configure() { + cd "${S}" + + 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} +} diff --git a/meta-gpe/recipes-support/fbreader/files/0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch b/meta-gpe/recipes-support/fbreader/files/0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch new file mode 100644 index 0000000000..f6e12023b1 --- /dev/null +++ b/meta-gpe/recipes-support/fbreader/files/0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch @@ -0,0 +1,40 @@ +From da4170b61bb41eff0af170d1d77bfd90f9ebe5dd Mon Sep 17 00:00:00 2001 +From: Denis 'GNUtoo' Carikli +Date: Fri, 20 Jan 2012 11:34:42 +0100 +Subject: [PATCH] Fix installation of the icons when RESOLUTION is set + +When resolution is set, the following code(in fbreader/Makefile) is executed: + VARIANT = $(TARGET_ARCH) + ifneq "$(RESOLUTION)" "" + VARIANT = $(TARGET_ARCH)_$(RESOLUTION) + endif + +This fix is based on a patch from the openembedded project, + which can be found here: + http://cgit.openembedded.org/openembedded/tree/recipes/fbreader/fbreader-0.12.1/Makefile.patch + +Signed-off-by: Denis 'GNUtoo' Carikli +--- + Submitted trough github to git://github.com/geometer/FBReader.git as a pull request + + fbreader/Makefile | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fbreader/Makefile b/fbreader/Makefile +index bfa9242..03e6cc3 100644 +--- a/fbreader/Makefile ++++ b/fbreader/Makefile +@@ -60,8 +60,8 @@ do_install: + @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 + +-- +1.7.4.1 + -- cgit 1.2.3-korg