diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 22:41:29 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 22:41:29 +0300 |
commit | 21f9b84b4b729fbd7acbd465e7a3f726e4d20f91 (patch) | |
tree | eb2d091d427ca0813b445509d59cc8e27e8ad25f /yocto-poky/meta/recipes-gnome/gnome | |
parent | 101cef31e2bf54c678501155cd2106251acbd076 (diff) | |
parent | c124f4f2e04dca16a428a76c89677328bc7bf908 (diff) | |
download | openbmc-21f9b84b4b729fbd7acbd465e7a3f726e4d20f91.tar.xz |
Merge commit 'c124f4f2e04dca16a428a76c89677328bc7bf908' as 'yocto-poky'
Diffstat (limited to 'yocto-poky/meta/recipes-gnome/gnome')
15 files changed, 749 insertions, 0 deletions
diff --git a/yocto-poky/meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch b/yocto-poky/meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch new file mode 100644 index 000000000..446f9c9ab --- /dev/null +++ b/yocto-poky/meta/recipes-gnome/gnome/adwaita-icon-theme/Create-symlinks-when-installing-cursors.patch @@ -0,0 +1,178 @@ +Create symlinks when installing cursors + +This cuts down the installed size by ~11MB. + +Upstream-Status: Backport +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> + + +From 1e8c0dd0a2de5e1d5ff60ff11f131e88510c7f50 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= + =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com> +Date: Sat, 16 May 2015 07:49:19 +0000 +Subject: [PATCH] Create symlinks when installing cursors + +Also support creating symlinks for W32 cursors (including L and XL variants). + +https://bugzilla.gnome.org/show_bug.cgi?id=749223 +--- + Makefile.am | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 24 ++++++++++++++++ + 2 files changed, 117 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index fed3972..4d00268 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -6,6 +6,17 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + + cursordir = $(datadir)/icons/Adwaita/cursors + cursor_DATA = $(wildcard $(srcdir)/Adwaita/cursors/*) ++if ENABLE_L_XL_VARIANTS ++cursorldir = $(datadir)/icons/Adwaita-Large/cursors ++cursorl_DATA = $(wildcard $(srcdir)/Adwaita-Large/cursors/*) ++cursorxldir = $(datadir)/icons/Adwaita-ExtraLarge/cursors ++cursorxl_DATA = $(wildcard $(srcdir)/Adwaita-ExtraLarge/cursors/*) ++else ++cursorldir = ++cursorl_DATA = ++cursorxldir = ++cursorxl_DATA = ++endif + + theme_in_files = index.theme.in.in + theme_DATA = $(theme_in_files:.theme.in.in=.theme) +@@ -99,6 +110,88 @@ install-data-local: + fi + + install-data-hook: ++ cd $(DESTDIR)$(cursordir) && \ ++ if test "x$(enable_w32_cursors)" = "xyes"; \ ++ then \ ++ cur=.cur && \ ++ ani=.ani; \ ++ else \ ++ cur= && \ ++ ani= ; \ ++ fi; \ ++ if test "x$(enable_l_xl_variants)" = "xyes"; \ ++ then \ ++ themedirs="$(cursordir) $(cursorldir) $(cursorxldir)"; \ ++ else \ ++ themedirs="$(cursordir)"; \ ++ fi; \ ++ for d in $$themedirs; \ ++ do \ ++ cd $(DESTDIR)$$d && \ ++ echo Creating symlinks in $(DESTDIR)$$d && \ ++ $(LN_S) -f dotbox$$cur draped_box$$cur && \ ++ $(LN_S) -f dotbox$$cur icon$$cur && \ ++ $(LN_S) -f dotbox$$cur target$$cur && \ ++ $(LN_S) -f dotbox$$cur dot_box_mask$$cur && \ ++ $(LN_S) -f X_cursor$$cur pirate$$cur && \ ++ $(LN_S) -f left_ptr_watch$$ani 08e8e1c95fe2fc01f976f1e063a24ccd$$ani && \ ++ $(LN_S) -f left_ptr_watch$$ani 3ecb610c1bf2410f44200f48c40d3599$$ani && \ ++ $(LN_S) -f left_ptr$$cur arrow$$cur && \ ++ $(LN_S) -f left_ptr$$cur top_left_arrow$$cur && \ ++ $(LN_S) -f right_ptr$$cur draft_large$$cur && \ ++ $(LN_S) -f right_ptr$$cur draft_small$$cur && \ ++ $(LN_S) -f move$$cur 4498f0e0c1937ffe01fd06f973665830$$cur && \ ++ $(LN_S) -f move$$cur 9081237383d90e509aa00f00170e968f$$cur && \ ++ $(LN_S) -f copy$$cur 1081e37283d90000800003c07f3ef6bf$$cur && \ ++ $(LN_S) -f copy$$cur 6407b0e94181790501fd1e167b474872$$cur && \ ++ $(LN_S) -f cross$$cur cross_reverse$$cur && \ ++ $(LN_S) -f cross$$cur diamond_cross$$cur && \ ++ $(LN_S) -f hand1$$cur grab$$cur && \ ++ $(LN_S) -f hand2$$cur 9d800788f1b08800ae810202380a0822$$cur && \ ++ $(LN_S) -f hand2$$cur e29285e634086352946a0e7090d73106$$cur && \ ++ $(LN_S) -f hand2$$cur hand$$cur && \ ++ $(LN_S) -f grabbing$$cur fleur$$cur && \ ++ $(LN_S) -f question_arrow$$cur d9ce0ab605698f320427677b458ad60b$$cur && \ ++ $(LN_S) -f question_arrow$$cur 5c6cd98b3f3ebcb1f9c7f1c204630408$$cur && \ ++ $(LN_S) -f question_arrow$$cur help$$cur && \ ++ $(LN_S) -f question_arrow$$cur left_ptr_help$$cur && \ ++ $(LN_S) -f link$$cur 3085a0e285430894940527032f8b26df$$cur && \ ++ $(LN_S) -f link$$cur 640fb0e74195791501fd1ed57b41487f$$cur && \ ++ $(LN_S) -f crossed_circle$$cur 03b6e0fcb3499374a867c041f52298f0$$cur && \ ++ $(LN_S) -f fd_double_arrow$$cur fcf1c3c7cd4491d801f1e1c78f100000$$cur && \ ++ $(LN_S) -f bd_double_arrow$$cur c7088f0f3e6c8088236ef8e1e3e70000$$cur && \ ++ $(LN_S) -f sb_h_double_arrow$$cur h_double_arrow$$cur && \ ++ $(LN_S) -f sb_h_double_arrow$$cur 14fef782d02440884392942c11205230$$cur && \ ++ $(LN_S) -f h_double_arrow$$cur 028006030e0e7ebffc7f7070c0600140$$cur && \ ++ $(LN_S) -f sb_v_double_arrow$$cur double_arrow$$cur && \ ++ $(LN_S) -f sb_v_double_arrow$$cur v_double_arrow$$cur && \ ++ $(LN_S) -f sb_v_double_arrow$$cur 2870a09082c103050810ffdffffe0204$$cur && \ ++ $(LN_S) -f v_double_arrow$$cur 00008160000006810000408080010102$$cur && \ ++ $(LN_S) -f left_ptr$$cur default$$cur && \ ++ $(LN_S) -f hand$$cur pointer$$cur && \ ++ $(LN_S) -f left_ptr_watch$$ani progress$$ani && \ ++ $(LN_S) -f watch$$ani wait$$ani && \ ++ $(LN_S) -f cross$$cur crosshair$$cur && \ ++ $(LN_S) -f xterm$$cur text$$cur && \ ++ $(LN_S) -f dnd-link$$cur alias$$cur && \ ++ $(LN_S) -f dnd-copy$$cur copy$$cur && \ ++ $(LN_S) -f dnd-none$$cur no-drop$$cur && \ ++ $(LN_S) -f crossed_circle$$cur not-allowed$$cur && \ ++ $(LN_S) -f sb_h_double_arrow$$cur col-resize$$cur && \ ++ $(LN_S) -f sb_v_double_arrow$$cur row-resize$$cur && \ ++ $(LN_S) -f top_side$$cur n-resize$$cur && \ ++ $(LN_S) -f right_side$$cur e-resize$$cur && \ ++ $(LN_S) -f bottom_side$$cur s-resize$$cur && \ ++ $(LN_S) -f left_side$$cur w-resize$$cur && \ ++ $(LN_S) -f top_right_corner$$cur ne-resize$$cur && \ ++ $(LN_S) -f top_left_corner$$cur nw-resize$$cur && \ ++ $(LN_S) -f bottom_right_corner$$cur se-resize$$cur && \ ++ $(LN_S) -f bottom_left_corner$$cur sw-resize$$cur && \ ++ $(LN_S) -f sb_h_double_arrow$$cur ew-resize$$cur && \ ++ $(LN_S) -f sb_v_double_arrow$$cur ns-resize$$cur && \ ++ $(LN_S) -f fd_double_arrow$$cur nesw-resize$$cur && \ ++ $(LN_S) -f bd_double_arrow$$cur nwse-resize$$cur; \ ++ done + if test -z "$(DESTDIR)" && test -n "$(GTK_UPDATE_ICON_CACHE)" ; then \ + $(GTK_UPDATE_ICON_CACHE) -q $(DESTDIR)$(themedir); \ + fi +diff --git a/configure.ac b/configure.ac +index 9e4d8a0..312b24c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -31,6 +31,7 @@ AC_SUBST([render_sizes], ["8x8 16x16 22x22 24x24 32x32 48x48 256x256"]) + AC_SUBST([symbolic_render_sizes], [""]) + AC_SUBST([install_sizes], ["8x8 16x16 22x22 24x24 32x32 48x48 64x64 96x96 256x256"]) + ++AC_PROG_LN_S + AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache) + + # need git, icontool, and inkscape for rendering +@@ -56,6 +57,29 @@ if test "x$GTK_ENCODE_SYMBOLIC_SVG" = "xfalse"; then + fi + AC_SUBST(symbolic_encode_sizes) + ++AC_ARG_ENABLE([w32-cursors], ++ [AS_HELP_STRING([--enable-w32-cursors], ++ [Make and install Windows cursors (.cur and .ani) instead of X cursors])], ++ [case "${enableval}" in ++ yes) enable_w32_cursors=yes ;; ++ no) enable_w32_cursors=no ;; ++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-w32-cursors]) ;; ++ esac], ++ [enable_w32_cursors=no]) ++AC_SUBST(enable_w32_cursors) ++ ++AC_ARG_ENABLE([l-xl-variants], ++ [AS_HELP_STRING([--enable-l-xl-variants], ++ [Also make and install Large and Extra Large Windows cursor versions])], ++ [case "${enableval}" in ++ yes) enable_l_xl_variants=yes ;; ++ no) enable_l_xl_variants=no ;; ++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-l-xl-variants]) ;; ++ esac], ++ [enable_l_xl_variants=no]) ++AC_SUBST(enable_l_xl_variants) ++AM_CONDITIONAL([ENABLE_L_XL_VARIANTS], [test x$enable_l_xl_variants = xyes]) ++ + AC_CONFIG_FILES([ + Makefile + adwaita-icon-theme.pc +-- +2.1.4 + diff --git a/yocto-poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb b/yocto-poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb new file mode 100644 index 000000000..526e699e9 --- /dev/null +++ b/yocto-poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb @@ -0,0 +1,34 @@ +SUMMARY = "GTK+ icon theme" +HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/sources/adwaita-icon-theme/" +BUGTRACKER = "https://bugzilla.gnome.org/" +SECTION = "x11/gnome" + +LICENSE = "LGPL-3.0 | CC-BY-SA-3.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c" + +inherit allarch autotools pkgconfig gettext gtk-icon-cache + +DEPENDS += "intltool-native" + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" +SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ + file://Create-symlinks-when-installing-cursors.patch \ + " + +SRC_URI[md5sum] = "9ef86952c947aa27a1a888b7735d60b3" +SRC_URI[sha256sum] = "b4556dfbf555d4fac12d4d5c12f7519de0d43ec42a1b649611439a50bf7acb96" + +do_install_append() { + # Build uses gtk-encode-symbolic-svg to create png versions: + # no need to store the svgs anymore. + rm -f ${D}${prefix}/share/icons/Adwaita/scalable/*/*-symbolic.svg \ + ${D}${prefix}/share/icons/Adwaita/scalable/*/*-symbolic-rtl.svg +} + +PACKAGES = "${PN}-cursors ${PN}-symbolic ${PN}-hires ${PN}" + +FILES_${PN}-cursors = "${prefix}/share/icons/Adwaita/cursors/" +FILES_${PN}-symbolic = "${prefix}/share/icons/Adwaita/*/*/*.symbolic.png" +FILES_${PN}-hires = "${prefix}/share/icons/Adwaita/256x256/" +FILES_${PN} = "${prefix}/share/icons/Adwaita/ \ + ${prefix}/share/pkgconfig/adwaita-icon-theme.pc" diff --git a/yocto-poky/meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch b/yocto-poky/meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch new file mode 100644 index 000000000..59a7ca780 --- /dev/null +++ b/yocto-poky/meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch @@ -0,0 +1,19 @@ +Upstream-Status: Pending + +Remove '+' from invalid characters list + +Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> + +Index: GConf-3.2.5/gconf/gconf-backend.c +=================================================================== +--- GConf-3.2.5.orig/gconf/gconf-backend.c ++++ GConf-3.2.5/gconf/gconf-backend.c +@@ -37,7 +37,7 @@ static const char invalid_chars[] = + /* Space is common in user names (and thus home directories) on Windows */ + " " + #endif +- "\t\r\n\"$&<>,+=#!()'|{}[]?~`;%\\"; ++ "\t\r\n\"$&<>,=#!()'|{}[]?~`;%\\"; + + static gboolean + gconf_address_valid (const char *address, diff --git a/yocto-poky/meta/recipes-gnome/gnome/gconf/unable-connect-dbus.patch b/yocto-poky/meta/recipes-gnome/gnome/gconf/unable-connect-dbus.patch new file mode 100644 index 000000000..f758a4bcc --- /dev/null +++ b/yocto-poky/meta/recipes-gnome/gnome/gconf/unable-connect-dbus.patch @@ -0,0 +1,95 @@ +Fixes errors such as this in the rootfs generation: + +(gconftool-2.real:10095): GConf-WARNING **: Client failed to connect to the D-BUS daemon: +Using X11 for dbus-daemon autolaunch was disabled at compile time, set your DBUS_SESSION_BUS_ADDRESS instead + +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From b0895e1998ebc83ab030ec0f17c0685439f5b404 Mon Sep 17 00:00:00 2001 +From: Ray Strode <rstrode@redhat.com> +Date: Mon, 15 Apr 2013 09:57:34 -0400 +Subject: [PATCH] dbus: Don't spew to console when unable to connect to dbus + daemon + +Instead pass the error up for the caller to decide what to do. + +This prevent untrappable warning messages from showing up at the +console if gconftool --makefile-install-rule is called. +--- + gconf/gconf-dbus.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c +index 5610fcf..048e3ea 100644 +--- a/gconf/gconf-dbus.c ++++ b/gconf/gconf-dbus.c +@@ -105,7 +105,7 @@ static GHashTable *engines_by_db = NULL; + static GHashTable *engines_by_address = NULL; + static gboolean dbus_disconnected = FALSE; + +-static gboolean ensure_dbus_connection (void); ++static gboolean ensure_dbus_connection (GError **error); + static gboolean ensure_service (gboolean start_if_not_found, + GError **err); + static gboolean ensure_database (GConfEngine *conf, +@@ -383,7 +383,7 @@ gconf_engine_detach (GConfEngine *conf) + } + + static gboolean +-ensure_dbus_connection (void) ++ensure_dbus_connection (GError **err) + { + DBusError error; + +@@ -392,7 +392,9 @@ ensure_dbus_connection (void) + + if (dbus_disconnected) + { +- g_warning ("The connection to DBus was broken. Can't reinitialize it."); ++ g_set_error (err, GCONF_ERROR, ++ GCONF_ERROR_NO_SERVER, ++ "The connection to DBus was broken. Can't reinitialize it."); + return FALSE; + } + +@@ -402,7 +404,10 @@ ensure_dbus_connection (void) + + if (!global_conn) + { +- g_warning ("Client failed to connect to the D-BUS daemon:\n%s", error.message); ++ g_set_error (err, GCONF_ERROR, ++ GCONF_ERROR_NO_SERVER, ++ "Client failed to connect to the D-BUS daemon:\n%s", ++ error.message); + + dbus_error_free (&error); + return FALSE; +@@ -431,13 +436,8 @@ ensure_service (gboolean start_if_not_found, + + if (global_conn == NULL) + { +- if (!ensure_dbus_connection ()) +- { +- g_set_error (err, GCONF_ERROR, +- GCONF_ERROR_NO_SERVER, +- _("No D-BUS daemon running\n")); +- return FALSE; +- } ++ if (!ensure_dbus_connection (err)) ++ return FALSE; + + g_assert (global_conn != NULL); + } +@@ -2512,7 +2512,7 @@ gconf_ping_daemon (void) + { + if (global_conn == NULL) + { +- if (!ensure_dbus_connection ()) ++ if (!ensure_dbus_connection (NULL)) + { + return FALSE; + } +-- +1.7.10.4 + diff --git a/yocto-poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb b/yocto-poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb new file mode 100644 index 000000000..17fdafa96 --- /dev/null +++ b/yocto-poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb @@ -0,0 +1,60 @@ +SUMMARY = "GNOME configuration system" +SECTION = "x11/gnome" +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" + +DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native gobject-introspection-stub" +DEPENDS_class-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native" + + +inherit gnomebase gtk-doc gettext + +SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive \ + file://remove_plus_from_invalid_characters_list.patch \ + file://unable-connect-dbus.patch \ +" + +SRC_URI[archive.md5sum] = "2b16996d0e4b112856ee5c59130e822c" +SRC_URI[archive.sha256sum] = "1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c" + +S = "${WORKDIR}/GConf-${PV}" + +EXTRA_OECONF = "--enable-shared --disable-static --enable-debug=yes \ + --disable-introspection --disable-orbit --with-openldap=no --disable-gtk" + +# Disable PolicyKit by default +PACKAGECONFIG ??= "" +# We really don't want PolicyKit for native or uclibc +PACKAGECONFIG_class-native = "" +PACKAGECONFIG_libc-uclibc = "" + +PACKAGECONFIG[policykit] = "--enable-defaults-service,--disable-defaults-service,polkit" + +do_install_append() { + # this directory need to be created to avoid an Error 256 at gdm launch + install -d ${D}${sysconfdir}/gconf/gconf.xml.system + + # this stuff is unusable + rm -f ${D}${libdir}/GConf/*/*.*a + rm -f ${D}${libdir}/gio/*/*.*a +} + +do_install_append_class-native() { + create_wrapper ${D}/${bindir}/gconftool-2 \ + GCONF_BACKEND_DIR=${STAGING_LIBDIR_NATIVE}/GConf/2 +} + +# disable dbus-x11 when x11 isn't in DISTRO_FEATURES +RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}" +RDEPENDS_${PN}_class-native = "" + +FILES_${PN} += "${libdir}/GConf/* \ + ${libdir}/gio/*/*.so \ + ${datadir}/polkit* \ + ${datadir}/dbus-1/services/*.service \ + ${datadir}/dbus-1/system-services/*.service \ + " +FILES_${PN}-dbg += "${libdir}/*/*/.debug" +FILES_${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd" + +BBCLASSEXTEND = "native" diff --git a/yocto-poky/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb b/yocto-poky/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb new file mode 100644 index 000000000..80b7033ee --- /dev/null +++ b/yocto-poky/meta/recipes-gnome/gnome/gnome-common_3.14.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "Common macros for building GNOME applications" +HOMEPAGE = "http://www.gnome.org/" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SECTION = "x11/gnome" +inherit gnomebase allarch + +SRC_URI[archive.md5sum] = "ba58c61d0d81b7c3ff8452c620513a9d" +SRC_URI[archive.sha256sum] = "4c00242f781bb441289f49dd80ed1d895d84de0c94bfc2c6818a104c9e39262c" + +EXTRA_AUTORECONF = "" +DEPENDS = "" + +FILES_${PN} += "${datadir}/aclocal" +FILES_${PN}-dev = "" + +BBCLASSEXTEND = "native" diff --git a/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils.inc b/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils.inc new file mode 100644 index 000000000..958750690 --- /dev/null +++ b/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils.inc @@ -0,0 +1,33 @@ +SUMMARY = "A collection of documentation utilities for the Gnome project" +DESCRIPTION = "The GNOME Documentation Build Utilities (gnome-doc- \ +utils) were created to make it easier for application developers to \ +include and create documentation in their releases. They include the \ +xml2po tool which makes it easier to translate and keep up to date \ +translations of documentation." +LICENSE = "GPLv2 & LGPLv2.1" +DEPENDS = "libxml2 libxslt libxslt-native gnome-doc-utils-native glib-2.0" +DEPENDS_class-native = "libxml2-native libxslt-native intltool-native glib-2.0-native" + +inherit gnomebase gettext python-dir pythonnative autotools-brokensep + +CLEANBROKEN = "1" + +EXTRA_OECONF += "--disable-scrollkeeper" + +do_install_append() { + mkdir -p ${D}${datadir}/xml/gnome/xslt/ + cp -pPr ${S}/xslt/* ${D}${datadir}/xml/gnome/xslt/ + + chown -R root:root ${D} +} + +do_install_append_class-native () { + sed -i -e 's|^#!.*/usr/bin/env python|#! /usr/bin/env nativepython|' ${D}${bindir}/xml2po +} + +FILES_${PN} += "${datadir}/xml* ${PYTHON_SITEPACKAGES_DIR}/*" + +RDEPENDS_${PN} = "bash" +RDEPENDS_${PN}_class-native = "" + +BBCLASSEXTEND = "native" diff --git a/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch b/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch new file mode 100644 index 000000000..416d69864 --- /dev/null +++ b/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/sysrooted-pkg-config.patch @@ -0,0 +1,35 @@ +In cross environment we have to prepend the sysroot to the path found by +pkgconfig since the path returned from pkgconfig does not have sysroot prefixed +it ends up using the files from host system. Now usually people have gnome installed +so the build succeeds but if you dont have gnome installed on build host then +it wont find the files on host system and packages using gnome-doc-utils wont +compile. + +This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR +will be empty + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Constantin Musca <constantinx.musca@intel.com> + +Index: gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make +=================================================================== +--- gnome-doc-utils-0.20.10.orig/tools/gnome-doc-utils.make ++++ gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make +@@ -133,11 +133,11 @@ _DOC_ABS_SRCDIR = @abs_srcdir@ + _xml2po ?= `which xml2po` + _xml2po_mode = $(if $(DOC_ID),mallard,docbook) + +-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` +-_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` +-_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl +-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl +-_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl ++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` ++_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` ++_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl ++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl ++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}$(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl + + if ENABLE_SK + _ENABLE_SK = true diff --git a/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch b/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch new file mode 100644 index 000000000..0e196c063 --- /dev/null +++ b/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch @@ -0,0 +1,30 @@ +We can't use #!/full/path/to/python -u as this can be longer than shebang +allows for. In order to be appropraite for upstream more work would be +needed to make sure that the main xml2po code doesn't rely on python +being invoked with -u (force stdin/out/err to be used raw). + +Upstream-Status: Inappropriate [Would break behavior on Windows] +Signed-off-by: Constantin Musca <constantinx.musca@intel.com> + +Index: gnome-doc-utils-0.20.10/xml2po/xml2po/Makefile.am +=================================================================== +--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/Makefile.am ++++ gnome-doc-utils-0.20.10/xml2po/xml2po/Makefile.am +@@ -7,7 +7,6 @@ CLEANFILES = xml2po + + xml2po: xml2po.py.in + $(AM_V_GEN)sed -e "s/^VERSION =.*/VERSION = \"@VERSION@\"/" \ +- -e "s+^#!.*python.*+#!$(PYTHON)+" \ + < $(srcdir)/xml2po.py.in > xml2po + $(AM_V_at)chmod +x xml2po + +Index: gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in +=================================================================== +--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in ++++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in +@@ -1,4 +1,4 @@ +-#!/usr/bin/python -u ++#!/usr/bin/env python + # -*- encoding: utf-8 -*- + # Copyright (c) 2004, 2005, 2006 Danilo Ĺ egan <danilo@gnome.org>. + # Copyright (c) 2009 Claude Paroz <claude@2xlibre.net>. diff --git a/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch b/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch new file mode 100644 index 000000000..9346494e9 --- /dev/null +++ b/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch @@ -0,0 +1,95 @@ +This adds the -nonet option to xsltproc invocations, which fixes +compile errors when building the gnome-doc-utils docs. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Scott Garman <scott.a.garman@intel.com> +Signed-off-by: Constantin Musca <constantinx.musca@intel.com> + +Index: gnome-doc-utils-0.20.10/doc/xslt/Makefile.am +=================================================================== +--- gnome-doc-utils-0.20.10.orig/doc/xslt/Makefile.am ++++ gnome-doc-utils-0.20.10/doc/xslt/Makefile.am +@@ -21,14 +21,14 @@ all: $(xsldoc_docs) $(xsldoc_xmls) + + $(xsldoc_docs): $(xsldoc_xsls) xsldoc.awk xsldoc-fill.xsl + $(AM_V_GEN)$(GDU_AWK) -f "$(srcdir)/xsldoc.awk" "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \ +- | xsltproc -o "$@" \ ++ | xsltproc -nonet -o "$@" \ + --stringparam basename "$(basename $(notdir $@))" \ + --stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \ + "$(srcdir)/xsldoc-fill.xsl" - + + $(xsldoc_xmls): xsldoc-docbook.xsl + $(xsldoc_xmls): C/%.xml : C/%.xsldoc +- $(AM_V_GEN)xsltproc -o "$@" \ ++ $(AM_V_GEN)xsltproc -nonet -o "$@" \ + --stringparam basename "$(basename $(notdir $@))" \ + --stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \ + "$(srcdir)/xsldoc-docbook.xsl" "$<" +@@ -62,7 +62,7 @@ gnome-doc-xslt-check-includes: + gnome-doc-xslt-check-xsldoc: $(xsldoc_docs) + @echo "Running xsldoc checks"; + @(echo "<xsldoc>"; cat $(xsldoc_docs); echo "</xsldoc>") \ +- | xsltproc "$(srcdir)/xsldoc-check.xsl" - 1> /dev/null ++ | xsltproc -nonet "$(srcdir)/xsldoc-check.xsl" - 1> /dev/null + + .PHONY: clean-xsldoc + clean-local: clean_xsldoc +Index: gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make +=================================================================== +--- gnome-doc-utils-0.20.10.orig/tools/gnome-doc-utils.make ++++ gnome-doc-utils-0.20.10/tools/gnome-doc-utils.make +@@ -37,7 +37,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS); + list='$(DOC_H_DOCS)'; for doc in $$list; do \ + xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ + if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ +- xsltproc --path "$$xmlpath" $(_credits) $$doc; \ ++ xsltproc -nonet --path "$$xmlpath" $(_credits) $$doc; \ + done | sort | uniq \ + | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \ + | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp +@@ -50,7 +50,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS); + docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \ + | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \ + echo $$xmlpath; \ +- ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \ ++ ids=`xsltproc -nonet --xinclude --path "$$xmlpath" $(_ids) $$doc`; \ + for id in $$ids; do \ + echo '#define HELP_'`echo $$docid`'_'`echo $$id \ + | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \ +@@ -197,7 +197,7 @@ $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : % + echo "The file '$(_skcontentslist)' does not exist." >&2; \ + echo "Please check your ScrollKeeper installation." >&2; \ + exit 1; } +- $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } ++ $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + + ## @ _DOC_OMF_HTML + ## The OMF files for HTML output +@@ -212,7 +212,7 @@ if ENABLE_SK + echo "Please check your ScrollKeeper installation." >&2; \ + exit 1; } + endif +- $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } ++ $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + + ## @ _DOC_OMF_ALL + ## All OMF output files to be built +@@ -267,7 +267,7 @@ _DOC_C_FIGURES = $(if $(DOC_FIGURES), + ## All HTML documentation in the C locale + # FIXME: probably have to shell escape to determine the file names + _DOC_C_HTML = $(foreach f, \ +- $(shell xsltproc --xinclude \ ++ $(shell xsltproc -nonet --xinclude \ + --stringparam db.chunk.basename "$(DOC_MODULE)" \ + $(_chunks) "C/$(DOC_MODULE).xml"), \ + C/$(f).xhtml) +@@ -393,7 +393,7 @@ _DOC_HTML_ALL = $(if $(filter html HTML, + _DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml) + + $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) +- $(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ++ $(GDU_V_DB2HTM)xsltproc -nonet -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) + + + ################################################################################ diff --git a/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb b/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb new file mode 100644 index 000000000..78cc005f9 --- /dev/null +++ b/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.10.bb @@ -0,0 +1,11 @@ +require gnome-doc-utils.inc +LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ + file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343" + +SRC_URI += "file://xsltproc_nonet.patch \ + file://use-usr-bin-env-for-python-in-xml2po.patch \ + file://sysrooted-pkg-config.patch \ + " + +SRC_URI[archive.md5sum] = "3c64ad7bacd617b04999e4a168afaac5" +SRC_URI[archive.sha256sum] = "cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6" diff --git a/yocto-poky/meta/recipes-gnome/gnome/gnome-mime-data/pkgconfig.patch b/yocto-poky/meta/recipes-gnome/gnome/gnome-mime-data/pkgconfig.patch new file mode 100644 index 000000000..09034255d --- /dev/null +++ b/yocto-poky/meta/recipes-gnome/gnome/gnome-mime-data/pkgconfig.patch @@ -0,0 +1,14 @@ +Upstream-Status: Inappropriate [configuration] + +Index: gnome-mime-data-2.18.0/Makefile.am +=================================================================== +--- gnome-mime-data-2.18.0.orig/Makefile.am 2009-06-11 17:27:48.000000000 +0100 ++++ gnome-mime-data-2.18.0/Makefile.am 2009-06-11 17:27:59.000000000 +0100 +@@ -1,6 +1,6 @@ + SUBDIRS = man po + +-pkgconfigdir = $(datadir)/pkgconfig ++pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = gnome-mime-data-2.0.pc + + NULL= diff --git a/yocto-poky/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb b/yocto-poky/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb new file mode 100644 index 000000000..a31eb5571 --- /dev/null +++ b/yocto-poky/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "Base MIME and Application database for GNOME" +HOMEPAGE = "http://www.gnome.org/" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "GPLv2 & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://check-mime.pl;endline=26;md5=a95b63c92c33d4ca1af61a315888f450" + +inherit gnomebase mime +PR = "r4" + +SRC_URI += "file://pkgconfig.patch" + +SRC_URI[archive.md5sum] = "541858188f80090d12a33b5a7c34d42c" +SRC_URI[archive.sha256sum] = "37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7" +GNOME_COMPRESS_TYPE="bz2" + +DEPENDS += "shared-mime-info intltool-native" +RDEPENDS_${PN} = "shared-mime-info" diff --git a/yocto-poky/meta/recipes-gnome/gnome/libart-lgpl/libart_lgpl-2.3.21-crosscompile.patch b/yocto-poky/meta/recipes-gnome/gnome/libart-lgpl/libart_lgpl-2.3.21-crosscompile.patch new file mode 100644 index 000000000..0261f58c9 --- /dev/null +++ b/yocto-poky/meta/recipes-gnome/gnome/libart-lgpl/libart_lgpl-2.3.21-crosscompile.patch @@ -0,0 +1,84 @@ +Taken from portage + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +From e1443c945a4cf67096d8c27721aadd7368382b3f Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Tue, 6 Apr 2010 15:22:25 +0200 +Subject: [PATCH 2/2] gentoo: use ISO types for fixed type size + +--- + Makefile.am | 11 ++--------- + art_config.h | 5 +++++ + configure.in | 10 ---------- + 3 files changed, 7 insertions(+), 19 deletions(-) + create mode 100644 art_config.h + +diff --git a/Makefile.am b/Makefile.am +index 95952da..6aa2fe3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,13 +2,6 @@ check_PROGRAMS = testart testuta + + bin_SCRIPTS = \ + libart2-config +- +-noinst_SCRIPTS = gen_art_config.sh +- +-BUILT_SOURCES = art_config.h +- +-art_config.h: +- ./gen_art_config.sh > art_config.h + + EXTRA_DIST = \ + libart.def \ +@@ -173,5 +166,5 @@ install-data-local: install-ms-lib install-libtool-import-lib + + uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib + +-CLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS) +-DISTCLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS) ++CLEANFILES = $(bin_SCRIPTS) ++DISTCLEANFILES = $(bin_SCRIPTS) +diff --git a/art_config.h b/art_config.h +new file mode 100644 +index 0000000..5985f1f +--- a/art_config.h ++++ b/art_config.h +@@ -0,0 +1,5 @@ ++#include <stdint.h> ++ ++typedef uint8_t art_u8; ++typedef uint16_t art_u16; ++typedef uint32_t art_u32; +diff --git a/configure.in b/configure.in +index e4804f7..ddcac4f 100644 +--- a/configure.in ++++ b/configure.in +@@ -92,15 +92,6 @@ AC_FUNC_ALLOCA + + AC_C_BIGENDIAN + +-AC_CHECK_SIZEOF(char) +-AC_SUBST(ART_SIZEOF_CHAR, $ac_cv_sizeof_char) +-AC_CHECK_SIZEOF(short) +-AC_SUBST(ART_SIZEOF_SHORT, $ac_cv_sizeof_short) +-AC_CHECK_SIZEOF(int) +-AC_SUBST(ART_SIZEOF_INT, $ac_cv_sizeof_int) +-AC_CHECK_SIZEOF(long) +-AC_SUBST(ART_SIZEOF_LONG, $ac_cv_sizeof_long) +- + AC_CONFIG_FILES([ + libart-features.h + Makefile +@@ -109,6 +100,5 @@ libart-2.0-uninstalled.pc + libart-zip]) + + AC_CONFIG_FILES([libart-config],[chmod +x libart-config]) +-AC_CONFIG_FILES([gen_art_config.sh],[chmod +x gen_art_config.sh]) + + AC_OUTPUT +-- +1.7.0.4 + diff --git a/yocto-poky/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb b/yocto-poky/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb new file mode 100644 index 000000000..95581b297 --- /dev/null +++ b/yocto-poky/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb @@ -0,0 +1,22 @@ +SUMMARY = "Library of functions for 2D graphics" +SECTION = "x11/gnome" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" +PR = "r2" + +# can't use gnome.oeclass due to _ in filename +SRC_URI = "${GNOME_MIRROR}/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \ + file://libart_lgpl-2.3.21-crosscompile.patch \ + " + +SRC_URI[md5sum] = "08559ff3c67fd95d57b0c5e91a6b4302" +SRC_URI[sha256sum] = "fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa" + +inherit autotools pkgconfig + +DEPENDS = "" + +FILES_${PN} = "${libdir}/*.so.*" +FILES_${PN}-dev += "${bindir}/libart2-config" + +S = "${WORKDIR}/libart_lgpl-${PV}" |