Patchwork [meta-gpe] fbreader: remove old, non-building version

login
register
mail settings
Submitter Trevor Woerner
Date April 9, 2014, 6:26 p.m.
Message ID <1397067991-1308-2-git-send-email-trevor.woerner@linaro.org>
Download mbox | patch
Permalink /patch/70403/
State Accepted, archived
Headers show

Comments

Trevor Woerner - April 9, 2014, 6:26 p.m.
The download for fbreader-0.12.10 doesn't exist at the location provided by
this recipe. Most of the downloads appear to have moved to
fbreader.org/files/desktop, but trying to retrieve version 0.12.10 from that
location fails too.

There is a _git version of this recipe which builds just fine.

Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
---
 .../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 ----------------------
 3 files changed, 84 deletions(-)
 delete mode 100644 meta-gpe/recipes-support/fbreader/fbreader-0.12.10/Makefile.patch
 delete mode 100644 meta-gpe/recipes-support/fbreader/fbreader-0.12.10/gcc45.patch
 delete mode 100644 meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb
Martin Jansa - April 20, 2014, 11:38 a.m.
On Wed, Apr 09, 2014 at 02:26:31PM -0400, Trevor Woerner wrote:
> The download for fbreader-0.12.10 doesn't exist at the location provided by
> this recipe. Most of the downloads appear to have moved to
> fbreader.org/files/desktop, but trying to retrieve version 0.12.10 from that
> location fails too.

The old one was building fine for me (tarball from PREMIRROR)

_git version has few QA issues:
log.world.20140418_190059.log/bitbake.log:WARNING: QA Issue: File '/usr/lib/libzlcore.so.0.14.0' from fbreader was already stripped, this will prevent future debugging!
log.world.20140418_190059.log/bitbake.log:WARNING: QA Issue: File '/usr/lib/libzltext.so.0.14.0' from fbreader was already stripped, this will prevent future debugging!
log.world.20140418_190059.log/bitbake.log:WARNING: QA Issue: File '/usr/lib/zlibrary/ui/zlui-gtk.so' from fbreader was already stripped, this will prevent future debugging!
log.world.20140418_190059.log/bitbake.log:WARNING: QA Issue: File '/usr/bin/FBReader' from fbreader was already stripped, this will prevent future debugging!

not sure if the old one had the same QA issues (I don't think so) so we should
resolve this before changing the version.

> 
> There is a _git version of this recipe which builds just fine.
> 
> Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
> ---
>  .../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 ----------------------
>  3 files changed, 84 deletions(-)
>  delete mode 100644 meta-gpe/recipes-support/fbreader/fbreader-0.12.10/Makefile.patch
>  delete mode 100644 meta-gpe/recipes-support/fbreader/fbreader-0.12.10/gcc45.patch
>  delete mode 100644 meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb
> 
> 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
> deleted file mode 100644
> index 0e498c7..0000000
> --- a/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/Makefile.patch
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -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
> deleted file mode 100644
> index 00cba10..0000000
> --- a/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/gcc45.patch
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -  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> 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
> deleted file mode 100644
> index e9ead0f..0000000
> --- a/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -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"
> -- 
> 1.9.0
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

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
deleted file mode 100644
index 0e498c7..0000000
--- a/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/Makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@ 
-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
deleted file mode 100644
index 00cba10..0000000
--- a/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/gcc45.patch
+++ /dev/null
@@ -1,20 +0,0 @@ 
-  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> 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
deleted file mode 100644
index e9ead0f..0000000
--- a/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb
+++ /dev/null
@@ -1,42 +0,0 @@ 
-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"