summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-06-04 11:31:07 +0000
committerRoss Burton <ross@openedhand.com>2007-06-04 11:31:07 +0000
commit82b28d21b88ae5efcc6f7750a7b48abd053b150d (patch)
tree41fca5326491dfd65c97be2edbf51f825343283c
parent3ad20903639119aaa70d6be597081a8f758fec40 (diff)
downloadpoky-82b28d21b88ae5efcc6f7750a7b48abd053b150d.tar.gz
Formatting changes to make merging easier
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1853 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/gtk+/gtk+_2.6.10.bb18
-rw-r--r--meta/packages/gtk+/gtk+_2.6.8.bb6
2 files changed, 13 insertions, 11 deletions
diff --git a/meta/packages/gtk+/gtk+_2.6.10.bb b/meta/packages/gtk+/gtk+_2.6.10.bb
index 8230515f3b..298e4c648d 100644
--- a/meta/packages/gtk+/gtk+_2.6.10.bb
+++ b/meta/packages/gtk+/gtk+_2.6.10.bb
@@ -28,22 +28,22 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
28inherit autotools pkgconfig 28inherit autotools pkgconfig
29 29
30FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ 30FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
31 ${bindir}/gtk-update-icon-cache \
32 ${bindir}/gtk-query-immodules-2.0 \ 31 ${bindir}/gtk-query-immodules-2.0 \
32 ${bindir}/gtk-update-icon-cache \
33 ${libdir}/lib*.so.* \ 33 ${libdir}/lib*.so.* \
34 ${datadir}/themes ${sysconfdir} \ 34 ${datadir}/themes ${sysconfdir} \
35 ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" 35 ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
36FILES_${PN}-dev += " \ 36FILES_${PN}-dev += " \
37 ${datadir}/gtk-2.0/include \ 37 ${datadir}/gtk-2.0/include \
38 ${libdir}/gtk-2.0/include \ 38 ${libdir}/gtk-2.0/include \
39 ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \ 39 ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
40 ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \ 40 ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
41 ${libdir}/gtk-2.0/${LIBV}/engines/*.la \ 41 ${libdir}/gtk-2.0/${LIBV}/engines/*.la \
42 ${bindir}/gdk-pixbuf-csource" 42 ${bindir}/gdk-pixbuf-csource"
43FILES_${PN}-dbg += " \ 43FILES_${PN}-dbg += " \
44 ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \ 44 ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \
45 ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \ 45 ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \
46 ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*" 46 ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*"
47 47
48 48
49RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" 49RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans"
@@ -52,6 +52,8 @@ EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-disp
52# --disable-cruft 52# --disable-cruft
53 53
54LIBV = "2.4.0" 54LIBV = "2.4.0"
55LEAD_SONAME = "libgtk-x11*"
56
55 57
56do_configure_prepend() { 58do_configure_prepend() {
57 for i in `find . -name "Makefile.am"` 59 for i in `find . -name "Makefile.am"`
diff --git a/meta/packages/gtk+/gtk+_2.6.8.bb b/meta/packages/gtk+/gtk+_2.6.8.bb
index f1ccb46b61..194a275900 100644
--- a/meta/packages/gtk+/gtk+_2.6.8.bb
+++ b/meta/packages/gtk+/gtk+_2.6.8.bb
@@ -20,14 +20,14 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
20 file://no-deprecation.patch;patch=1 \ 20 file://no-deprecation.patch;patch=1 \
21 file://filesystem-volumes.patch;patch=1 \ 21 file://filesystem-volumes.patch;patch=1 \
22 file://filechooser-respect-style.patch;patch=1 \ 22 file://filechooser-respect-style.patch;patch=1 \
23 file://filechooser-default.patch;patch=1 \ 23 file://filechooser-default.patch;patch=1 \
24 " 24 "
25 25
26inherit autotools pkgconfig 26inherit autotools pkgconfig
27 27
28FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ 28FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
29 ${bindir}/gtk-query-immodules-2.0 \ 29 ${bindir}/gtk-query-immodules-2.0 \
30 ${bindir}/gtk-update-icon-cache \ 30 ${bindir}/gtk-update-icon-cache \
31 ${libdir}/lib*.so.* \ 31 ${libdir}/lib*.so.* \
32 ${datadir}/themes ${sysconfdir} \ 32 ${datadir}/themes ${sysconfdir} \
33 ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" 33 ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
@@ -88,7 +88,7 @@ python populate_packages_prepend () {
88 immodules_root = os.path.join(gtk_libdir, 'immodules') 88 immodules_root = os.path.join(gtk_libdir, 'immodules')
89 89
90 do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders') 90 do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
91 do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules') 91 do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules')
92 92
93 if (bb.data.getVar('DEBIAN_NAMES', d, 1)): 93 if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
94 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) 94 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)