Patchwork [01/17] leafpad: Package currently unpackaged files.

login
register
mail settings
Submitter Richard Purdie
Date March 13, 2012, 12:22 a.m.
Message ID <df48742cfc0c46ae33f28900cfd5a7a2f94c326c.1331598077.git.richard.purdie@linuxfoundation.org>
Download mbox | patch
Permalink /patch/23061/
State Accepted
Commit df48742cfc0c46ae33f28900cfd5a7a2f94c326c
Headers show

Comments

Richard Purdie - March 13, 2012, 12:22 a.m.
This resolves the QA warning:

WARNING: For recipe leafpad, the following files/directories were installed but not shipped in any package:
WARNING:   /usr/share/icons
WARNING:   /usr/share/icons/hicolor
WARNING:   /usr/share/icons/hicolor/16x16
WARNING:   /usr/share/icons/hicolor/22x22
WARNING:   /usr/share/icons/hicolor/scalable
WARNING:   /usr/share/icons/hicolor/32x32
WARNING:   /usr/share/icons/hicolor/24x24
WARNING:   /usr/share/icons/hicolor/16x16/apps
WARNING:   /usr/share/icons/hicolor/16x16/apps/leafpad.png
WARNING:   /usr/share/icons/hicolor/22x22/apps
WARNING:   /usr/share/icons/hicolor/22x22/apps/leafpad.png
WARNING:   /usr/share/icons/hicolor/scalable/apps
WARNING:   /usr/share/icons/hicolor/scalable/apps/leafpad.svg
WARNING:   /usr/share/icons/hicolor/32x32/apps
WARNING:   /usr/share/icons/hicolor/32x32/apps/leafpad.png
WARNING:   /usr/share/icons/hicolor/24x24/apps
WARNING:   /usr/share/icons/hicolor/24x24/apps/leafpad.png

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
Koen Kooi - March 13, 2012, 8:07 a.m.
Op 13 mrt. 2012, om 01:22 heeft Richard Purdie het volgende geschreven:

> This resolves the QA warning:
> 
> WARNING: For recipe leafpad, the following files/directories were installed but not shipped in any package:
> WARNING:   /usr/share/icons
> WARNING:   /usr/share/icons/hicolor
> WARNING:   /usr/share/icons/hicolor/16x16
> WARNING:   /usr/share/icons/hicolor/22x22
> WARNING:   /usr/share/icons/hicolor/scalable
> WARNING:   /usr/share/icons/hicolor/32x32
> WARNING:   /usr/share/icons/hicolor/24x24
> WARNING:   /usr/share/icons/hicolor/16x16/apps
> WARNING:   /usr/share/icons/hicolor/16x16/apps/leafpad.png
> WARNING:   /usr/share/icons/hicolor/22x22/apps
> WARNING:   /usr/share/icons/hicolor/22x22/apps/leafpad.png
> WARNING:   /usr/share/icons/hicolor/scalable/apps
> WARNING:   /usr/share/icons/hicolor/scalable/apps/leafpad.svg
> WARNING:   /usr/share/icons/hicolor/32x32/apps
> WARNING:   /usr/share/icons/hicolor/32x32/apps/leafpad.png
> WARNING:   /usr/share/icons/hicolor/24x24/apps
> WARNING:   /usr/share/icons/hicolor/24x24/apps/leafpad.png
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb |    6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> index 68402c5..3d1bc43 100644
> --- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> +++ b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> @@ -1,6 +1,5 @@
> DESCRIPTION = "Simple GTK+ Text Editor"
> HOMEPAGE = "http://tarot.freeshell.org/leafpad/"
> -BUGTRACKER = ""
> 
> LICENSE = "GPLv2 & GPLv2+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> @@ -14,7 +13,7 @@ SRC_URI = "http://savannah.nongnu.org/download/${BPN}/${BPN}-${PV}.tar.gz \
> 
> SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97"
> SRC_URI[sha256sum] = "959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c"
> -PR = "r1"
> +PR = "r2"
> 
> SRC_URI_append_poky += " file://owl-menu.patch;apply=yes "
> 
> @@ -29,3 +28,6 @@ do_install_append () {
> }
> 
> FILES_${PN} += "${datadir}/applications/leafpad.desktop"
> +
> +PACKAGES += "leafpad-stock-icons"
> +FILES_leafpad-stock-icons = "${datadir}/icons/hicolor/"

I strongly suspect that that .desktop will reference leafpad.png as the icon, but I haven't actually verified that. This recipe should probably inherit gtk-icon-cache.

regards,

Koen
Richard Purdie - March 13, 2012, 9:52 a.m.
On Tue, 2012-03-13 at 09:07 +0100, Koen Kooi wrote:
> Op 13 mrt. 2012, om 01:22 heeft Richard Purdie het volgende geschreven:
> 
> > This resolves the QA warning:
> > 
> > WARNING: For recipe leafpad, the following files/directories were installed but not shipped in any package:
> > WARNING:   /usr/share/icons
> > WARNING:   /usr/share/icons/hicolor
> > WARNING:   /usr/share/icons/hicolor/16x16
> > WARNING:   /usr/share/icons/hicolor/22x22
> > WARNING:   /usr/share/icons/hicolor/scalable
> > WARNING:   /usr/share/icons/hicolor/32x32
> > WARNING:   /usr/share/icons/hicolor/24x24
> > WARNING:   /usr/share/icons/hicolor/16x16/apps
> > WARNING:   /usr/share/icons/hicolor/16x16/apps/leafpad.png
> > WARNING:   /usr/share/icons/hicolor/22x22/apps
> > WARNING:   /usr/share/icons/hicolor/22x22/apps/leafpad.png
> > WARNING:   /usr/share/icons/hicolor/scalable/apps
> > WARNING:   /usr/share/icons/hicolor/scalable/apps/leafpad.svg
> > WARNING:   /usr/share/icons/hicolor/32x32/apps
> > WARNING:   /usr/share/icons/hicolor/32x32/apps/leafpad.png
> > WARNING:   /usr/share/icons/hicolor/24x24/apps
> > WARNING:   /usr/share/icons/hicolor/24x24/apps/leafpad.png
> > 
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> > meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb |    6 ++++--
> > 1 files changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> > index 68402c5..3d1bc43 100644
> > --- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> > +++ b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> > @@ -1,6 +1,5 @@
> > DESCRIPTION = "Simple GTK+ Text Editor"
> > HOMEPAGE = "http://tarot.freeshell.org/leafpad/"
> > -BUGTRACKER = ""
> > 
> > LICENSE = "GPLv2 & GPLv2+"
> > LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> > @@ -14,7 +13,7 @@ SRC_URI = "http://savannah.nongnu.org/download/${BPN}/${BPN}-${PV}.tar.gz \
> > 
> > SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97"
> > SRC_URI[sha256sum] = "959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c"
> > -PR = "r1"
> > +PR = "r2"
> > 
> > SRC_URI_append_poky += " file://owl-menu.patch;apply=yes "
> > 
> > @@ -29,3 +28,6 @@ do_install_append () {
> > }
> > 
> > FILES_${PN} += "${datadir}/applications/leafpad.desktop"
> > +
> > +PACKAGES += "leafpad-stock-icons"
> > +FILES_leafpad-stock-icons = "${datadir}/icons/hicolor/"
> 
> I strongly suspect that that .desktop will reference leafpad.png as
> the icon, but I haven't actually verified that.

I can confirm it does not (it references accessories-text-editor).

>  This recipe should probably inherit gtk-icon-cache.

Probably although given the above it becomes less of an issue.

Cheers,

Richard
Martin Jansa - March 13, 2012, 9:54 a.m.
On Tue, Mar 13, 2012 at 09:52:14AM +0000, Richard Purdie wrote:
> On Tue, 2012-03-13 at 09:07 +0100, Koen Kooi wrote:
> > Op 13 mrt. 2012, om 01:22 heeft Richard Purdie het volgende geschreven:
> > 
> > > This resolves the QA warning:
> > > 
> > > WARNING: For recipe leafpad, the following files/directories were installed but not shipped in any package:
> > > WARNING:   /usr/share/icons
> > > WARNING:   /usr/share/icons/hicolor
> > > WARNING:   /usr/share/icons/hicolor/16x16
> > > WARNING:   /usr/share/icons/hicolor/22x22
> > > WARNING:   /usr/share/icons/hicolor/scalable
> > > WARNING:   /usr/share/icons/hicolor/32x32
> > > WARNING:   /usr/share/icons/hicolor/24x24
> > > WARNING:   /usr/share/icons/hicolor/16x16/apps
> > > WARNING:   /usr/share/icons/hicolor/16x16/apps/leafpad.png
> > > WARNING:   /usr/share/icons/hicolor/22x22/apps
> > > WARNING:   /usr/share/icons/hicolor/22x22/apps/leafpad.png
> > > WARNING:   /usr/share/icons/hicolor/scalable/apps
> > > WARNING:   /usr/share/icons/hicolor/scalable/apps/leafpad.svg
> > > WARNING:   /usr/share/icons/hicolor/32x32/apps
> > > WARNING:   /usr/share/icons/hicolor/32x32/apps/leafpad.png
> > > WARNING:   /usr/share/icons/hicolor/24x24/apps
> > > WARNING:   /usr/share/icons/hicolor/24x24/apps/leafpad.png
> > > 
> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > > ---
> > > meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb |    6 ++++--
> > > 1 files changed, 4 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> > > index 68402c5..3d1bc43 100644
> > > --- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> > > +++ b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> > > @@ -1,6 +1,5 @@
> > > DESCRIPTION = "Simple GTK+ Text Editor"
> > > HOMEPAGE = "http://tarot.freeshell.org/leafpad/"
> > > -BUGTRACKER = ""
> > > 
> > > LICENSE = "GPLv2 & GPLv2+"
> > > LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> > > @@ -14,7 +13,7 @@ SRC_URI = "http://savannah.nongnu.org/download/${BPN}/${BPN}-${PV}.tar.gz \
> > > 
> > > SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97"
> > > SRC_URI[sha256sum] = "959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c"
> > > -PR = "r1"
> > > +PR = "r2"
> > > 
> > > SRC_URI_append_poky += " file://owl-menu.patch;apply=yes "

^^ this should be probably dropped too (at least apply=yes) or applied for everybody

> > > 
> > > @@ -29,3 +28,6 @@ do_install_append () {
> > > }
> > > 
> > > FILES_${PN} += "${datadir}/applications/leafpad.desktop"
> > > +
> > > +PACKAGES += "leafpad-stock-icons"
> > > +FILES_leafpad-stock-icons = "${datadir}/icons/hicolor/"
> > 
> > I strongly suspect that that .desktop will reference leafpad.png as
> > the icon, but I haven't actually verified that.
> 
> I can confirm it does not (it references accessories-text-editor).
> 
> >  This recipe should probably inherit gtk-icon-cache.
> 
> Probably although given the above it becomes less of an issue.
> 
> Cheers,
> 
> Richard
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Richard Purdie - March 13, 2012, 5:49 p.m.
On Tue, 2012-03-13 at 10:54 +0100, Martin Jansa wrote:
> On Tue, Mar 13, 2012 at 09:52:14AM +0000, Richard Purdie wrote:
> > On Tue, 2012-03-13 at 09:07 +0100, Koen Kooi wrote:
> > > Op 13 mrt. 2012, om 01:22 heeft Richard Purdie het volgende geschreven:
> > > > meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb |    6 ++++--
> > > > 1 files changed, 4 insertions(+), 2 deletions(-)
> > > > 
> > > > diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> > > > index 68402c5..3d1bc43 100644
> > > > --- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> > > > +++ b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> > > > @@ -1,6 +1,5 @@
> > > > DESCRIPTION = "Simple GTK+ Text Editor"
> > > > HOMEPAGE = "http://tarot.freeshell.org/leafpad/"
> > > > -BUGTRACKER = ""
> > > > 
> > > > LICENSE = "GPLv2 & GPLv2+"
> > > > LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> > > > @@ -14,7 +13,7 @@ SRC_URI = "http://savannah.nongnu.org/download/${BPN}/${BPN}-${PV}.tar.gz \
> > > > 
> > > > SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97"
> > > > SRC_URI[sha256sum] = "959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c"
> > > > -PR = "r1"
> > > > +PR = "r2"
> > > > 
> > > > SRC_URI_append_poky += " file://owl-menu.patch;apply=yes "
> 
> ^^ this should be probably dropped too (at least apply=yes) or applied for everybody

I agree we need to resolve those. Applying them unequivocally would be a
bad idea though and we talked about a sato override. That is something
for a different patch and I wish there were more hours in the day...

Cheers,

Richard

Patch

diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
index 68402c5..3d1bc43 100644
--- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
+++ b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
@@ -1,6 +1,5 @@ 
 DESCRIPTION = "Simple GTK+ Text Editor"
 HOMEPAGE = "http://tarot.freeshell.org/leafpad/"
-BUGTRACKER = ""
 
 LICENSE = "GPLv2 & GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
@@ -14,7 +13,7 @@  SRC_URI = "http://savannah.nongnu.org/download/${BPN}/${BPN}-${PV}.tar.gz \
 
 SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97"
 SRC_URI[sha256sum] = "959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c"
-PR = "r1"
+PR = "r2"
 
 SRC_URI_append_poky += " file://owl-menu.patch;apply=yes "
 
@@ -29,3 +28,6 @@  do_install_append () {
 }
 
 FILES_${PN} += "${datadir}/applications/leafpad.desktop"
+
+PACKAGES += "leafpad-stock-icons"
+FILES_leafpad-stock-icons = "${datadir}/icons/hicolor/"