summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/gtk+/gdk-pixbuf-csource-native_2.12.7.bb9
-rw-r--r--meta/packages/gtk+/gtk+.inc34
2 files changed, 19 insertions, 24 deletions
diff --git a/meta/packages/gtk+/gdk-pixbuf-csource-native_2.12.7.bb b/meta/packages/gtk+/gdk-pixbuf-csource-native_2.12.7.bb
index 338d66e9f0..5c0c84a582 100644
--- a/meta/packages/gtk+/gdk-pixbuf-csource-native_2.12.7.bb
+++ b/meta/packages/gtk+/gdk-pixbuf-csource-native_2.12.7.bb
@@ -23,12 +23,9 @@ do_compile() {
23 cd gdk-pixbuf && oe_runmake 23 cd gdk-pixbuf && oe_runmake
24} 24}
25 25
26do_stage() {
27 cd gdk-pixbuf && oe_runmake install
28 find ${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \;
29}
30
31do_install() { 26do_install() {
32 : 27 cd gdk-pixbuf
28 oe_runmake 'DESTDIR=${D}' install
29 find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \;
33} 30}
34 31
diff --git a/meta/packages/gtk+/gtk+.inc b/meta/packages/gtk+/gtk+.inc
index 3e1806f00f..e8fe233382 100644
--- a/meta/packages/gtk+/gtk+.inc
+++ b/meta/packages/gtk+/gtk+.inc
@@ -7,7 +7,7 @@ PRIORITY = "optional"
7DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc-native libxrandr \ 7DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc-native libxrandr \
8 libgcrypt libxdamage libxrender libxcomposite cairo" 8 libgcrypt libxdamage libxrender libxcomposite cairo"
9 9
10inherit autotools pkgconfig pkgconfig_stage 10inherit autotools pkgconfig
11 11
12FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ 12FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
13 ${bindir}/gtk-update-icon-cache \ 13 ${bindir}/gtk-update-icon-cache \
@@ -42,28 +42,26 @@ RRECOMMENDS_${PN} = "${BASE_RRECOMMENDS}"
42RRECOMMENDS_${PN}_linux = "${GLIBC_RRECOMMENDS}" 42RRECOMMENDS_${PN}_linux = "${GLIBC_RRECOMMENDS}"
43RRECOMMENDS_${PN}_linux-gnueabi = "${GLIBC_RRECOMMENDS}" 43RRECOMMENDS_${PN}_linux-gnueabi = "${GLIBC_RRECOMMENDS}"
44 44
45do_stage () { 45do_install () {
46 oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR} 46 autotools_do_install
47 oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
48 oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
49 oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
50 47
51 autotools_stage_includes 48 install -d ${D}${sysconfdir}/gtk-2.0
52
53 mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
54 install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
55
56 install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
57 49
58 install -m 0644 gtk/gtkfilechooserprivate.h ${STAGING_INCDIR}/gtk-2.0/gtk/ 50 mkdir -p ${D}${libdir}/gtk-2.0/include
59 install -m 0644 gtk/gtkfilechooserutils.h ${STAGING_INCDIR}/gtk-2.0/gtk/ 51 install -m 0644 gdk/gdkconfig.h ${D}${libdir}/gtk-2.0/include/gdkconfig.h
60 install -m 0644 gtk/gtkfilesystemmodel.h ${STAGING_INCDIR}/gtk-2.0/gtk/
61 52
62 install -m 755 gtk/gtk-builder-convert ${STAGING_BINDIR_NATIVE} 53 install -m 0644 gtk/gtkfilechooserprivate.h ${D}${includedir}/gtk-2.0/gtk/
54 install -m 0644 gtk/gtkfilechooserutils.h ${D}${includedir}/gtk-2.0/gtk/
55 install -m 0644 gtk/gtkfilesystemmodel.h ${D}${includedir}/gtk-2.0/gtk/
63} 56}
64 57
65do_install_append () { 58SYSROOT_PREPROCESS_FUNCS += "gtk_sysroot_preprocess"
66 install -d ${D}${sysconfdir}/gtk-2.0 59
60gtk_sysroot_preprocess () {
61 if [ -e ${D}${bindir}/gtk-builder-convert ]; then
62 install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/
63 install -m 755 ${D}${bindir}/gtk-builder-convert ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/
64 fi
67} 65}
68 66
69postinst_prologue() { 67postinst_prologue() {