[oe] [STABLE][STABLE][PATCH 3/4] gnome: update various bits to 2.26, sync with .dev
Koen Kooi
k.kooi at student.utwente.nl
Tue Apr 14 09:25:16 UTC 2009
From: Koen Kooi <koen at openembedded.org>
---
classes/gtk-icon-cache.bbclass | 14 ++++++--
recipes/gnome/cheese_2.26.0.bb | 12 ++++++
recipes/gnome/gail_1.20.0.bb | 1 +
recipes/gnome/gnome-bluetooth_2.27.3.bb | 23 ++++++++++++
recipes/gnome/gnome-desktop_2.26.0.bb | 8 ++++
recipes/gnome/gnome-icon-theme_2.26.0.bb | 13 +++++++
recipes/gnome/gnome-keyring_2.24.1.bb | 4 ++-
recipes/gnome/gnome-menus_2.26.0.bb | 15 ++++++++
recipes/gnome/gnome-panel/idl-sysroot.patch | 12 +++---
recipes/gnome/gnome-panel_2.26.0.bb | 27 ++++++++++++++
recipes/gnome/gnome-python-desktop_2.26.0.bb | 28 +++++++++++++++
recipes/gnome/gvfs_1.2.1.bb | 21 +++++++++++
recipes/gnome/libart-lgpl/x86_64/art_config.h | 10 +++++
recipes/gnome/libgnomecanvas_2.20.0.bb | 3 +-
recipes/gnome/libgweather_2.26.0.bb | 25 +++++++++++++
recipes/gnome/libsoup-2.4_2.26.0.bb | 4 +-
recipes/gnome/libunique_1.0.8.bb | 7 ++++
recipes/nautilus/nautilus/idl-sysroot.patch | 7 ++++
recipes/nautilus/nautilus/no-try-run-strftime.diff | 28 +++++++++++++++
recipes/nautilus/nautilus_2.24.2.bb | 3 ++
recipes/nautilus/nautilus_2.26.1.bb | 37 ++++++++++++++++++++
21 files changed, 289 insertions(+), 13 deletions(-)
create mode 100644 recipes/gnome/cheese_2.26.0.bb
create mode 100644 recipes/gnome/gnome-bluetooth_2.27.3.bb
create mode 100644 recipes/gnome/gnome-desktop_2.26.0.bb
create mode 100644 recipes/gnome/gnome-icon-theme_2.26.0.bb
create mode 100644 recipes/gnome/gnome-menus_2.26.0.bb
create mode 100644 recipes/gnome/gnome-panel_2.26.0.bb
create mode 100644 recipes/gnome/gnome-python-desktop_2.26.0.bb
create mode 100644 recipes/gnome/gvfs_1.2.1.bb
create mode 100644 recipes/gnome/libart-lgpl/x86_64/art_config.h
create mode 100644 recipes/gnome/libgweather_2.26.0.bb
create mode 100644 recipes/gnome/libunique_1.0.8.bb
create mode 100644 recipes/nautilus/nautilus/idl-sysroot.patch
create mode 100644 recipes/nautilus/nautilus/no-try-run-strftime.diff
create mode 100644 recipes/nautilus/nautilus_2.26.1.bb
diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass
index b256365..ea1fdff 100644
--- a/classes/gtk-icon-cache.bbclass
+++ b/classes/gtk-icon-cache.bbclass
@@ -11,11 +11,19 @@ fi
# Update the pixbuf loaders in case they haven't been registered yet
gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
-gtk-update-icon-cache -q /usr/share/icons/hicolor
+for icondir in /usr/share/icons/* ; do
+ if [ -d $icondir ] ; then
+ gtk-update-icon-cache -qt $icondir
+ fi
+done
}
gtk_icon_cache_postrm() {
-gtk-update-icon-cache -q /usr/share/icons/hicolor
+for icondir in /usr/share/icons/* ; do
+ if [ -d $icondir ] ; then
+ gtk-update-icon-cache -qt $icondir
+ fi
+done
}
python populate_packages_append () {
@@ -24,7 +32,7 @@ python populate_packages_append () {
workdir = bb.data.getVar('WORKDIR', d, 1)
for pkg in packages:
- icon_dir = '%s/install/%s/%s/icons/hicolor' % (workdir, pkg, bb.data.getVar('datadir', d, 1))
+ icon_dir = '%s/install/%s/%s/icons' % (workdir, pkg, bb.data.getVar('datadir', d, 1))
if not os.path.exists(icon_dir):
continue
diff --git a/recipes/gnome/cheese_2.26.0.bb b/recipes/gnome/cheese_2.26.0.bb
new file mode 100644
index 0000000..6b780bd
--- /dev/null
+++ b/recipes/gnome/cheese_2.26.0.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Take photos and videos with your webcam, with fun graphical effects"
+LICENSE = "GPLv2"
+
+PR = "r1"
+
+DEPENDS = "gtk+ gstreamer hal librsvg gnome-desktop eds-dbus"
+RRECOMMENDS_${PN} = "gst-plugin-gconfelements gst-plugins-good-meta gst-plugins-base-meta"
+
+inherit gnome
+
+FILES_${PN} += "${datadir}/dbus-1"
+
diff --git a/recipes/gnome/gail_1.20.0.bb b/recipes/gnome/gail_1.20.0.bb
index 58168a0..13346f3 100644
--- a/recipes/gnome/gail_1.20.0.bb
+++ b/recipes/gnome/gail_1.20.0.bb
@@ -3,6 +3,7 @@ SECTION = "x11/libs"
PR = "r0"
DESCRIPTION = "GNOME Accessibility Implementation Library"
DEPENDS = "gtk+"
+PROVIDES = "virtual/gail"
inherit gnome
diff --git a/recipes/gnome/gnome-bluetooth_2.27.3.bb b/recipes/gnome/gnome-bluetooth_2.27.3.bb
new file mode 100644
index 0000000..9742afa
--- /dev/null
+++ b/recipes/gnome/gnome-bluetooth_2.27.3.bb
@@ -0,0 +1,23 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+
+inherit autotools gnome pkgconfig
+
+GBTREV = "607"
+SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk;rev=${GBTREV};proto=http"
+S = "${WORKDIR}/trunk"
+PV = "2.27.3+svnr${GBTREV}"
+
+DEPENDS = "obexd obex-data-server gconf-dbus gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring"
+RRECOMMENDS_${PN} += "obexd obex-data-server"
+RCONFLICTS_${PN} = "bluez-gnome"
+
+EXTRA_OECONF = "--enable-debug"
+CFLAGS += " -g "
+
+do_configure_prepend() {
+ sed -i -e s:docs::g ${S}/Makefile.am
+ echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make
+ echo "EXTRA_DIST = version.xml" > gtk-doc.make
+}
+
diff --git a/recipes/gnome/gnome-desktop_2.26.0.bb b/recipes/gnome/gnome-desktop_2.26.0.bb
new file mode 100644
index 0000000..52c0e6d
--- /dev/null
+++ b/recipes/gnome/gnome-desktop_2.26.0.bb
@@ -0,0 +1,8 @@
+require gnome-desktop.inc
+
+inherit gnome pkgconfig
+
+DEPENDS += "gnome-doc-utils gnome-vfs libxrandr"
+
+SRC_URI += " \
+ file://no-desktop-docs.patch;patch=1;pnum=0"
diff --git a/recipes/gnome/gnome-icon-theme_2.26.0.bb b/recipes/gnome/gnome-icon-theme_2.26.0.bb
new file mode 100644
index 0000000..7e5c7b3
--- /dev/null
+++ b/recipes/gnome/gnome-icon-theme_2.26.0.bb
@@ -0,0 +1,13 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native"
+RDEPENDS = "hicolor-icon-theme"
+RRECOMMENDS = "librsvg-gtk"
+
+FILES_${PN} += "${datadir}/*"
+
+EXTRA_OECONF = "--disable-hicolor-check"
+
+inherit gnome
+
+
diff --git a/recipes/gnome/gnome-keyring_2.24.1.bb b/recipes/gnome/gnome-keyring_2.24.1.bb
index 105ee16..9d2b523 100644
--- a/recipes/gnome/gnome-keyring_2.24.1.bb
+++ b/recipes/gnome/gnome-keyring_2.24.1.bb
@@ -3,7 +3,9 @@ SECTION = "x11/gnome"
inherit autotools gnome pkgconfig
-DEPENDS = "gtk+ libtasn1 libgcrypt"
+PR = "r1"
+
+DEPENDS = "gtk+ libtasn1 libgcrypt gconf"
EXTRA_OECONF = "--disable-gtk-doc"
diff --git a/recipes/gnome/gnome-menus_2.26.0.bb b/recipes/gnome/gnome-menus_2.26.0.bb
new file mode 100644
index 0000000..5837e7f
--- /dev/null
+++ b/recipes/gnome/gnome-menus_2.26.0.bb
@@ -0,0 +1,15 @@
+DEPENDS = "python gnome-vfs libxml2 gconf popt gtk+"
+LICENSE = "GPL"
+
+inherit gnome pkgconfig
+
+do_stage() {
+autotools_stage_all
+}
+
+PACKAGES += "${PN}-python"
+FILES_${PN} += "${datadir}/desktop-directories/"
+FILES_${PN}-python = "${libdir}/python*"
+FILES_${PN}-dbg += "${libdir}/python*/site-packages/*/.debug \
+ ${libdir}/python*/site-packages/.debug"
+
diff --git a/recipes/gnome/gnome-panel/idl-sysroot.patch b/recipes/gnome/gnome-panel/idl-sysroot.patch
index f863d4b..07e5ded 100644
--- a/recipes/gnome/gnome-panel/idl-sysroot.patch
+++ b/recipes/gnome/gnome-panel/idl-sysroot.patch
@@ -1,7 +1,7 @@
-Index: gnome-panel-2.24.0/gnome-panel/Makefile.am
+Index: gnome-panel-2.26.0/gnome-panel/Makefile.am
===================================================================
---- gnome-panel-2.24.0.orig/gnome-panel/Makefile.am 2009-03-16 22:37:12.000000000 +0000
-+++ gnome-panel-2.24.0/gnome-panel/Makefile.am 2009-04-09 14:39:02.000000000 +0000
+--- gnome-panel-2.26.0.orig/gnome-panel/Makefile.am 2009-03-16 22:37:12.000000000 +0000
++++ gnome-panel-2.26.0/gnome-panel/Makefile.am 2009-04-09 14:39:02.000000000 +0000
@@ -43,7 +43,7 @@
$(NULL)
@@ -11,10 +11,10 @@ Index: gnome-panel-2.24.0/gnome-panel/Makefile.am
BUILT_SOURCES = \
$(CORBA_SRCLIST) \
-Index: gnome-panel-2.24.0/libpanel-applet/Makefile.am
+Index: gnome-panel-2.26.0/libpanel-applet/Makefile.am
===================================================================
---- gnome-panel-2.24.0.orig/libpanel-applet/Makefile.am 2009-03-16 22:37:13.000000000 +0000
-+++ gnome-panel-2.24.0/libpanel-applet/Makefile.am 2009-04-09 14:51:18.000000000 +0000
+--- gnome-panel-2.26.0.orig/libpanel-applet/Makefile.am 2009-03-16 22:37:13.000000000 +0000
++++ gnome-panel-2.26.0/libpanel-applet/Makefile.am 2009-04-09 14:51:18.000000000 +0000
@@ -45,7 +45,7 @@
GNOME_Panel.h
diff --git a/recipes/gnome/gnome-panel_2.26.0.bb b/recipes/gnome/gnome-panel_2.26.0.bb
new file mode 100644
index 0000000..c744a44
--- /dev/null
+++ b/recipes/gnome/gnome-panel_2.26.0.bb
@@ -0,0 +1,27 @@
+LICENSE = "GPL"
+DEPENDS = "gconf librsvg libgweather startup-notification libwnck orbit2 gtk+ libbonoboui libglade libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native"
+
+inherit gnome pkgconfig
+
+SRC_URI += "file://idl-sysroot.patch;patch=1"
+
+do_configure_prepend() {
+ sed -i -e s:help:: ${S}/Makefile.am
+}
+
+
+PACKAGES =+ "libpanel-applet"
+FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*"
+
+FILES_${PN} =+ "${datadir}/gnome* \
+ ${datadir}/icons"
+
+export SYSROOT = "${STAGING_DIR_HOST}"
+EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2 SYSROOT=${SYSROOT}"
+EXTRA_OECONF = "--disable-scrollkeeper \
+ --disable-eds \
+ "
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/recipes/gnome/gnome-python-desktop_2.26.0.bb b/recipes/gnome/gnome-python-desktop_2.26.0.bb
new file mode 100644
index 0000000..0ddc05e
--- /dev/null
+++ b/recipes/gnome/gnome-python-desktop_2.26.0.bb
@@ -0,0 +1,28 @@
+LICENSE = "GPL/LGPL"
+DEPENDS = "librsvg libwnck totem-pl-parser libgtop gnome-panel gnome-desktop eds-dbus python-pygtk gnome-python libgnomeprint libgnomeprintui"
+
+PR = "r4"
+
+inherit gnome distutils-base
+
+SRC_URI += "file://acinclude.m4"
+
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+
+do_configure_prepend() {
+ install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+do_configure_prepend() {
+ sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g \
+ -e s:'`$PKG_CONFIG --variable=defsdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g \
+ -e s:'`$PKG_CONFIG --variable=argtypesdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/argtypes\":g \
+ ${S}/configure.ac
+}
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+do_stage() {
+ autotools_stage_all
+}
+
+FILES_${PN}-dev += "${datadir}/pygtk"
diff --git a/recipes/gnome/gvfs_1.2.1.bb b/recipes/gnome/gvfs_1.2.1.bb
new file mode 100644
index 0000000..399cce6
--- /dev/null
+++ b/recipes/gnome/gvfs_1.2.1.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "gvfs is a userspace virtual filesystem"
+LICENSE = "LGPL"
+DEPENDS = "gnome-keyring glib-2.0 obexftp fuse avahi fuse hal gconf-dbus samba gphoto2"
+
+inherit gnome
+
+EXTRA_OECONF = "--enable-samba --with-archive-includes=${STAGING_INCDIR}"
+
+PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash"
+
+FILES_${PN} += "${datadir}/dbus-1/services/* ${libdir}/gio/modules/*.so"
+FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*"
+FILES_${PN}-dev += "${libdir}/gio/modules/*.la"
+
+FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${sysconfdir}/gvfs/mounts/ftp.mount"
+FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${sysconfdir}/gvfs/mounts/sftp.mount"
+FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${sysconfdir}/gvfs/mounts/trash.mount"
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/recipes/gnome/libart-lgpl/x86_64/art_config.h b/recipes/gnome/libart-lgpl/x86_64/art_config.h
new file mode 100644
index 0000000..500ffc3
--- /dev/null
+++ b/recipes/gnome/libart-lgpl/x86_64/art_config.h
@@ -0,0 +1,10 @@
+/* Automatically generated by gen_art_config.c */
+
+#define ART_SIZEOF_CHAR 1
+#define ART_SIZEOF_SHORT 2
+#define ART_SIZEOF_INT 4
+#define ART_SIZEOF_LONG 8
+
+typedef unsigned char art_u8;
+typedef unsigned short art_u16;
+typedef unsigned int art_u32;
diff --git a/recipes/gnome/libgnomecanvas_2.20.0.bb b/recipes/gnome/libgnomecanvas_2.20.0.bb
index 8e13c95..16391cb 100644
--- a/recipes/gnome/libgnomecanvas_2.20.0.bb
+++ b/recipes/gnome/libgnomecanvas_2.20.0.bb
@@ -1,10 +1,11 @@
LICENSE = "GPL"
SECTION = "x11/gnome/libs"
DESCRIPTION = "A powerful object-oriented display"
+PR = "r2"
inherit gnome
-DEPENDS = "libglade libart-lgpl gail"
+DEPENDS = "libglade libart-lgpl virtual/gail"
EXTRA_OECONF = "--disable-gtk-doc"
diff --git a/recipes/gnome/libgweather_2.26.0.bb b/recipes/gnome/libgweather_2.26.0.bb
new file mode 100644
index 0000000..f36dbbd
--- /dev/null
+++ b/recipes/gnome/libgweather_2.26.0.bb
@@ -0,0 +1,25 @@
+LICENSE = "LGPL"
+DEPENDS = "libgnome libsoup-2.4 gtk+"
+
+inherit gnome
+
+do_configure_prepend() {
+ sed -i -e s:help:: ${S}/Makefile.am
+}
+
+
+PACKAGES =+ "libpanel-applet"
+FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*"
+
+FILES_${PN} =+ "${datadir}/gnome* \
+ ${datadir}/icons"
+
+do_configure_prepend() {
+ sed -i -e 's: doc : :g' ${S}/Makefile.am
+}
+
+EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/recipes/gnome/libsoup-2.4_2.26.0.bb b/recipes/gnome/libsoup-2.4_2.26.0.bb
index 5413d49..73824f9 100644
--- a/recipes/gnome/libsoup-2.4_2.26.0.bb
+++ b/recipes/gnome/libsoup-2.4_2.26.0.bb
@@ -1,9 +1,9 @@
DESCRIPTION = "An HTTP library implementation in C"
SECTION = "x11/gnome/libs"
LICENSE = "GPL"
-DEPENDS = "libproxy glib-2.0 gnutls libxml2"
+DEPENDS = "libproxy glib-2.0 gnutls libxml2 sqlite3"
-Pr = "r1"
+PR = "r2"
inherit gnome
diff --git a/recipes/gnome/libunique_1.0.8.bb b/recipes/gnome/libunique_1.0.8.bb
new file mode 100644
index 0000000..1526930
--- /dev/null
+++ b/recipes/gnome/libunique_1.0.8.bb
@@ -0,0 +1,7 @@
+LICENSE = "LGPL"
+SECTION = "x11/gnome"
+
+inherit autotools_stage gnome lib_package
+
+DEPENDS = "gtk+ dbus"
+
diff --git a/recipes/nautilus/nautilus/idl-sysroot.patch b/recipes/nautilus/nautilus/idl-sysroot.patch
new file mode 100644
index 0000000..0062cfb
--- /dev/null
+++ b/recipes/nautilus/nautilus/idl-sysroot.patch
@@ -0,0 +1,7 @@
+Index: nautilus-2.24.2/add-include-prefix
+===================================================================
+--- nautilus-2.24.2.orig/add-include-prefix 2008-10-06 17:22:21.000000000 +0000
++++ nautilus-2.24.2/add-include-prefix 2009-04-09 16:00:05.000000000 +0000
+@@ -1 +1 @@
+-sed -e 's/^/ /' -e 's/ */ /g' -e 's/ / -I /g' -e 's/ -I $//'
++sed -e 's:^: :' -e 's: *: :g' -e 's: : -I '"$SYSROOT"':g' -e 's: -I '"$SYSROOT"'$::'
diff --git a/recipes/nautilus/nautilus/no-try-run-strftime.diff b/recipes/nautilus/nautilus/no-try-run-strftime.diff
new file mode 100644
index 0000000..ccd2934
--- /dev/null
+++ b/recipes/nautilus/nautilus/no-try-run-strftime.diff
@@ -0,0 +1,28 @@
+--- /tmp/configure.in 2009-04-13 11:26:43.000000000 +0200
++++ nautilus-2.26.1/configure.in 2009-04-13 11:28:37.000000000 +0200
+@@ -375,25 +375,6 @@
+
+ dnl ===========================================================================
+
+-dnl strftime checks
+-
+-AC_TRY_RUN([#include <time.h>
+- int main ()
+- {
+- char buf[100];
+- struct tm tm = {0};
+- tm.tm_year = 99;
+- if (strftime(buf, 100, "%EY", &tm) == 4 &&
+- strcmp (buf, "1999")==0)
+- return 0;
+- return 1;
+- }
+- ],
+- AC_DEFINE(HAVE_STRFTIME_EXTENSION, 1, [Define if strftime supports %E and %O modifiers.])
+- )
+-
+-dnl ===========================================================================
+-
+ #
+ # Checks for Xft/XRender
+ #
diff --git a/recipes/nautilus/nautilus_2.24.2.bb b/recipes/nautilus/nautilus_2.24.2.bb
index 30915b7..58cb015 100644
--- a/recipes/nautilus/nautilus_2.24.2.bb
+++ b/recipes/nautilus/nautilus_2.24.2.bb
@@ -4,6 +4,9 @@
inherit gnome
+SRC_URI += "file://idl-sysroot.patch;patch=1"
+export SYSROOT = "${STAGING_DIR_HOST}"
+
LICENSE="GPL"
PR = "r1"
diff --git a/recipes/nautilus/nautilus_2.26.1.bb b/recipes/nautilus/nautilus_2.26.1.bb
new file mode 100644
index 0000000..8eb5c80
--- /dev/null
+++ b/recipes/nautilus/nautilus_2.26.1.bb
@@ -0,0 +1,37 @@
+# nautilus OE build file
+# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+inherit gnome
+
+SRC_URI += "file://idl-sysroot.patch;patch=1 \
+ file://no-try-run-strftime.diff;patch=1 \
+"
+
+export SYSROOT = "${STAGING_DIR_HOST}"
+
+LICENSE="GPL"
+
+DEPENDS += " gvfs tracker librsvg libexif eel esound gnome-desktop orbit2-native"
+RDEPENDS = "gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash"
+
+EXTRA_OECONF = " --disable-gtk-doc --disable-update-mimedb "
+
+PACKAGES += " libnautilus"
+
+FILES_${PN} += "${datadir}/icons /usr/libexec/ "
+FILES_libnautilus = "/usr/lib/*.so*"
+FILES_${PN}-dbg += "/usr/libexec/.debug"
+
+do_configure_prepend() {
+ sed -i -e /docs/d Makefile.am
+}
+
+# We need native orbit-idl with target idl files. No way to say it in a clean way:
+do_configure_append () {
+ find -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \;
+}
+
+do_stage() {
+ autotools_stage_all
+}
--
1.6.1
More information about the Openembedded-devel
mailing list