From 1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Thu, 8 Oct 2015 22:51:41 +0200 Subject: initial commit for Enea Linux 5.0 arm Signed-off-by: Tudor Florea --- meta-gpe/README | 23 ++++++++++++ meta-gpe/conf/layer.conf | 15 ++++++++ ...ering-of-LDADD-options-to-fix-a-compilati.patch | 28 +++++++++++++++ .../gpe-scap/gpe-scap/use.libsoup-2.4.patch | 42 ++++++++++++++++++++++ meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb | 23 ++++++++++++ .../libgpewidget/libgpewidget/glib-2.32.patch | 11 ++++++ .../libgpewidget/libgpewidget/pkgconfig.patch | 11 ++++++ .../libgpewidget/libgpewidget_0.117.bb | 23 ++++++++++++ .../minilite/minilite/makefile-fix.patch | 11 ++++++ .../recipes-graphics/minilite/minilite_0.50.bb | 16 +++++++++ .../fbreader/fbreader-0.12.10/Makefile.patch | 22 ++++++++++++ .../fbreader/fbreader-0.12.10/gcc45.patch | 20 +++++++++++ .../recipes-support/fbreader/fbreader_0.12.10.bb | 42 ++++++++++++++++++++++ meta-gpe/recipes-support/fbreader/fbreader_git.bb | 42 ++++++++++++++++++++++ ...ation-of-the-icons-when-RESOLUTION-is-set.patch | 40 +++++++++++++++++++++ 15 files changed, 369 insertions(+) create mode 100644 meta-gpe/README create mode 100644 meta-gpe/conf/layer.conf create mode 100644 meta-gpe/recipes-graphics/gpe-scap/gpe-scap/0001-Fix-the-ordering-of-LDADD-options-to-fix-a-compilati.patch create mode 100644 meta-gpe/recipes-graphics/gpe-scap/gpe-scap/use.libsoup-2.4.patch create mode 100644 meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb create mode 100644 meta-gpe/recipes-graphics/libgpewidget/libgpewidget/glib-2.32.patch create mode 100644 meta-gpe/recipes-graphics/libgpewidget/libgpewidget/pkgconfig.patch create mode 100644 meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb create mode 100644 meta-gpe/recipes-graphics/minilite/minilite/makefile-fix.patch create mode 100644 meta-gpe/recipes-graphics/minilite/minilite_0.50.bb 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/README b/meta-gpe/README new file mode 100644 index 000000000..3be1d105b --- /dev/null +++ b/meta-gpe/README @@ -0,0 +1,23 @@ +This layer depends on: + +URI: git://github.com/openembedded/oe-core.git +branch: dizzy +revision: HEAD + +URI: git://github.com/openembedded/meta-oe.git +branch: dizzy +revision: HEAD + +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gpe][dizzy]' in the subject' + +When sending single patches, please using something like: +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-gpe][dizzy][PATCH' + +Interim layer maintainers: Koen Kooi + Martin Jansa + +Dizzy branch maintainers: + Otavio Salvador + Armin Kuster + +Prefix email subject with: [dizzy] diff --git a/meta-gpe/conf/layer.conf b/meta-gpe/conf/layer.conf new file mode 100644 index 000000000..00f3929f8 --- /dev/null +++ b/meta-gpe/conf/layer.conf @@ -0,0 +1,15 @@ +# We have a conf and classes directory, append to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have a recipes directory, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "gpe-layer" +BBFILE_PATTERN_gpe-layer := "^${LAYERDIR}/" +BBFILE_PRIORITY_gpe-layer = "7" + +# This should only be incremented on significant changes that will +# cause compatibility issues with other layers +LAYERVERSION_gpe-layer = "1" + +LAYERDEPENDS_gpe-layer = "core openembedded-layer" diff --git a/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/0001-Fix-the-ordering-of-LDADD-options-to-fix-a-compilati.patch b/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/0001-Fix-the-ordering-of-LDADD-options-to-fix-a-compilati.patch new file mode 100644 index 000000000..c976ff470 --- /dev/null +++ b/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/0001-Fix-the-ordering-of-LDADD-options-to-fix-a-compilati.patch @@ -0,0 +1,28 @@ +From c551dece6768f67b74b508e9c0133320205ef2df Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Mon, 23 May 2011 15:03:29 +0200 +Subject: [PATCH] Fix the ordering of LDADD options to fix a compilation failure. + +"invalid DSO for symbol `XUngrabServer' definition " + +Signed-off-by: Koen Kooi +--- + src/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 2fddc98..45bd850 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -6,7 +6,7 @@ INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" \ + $(GLADE_CFLAGS) \ + -D_GNU_SOURCE + +-LIBS = $(GTK_LIBS) $(GLADE_LIBS) $(XSHAPE_LIBS) ++LIBS = -lX11 $(XSHAPE_LIBS) $(GLADE_LIBS) $(GTK_LIBS) + + bin_PROGRAMS = gpe-scap + gpe_scap_SOURCES = scr-i18n.h \ +-- +1.6.6.1 + diff --git a/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/use.libsoup-2.4.patch b/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/use.libsoup-2.4.patch new file mode 100644 index 000000000..3cfe5d724 --- /dev/null +++ b/meta-gpe/recipes-graphics/gpe-scap/gpe-scap/use.libsoup-2.4.patch @@ -0,0 +1,42 @@ +diff -uNr gpe-scap-1.4.orig/configure.ac gpe-scap-1.4/configure.ac +--- gpe-scap-1.4.orig/configure.ac 2009-03-05 18:53:53.000000000 +0100 ++++ gpe-scap-1.4/configure.ac 2012-05-06 10:18:29.348308322 +0200 +@@ -24,7 +24,7 @@ + AC_SUBST(LDFLAGS) + + dnl libraries +-GTK_MODULES="gtk+-2.0 >= 2.6.0 gthread-2.0 libsoup-2.2" ++GTK_MODULES="gtk+-2.0 >= 2.6.0 gthread-2.0 libsoup-2.4" + PKG_CHECK_MODULES(GTK, $GTK_MODULES) + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) +diff -uNr gpe-scap-1.4.orig/src/scr-shot-common.c gpe-scap-1.4/src/scr-shot-common.c +--- gpe-scap-1.4.orig/src/scr-shot-common.c 2009-03-05 12:13:20.000000000 +0100 ++++ gpe-scap-1.4/src/scr-shot-common.c 2012-05-06 10:30:52.299371576 +0200 +@@ -182,12 +182,12 @@ + /* create session and message */ + session = soup_session_sync_new (); + message = soup_message_new ("POST", url); +- soup_message_add_header (message->request_headers, "User-Agent", "gpe-scap/" VERSION); +- soup_message_add_header (message->request_headers, "Accept", ++ soup_message_headers_append (message->request_headers, "User-Agent", "gpe-scap/" VERSION); ++ soup_message_headers_append (message->request_headers, "Accept", + "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"); +-/* soup_message_add_header (message->request_headers, "Accept-Charset", "Accept-Charset=ISO-8859-1,utf-8;q=0.7,*;q=0.7"); +- soup_message_add_header (message->request_headers, "Keep-Alive", "100"); +- soup_message_add_header (message->request_headers, "Connection", "keep-alive"); ++/* soup_message_headers_append (message->request_headers, "Accept-Charset", "Accept-Charset=ISO-8859-1,utf-8;q=0.7,*;q=0.7"); ++ soup_message_headers_append (message->request_headers, "Keep-Alive", "100"); ++ soup_message_headers_append (message->request_headers, "Connection", "keep-alive"); + soup_message_wire add_header (message->request_headers, "Accept-Encoding", "gzip,deflate"); + */ + /* build message body */ +@@ -207,7 +207,7 @@ + memcpy (body + strlen (cmd) + len, tail, strlen (tail)); + + soup_message_set_request (message, "multipart/form-data; boundary="SEP, +- SOUP_BUFFER_SYSTEM_OWNED, body, content_len); ++ SOUP_MEMORY_TAKE, body, content_len); + + soup_session_send_message (session, message); + diff --git a/meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb b/meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb new file mode 100644 index 000000000..3f1e27e87 --- /dev/null +++ b/meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb @@ -0,0 +1,23 @@ +SUMMARY = "A GPE application that allows you to take screenshots" +SECTION = "gpe" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +DEPENDS = "glib-2.0 gtk+ libgpewidget libglade libsoup-2.4" + +PR = "r3" + +SRC_URI[md5sum] = "eaf545561b0ad981c9d01833f30fcf95" +SRC_URI[sha256sum] = "762778421fae7c62d5ec6a9d27986166c0dbbe2ff51fc10bb9b8baff5c367534" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpe autotools pkgconfig + +SRC_URI += "file://0001-Fix-the-ordering-of-LDADD-options-to-fix-a-compilati.patch \ + file://use.libsoup-2.4.patch \ +" + +RREPLACES_${PN} = "gpe-screenshot" + diff --git a/meta-gpe/recipes-graphics/libgpewidget/libgpewidget/glib-2.32.patch b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget/glib-2.32.patch new file mode 100644 index 000000000..f590caa46 --- /dev/null +++ b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget/glib-2.32.patch @@ -0,0 +1,11 @@ +diff -uNr libgpewidget-0.117.orig/gpehelp.c libgpewidget-0.117/gpehelp.c +--- libgpewidget-0.117.orig/gpehelp.c 2006-10-12 12:20:33.000000000 +0200 ++++ libgpewidget-0.117/gpehelp.c 2012-04-30 07:45:57.813293792 +0200 +@@ -33,7 +33,6 @@ + #include + #include + #include +-#include + + + /* helper function definitions*/ diff --git a/meta-gpe/recipes-graphics/libgpewidget/libgpewidget/pkgconfig.patch b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget/pkgconfig.patch new file mode 100644 index 000000000..317e01a9b --- /dev/null +++ b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget/pkgconfig.patch @@ -0,0 +1,11 @@ +--- configure.ac.orig 2006-02-04 17:37:55.000000000 +0100 ++++ configure.ac 2006-02-06 00:56:28.000000000 +0100 +@@ -36,7 +36,7 @@ + ENABLE_CAIRO=$enableval + ], + [ +- PKG_CHECK_EXISTS(cairo, [ENABLE_CAIRO=yes], [ENABLE_CAIRO=no]) ++ PKG_CHECK_MODULES(cairo, [ENABLE_CAIRO=yes], [ENABLE_CAIRO=no]) + ]) + + ENABLE_HILDON=false diff --git a/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb new file mode 100644 index 000000000..df774eed0 --- /dev/null +++ b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." +SECTION = "gpe/libs" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499" + +DEPENDS = "gtk+ cairo libxinerama libxcomposite libxrender" +PR = "r5" + +inherit gpe pkgconfig autotools gtk-doc + +SRC_URI += "file://pkgconfig.patch;striplevel=0 \ + file://glib-2.32.patch \ +" +SRC_URI[md5sum] = "b85a839264a35d0faf9a1a38c486e189" +SRC_URI[sha256sum] = "f96d30c09b0395ea4e146730fd52d9ea303b619bb139051d9f12d3f868a9e18c" + +GPE_TARBALL_SUFFIX = "bz2" + +EXTRA_OECONF = "--enable-cairo" +LDFLAGS += " -L${STAGING_LIBDIR}" + +PACKAGES =+ "${PN}-bin" diff --git a/meta-gpe/recipes-graphics/minilite/minilite/makefile-fix.patch b/meta-gpe/recipes-graphics/minilite/minilite/makefile-fix.patch new file mode 100644 index 000000000..1be6ceaa8 --- /dev/null +++ b/meta-gpe/recipes-graphics/minilite/minilite/makefile-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile.old 2006-01-16 22:51:34.000000000 +0100 ++++ minilite-050/Makefile 2009-05-01 16:36:32.000000000 +0200 +@@ -45,7 +45,7 @@ + + install-program: all + mkdir -p $(DESTDIR)$(PREFIX)/bin +- $(INSTALL) -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ $(INSTALL) $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)$(PREFIX)/share/applications + $(INSTALL) -m 644 $(PACKAGE).desktop $(DESTDIR)$(PREFIX)/share/applications/$(PACKAGE).desktop + mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps/ diff --git a/meta-gpe/recipes-graphics/minilite/minilite_0.50.bb b/meta-gpe/recipes-graphics/minilite/minilite_0.50.bb new file mode 100644 index 000000000..90960a2b0 --- /dev/null +++ b/meta-gpe/recipes-graphics/minilite/minilite_0.50.bb @@ -0,0 +1,16 @@ +SUMMARY = "GPE Screen light control dockapp" +SECTION = "gpe" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://minilite.c;beginline=8;endline=11;md5=fe9332aaecbce9f74ce2bfeb91680ed1" + +DEPENDS = "libgpewidget" + +inherit gpe + +SRC_URI = "${GPE_MIRROR}/${BP}.tar.gz \ + file://makefile-fix.patch" +SRC_URI[md5sum] = "d81cecf269ad7bab0da960e6e7228332" +SRC_URI[sha256sum] = "2b299425203246090a4949e034f1d0efb3ff99cd1591d0e16c57370a530b361e" + +export CVSBUILD="no" 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 000000000..0e498c712 --- /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 000000000..00cba1023 --- /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 000000000..e9ead0f24 --- /dev/null +++ b/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb @@ -0,0 +1,42 @@ +SUMMARY = "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 sqlite3" + +PR = "r1" + +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 000000000..763889a56 --- /dev/null +++ b/meta-gpe/recipes-support/fbreader/fbreader_git.bb @@ -0,0 +1,42 @@ +SUMMARY = "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 sqlite3" +SRCREV = "2cf1ec0e306e1122dbed850bfa005cd59a6168ee" +PV = "0.99.5+gitr${SRCPV}" + +PR = "r1" + +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 000000000..f6e12023b --- /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 v1.2.3-54-g00ecf