Skip to contentSkip to conversation

gdk-pixbuf: fix the postinstall script failure when no icon is installed

PATCH Applied [email protected] 3 participants 4 messages Aug 9, 2012 – Aug 16, 2012

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover gdk-pixbuf: fix the postinstall script failure when no icon is installed

From: Jackie Huang <[email protected]>

If gtk+ is added to core-image-minimal, postinstall script failed on boot:

Running postinst /etc/rpm-postinsts/104...
gtk-update-icon-cache: No theme index file.
ERROR: postinst /etc/rpm-postinsts/104 failed.

This patch fixed the postinstall script to check for the icon file first and not run the gtk-update-icon-cache if no icon is installed.

[YOCTO #2905]

Signed-off-by Jackie Huang <[email protected]>

---
The following changes since commit 1e873271362b770381903098d46c4aec164d81de:

automake: Fix version reference in path substitutions (2012-08-07 23:35:54 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib jhuang0/bug2905_gdk_0809
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/bug2905_gdk_0809

Jackie Huang (1):
gdk-pixbuf: fix the postinstall script failure when no icon is
installed

 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.4
author
#1 lore raw

PATCH 1/1 gdk-pixbuf: fix the postinstall script failure when no icon is installed

From: Jackie Huang <[email protected]>

If gtk+ is added to core-image-minimal, postinstall script failed on boot:

Running postinst /etc/rpm-postinsts/104...
gtk-update-icon-cache: No theme index file.
ERROR: postinst /etc/rpm-postinsts/104 failed.

This patch fixed the postinstall script to check for the icon file first and not run the gtk-update-icon-cache if no icon is installed.

[YOCTO #2905]

Signed-off-by Jackie Huang <[email protected]>
---
 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb +8 -2
index 484fb12..159bdae 100644
@@ -21,7 +21,7 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${
 SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412"
 SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1"
 
-PR = "r4"
+PR = "r5"
 
 inherit autotools pkgconfig gettext
 

@@ -62,7 +62,13 @@ fi
 
 GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders gdk-pixbuf-query-loaders --update-cache
 
-test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache  -q ${datadir}/icons/hicolor
+if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then
+    for icondir in /usr/share/icons/*; do
+        if [ -d ${icondir} ]; then
+            gtk-update-icon-cache -q ${icondir}
+        fi
+    done
+fi
 }
 
 PACKAGES_DYNAMIC += "gdk-pixbuf-loader-*"
Signature · 1 line
1.7.4
#2 lore raw
Quoted 48 lines · On Thu, Aug 9, 2012 at 4:30 AM, <[email protected]> wrote:

From: Jackie Huang <[email protected]>

If gtk+ is added to core-image-minimal, postinstall script failed on boot:

Running postinst /etc/rpm-postinsts/104...
gtk-update-icon-cache: No theme index file.
ERROR: postinst /etc/rpm-postinsts/104 failed.

This patch fixed the postinstall script to check for the icon file first and not run the gtk-update-icon-cache if no icon is installed.

[YOCTO #2905]

Signed-off-by Jackie Huang <[email protected]>
---
 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb +8 -3
index 484fb12..159bdae 100644
@@ -21,7 +21,7 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${
 SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412"
 SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1"
 
-PR = "r4"
+PR = "r5"
 
 inherit autotools pkgconfig gettext
 

@@ -62,7 +62,13 @@ fi
 
 GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders gdk-pixbuf-query-loaders --update-cache
 
-test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache  -q ${datadir}/icons/hicolor
+if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then
+    for icondir in /usr/share/icons/*; do
+        if [ -d ${icondir} ]; then
+            gtk-update-icon-cache -q ${icondir}
+        fi
+    done
+fi
 }
 
 PACKAGES_DYNAMIC += "gdk-pixbuf-loader-*"
--
Quoted 2 lines

1.7.4

Maybe I missed something: Wouldn't it be better to remove inherit gtk-update-icon-cache for those recipes failing?

Andreas

Applied
#3 lore raw
In reply to [email protected]
Quoted 24 lines · On 08/08/2012 07:30 PM, [email protected] wrote:

From: Jackie Huang <[email protected]>

If gtk+ is added to core-image-minimal, postinstall script failed on boot:

Running postinst /etc/rpm-postinsts/104...
gtk-update-icon-cache: No theme index file.
ERROR: postinst /etc/rpm-postinsts/104 failed.

This patch fixed the postinstall script to check for the icon file first and not run the gtk-update-icon-cache if no icon is installed.

[YOCTO #2905]

Signed-off-by Jackie Huang <[email protected]>

---
The following changes since commit 1e873271362b770381903098d46c4aec164d81de:

automake: Fix version reference in path substitutions (2012-08-07 23:35:54 +0100)

are available in the git repository at:

   git://git.pokylinux.org/poky-contrib jhuang0/bug2905_gdk_0809
   http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/bug2905_gdk_0809
Quoted 7 lines

Jackie Huang (1):
gdk-pixbuf: fix the postinstall script failure when no icon is
installed

  meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb |   10 ++++++++--
  1 files changed, 8 insertions(+), 2 deletions(-)

Merged into OE-Core

Thanks
Sau!