gdk-pixbuf: move gdk-pixbuf-pixdata to gdk-pixbuf-dev
PATCH 1/3 gdk-pixbuf: move gdk-pixbuf-pixdata to gdk-pixbuf-dev
This is a development tool, similar to gdk-pixbuf-csource, so move it to the -dev package.
Signed-off-by Ross Burton <[email protected]>
--- meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb +2 -2
@@ -50,17 +50,17 @@ FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}" ALLOW_EMPTY_${PN}-xlib = "1" FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ - ${bindir}/gdk-pixbuf-pixdata \ ${libdir}/lib*.so.*" FILES_${PN}-dev += " \ ${bindir}/gdk-pixbuf-csource \ + ${bindir}/gdk-pixbuf-pixdata \ ${includedir}/* \ ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/*.la \ " FILES_${PN}-dbg += " \ - ${libdir}/.debug/* \ + ${libdir}/.debug/* \ ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/.debug/* \ "
Signature · 1 line
2.1.4
PATCH 2/3 gdk-pixbuf: move gdk-pixbuf-query-loaders to $libdir for multilib safety
If for example gdk-pixbuf and lib32-gdk-pixbuf are in an image then only one ${bindir}/gdk-pixbuf-query-loaders will be installed, so only one variant will actually be usable.
Solve this by moving gdk-pixbuf-query-loaders into ${libdir} as it's intimately tied to the library and rarely directly invoked by the user, and update the callers to use the right path.
Signed-off-by Ross Burton <[email protected]>
--- meta/classes/gtk-icon-cache.bbclass | 14 +++++++++----- meta/classes/pixbufcache.bbclass | 4 ++-- meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb | 11 +++++++++-- scripts/postinst-intercepts/update_icon_cache | 3 ++- scripts/postinst-intercepts/update_pixbuf_cache | 4 +--- 5 files changed, 23 insertions(+), 13 deletions(-)
meta/classes/gtk-icon-cache.bbclass +9 -5
@@ -4,12 +4,14 @@ DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk gtk_icon_cache_postinst() { if [ "x$D" != "x" ]; then - $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} mlprefix=${MLPREFIX} libdir=${libdir} \ - base_libdir=${base_libdir} + $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} \ + mlprefix=${MLPREFIX} \ + libdir=${libdir} \ + STAGING_LIBDIR_NATIVE=${STAGING_LIBDIR_NATIVE} else # Update the pixbuf loaders in case they haven't been registered yet - GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders --update-cache + GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders ${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache for icondir in /usr/share/icons/* ; do if [ -d $icondir ] ; then
@@ -21,8 +23,10 @@ fi gtk_icon_cache_postrm() { if [ "x$D" != "x" ]; then - $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} mlprefix=${MLPREFIX} libdir=${libdir} \ - base_libdir=${base_libdir} + $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} \ + mlprefix=${MLPREFIX} \ + libdir=${libdir} \ + STAGING_LIBDIR_NATIVE=${STAGING_LIBDIR_NATIVE} else for icondir in /usr/share/icons/* ; do if [ -d $icondir ] ; then
meta/classes/pixbufcache.bbclass +2 -2
@@ -15,7 +15,7 @@ if [ "x$D" != "x" ]; then else # Update the pixbuf loaders in case they haven't been registered yet - GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders --update-cache + GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders ${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then for icondir in /usr/share/icons/*; do
@@ -46,7 +46,7 @@ python populate_packages_append() { } gdkpixbuf_complete() { - GDK_PIXBUF_FATAL_LOADER=1 ${STAGING_BINDIR_NATIVE}/gdk-pixbuf-query-loaders --update-cache || exit 1 + GDK_PIXBUF_FATAL_LOADER=1 ${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache || exit 1 } #
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb +9 -2
@@ -49,7 +49,7 @@ PACKAGES =+ "${PN}-xlib" FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}" ALLOW_EMPTY_${PN}-xlib = "1" -FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ +FILES_${PN} = "${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ ${libdir}/lib*.so.*" FILES_${PN}-dev += " \
@@ -61,6 +61,7 @@ FILES_${PN}-dev += " \ FILES_${PN}-dbg += " \ ${libdir}/.debug/* \ + ${libdir}/gdk-pixbuf-2.0/.debug/* \ ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/.debug/* \ "
@@ -80,6 +81,12 @@ python populate_packages_prepend () { d.appendVar("RDEPENDS_gdk-pixbuf-ptest", " " + packages) } +do_install_append() { + # Move gdk-pixbuf-query-loaders into libdir so it is always available + # in multilib builds. + mv ${D}/${bindir}/gdk-pixbuf-query-loaders ${D}/${libdir}/gdk-pixbuf-2.0/ +} + do_install_append_class-native() { find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \;
@@ -89,7 +96,7 @@ do_install_append_class-native() { create_wrapper ${D}/${bindir}/gdk-pixbuf-pixdata \ GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache - create_wrapper ${D}/${bindir}/gdk-pixbuf-query-loaders \ + create_wrapper ${D}/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \ GDK_PIXBUF_MODULEDIR=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders }
scripts/postinst-intercepts/update_icon_cache +2 -1
@@ -1,8 +1,9 @@ #!/bin/sh set -e + # update native pixbuf loaders -gdk-pixbuf-query-loaders --update-cache +${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache for icondir in $D/usr/share/icons/*/ ; do if [ -d $icondir ] ; then
scripts/postinst-intercepts/update_pixbuf_cache +1 -3
@@ -4,8 +4,6 @@ export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders export GDK_PIXBUF_FATAL_LOADER=1 PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\ - $D${bindir}/gdk-pixbuf-query-loaders \ + $D${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ >$GDK_PIXBUF_MODULEDIR/../loaders.cache && \ sed -i -e "s:$D::g" $GDK_PIXBUF_MODULEDIR/../loaders.cache - -
Signature · 1 line
2.1.4
PATCH 3/3 librsvg: tell configure where gdk-pixbuf-query-loaders is
In reply to Ross BurtonNow that gdk-pixbuf-query-loaders isn't in the path, tell configure where to find it.
Signed-off-by Ross Burton <[email protected]>
--- meta/recipes-gnome/librsvg/librsvg_2.40.10.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-gnome/librsvg/librsvg_2.40.10.bb +2 -0
@@ -17,6 +17,8 @@ SRC_URI += "file://gtk-option.patch" SRC_URI[archive.md5sum] = "fadebe2e799ab159169ee3198415ff85" SRC_URI[archive.sha256sum] = "965c807438ce90b204e930ff80c92eba1606a2f6fd5ccfd09335c99896dd3479" +CACHED_CONFIGUREVARS = "ac_cv_path_GDK_PIXBUF_QUERYLOADERS=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" + EXTRA_OECONF = "--disable-introspection --disable-vala" # The older ld (2.22) on the host (Centos 6.5) doesn't have the
Signature · 1 line
2.1.4