diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-30 00:21:37 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-30 00:21:37 +0000 |
| commit | d147900a4c35dd78cebf1349e7912554a2a5f59f (patch) | |
| tree | 130fe970f482404777e0e42af79cb3211fdcfa86 | |
| parent | ea748f84046d22252abe8a5a6d160a73bcb2e92f (diff) | |
| parent | 86508c7c6b59825f8a82361794beee0eac46dc6e (diff) | |
merge of 45de09dab54a555a9dcd180a4903909773cf34d2
and e4d8da41e5409080382f7a87c16b20bcc29516e3
| -rw-r--r-- | classes/package.bbclass | 7 | ||||
| -rw-r--r-- | packages/evince/evince-0.5.0/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/evince/evince-0.5.0/more-no-doc.patch | 16 | ||||
| -rw-r--r-- | packages/evince/evince_0.5.0.bb | 14 |
4 files changed, 36 insertions, 1 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass index db479d5847..dbb65cdf06 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -166,7 +166,12 @@ python populate_packages () { dpath = os.path.dirname(fpath) bb.mkdirhier(dpath) if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, 1) != '1') and not os.path.islink(file) and isexec(file): - stripfunc += "${STRIP} %s || : ;\n" % fpath + if bb.data.getVar('IGNORE_STRIP_ERRORS', d, 1) != '1': + # bail out on errors + stripfunc += "file %s | grep -q 'not stripped' && ${STRIP} %s || return 1;\n" % (fpath, fpath) + else: + # old behaviour: ignore errors + stripfunc += "${STRIP} %s || : ;\n" % fpath ret = bb.movefile(file,fpath) if ret is None or ret == 0: raise bb.build.FuncFailed("File population failed") diff --git a/packages/evince/evince-0.5.0/.mtn2git_empty b/packages/evince/evince-0.5.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/evince/evince-0.5.0/.mtn2git_empty diff --git a/packages/evince/evince-0.5.0/more-no-doc.patch b/packages/evince/evince-0.5.0/more-no-doc.patch new file mode 100644 index 0000000000..ed8b6c3032 --- /dev/null +++ b/packages/evince/evince-0.5.0/more-no-doc.patch @@ -0,0 +1,16 @@ +--- evince-0.5.0/Makefile.am.orig 2006-01-29 00:32:34.000000000 +0000 ++++ evince-0.5.0/Makefile.am 2006-01-29 00:32:45.000000000 +0000 +@@ -1,4 +1,4 @@ +-SUBDIRS = cut-n-paste po help data ++SUBDIRS = cut-n-paste po data + + # Backends + +--- evince-0.5.0/help/Makefile.am.orig 2006-01-29 00:33:03.000000000 +0000 ++++ evince-0.5.0/help/Makefile.am 2006-01-29 00:33:16.000000000 +0000 +@@ -1,4 +1,4 @@ +-include $(top_srcdir)/gnome-doc-utils.make ++#include $(top_srcdir)/gnome-doc-utils.make + dist-hook: doc-dist-hook + + DOC_MODULE = evince diff --git a/packages/evince/evince_0.5.0.bb b/packages/evince/evince_0.5.0.bb new file mode 100644 index 0000000000..a772bb2de5 --- /dev/null +++ b/packages/evince/evince_0.5.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Evince is simply a document viewer" +LICENSE = "GPL" +DEPENDS = "tiff espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" +RDEPENDS = "espgs gconf" +RRECOMMENDS = "gnome-vfs-plugin-file" +PR = "r0" + +inherit gnome pkgconfig + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.5/${PN}-${PV}.tar.bz2 \ + file://more-no-doc.patch;patch=1" + +EXTRA_OECONF = "--disable-tiff" + |