summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2012-11-14 13:34:27 +0100
committerKoen Kooi <koen@dominion.thruhere.net>2012-12-04 11:25:35 +0100
commit31cec2ac2ea0533d0734c7d2214ea3d2aa8c13e9 (patch)
tree003d872906fe97c01e4dbac1ec0e36940a40fb34 /meta-oe/recipes-support
parentde7c5162f83bc4e9eb6ecb9d8e8717049bb8df00 (diff)
downloadmeta-openembedded-31cec2ac2ea0533d0734c7d2214ea3d2aa8c13e9.tar.gz
fbreader: move to meta-gpe due to libgpewidget dependency
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r--meta-oe/recipes-support/fbreader/fbreader-0.12.10/Makefile.patch22
-rw-r--r--meta-oe/recipes-support/fbreader/fbreader-0.12.10/gcc45.patch20
-rw-r--r--meta-oe/recipes-support/fbreader/fbreader_0.12.10.bb40
-rw-r--r--meta-oe/recipes-support/fbreader/fbreader_git.bb41
-rw-r--r--meta-oe/recipes-support/fbreader/files/0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch40
5 files changed, 0 insertions, 163 deletions
diff --git a/meta-oe/recipes-support/fbreader/fbreader-0.12.10/Makefile.patch b/meta-oe/recipes-support/fbreader/fbreader-0.12.10/Makefile.patch
deleted file mode 100644
index 0e498c712..000000000
--- a/meta-oe/recipes-support/fbreader/fbreader-0.12.10/Makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1diff -uri fbreader-0.12.1.orig/fbreader/Makefile fbreader-0.12.1/fbreader/Makefile
2--- fbreader-0.12.1.orig/fbreader/Makefile 2009-12-13 09:03:11.000000000 +0100
3+++ fbreader-0.12.1/fbreader/Makefile 2009-12-14 17:18:47.548638783 +0100
4@@ -37,7 +37,6 @@
5 @install $(TARGET) $(DESTDIR)$(BINDIR)/FBReader
6 @install -d $(FBSHAREDIR)
7 @install -d $(FBSHAREDIR)/help
8- @./scripts/install_help.sh $(VARIANT) $(FBSHAREDIR)/help
9 @install -d $(FBSHAREDIR)/network
10 @install -m 0644 $(wildcard data/network/*.xml) $(FBSHAREDIR)/network
11 @install -d $(FBSHAREDIR)/network/certificates
12@@ -58,8 +57,8 @@
13 @install -d $(FBSHAREDIR)/resources
14 @install -m 0644 $(wildcard data/resources/*.xml) $(FBSHAREDIR)/resources
15 @install -d $(DESTDIR)$(APPIMAGEDIR_REAL)
16- @install -m 0644 $(wildcard data/icons/toolbar/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
17- @install -m 0644 $(wildcard data/icons/filetree/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
18+ @install -m 0644 $(wildcard data/icons/toolbar/$(TARGET_ARCH)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
19+ @install -m 0644 $(wildcard data/icons/filetree/$(TARGET_ARCH)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
20 @install -m 0644 $(wildcard data/icons/booktree/new/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
21 @make -C $(TARGET_ARCH) RESOLUTION=$(RESOLUTION) install
22
diff --git a/meta-oe/recipes-support/fbreader/fbreader-0.12.10/gcc45.patch b/meta-oe/recipes-support/fbreader/fbreader-0.12.10/gcc45.patch
deleted file mode 100644
index 00cba1023..000000000
--- a/meta-oe/recipes-support/fbreader/fbreader-0.12.10/gcc45.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1 Fix compilation with gcc 4.5
2
3 [FBreader Ticket #340] -- http://old.fbreader.org/mantis/view.php?id=340
4
5 Without that patch we have:
6 Compiling Library.o ...Library.cpp:42:1: error: 'Library::Library' names the constructor, not the type
7
8 Upstream-Status: Accepted [Fixed in Version 0.14.0]
9
10--- fbreader-0.12.10-orig/fbreader/src/library/Library.cpp 2010-04-01 15:14:24.000000000 +0200
11+++ fbreader-0.12.10/fbreader/src/library/Library.cpp 2010-04-13 13:34:06.000000000 +0200
12@@ -39,7 +39,7 @@
13 shared_ptr<Library> Library::ourInstance;
14 const size_t Library::MaxRecentListSize = 10;
15
16-Library::Library &Library::Instance() {
17+Library &Library::Instance() {
18 if (ourInstance.isNull()) {
19 ourInstance = new Library();
20 }
diff --git a/meta-oe/recipes-support/fbreader/fbreader_0.12.10.bb b/meta-oe/recipes-support/fbreader/fbreader_0.12.10.bb
deleted file mode 100644
index 478684664..000000000
--- a/meta-oe/recipes-support/fbreader/fbreader_0.12.10.bb
+++ /dev/null
@@ -1,40 +0,0 @@
1DESCRIPTION = "FBreader is an ebook reader"
2HOMEPAGE = "http://www.fbreader.org"
3SECTION = "x11/utils"
4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://fbreader/LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
6DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libfribidi curl"
7
8SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \
9file://Makefile.patch \
10file://gcc45.patch"
11
12# Set the defaults
13READER_RESOLUTION ?= "1024x600"
14READER_ARCH ?= "desktop"
15READER_UI ?= "gtk"
16READER_STATUS ?= "release"
17
18FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary ${libdir}/zlibrary"
19FILES_${PN}-dbg += "${libdir}/zlibrary/ui/.debug/"
20
21CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=${prefix}"
22EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' LDFLAGS='${LDFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'"
23
24inherit pkgconfig
25
26do_configure() {
27 cd ${WORKDIR}/${PN}-${PV}
28 mv makefiles/target.mk makefiles/target.mk.orig
29
30 echo "TARGET_ARCH = ${READER_ARCH}" > makefiles/target.mk
31 echo "UI_TYPE = ${READER_UI}" >> makefiles/target.mk
32 echo "TARGET_STATUS = ${READER_STATUS}" >> makefiles/target.mk
33}
34
35do_install() {
36 oe_runmake install DESTDIR=${D} RESOLUTION=${READER_RESOLUTION}
37}
38
39SRC_URI[md5sum] = "da9ec4721efdb0ec0aaa182bff16ad82"
40SRC_URI[sha256sum] = "328aec454db80e225aa0b5c31adef74bf62a14357482947e87e9731686b3c624"
diff --git a/meta-oe/recipes-support/fbreader/fbreader_git.bb b/meta-oe/recipes-support/fbreader/fbreader_git.bb
deleted file mode 100644
index 937bdc828..000000000
--- a/meta-oe/recipes-support/fbreader/fbreader_git.bb
+++ /dev/null
@@ -1,41 +0,0 @@
1DESCRIPTION = "FBreader is an ebook reader"
2HOMEPAGE = "http://www.fbreader.org"
3SECTION = "x11/utils"
4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://fbreader/LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
6DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libfribidi curl"
7SRCREV = "2cf1ec0e306e1122dbed850bfa005cd59a6168ee"
8PV = "0.99.5+gitr${SRCPV}"
9PR = "r0"
10
11DEFAULT_PREFERENCE = "-1"
12
13SRC_URI = "git://github.com/geometer/FBReader.git;protocol=http;branch=master \
14 file://0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch"
15
16# Set the defaults
17READER_RESOLUTION ?= "1024x600"
18READER_ARCH ?= "desktop"
19READER_UI ?= "gtk"
20READER_STATUS ?= "release"
21
22FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary ${libdir}/zlibrary"
23FILES_${PN}-dbg += "${libdir}/zlibrary/ui/.debug/"
24
25CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=${prefix}"
26EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'"
27inherit pkgconfig
28
29S = "${WORKDIR}/git"
30
31do_configure() {
32 cd "${S}"
33
34 echo "TARGET_ARCH = ${READER_ARCH}" > makefiles/target.mk
35 echo "UI_TYPE = ${READER_UI}" >> makefiles/target.mk
36 echo "TARGET_STATUS = ${READER_STATUS}" >> makefiles/target.mk
37}
38
39do_install() {
40 oe_runmake install DESTDIR=${D} RESOLUTION=${READER_RESOLUTION}
41}
diff --git a/meta-oe/recipes-support/fbreader/files/0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch b/meta-oe/recipes-support/fbreader/files/0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch
deleted file mode 100644
index f6e12023b..000000000
--- a/meta-oe/recipes-support/fbreader/files/0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From da4170b61bb41eff0af170d1d77bfd90f9ebe5dd Mon Sep 17 00:00:00 2001
2From: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
3Date: Fri, 20 Jan 2012 11:34:42 +0100
4Subject: [PATCH] Fix installation of the icons when RESOLUTION is set
5
6When resolution is set, the following code(in fbreader/Makefile) is executed:
7 VARIANT = $(TARGET_ARCH)
8 ifneq "$(RESOLUTION)" ""
9 VARIANT = $(TARGET_ARCH)_$(RESOLUTION)
10 endif
11
12This fix is based on a patch from the openembedded project,
13 which can be found here:
14 http://cgit.openembedded.org/openembedded/tree/recipes/fbreader/fbreader-0.12.1/Makefile.patch
15
16Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
17---
18 Submitted trough github to git://github.com/geometer/FBReader.git as a pull request
19
20 fbreader/Makefile | 4 ++--
21 1 files changed, 2 insertions(+), 2 deletions(-)
22
23diff --git a/fbreader/Makefile b/fbreader/Makefile
24index bfa9242..03e6cc3 100644
25--- a/fbreader/Makefile
26+++ b/fbreader/Makefile
27@@ -60,8 +60,8 @@ do_install:
28 @install -d $(FBSHAREDIR)/resources
29 @install -m 0644 $(wildcard data/resources/*.xml) $(FBSHAREDIR)/resources
30 @install -d $(DESTDIR)$(APPIMAGEDIR_REAL)
31- @install -m 0644 $(wildcard data/icons/toolbar/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
32- @install -m 0644 $(wildcard data/icons/filetree/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
33+ @install -m 0644 $(wildcard data/icons/toolbar/$(TARGET_ARCH)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
34+ @install -m 0644 $(wildcard data/icons/filetree/$(TARGET_ARCH)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
35 @install -m 0644 $(wildcard data/icons/booktree/new/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
36 @make -C $(TARGET_ARCH) RESOLUTION=$(RESOLUTION) install
37
38--
391.7.4.1
40
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 19:26:18 +0000