Commit Graph

9 Commits

Author SHA1 Message Date
Jackie Huang 883c1e97ec gdk-pixbuf: fix the postinstall script failure when no icon is installed
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]

(From OE-Core rev: 1d4fbe4761d3d97e3c4b6e894719ee41b21559b2)

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-15 14:26:39 +01:00
Wenzong Fan e51d01a6b7 gdk-pixbuf: fix parallel install issue
This patch fixes parallel install issue that lib libpixbufloader-png.la
depends on libgdk_pixbuf-2.0.la which will be regenerated during insta-
llation, if libgdk_pixbuf-2.0.la is regenerating and at the same time
libpixbufloader-png.la links it, the error will happen.

Error message is:
* usr/bin/ld: cannot find -lgdk_pixbuf-2.0
* collect2: ld returned 1 exit status

Make an explicit dependency to the libs install targets would fix this
issue.

[YOCTO #2883]

(From OE-Core rev: e6fb5a25a098bd639be4b176f58e552404232c93)

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-06 15:18:45 +01:00
Richard Purdie bfd279de32 Convert tab indentation in python functions into four-space
(From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-19 10:24:50 +01:00
Richard Purdie f3ba3cb6af gdk-pixbuf: Fix lsb builds where dependency may be missing
We turn on the xlib depdendency for linuxstdbase builds but
were missing the dependency on libx11. This adds the missing
dependency.

(From OE-Core rev: 89c3eb5247d9d15f0beaf397d2aa5332007f229a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-15 19:44:37 +01:00
Richard Purdie cf0db01c55 gdk-pixbuf: Allow empty -xlib package
There are things that depend on the -xlib package. There are two
possible ways to fix this, either recommend them instead of depending
on them, or allow the package to be empty. I'm doing the latter
since its a bit cleaner and less invasive.

This library is a bit pointless which is why there is little point
in adding the x dependency in the non-lsb case. If it becomes widly
used we can rethink this.

(From OE-Core rev: 7d49da7389b5bb0e74d9000b002ebf0bc554e85b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-15 18:51:13 +01:00
Richard Purdie d93e43a126 gdk-pixbuf: Drop unneeded RPROVIDES
(From OE-Core rev: cab85fd0b481cdbf36477348de75352be3f38ca2)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-12 11:23:35 +01:00
Xiaofeng Yan 31122b03bf gdk-pixbuf: Add --with-x11 when building lsb image
LSB Test Suite complains "No library libgdk_pixbuf_xlib-2.0.so.0" \
because of having "--without-x11" for gdk-pixbuf_2.24.1.bb.
Use the linuxstdbase override and also make it conditional on x11 \
being in DISTRO_FEATURES for passing lsb test.
Split libgdk_pixbuf_xlib to a single package.

(From OE-Core rev: 4cb21630cf87e6cc9a062f1c2be9fea25d3e218a)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-11 18:00:27 +01:00
Richard Purdie 9cb1f86301 gdk-pixbuf: Fix checksum warning issue
(From OE-Core rev: 6a7ea3cf81f3600fec01bdd4af96ed149398a1a1)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-30 17:20:23 +01:00
Shane Wang 6e5446cda6 gdk-pixbuf: upgrade to 2.24.1
(From OE-Core rev: a9c128897e7fa496cf8f297819b64bdc7b8c319c)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:39 +00:00