meta-gpe: remove this now pretty empty layer
PATCH 1/1 meta-gpe: remove this now pretty empty layer
Signed-off-by Martin Jansa <[email protected]>
--- meta-gpe/README | 17 --------- 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 ---------------------- .../libgpewidget/libgpewidget/glib-2.32.patch | 11 ------ .../libgpewidget/libgpewidget/pkgconfig.patch | 11 ------ .../minilite/minilite/makefile-fix.patch | 11 ------ .../fbreader/fbreader-0.12.10/Makefile.patch | 22 ------------ .../fbreader-0.12.10/fix-cflags-fribidi.patch | 11 ------ .../fbreader-0.12.10/fix-return-code-gcc6.patch | 11 ------ .../fbreader/fbreader-0.12.10/gcc45.patch | 20 ----------- ...ation-of-the-icons-when-RESOLUTION-is-set.patch | 40 --------------------- 12 files changed, 239 deletions(-) delete mode 100644 meta-gpe/README delete mode 100644 meta-gpe/conf/layer.conf delete mode 100644 meta-gpe/recipes-graphics/gpe-scap/gpe-scap/0001-Fix-the-ordering-of-LDADD-options-to-fix-a-compilati.patch delete mode 100644 meta-gpe/recipes-graphics/gpe-scap/gpe-scap/use.libsoup-2.4.patch delete mode 100644 meta-gpe/recipes-graphics/libgpewidget/libgpewidget/glib-2.32.patch delete mode 100644 meta-gpe/recipes-graphics/libgpewidget/libgpewidget/pkgconfig.patch delete mode 100644 meta-gpe/recipes-graphics/minilite/minilite/makefile-fix.patch 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/fix-cflags-fribidi.patch delete mode 100644 meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-return-code-gcc6.patch delete mode 100644 meta-gpe/recipes-support/fbreader/fbreader-0.12.10/gcc45.patch delete mode 100644 meta-gpe/recipes-support/fbreader/files/0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch
meta-gpe/README deleted +0 -17
@@ -1,17 +0,0 @@ -This layer depends on: - -URI: git://github.com/openembedded/oe-core.git -branch: master -revision: HEAD - -URI: git://github.com/openembedded/meta-oe.git -branch: master -revision: HEAD - -Send pull requests to [email protected] with '[meta-gpe]' in the subject' - -When sending single patches, please using something like: -'git send-email -M -1 --to [email protected] --subject-prefix=meta-gpe][PATCH' - -Interim layer maintainers: Koen Kooi <[email protected]> - Martin Jansa <[email protected]>
meta-gpe/conf/layer.conf deleted +0 -15
@@ -1,15 +0,0 @@ -# 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"
meta-gpe/recipes-graphics/gpe-scap/gpe-scap/0001-Fix-the-ordering-of-LDADD-options-to-fix-a-compilati.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From c551dece6768f67b74b508e9c0133320205ef2df Mon Sep 17 00:00:00 2001 -From: Koen Kooi <[email protected]> -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 <[email protected]> ---- - 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 -
meta-gpe/recipes-graphics/gpe-scap/gpe-scap/use.libsoup-2.4.patch deleted +0 -42
42 lines not on this page · raw message
meta-gpe/recipes-graphics/libgpewidget/libgpewidget/glib-2.32.patch deleted +0 -11
@@ -1,11 +0,0 @@ -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 <gdk-pixbuf/gdk-pixbuf.h> - #include <gdk/gdk.h> - #include <glib.h> --#include <glib/gkeyfile.h> - - - /* helper function definitions*/
meta-gpe/recipes-graphics/libgpewidget/libgpewidget/pkgconfig.patch deleted +0 -11
@@ -1,11 +0,0 @@ ---- 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
meta-gpe/recipes-graphics/minilite/minilite/makefile-fix.patch deleted +0 -11
@@ -1,11 +0,0 @@ ---- /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/
meta-gpe/recipes-support/fbreader/fbreader-0.12.10/Makefile.patch deleted +0 -22
@@ -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 -
meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-cflags-fribidi.patch deleted +0 -11
@@ -1,11 +0,0 @@ ---- fbreader-0.12.10/makefiles/config.mk.orig 2016-05-03 11:11:07.259734561 -0400 -+++ fbreader-0.12.10/makefiles/config.mk 2016-05-03 11:11:37.447735786 -0400 -@@ -38,7 +38,7 @@ - LDFLAGS += -pg - endif - --ZINCLUDE = -I $(ROOTDIR)/zlibrary/core/include -I $(ROOTDIR)/zlibrary/text/include -+ZINCLUDE = $(shell pkg-config --cflags fribidi) -I $(ROOTDIR)/zlibrary/core/include -I $(ROOTDIR)/zlibrary/text/include - - ZLSHARED ?= yes -
meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-return-code-gcc6.patch deleted +0 -11
@@ -1,11 +0,0 @@ ---- fbreader-0.12.10/fbreader/src/database/booksdb/BooksDB.cpp.orig 2016-06-08 14:54:04.206196501 -0400 -+++ fbreader-0.12.10/fbreader/src/database/booksdb/BooksDB.cpp 2016-06-08 14:54:17.686196322 -0400 -@@ -145,7 +145,7 @@ - - myFindFileId->setFileName(fileName); - if (!myFindFileId->run()) { -- return false; -+ return 0; - } - ((DBIntValue&)*myLoadBook->parameter("@file_id").value()) = myFindFileId->fileId(); - shared_ptr<DBDataReader> reader = myLoadBook->executeReader();
meta-gpe/recipes-support/fbreader/fbreader-0.12.10/gcc45.patch deleted +0 -20
@@ -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(); - }
meta-gpe/recipes-support/fbreader/files/0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From da4170b61bb41eff0af170d1d77bfd90f9ebe5dd Mon Sep 17 00:00:00 2001 -From: Denis 'GNUtoo' Carikli <[email protected]> -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 <[email protected]> ---- - 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 -
Signature · 1 line
2.14.1