diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-07-30 23:52:49 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-07-31 00:14:55 +0200 |
commit | 4339668ff27c839af1a1e4cfa5a2d034afe204f2 (patch) | |
tree | d2a48dca9a2a46a944e5091bf9b157cb2dc15e44 /meta-oe/recipes-support/fbreader/files/0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch | |
parent | f2afdd2b988af8d0b4d822c7c03529b725fe24ba (diff) | |
download | meta-openembedded-contrib-4339668ff27c839af1a1e4cfa5a2d034afe204f2.tar.gz |
fbreader, fltk, gpm, iksemel, joe, links, ode, openldap, opensync, xchat: import from meta-smartphone
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/fbreader/files/0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch')
-rw-r--r-- | meta-oe/recipes-support/fbreader/files/0001-Fix-installation-of-the-icons-when-RESOLUTION-is-set.patch | 40 |
1 files changed, 40 insertions, 0 deletions
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 new file mode 100644 index 0000000000..f6e12023b1 --- /dev/null +++ b/meta-oe/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 <GNUtoo@no-log.org> +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 <GNUtoo@no-log.org> +--- + 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 + |