diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-gnome')
62 files changed, 1508 insertions, 145 deletions
diff --git a/import-layers/meta-openembedded/meta-gnome/README b/import-layers/meta-openembedded/meta-gnome/README index 2a889e47c..143173727 100644 --- a/import-layers/meta-openembedded/meta-gnome/README +++ b/import-layers/meta-openembedded/meta-gnome/README @@ -1,17 +1,18 @@ This layer depends on: URI: git://github.com/openembedded/oe-core.git -branch: krogoth +branch: morty revision: HEAD URI: git://github.com/openembedded/meta-oe.git -branch: krogoth +branch: morty revision: HEAD -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome][krogoth]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome]' in the subject' When sending single patches, please using something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-gnome][krogoth][PATCH' +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-gnome][morty][PATCH' -krogoth Branch Maintainer: +morty branch maintainer(s): Armin Kuster <akuster808@gmail.com> + diff --git a/import-layers/meta-openembedded/meta-gnome/conf/layer.conf b/import-layers/meta-openembedded/meta-gnome/conf/layer.conf index 58e12a9cd..fce5627bd 100644 --- a/import-layers/meta-openembedded/meta-gnome/conf/layer.conf +++ b/import-layers/meta-openembedded/meta-gnome/conf/layer.conf @@ -13,3 +13,5 @@ BBFILE_PRIORITY_gnome-layer = "7" LAYERVERSION_gnome-layer = "1" LAYERDEPENDS_gnome-layer = "core openembedded-layer" + +AVAHI_GTK_pn-avahi-ui = "gtk gtk3" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.10.bb b/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.10.bb index d3e08cadb..9803a8323 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.10.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.10.bb @@ -2,7 +2,10 @@ SUMMARY = "GTK+ applet for NetworkManager" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -DEPENDS = "gtk+3 libnotify libsecret networkmanager dbus-glib gconf libgnome-keyring iso-codes nss" +DEPENDS = "gtk+3 libnotify libsecret networkmanager dbus-glib \ + gconf libgnome-keyring iso-codes nss \ + intltool-native \ +" inherit gnomebase gsettings gtk-icon-cache gobject-introspection diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb b/import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb index 2f38977fd..73a15db00 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb @@ -13,7 +13,7 @@ SRC_URI = " \ SRC_URI[md5sum] = "b8480274c68876acff5965d4346710e7" SRC_URI[sha256sum] = "02398ab33894a59b0bd8707e598c46d8bb56f1413cd54de48eed61e2920ecd60" -DEPENDS = "glib-2.0 gtkmm parted gnome-doc-utils-native" +DEPENDS = "glib-2.0 gtkmm parted gnome-doc-utils intltool-native" do_install_append() { # Add a script which checks if polkit is installed. diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-extended/gtk-theme-torturer/gtk-theme-torturer_git.bb b/import-layers/meta-openembedded/meta-gnome/recipes-extended/gtk-theme-torturer/gtk-theme-torturer_git.bb index 2621d1540..8a21112dd 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-extended/gtk-theme-torturer/gtk-theme-torturer_git.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-extended/gtk-theme-torturer/gtk-theme-torturer_git.bb @@ -17,8 +17,8 @@ inherit distro_features_check ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" do_install() { - install -d ${D}${bindir} - install -m 0755 torturer ${D}${bindir} + install -d ${D}${bindir} + install -m 0755 torturer ${D}${bindir} } # http://errors.yoctoproject.org/Errors/Details/35132/ diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0002-Bug-13754-Fix-build-on-gcc-6-default-to-C-11.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0002-Bug-13754-Fix-build-on-gcc-6-default-to-C-11.patch new file mode 100644 index 000000000..595ee8e5a --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0002-Bug-13754-Fix-build-on-gcc-6-default-to-C-11.patch @@ -0,0 +1,74 @@ +From a83e6f50dbd5efa16fb39efe32b9de370f103130 Mon Sep 17 00:00:00 2001 +From: Hubert Figuiere <hub@figuiere.net> +Date: Sat, 23 Jan 2016 20:46:02 +0000 +Subject: [PATCH] Bug 13754 - Fix build on gcc-6 (default to C++11). + +This is debian bug https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811381 + +git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/trunk@35182 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6 + +Upstream-Status: Backport +--- + plugins/collab/backends/service/xp/RealmProtocol.cpp | 4 ++-- + plugins/collab/backends/service/xp/soa_soup.cpp | 2 +- + plugins/latex/xp/ie_exp_LaTeX.cpp | 2 +- + plugins/xslfo/xp/ie_exp_XSL-FO.cpp | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/plugins/collab/backends/service/xp/RealmProtocol.cpp b/plugins/collab/backends/service/xp/RealmProtocol.cpp +index fb426eb..347a49c 100644 +--- a/plugins/collab/backends/service/xp/RealmProtocol.cpp ++++ b/plugins/collab/backends/service/xp/RealmProtocol.cpp +@@ -6,8 +6,8 @@ namespace protocolv1 { + + #define MAX_PACKET_DATA_SIZE 64*1024*1024 + +-#define RPV1_PACKET_NONEXISTENT -2 +-#define RPV1_PACKET_VARIABLE -1 ++#define RPV1_PACKET_NONEXISTENT uint32_t(-2) ++#define RPV1_PACKET_VARIABLE uint32_t(-1) + + static uint32_t body_size[6] = { + RPV1_PACKET_NONEXISTENT, /* 0: reserved */ +diff --git a/plugins/collab/backends/service/xp/soa_soup.cpp b/plugins/collab/backends/service/xp/soa_soup.cpp +index 4b81735..f4f5134 100644 +--- a/plugins/collab/backends/service/xp/soa_soup.cpp ++++ b/plugins/collab/backends/service/xp/soa_soup.cpp +@@ -163,7 +163,7 @@ namespace soup_soa { + + static bool _invoke(const std::string& /*url*/, const soa::method_invocation& /*mi*/, SoaSoupSession& sess, std::string& result) { + if (!sess.m_session || !sess.m_msg ) +- return soa::GenericPtr(); ++ return false; + + guint status = soup_session_send_message (sess.m_session, sess.m_msg); + if (!(SOUP_STATUS_IS_SUCCESSFUL (status) || +diff --git a/plugins/latex/xp/ie_exp_LaTeX.cpp b/plugins/latex/xp/ie_exp_LaTeX.cpp +index 7aaf3a9..8bcc250 100644 +--- a/plugins/latex/xp/ie_exp_LaTeX.cpp ++++ b/plugins/latex/xp/ie_exp_LaTeX.cpp +@@ -1330,7 +1330,7 @@ void s_LaTeX_Listener::_outputData(const UT_UCSChar * data, UT_uint32 length) + m_pie->write(sBuf.c_str(),sBuf.size()); + } + +-#define SUB(a,who) case a: subst = "\\(\\"who"\\)"; return true; ++#define SUB(a,who) case a: subst = "\\(\\" who"\\)"; return true; + #define SUBd(a,who) case a: subst = who; return true; + static bool _convertLettersToSymbols(char c, const char *& subst) + { +diff --git a/plugins/xslfo/xp/ie_exp_XSL-FO.cpp b/plugins/xslfo/xp/ie_exp_XSL-FO.cpp +index cc5e4e6..957226e 100644 +--- a/plugins/xslfo/xp/ie_exp_XSL-FO.cpp ++++ b/plugins/xslfo/xp/ie_exp_XSL-FO.cpp +@@ -1451,7 +1451,7 @@ void s_XSL_FO_Listener::_openSection(PT_AttrPropIndex api) + { \ + UT_UTF8String esc = szValue; \ + esc.escapeXML(); \ +- buf += " "x"=\""; \ ++ buf += " " x"=\""; \ + buf += esc.utf8_str(); \ + buf += "\""; \ + } +-- +2.5.5 + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb index 962a56cb9..5052b36fc 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb @@ -13,6 +13,7 @@ RCONFLICTS_${PN} = "${PN}-embedded" SRC_URI = " \ http://www.abisource.com/downloads/${BPN}/${PV}/source/${BP}.tar.gz \ file://0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch \ + file://0002-Bug-13754-Fix-build-on-gcc-6-default-to-C-11.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=c5edcc3ccd864b19004d14e9c1c9a26a" @@ -75,7 +76,7 @@ FILES_${PN} += " \ ${datadir}/${PN}-${SHRT_VER}/templates/Press-Release.awt \ ${datadir}/${PN}-${SHRT_VER}/certs \ ${datadir}/${PN}-${SHRT_VER}/ui \ - ${datadir}/${PN}-${SHRT_VER}/xsl* \ + ${datadir}/${PN}-${SHRT_VER}/xsl* \ ${datadir}/${PN}-${SHRT_VER}/mime-info \ ${datadir}/${PN}-${SHRT_VER}/Pr*.xml \ " @@ -113,7 +114,7 @@ python populate_packages_prepend () { packages = d.getVar('PACKAGES', 1).split() for pkg in packages[1:]: if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale") and not pkg.count("abiword-doc"): - print "Modifying ", pkg + print("Modifying %s" % pkg) metapkg_rdepends.append(pkg) d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) d.setVar('DESCRIPTION_' + metapkg, 'abiword-plugin meta package') diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo.inc b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo.inc index e0f616869..60a85974e 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo.inc +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo.inc @@ -3,7 +3,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" SECTION = "x11/gnome/libs" -DEPENDS = "glib-2.0 orbit2 intltool-native libxml2 dbus dbus-glib" +DEPENDS = "glib-2.0 orbit2-native orbit2 intltool-native libxml2 dbus dbus-glib" inherit gnomebase gtk-doc lib_package diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patch new file mode 100644 index 000000000..20db671e0 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patch @@ -0,0 +1,26 @@ +This checks whether the format string is a literal on the calling function. As bonobo_debug_print() +takes already a va_list, we specify the format on the functions that call it +The second number, which is 0 here, should then be the argument index of the variadic argument + +Fixed warning with clang + +| ../../libbonobo-2.32.1/bonobo/bonobo-debug.c:58:32: error: format string is not a string literal [-Werror,-Wformat-nonliteral] +| vfprintf (_bonobo_debug_file, fmt, args); +| ^~~ +| 1 error generated. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: libbonobo-2.32.1/bonobo/bonobo-debug.c +=================================================================== +--- libbonobo-2.32.1.orig/bonobo/bonobo-debug.c ++++ libbonobo-2.32.1/bonobo/bonobo-debug.c +@@ -47,6 +47,7 @@ bonobo_debug_init(void) + _bonobo_debug_file = stderr; + } + ++__attribute__((__format__ (printf, 2, 0))) + void + bonobo_debug_print (const char *name, char *fmt, ...) + { diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb index fd4d81210..8e00eb4d2 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb @@ -2,6 +2,7 @@ require libbonobo.inc SRC_URI += "file://0001-Remove-use-of-G_DISABLE_DEPRECATED.patch \ file://do-not-use-srcdir-variable.patch \ + file://fix-nonliteral-in-string.patch \ " SRC_URI[archive.md5sum] = "27fa902d4fdf6762ee010e7053aaf77b" SRC_URI[archive.sha256sum] = "9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb index 2b6f15e82..f38be880f 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb @@ -9,21 +9,23 @@ SRC_URI[archive.md5sum] = "69a12ed68893f2e1e81ac4e531bc1515" SRC_URI[archive.sha256sum] = "109b1bc6078690af1ed88cb144ef5c5aee7304769d8bdc82ed48c3696f10c955" GNOME_COMPRESS_TYPE = "xz" -DEPENDS = "glib-2.0 gtk+3 libxml2" +DEPENDS = "glib-2.0 gtk+3 libxml2 intltool-native" -inherit vala gtk-doc +inherit vala gtk-doc distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OECONF += "--disable-man" PACKAGES =+ "dconf-editor" FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${libdir}/gio/modules/*.so \ + ${datadir}/dbus-1 \ + ${libdir}/gio/modules/*.so \ " FILES_dconf-editor = " \ - ${bindir}/dconf-editor \ - ${datadir}/icons \ - ${datadir}/bash-completion \ + ${bindir}/dconf-editor \ + ${datadir}/icons \ + ${datadir}/bash-completion \ " FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/libdconfsettings.so" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb index a5664b085..c31de0ca1 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb @@ -48,7 +48,7 @@ do_compile_prepend() { EXTRA_OECONF = "--without-openldap \ --with-libdb=${STAGING_DIR_HOST}${prefix} \ - --disable-nntp --disable-goa --disable-weather" + --disable-nntp --disable-goa --disable-weather --disable-gtk-doc" PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \ libedata-book libedata-book-dev libedata-cal libedata-cal-dev \ diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0002-fix-gcc6-errors.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0002-fix-gcc6-errors.patch new file mode 100644 index 000000000..b8e30f7d9 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0002-fix-gcc6-errors.patch @@ -0,0 +1,39 @@ +--- evince-3.18.2/backend/comics/comics-document.c.orig 2016-06-22 20:08:01.789805750 +0000 ++++ evince-3.18.2/backend/comics/comics-document.c 2016-06-22 20:07:00.817804688 +0000 +@@ -241,6 +241,8 @@ + /* This function shows how to use the choosen command for decompressing a + * comic book file. It modifies fields of the ComicsDocument struct with + * this information */ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + static gboolean + comics_generate_command_lines (ComicsDocument *comics_document, + GError **error) +@@ -296,6 +298,7 @@ + } + + } ++#pragma GCC diagnostic pop + + /* This function chooses an external command for decompressing a comic + * book based on its mime tipe. */ +--- evince-3.18.2/libdocument/ev-document-misc.c.orig 2016-06-22 20:01:49.205799262 +0000 ++++ evince-3.18.2/libdocument/ev-document-misc.c 2016-06-22 20:02:27.233799924 +0000 +@@ -519,7 +519,8 @@ + + return (dp / di); + } +- ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-y2k" + /* Returns a locale specific date and time representation */ + gchar * + ev_document_misc_format_date (GTime utime) +@@ -542,6 +543,7 @@ + + return g_locale_to_utf8 (s, -1, NULL, NULL, NULL); + } ++#pragma GCC diagnostic pop + + void + ev_document_misc_get_pointer_position (GtkWidget *widget, diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.18.2.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.18.2.bb index fe63093ad..e42e9045d 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.18.2.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.18.2.bb @@ -2,15 +2,19 @@ SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b" SECTION = "x11/office" -DEPENDS = "gtk+3 libsecret gnome-desktop3 poppler gstreamer1.0-plugins-base orc adwaita-icon-theme" +DEPENDS = "gtk+3 libsecret gnome-desktop3 poppler gstreamer1.0-plugins-base orc adwaita-icon-theme intltool-native" PR = "r5" -inherit gnome pkgconfig gtk-icon-cache gsettings gobject-introspection +inherit gnome pkgconfig gtk-icon-cache gsettings gobject-introspection distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[archive.md5sum] = "c39af6b8b1c44d4393ef8ac9dab99c0b" SRC_URI[archive.sha256sum] = "42ad6c7354d881a9ecab136ea84ff867acb942605bcfac48b6c12e1c2d8ecb17" -SRC_URI += "file://0001-help-remove-YELP-macro.patch" +SRC_URI += "file://0001-help-remove-YELP-macro.patch \ + file://0002-fix-gcc6-errors.patch \ +" EXTRA_OECONF = " --enable-thumbnailer \ " diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb index 259c609fd..9266f97a2 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb @@ -34,6 +34,7 @@ EXTRA_OECONF = " \ do_configure_prepend() { sed -i -e "s:\bdocs::g" ${S}/Makefile.am + rm -f ${S}/m4/gnome-doc-utils.m4 } do_install_prepend() { @@ -103,3 +104,5 @@ pkg_postrm_${PN} () { delgroup gdm || true sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true } + +PNBLACKLIST[gdm] ?= "Depends on broken gnome-panel" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch new file mode 100644 index 000000000..4ad57effe --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch @@ -0,0 +1,29 @@ +From 1d2e6165e3154e27ecde329a40c05f0880afb9e0 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 17 May 2016 14:14:03 +0300 +Subject: [PATCH] Remove help directory from build + +It hardcodes the use of xml2po utility, which is provided by obsolete gnome-doc-utils + +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Makefile.am | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index e57b203..a88152d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,9 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 + + SUBDIRS = gedit pixmaps po data plugin-loaders plugins docs tests win32 osx + +-if !OS_OSX +-SUBDIRS += help +-endif + + distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper + +-- +2.8.1 + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch new file mode 100644 index 000000000..a5d231012 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch @@ -0,0 +1,38 @@ +From 4ebdf8023f763f75a7e1b548894de2e8b784f4a8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Fri, 29 Jul 2016 23:19:40 +0200 +Subject: [PATCH] suppress string format literal warning to fix build with gcc6 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + plugins/time/gedit-time-plugin.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/plugins/time/gedit-time-plugin.c b/plugins/time/gedit-time-plugin.c +index d2ffdb9..441d9f9 100644 +--- a/plugins/time/gedit-time-plugin.c ++++ b/plugins/time/gedit-time-plugin.c +@@ -473,12 +473,15 @@ get_time (const gchar* format) + clock = time (NULL); + now = localtime (&clock); + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + do + { + out_length += 255; + out = g_realloc (out, out_length); + } + while (strftime (out, out_length, locale_format, now) == 0); ++#pragma GCC diagnostic pop + + g_free (locale_format); + +-- +2.5.5 + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb index 1c7b7e3ed..a6c68d383 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb @@ -3,12 +3,16 @@ SECTION = "x11/gnome" LICENSE = "GPLv2+" PR = "r2" -DEPENDS = "gvfs enchant gconf gnome-doc-utils gnome-doc-utils-native glib-2.0 gtk+ gtksourceview2 iso-codes" +DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 gtk+ gtksourceview2 iso-codes intltool-native" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit gnome gettext pythonnative -SRC_URI+= "file://0001-workaround-void-pointer-arithmetic.patch" +SRC_URI+= " \ + file://0001-workaround-void-pointer-arithmetic.patch \ + file://0001-Remove-help-directory-from-build.patch \ + file://0002-suppress-string-format-literal-warning-to-fix-build-.patch \ +" SRC_URI[archive.md5sum] = "e1eecb0a92a1a363b3d375ec5ac0fb3b" SRC_URI[archive.sha256sum] = "a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c" GNOME_COMPRESS_TYPE="bz2" @@ -16,13 +20,5 @@ GNOME_COMPRESS_TYPE="bz2" EXTRA_OECONF = "--disable-scrollkeeper \ --enable-gvfs-metadata" -do_configure_prepend() { - cd ${S} - gnome-doc-common --copy || true - gnome-doc-prepare --force --copy || true - cd ${B} -} - FILES_${PN} += "${libdir}/gedit-2/plugin* ${datadir}/gedit-2" FILES_${PN}-dbg += "${libdir}/gedit-2/plugin-loaders/.debug ${libdir}/gedit-2/plugins/.debug" - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb index 7b064c332..fe3e572f3 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb @@ -6,8 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ SECTION = "x11/gnome" -DEPENDS = "udev gtk+3 libnotify libcanberra" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}" +DEPENDS = "udev gtk+3 libnotify libcanberra intltool-native \ + ${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)} \ +" inherit gnomebase gtk-icon-cache gobject-introspection diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb index 86b913bb1..391d0dd97 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb @@ -16,6 +16,7 @@ LDFLAGS += "-lgthread-2.0 -lxml2" do_configure_prepend() { sed -i s:help::g ${S}/Makefile.am + rm -f ${S}/m4/gnome-doc-utils.m4 } do_install_append() { rm -rf ${D}${datadir}/mime @@ -30,3 +31,5 @@ FILES_${PN} += "${datadir}/icon* \ FILES_${PN}-dbg += "${libdir}/window-manager-settings/.debug" FILES_${PN}-dev += "${libdir}/window-manager-settings/*.la" FILES_${PN}-staticdev += "${libdir}/window-manager-settings/*.a" + +PNBLACKLIST[gnome-control-center] ?= "Depends on broken gnome-menus" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb index 703c397b2..c1a47e09b 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb @@ -12,12 +12,13 @@ SRC_URI[archive.md5sum] = "5c80d628a240eb9d9ff78913b31f2f67" SRC_URI[archive.sha256sum] = "55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d" GNOME_COMPRESS_TYPE="bz2" -DEPENDS += "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils startup-notification" +DEPENDS += "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils startup-notification intltool-native" EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs --disable-gnome-about" do_configure_prepend () { sed -i -e s:^#!@PYTHON@:#!${bindir}/python: ${S}/gnome-about/gnome-about.in + rm -f ${S}/m4/gnome-doc-utils.m4 } PACKAGES =+ "libgnome-desktop" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb index 2f427e7ef..eac9dbd26 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb @@ -7,7 +7,10 @@ DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui virtual/libx11 liba PR = "r4" -inherit gnomebase gtk-icon-cache +inherit gnomebase gtk-icon-cache distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" + SRC_URI[archive.md5sum] = "f0366c8baebca0404d190b2d78f3582d" SRC_URI[archive.sha256sum] = "03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d962652f4de6a98" GNOME_COMPRESS_TYPE="bz2" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb index f8f5dddfb..100d32ef2 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb @@ -36,6 +36,8 @@ FILES_${PN}-dev += "${libdir}/${BPN}/devel/*.la \ ${base_libdir}/security/*.la \ " +INSANE_SKIP_${PN}-dev += "dev-elf" + FILES_${PN}-dbg += "${libdir}/${BPN}/standalone/.debug/ \ ${libdir}/${BPN}/devel/.debug/ \ ${base_libdir}/security/.debug/" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb index 1b84a54c8..418951890 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" PR = "r1" -DEPENDS = "python libxml2 gconf popt gtk+" +DEPENDS = "python libxml2 gconf popt gtk+ intltool-native" inherit gnomebase pkgconfig python-dir pythonnative gobject-introspection @@ -13,10 +13,18 @@ SRC_URI[archive.md5sum] = "caa6772e63ed5870cf43dc3d354e0624" SRC_URI[archive.sha256sum] = "6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa" GNOME_COMPRESS_TYPE="bz2" -PACKAGES += "${PN}-python" +do_configure_append () { + + # this expands to native-pthon which we don't want. + sed -i 's:\@PYTHON\@:/usr/bin/env python:' ${S}/simple-editor/gmenu-simple-editor.in + +} +PACKAGES += "${PN}-python ${PN}-python-staticdev" FILES_${PN} += "${datadir}/desktop-directories/" -FILES_${PN}-python = "${libdir}/python*" +FILES_${PN}-python-staticdev = "${PYTHON_SITEPACKAGES_DIR}/gmenu.a ${PYTHON_SITEPACKAGES_DIR}/gmenu.la" +FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/gmenu.so ${PYTHON_SITEPACKAGES_DIR}/GMenuSimpleEditor " FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug \ ${PYTHON_SITEPACKAGES_DIR}/.debug" - +# http://errors.yoctoproject.org/Errors/Details/81001/ +PNBLACKLIST[gnome-menus] ?= "BROKEN: fails to build because of python" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Add-gnome-doc-utils.make.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Add-gnome-doc-utils.make.patch new file mode 100644 index 000000000..fdcccb9d7 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Add-gnome-doc-utils.make.patch @@ -0,0 +1,730 @@ +From 7345730ac882ee5a493254e5cf9162c96c648ef2 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 17 May 2016 14:40:33 +0300 +Subject: [PATCH] Add gnome-doc-utils.make + +Since the sources are taken from git, the file is absent +(and is installed by tools from gnome-doc-utils which +are no longer provided). + +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + gnome-doc-utils.make | 706 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 706 insertions(+) + create mode 100644 gnome-doc-utils.make + +diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make +new file mode 100644 +index 0000000..b2e0fa1 +--- /dev/null ++++ b/gnome-doc-utils.make +@@ -0,0 +1,706 @@ ++# gnome-doc-utils.make - make magic for building documentation ++# Copyright (C) 2004-2005 Shaun McCance <shaunm@gnome.org> ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software Foundation, ++# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++################################################################################ ++## @@ Generating Header Files ++ ++## @ DOC_H_FILE ++## The name of the header file to generate ++DOC_H_FILE ?= ++ ++## @ DOC_H_DOCS ++## The input DocBook files for generating the header file ++DOC_H_DOCS ?= ++ ++$(DOC_H_FILE): $(DOC_H_DOCS); ++ @rm -f $@.tmp; touch $@.tmp; ++ echo 'const gchar* documentation_credits[] = {' >> $@.tmp ++ 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 -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 ++ echo ' NULL' >> $@.tmp ++ echo '};' >> $@.tmp ++ echo >> $@.tmp ++ 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; \ ++ docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \ ++ | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \ ++ echo $$xmlpath; \ ++ 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; \ ++ done; \ ++ echo >> $@.tmp; \ ++ done; ++ cp $@.tmp $@ && rm -f $@.tmp ++ ++dist-check-gdu: ++if !HAVE_GNOME_DOC_UTILS ++ @echo "*** GNOME Doc Utils must be installed in order to make dist" ++ @false ++endif ++ ++.PHONY: dist-doc-header ++dist-doc-header: $(DOC_H_FILE) ++ @if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \ ++ $(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)"; ++ ++doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header) ++ ++.PHONY: clean-doc-header ++_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header) ++clean-local: $(_clean_doc_header) ++distclean-local: $(_clean_doc_header) ++mostlyclean-local: $(_clean_doc_header) ++maintainer-clean-local: $(_clean_doc_header) ++clean-doc-header: ++ rm -f $(DOC_H_FILE) ++ ++all: $(DOC_H_FILE) ++ ++ ++################################################################################ ++## @@ Generating Documentation Files ++ ++## @ DOC_MODULE ++## The name of the document being built ++DOC_MODULE ?= ++ ++## @ DOC_ID ++## The unique identifier for a Mallard document ++DOC_ID ?= ++ ++## @ DOC_PAGES ++## Page files in a Mallard document ++DOC_PAGES ?= ++ ++## @ DOC_ENTITIES ++## Files included with a SYSTEM entity ++DOC_ENTITIES ?= ++ ++## @ DOC_INCLUDES ++## Files included with XInclude ++DOC_INCLUDES ?= ++ ++## @ DOC_FIGURES ++## Figures and other external data ++DOC_FIGURES ?= ++ ++## @ DOC_FORMATS ++## The default formats to be built and installed ++DOC_FORMATS ?= docbook ++_DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS)) ++ ++## @ DOC_LINGUAS ++## The languages this document is translated into ++DOC_LINGUAS ?= ++_DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \ ++ $(filter $(LINGUAS),$(DOC_LINGUAS)), \ ++ $(DOC_LINGUAS)) ++ ++_DOC_ABS_SRCDIR = @abs_srcdir@ ++ ++ ++################################################################################ ++## Variables for Bootstrapping ++ ++_xml2po ?= `which xml2po` ++_xml2po_mode = $(if $(DOC_ID),mallard,docbook) ++ ++_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 ++_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir` ++_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir` ++_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml ++endif ++ ++ ++################################################################################ ++## Support for automake silent-rules ++GDU_V_XML2PO=$(GDU__v_XML2PO_$(V)) ++GDU__v_XML2PO_=$(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY)) ++GDU__v_XML2PO_0=@echo " XML2PO" $@; ++ ++GDU_V_MSGFMT=$(GDU__v_MSGFMT_$(V)) ++GDU__v_MSGFMT_=$(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) ++GDU__v_MSGFMT_0=@echo " MSGFMT" $@; ++ ++GDU_V_DB2OMF=$(GDU__v_DB2OMF_$(V)) ++GDU__v_DB2OMF_=$(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY)) ++GDU__v_DB2OMF_0=@echo " DB2OMF" $@; ++ ++GDU_V_DB2HTM=$(GDU__v_DB2HTM_$(V)) ++GDU__v_DB2HTM_=$(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY)) ++GDU__v_DB2HTM_0=@echo " DB2HTM" $@; ++ ++################################################################################ ++## @@ Rules for OMF Files ++ ++db2omf_args = \ ++ --stringparam db2omf.basename $(DOC_MODULE) \ ++ --stringparam db2omf.format $(3) \ ++ --stringparam db2omf.dtd \ ++ $(shell xmllint --format $(2) | grep -h PUBLIC | head -n 1 \ ++ | sed -e 's/.*PUBLIC \(\"[^\"]*\"\).*/\1/') \ ++ --stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2))) \ ++ --stringparam db2omf.omf_dir "$(OMF_DIR)" \ ++ --stringparam db2omf.help_dir "$(HELP_DIR)" \ ++ --stringparam db2omf.omf_in "$(_DOC_OMF_IN)" \ ++ $(if $(_ENABLE_SK), \ ++ --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)") \ ++ $(_db2omf) $(2) ++ ++## @ _DOC_OMF_IN ++## The OMF input file ++_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in)) ++ ++## @ _DOC_OMF_DB ++## The OMF files for DocBook output ++_DOC_OMF_DB = $(if $(_DOC_OMF_IN), \ ++ $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf)) ++ ++$(_DOC_OMF_DB) : $(_DOC_OMF_IN) ++$(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml ++ @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \ ++ echo "The file '$(_skcontentslist)' does not exist." >&2; \ ++ echo "Please check your ScrollKeeper installation." >&2; \ ++ 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 ++_DOC_OMF_HTML = $(if $(_DOC_OMF_IN), \ ++ $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-html-$(lc).omf)) ++ ++$(_DOC_OMF_HTML) : $(_DOC_OMF_IN) ++$(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml ++if ENABLE_SK ++ @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \ ++ echo "The file '$(_skcontentslist)' does not exist" >&2; \ ++ echo "Please check your ScrollKeeper installation." >&2; \ ++ exit 1; } ++endif ++ $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } ++ ++## @ _DOC_OMF_ALL ++## All OMF output files to be built ++# FIXME ++_DOC_OMF_ALL = \ ++ $(if $(filter docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB)) \ ++ $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML)) ++ ++.PHONY: omf ++omf: $(_DOC_OMF_ALL) ++ ++ ++################################################################################ ++## @@ C Locale Documents ++ ++## @ _DOC_C_MODULE ++## The top-level documentation file in the C locale ++_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml) ++ ++## @ _DOC_C_PAGES ++## Page files in a Mallard document in the C locale ++_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page)) ++ ++## @ _DOC_C_ENTITIES ++## Files included with a SYSTEM entity in the C locale ++_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent)) ++ ++## @ _DOC_C_XINCLUDES ++## Files included with XInclude in the C locale ++_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc)) ++ ++## @ _DOC_C_DOCS ++## All documentation files in the C locale ++_DOC_C_DOCS = \ ++ $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \ ++ $(_DOC_C_PAGES) $(_DOC_C_MODULE) ++ ++## @ _DOC_C_DOCS_NOENT ++## All documentation files in the C locale, ++## except files included with a SYSTEM entity ++_DOC_C_DOCS_NOENT = \ ++ $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \ ++ $(_DOC_C_PAGES) ++ ++## @ _DOC_C_FIGURES ++## All figures and other external data in the C locale ++_DOC_C_FIGURES = $(if $(DOC_FIGURES), \ ++ $(foreach fig,$(DOC_FIGURES),C/$(fig)), \ ++ $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/C/figures/*.png))) ++ ++## @ _DOC_C_HTML ++## 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 -nonet --xinclude \ ++ --stringparam db.chunk.basename "$(DOC_MODULE)" \ ++ $(_chunks) "C/$(DOC_MODULE).xml"), \ ++ C/$(f).xhtml) ++ ++############################################################################### ++## @@ Other Locale Documentation ++ ++## @ _DOC_POFILES ++## The .po files used for translating the document ++_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \ ++ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po)) ++ ++.PHONY: po ++po: $(_DOC_POFILES) ++ ++## @ _DOC_MOFILES ++## The .mo files used for translating the document ++_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES)) ++ ++.PHONY: mo ++mo: $(_DOC_MOFILES) ++ ++## @ _DOC_LC_MODULES ++## The top-level documentation files in all other locales ++_DOC_LC_MODULES = $(if $(DOC_MODULE), \ ++ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml)) ++ ++## @ _DOC_LC_PAGES ++## Page files in a Mallard document in all other locales ++_DOC_LC_PAGES = \ ++ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES), \ ++ $(lc)/$(notdir $(page)) )) ++ ++## @ _DOC_LC_XINCLUDES ++## Files included with XInclude in all other locales ++_DOC_LC_INCLUDES = \ ++ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \ ++ $(lc)/$(notdir $(inc)) )) ++ ++## @ _DOC_LC_HTML ++## All HTML documentation in all other locales ++# FIXME: probably have to shell escape to determine the file names ++_DOC_LC_HTML = \ ++ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_DOC_C_HTML), \ ++ $(lc)/$(notdir $(doc)) )) ++ ++## @ _DOC_LC_DOCS ++## All documentation files in all other locales ++_DOC_LC_DOCS = \ ++ $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) $(_DOC_LC_PAGES) \ ++ $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML)) ++ ++## @ _DOC_LC_FIGURES ++## All figures and other external data in all other locales ++_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \ ++ $(patsubst C/%,$(lc)/%,$(_DOC_C_FIGURES)) ) ++ ++_DOC_SRC_FIGURES = \ ++ $(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS), \ ++ $(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) )) ++ ++$(_DOC_POFILES): ++ @if ! test -d $(dir $@); then \ ++ echo "mkdir $(dir $@)"; \ ++ mkdir "$(dir $@)"; \ ++ fi ++ @if test ! -f $@ -a -f $(srcdir)/$@; then \ ++ echo "cp $(srcdir)/$@ $@"; \ ++ cp "$(srcdir)/$@" "$@"; \ ++ fi; ++ @docs=; \ ++ list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \ ++ docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \ ++ done; \ ++ if ! test -f $@; then \ ++ echo "(cd $(dir $@) && \ ++ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \ ++ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \ ++ (cd $(dir $@) && \ ++ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \ ++ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \ ++ else \ ++ echo "(cd $(dir $@) && \ ++ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \ ++ (cd $(dir $@) && \ ++ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \ ++ fi ++ ++$(_DOC_MOFILES): %.mo: %.po ++ $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi ++ $(GDU_V_MSGFMT)msgfmt -o $@ $< ++ ++# FIXME: fix the dependancy ++# FIXME: hook xml2po up ++$(_DOC_LC_DOCS) : $(_DOC_MOFILES) ++$(_DOC_LC_DOCS) : $(_DOC_C_DOCS) ++ $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi ++ $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ ++ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ ++ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ ++ (cd $(dir $@) && \ ++ $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \ ++ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \ ++ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp) ++ ++## @ _DOC_POT ++## A pot file ++_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,$(if $(DOC_ID),$(DOC_ID).pot)) ++.PHONY: pot ++pot: $(_DOC_POT) ++$(_DOC_POT): $(_DOC_C_DOCS_NOENT) ++ $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ ++ ++ ++################################################################################ ++## @@ All Documentation ++ ++## @ _DOC_HTML_ALL ++## All HTML documentation, only if it's built ++_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \ ++ $(_DOC_C_HTML) $(_DOC_LC_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 -nonet -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ++ ++ ++################################################################################ ++## All ++ ++all: \ ++ $(_DOC_C_DOCS) $(_DOC_LC_DOCS) \ ++ $(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \ ++ $(_DOC_HTML_ALL) $(_DOC_POFILES) ++ ++ ++################################################################################ ++## Clean ++ ++.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir ++ ++clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML) ++clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML) ++clean-doc-lc: ++ rm -f $(_DOC_LC_DOCS) ++ rm -f $(_DOC_MOFILES) ++ @list='$(_DOC_POFILES)'; for po in $$list; do \ ++ if ! test "$$po" -ef "$(srcdir)/$$po"; then \ ++ echo "rm -f $$po"; \ ++ rm -f "$$po"; \ ++ fi; \ ++ done ++# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x ++ @for lc in C $(_DOC_REAL_LINGUAS); do \ ++ if test -f "$$lc/.xml2po.mo"; then \ ++ echo "rm -f $$lc/.xml2po.mo"; \ ++ rm -f "$$lc/.xml2po.mo"; \ ++ fi; \ ++ done ++clean-doc-dir: clean-doc-lc ++ @for lc in C $(_DOC_REAL_LINGUAS); do \ ++ for dir in `find $$lc -depth -type d`; do \ ++ if ! test $$dir -ef $(srcdir)/$$dir; then \ ++ echo "rmdir $$dir"; \ ++ rmdir "$$dir"; \ ++ fi; \ ++ done; \ ++ done ++ ++_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf) ++_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk) ++_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc) ++_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir) ++ ++clean-local: \ ++ $(_clean_omf) $(_clean_dsk) \ ++ $(_clean_lc) $(_clean_dir) ++distclean-local: \ ++ $(_clean_omf) $(_clean_dsk) \ ++ $(_clean_lc) $(_clean_dir) ++mostlyclean-local: \ ++ $(_clean_omf) $(_clean_dsk) \ ++ $(_clean_lc) $(_clean_dir) ++maintainer-clean-local: \ ++ $(_clean_omf) $(_clean_dsk) \ ++ $(_clean_lc) $(_clean_dir) ++ ++ ++ ++################################################################################ ++## Dist ++ ++.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk ++doc-dist-hook: \ ++ $(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs) \ ++ $(if $(_DOC_C_FIGURES),dist-doc-figs) \ ++ $(if $(_DOC_OMF_IN),dist-doc-omf) ++# $(if $(_DOC_DSK_IN),dist-doc-dsk) ++ ++dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES) ++ @for lc in C $(_DOC_REAL_LINGUAS); do \ ++ echo " $(mkinstalldirs) $(distdir)/$$lc"; \ ++ $(mkinstalldirs) "$(distdir)/$$lc"; \ ++ done ++ @list='$(_DOC_C_DOCS)'; \ ++ for doc in $$list; do \ ++ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ ++ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ if ! test -d "$(distdir)/$$docdir"; then \ ++ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ ++ $(mkinstalldirs) "$(distdir)/$$docdir"; \ ++ fi; \ ++ echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ ++ $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ ++ done ++ @list='$(_DOC_LC_DOCS)'; \ ++ for doc in $$list; do \ ++ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ ++ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ if ! test -d "$(distdir)/$$docdir"; then \ ++ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ ++ $(mkinstalldirs) "$(distdir)/$$docdir"; \ ++ fi; \ ++ echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ ++ $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ ++ done ++ @list='$(_DOC_POFILES)'; \ ++ for doc in $$list; do \ ++ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ ++ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ if ! test -d "$(distdir)/$$docdir"; then \ ++ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ ++ $(mkinstalldirs) "$(distdir)/$$docdir"; \ ++ fi; \ ++ echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ ++ $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ ++ done ++ ++dist-doc-figs: $(_DOC_SRC_FIGURES) ++ @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; \ ++ for fig in $$list; do \ ++ if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$fig"; then \ ++ figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ if ! test -d "$(distdir)/$$figdir"; then \ ++ echo "$(mkinstalldirs) $(distdir)/$$figdir"; \ ++ $(mkinstalldirs) "$(distdir)/$$figdir"; \ ++ fi; \ ++ echo "$(INSTALL_DATA) $$d$$fig $(distdir)/$$fig"; \ ++ $(INSTALL_DATA) "$$d$$fig" "$(distdir)/$$fig"; \ ++ fi; \ ++ done; ++ ++dist-doc-omf: ++ @if test -f "$(_DOC_OMF_IN)"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$(INSTALL_DATA) $$d$(_DOC_OMF_IN) $(distdir)/$(notdir $(_DOC_OMF_IN))"; \ ++ $(INSTALL_DATA) "$$d$(_DOC_OMF_IN)" "$(distdir)/$(notdir $(_DOC_OMF_IN))" ++ ++dist-doc-dsk: ++ @if test -f "$(_DOC_DSK_IN)"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \ ++ $(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))" ++ ++ ++ ++################################################################################ ++## Check ++ ++.PHONY: check-doc-docs check-doc-omf ++check: \ ++ $(if $(DOC_MODULE),check-doc-docs) \ ++ $(if $(DOC_ID),check-doc-pages) \ ++ $(if $(_DOC_OMF_IN),check-doc-omf) ++ ++check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) ++ @for lc in C $(_DOC_REAL_LINGUAS); do \ ++ if test -f "$$lc"; \ ++ then d=; \ ++ xmlpath="$$lc"; \ ++ else \ ++ d="$(srcdir)/"; \ ++ xmlpath="$$lc:$(srcdir)/$$lc"; \ ++ fi; \ ++ echo "xmllint --noout --noent --path $$xmlpath --xinclude --postvalid $$d$$lc/$(DOC_MODULE).xml"; \ ++ xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \ ++ done ++ ++check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES) ++ for lc in C $(_DOC_REAL_LINGUAS); do \ ++ if test -f "$$lc"; \ ++ then d=; \ ++ xmlpath="$$lc"; \ ++ else \ ++ d="$(srcdir)/"; \ ++ xmlpath="$$lc:$(srcdir)/$$lc"; \ ++ fi; \ ++ for page in $(DOC_PAGES); do \ ++ echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ ++ xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ ++ done; \ ++ done ++ ++check-doc-omf: $(_DOC_OMF_ALL) ++ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ ++ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \ ++ xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \ ++ done ++ ++ ++ ++################################################################################ ++## Install ++ ++.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk ++ ++_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE)) ++ ++install-data-local: \ ++ $(if $(DOC_MODULE)$(DOC_ID),install-doc-docs) \ ++ $(if $(_DOC_HTML_ALL),install-doc-html) \ ++ $(if $(_DOC_C_FIGURES),install-doc-figs) \ ++ $(if $(_DOC_OMF_IN),install-doc-omf) ++# $(if $(_DOC_DSK_IN),install-doc-dsk) ++ ++install-doc-docs: ++ @for lc in C $(_DOC_REAL_LINGUAS); do \ ++ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ ++ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ ++ done ++ @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ ++ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ ++ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ ++ if ! test -d "$$docdir"; then \ ++ echo "$(mkinstalldirs) $$docdir"; \ ++ $(mkinstalldirs) "$$docdir"; \ ++ fi; \ ++ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ ++ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ ++ done ++ @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ ++ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ ++ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ ++ if ! test -d "$$docdir"; then \ ++ echo "$(mkinstalldirs) $$docdir"; \ ++ $(mkinstalldirs) "$$docdir"; \ ++ fi; \ ++ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ ++ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ ++ done ++ ++install-doc-figs: ++ @list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \ ++ for lc in C $(_DOC_REAL_LINGUAS); do \ ++ figsymlink=false; \ ++ if test -f "$$lc/$$fig"; then \ ++ figfile="$$lc/$$fig"; \ ++ elif test -f "$(srcdir)/$$lc/$$fig"; then \ ++ figfile="$(srcdir)/$$lc/$$fig"; \ ++ else \ ++ figsymlink=true; \ ++ fi; \ ++ figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \ ++ if ! test -d "$$figdir"; then \ ++ echo "$(mkinstalldirs) $$figdir"; \ ++ $(mkinstalldirs) "$$figdir"; \ ++ fi; \ ++ figbase=`echo $$fig | sed -e 's/^.*\///'`; \ ++ if $$figsymlink; then \ ++ echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \ ++ ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \ ++ else \ ++ echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \ ++ $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \ ++ fi; \ ++ done; \ ++ done ++ ++install-doc-html: ++ echo install-html ++ ++install-doc-omf: ++ $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir) ++ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ ++ echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ ++ $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \ ++ done ++ @if test "x$(_ENABLE_SK)" = "xtrue"; then \ ++ echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \ ++ scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \ ++ fi; ++ ++install-doc-dsk: ++ echo install-dsk ++ ++ ++ ++################################################################################ ++## Uninstall ++ ++.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk ++uninstall-local: \ ++ $(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs) \ ++ $(if $(_DOC_HTML_ALL),uninstall-doc-html) \ ++ $(if $(_DOC_C_FIGURES),uninstall-doc-figs) \ ++ $(if $(_DOC_OMF_IN),uninstall-doc-omf) ++# $(if $(_DOC_DSK_IN),uninstall-doc-dsk) ++ ++uninstall-doc-docs: ++ @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ ++ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ ++ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ ++ done ++ @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ ++ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ ++ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ ++ done ++ ++uninstall-doc-figs: ++ @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \ ++ echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \ ++ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \ ++ done; ++ ++uninstall-doc-omf: ++ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ ++ if test "x$(_ENABLE_SK)" = "xtrue"; then \ ++ echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ ++ scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ ++ fi; \ ++ echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ ++ rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ ++ done +-- +2.8.1 + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb index fbcf76f6f..138d985fe 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb @@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SECTION = "x11/gnome" -DEPENDS = "gnome-doc-utils-native gtk+3 dconf gconf glib-2.0 gnome-desktop3 gtk+ pango libwnck3 gnome-menus cairo libgweather3 dbus-glib librsvg libcanberra" +DEPENDS = "gnome-doc-utils-native gtk+3 dconf gconf glib-2.0 gnome-desktop3 gtk+ pango libwnck3 gnome-menus cairo libgweather3 dbus-glib librsvg libcanberra" inherit gtk-doc gnome gettext pkgconfig @@ -48,4 +48,4 @@ FILES_${PN} =+ "${datadir}/gnome* \ ${libdir}/bonobo \ " - +PNBLACKLIST[gnome-panel3] ?= "Depends on broken gnome-menus" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb index 9be2ec10a..2e36063f2 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb @@ -9,9 +9,10 @@ SECTION = "x11/gnome" PR = "r7" -DEPENDS = "gnome-doc-utils-native gconf glib-2.0 gnome-desktop gtk+ \ - pango libwnck gnome-menus cairo libgweather dbus dbus-glib \ - librsvg libcanberra" +DEPENDS = "gnome-doc-utils gconf glib-2.0 gnome-desktop gtk+ \ + pango libwnck gnome-menus cairo libgweather dbus dbus-glib \ + librsvg libcanberra \ +" RDEPENDS_${PN} = "python" inherit gtk-doc gnome autotools-brokensep gettext pkgconfig gconf gobject-introspection @@ -19,7 +20,8 @@ inherit gtk-doc gnome autotools-brokensep gettext pkgconfig gconf gobject-intros SRCREV = "8292bd2b8a36df7eed3c760899400790cde68590" SRC_URI = "git://git.gnome.org/gnome-panel;branch=gnome-2-32 \ file://0001-Fix-build-with-gcc-5.patch \ - " + file://0001-Add-gnome-doc-utils.make.patch \ +" S = "${WORKDIR}/git" @@ -29,7 +31,6 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[networkmanager] = "--enable-network-manager,--disable-network-manager,networkmanager" do_configure_prepend() { - gnome-doc-prepare --automake sed -i -e s:help:: ${S}/Makefile.am sed -i -e s:^#!@PYTHON@:#!/usr/bin/python: ${S}/gnome-panel/gnome-panel-add.in } @@ -43,3 +44,5 @@ FILES_${PN} =+ "${datadir}/gnome* \ ${datadir}/PolicyKit \ ${libdir}/bonobo \ " + +PNBLACKLIST[gnome-panel] ?= "Depends on broken libgweather" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb index c6fb75b8f..94e0a6329 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb @@ -21,9 +21,12 @@ do_configure_append() { for i in $(find ${S} -name "Makefile") ; do sed -i -e s:"GCONFTOOL = .*/usr/bin/gconftool-2":"GCONFTOOL = /usr/bin/gconftool-2":g $i sed -i -e s:"GCONF_SANITY_CHECK = set":"GCONF_SANITY_CHECK = /usr/libexec/gconf-sanity-check-2":g $i - done + done } RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-ck-connector', '', d)}" FILES_${PN} += "${datadir}/xsessions ${datadir}/icons ${datadir}/gnome ${libdir}/gnome-session/helpers" FILES_${PN}-dbg += "${libexecdir}/gnome-session/helpers/.debug" + +# http://errors.yoctoproject.org/Errors/Details/68621/ +PNBLACKLIST[gnome-session] ?= "BROKEN: fails to build with gcc-6" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb index f9b02b1db..1c784743f 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb @@ -53,8 +53,6 @@ FILES_${PN}-doc += "${datadir}/gtk-doc" PACKAGES_DYNAMIC += "^gnome-vfs-plugin-.*" python populate_packages_prepend () { - print d.getVar('FILES_gnome-vfs', 1) - plugindir = d.expand('${libdir}/gnome-vfs-2.0/modules/') do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s') } diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb index 0ac2b20e4..18e74dae6 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb @@ -1,7 +1,7 @@ SUMMARY = "GNOME Terminal" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=5b51eba4ba4cafe64073227530c061ed" -DEPENDS = "gtk+ glib-2.0 startup-notification dbus-glib vte gnome-doc-utils intltool-native" +DEPENDS = "gtk+ glib-2.0 startup-notification dbus-glib vte9 gnome-doc-utils intltool-native" PR = "r1" inherit gnome @@ -17,3 +17,6 @@ SRC_URI[archive.sha256sum] = "2c7af2250698b9f9f53c6eaa93211c1118cf2c7e29cbbacfd1 GNOME_COMPRESS_TYPE="bz2" RRECOMMENDS_${PN} += "gnome-common-schemas" + +# http://errors.yoctoproject.org/Errors/Details/68636/ +PNBLACKLIST[gnome-terminal] ?= "BROKEN: fails to build with gcc-6" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb index 6bb6816cb..2caa82081 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb @@ -21,3 +21,5 @@ SRC_URI += "\ SRC_URI[archive.md5sum] = "dc4920c15c9f886f73ea74fbff0ae48b" SRC_URI[archive.sha256sum] = "e130e80942b386de19a288a4c194ff3dbe9140315b31e982058c8bffbb6a1d29" GNOME_COMPRESS_TYPE="bz2" + +PNBLACKLIST[libgnomecups] ?= "Depends on broken libgnomeui" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb index 9d41914b2..ff14616d2 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb @@ -24,3 +24,5 @@ FILES_${PN}-staticdev += "\ ${libdir}/${PN}/${PV}/modules/*.a \ ${libdir}/${PN}/${PV}/modules/*/*.a \ " + +PNBLACKLIST[libgnomeprint] ?= "Depends on broken libgnomecups" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb index 3d3118a92..5d1d251b1 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb @@ -45,3 +45,5 @@ python populate_packages_prepend () { recursive=True, prepend=True) } + +PNBLACKLIST[gnumeric] ?= "Depends on broken libgnomeprint" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gthumb/files/0001-Drop-help-directory-from-build.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gthumb/files/0001-Drop-help-directory-from-build.patch new file mode 100644 index 000000000..d116968a6 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gthumb/files/0001-Drop-help-directory-from-build.patch @@ -0,0 +1,25 @@ +From 48cb878cb724e7a509260f014db6365510b8b541 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 17 May 2016 14:05:29 +0300 +Subject: [PATCH] Drop help directory from build + +It hardcodes the use of xml2po tool form gnome-doc-utils + +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index d056875..3fc4a41 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = m4 copy-n-paste data po gthumb extensions tests help ++SUBDIRS = m4 copy-n-paste data po gthumb extensions tests + + ACLOCAL_AMFLAGS = -I m4 + AMCFLAGS = -fPIC -DPIC +-- +2.8.1 + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb index 0bf1321de..5eee7f065 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb @@ -2,7 +2,7 @@ SUMMARY = "gThumb is an image viewer and browser for the GNOME Desktop" SECTION = "x11/gnome" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf libpng gstreamer jpeg tiff gst-plugins-base" +DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf libpng gstreamer jpeg tiff gst-plugins-base intltool-native" PR = "r4" @@ -14,7 +14,12 @@ SRC_URI[archive.md5sum] = "97fc13221b0c5d80c27a2e25a3a3ac6f" SRC_URI[archive.sha256sum] = "cf809695230ab8892a078be454a42ade865754c72ec1da7c3d74d4310de54f1d" GNOME_COMPRESS_TYPE="bz2" -SRC_URI += "file://parallel.patch" +SRC_URI += "file://parallel.patch \ + file://0001-Drop-help-directory-from-build.patch" + +do_configure_prepend () { + rm -f ${S}/m4/gnome-doc-utils.m4 +} do_install_append () { rm -f ${D}${libdir}/${BPN}/extensions/*.a diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/files/glib-2.32.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/files/glib-2.32.patch new file mode 100644 index 000000000..f0b878d37 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/files/glib-2.32.patch @@ -0,0 +1,23 @@ +From 8d49a386f467cbf8e0842d2218126f643e50f834 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger <dimstar@opensuse.org> +Date: Sun, 27 Nov 2011 14:24:57 +0000 +Subject: Fix build with glib 2.31: Only glib.h can be #include'd. Fixes bug #664914 + +Upstream-Status: Backport + +--- +diff --git a/engines/clearlooks/src/animation.c b/engines/clearlooks/src/animation.c +index 1f7a41f..56a9286 100644 +--- a/engines/clearlooks/src/animation.c ++++ b/engines/clearlooks/src/animation.c +@@ -28,7 +28,7 @@ + #include "animation.h" + + #ifdef HAVE_WORKING_ANIMATION +-#include <glib/gtimer.h> ++#include <glib.h> + + struct _AnimationInfo { + GTimer *timer; +-- +cgit v0.9.0.2 diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/files/substitute-tests.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/files/substitute-tests.patch new file mode 100644 index 000000000..5c557ba68 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/files/substitute-tests.patch @@ -0,0 +1,37 @@ +Upstream-Status: Pending + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd gtk-engines-2.20.2/configure.ac gtk-engines-2.20.2/configure.ac +--- gtk-engines-2.20.2/configure.ac 2010-10-01 15:42:37.000000000 +0300 ++++ gtk-engines-2.20.2/configure.ac 2013-08-20 02:50:27.930510565 +0300 +@@ -166,6 +166,9 @@ + + AC_SUBST(DEVELOPMENT_CFLAGS) + ++AC_SUBST([exported_symbols_tests], [[$(EXPORTED_SYMBOLS_TESTS)]]) ++AC_SUBST([torture_test_tests], [[$(TORTURE_TEST_TESTS)]]) ++ + AM_CONFIG_HEADER([engines/support/config.h]) + + AC_CONFIG_FILES([ +diff -Nurd gtk-engines-2.20.2/test/Makefile.am gtk-engines-2.20.2/test/Makefile.am +--- gtk-engines-2.20.2/test/Makefile.am 2010-09-19 18:18:21.000000000 +0300 ++++ gtk-engines-2.20.2/test/Makefile.am 2013-08-20 02:50:36.842510865 +0300 +@@ -66,7 +66,7 @@ + # Prefix with exported_ + EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES)) + +-TESTS += $(EXPORTED_SYMBOLS_TESTS) ++TESTS += @exported_symbols_tests@ + + + ############################################################# +@@ -88,7 +88,7 @@ + TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES)) + + # Add TORTURE_TEST_ENGINES to list of tests +-TESTS += $(TORTURE_TEST_TESTS) ++TESTS += @torture_test_tests@ + + # Possible other tests: + # - An extensive theme switch tests that loads/unloads the engine diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb new file mode 100644 index 000000000..c0ac911a6 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb @@ -0,0 +1,55 @@ +SUMMARY = "GTK+ theme engines" +HOMEPAGE = "http://www.gnome.org/" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +SECTION = "x11/base" +DEPENDS = "intltool-native gtk+ gettext-native" + +PR = "r3" + +PACKAGES += "${PN}-schemas" +PACKAGES_DYNAMIC += "^gtk-engine-.* ^gtk-theme-.*" + +RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95" +RDEPENDS_gtk-theme-metal = "gtk-engine-metal" +RDEPENDS_gtk-theme-mist = "gtk-engine-mist" +RDEPENDS_gtk-theme-crux = "gtk-engine-crux-engine" +RDEPENDS_gtk-theme-lighthouseblue = "gtk-engine-lighthouseblue" +RDEPENDS_gtk-theme-thinice = "gtk-engine-thinice" +RDEPENDS_gtk-theme-industrial = "gtk-engine-industrial" +RDEPENDS_gtk-theme-clearlooks = "gtk-engine-clearlooks" + +FILES_${PN} = "" +FILES_${PN}-dev += "${libdir}/gtk-2.0/*/engines/*.la" +FILES_${PN}-schemas = "${datadir}/gtk-engines/*.xml" + +CFLAGS_prepend = "-DHAVE_ANIMATION " + +RDEPENDS_${PN}-dev = "" + +inherit gnomebase +GNOME_COMPRESS_TYPE="bz2" + +inherit distro_features_check +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" + +# This picks stable releases in the 2.x series (but not 2.90 onwards, +# which were GNOME 3 betas). +UPSTREAM_CHECK_REGEX = "(?P<pver>2\.([0-8]*[02468])+(\.\d+)+)" + +python populate_packages_prepend() { + engines_root = os.path.join(d.getVar('libdir', True), "gtk-2.0/2.10.0/engines") + themes_root = os.path.join(d.getVar('datadir', True), "themes") + + do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='') + do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='') + # TODO: mark theme packages as arch all +} + +SRC_URI += "file://glib-2.32.patch \ + file://substitute-tests.patch" +SRC_URI[archive.md5sum] = "5deb287bc6075dc21812130604c7dc4f" +SRC_URI[archive.sha256sum] = "15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch new file mode 100644 index 000000000..f9ae07763 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch @@ -0,0 +1,33 @@ +Fix build error with gcc6: +../../gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c: In function 'strdup_strftime': +../../gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c:1951:3: error: format not a string literal, format string not checked [-Werror=format-nonliteral] + tmplen = strftime (tmpbuf, tmpbufsize, locale_format, tm); + ^~~~~~ + +Patch Reference: +https://git.gnome.org/browse/glib/commit/?id=0817af40e8c74c721c30f6ef482b1f53d12044c7 +https://git.gnome.org/browse/glib/commit/?id=8cdbc7fb2c8c876902e457abe46ee18a0b134486 + +Upstream-Status: Pending +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> + +diff -Nurp gtksourceview-2.10.5.orig/gtksourceview/gtksourceprintcompositor.c gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c +--- gtksourceview-2.10.5.orig/gtksourceview/gtksourceprintcompositor.c 2016-07-01 13:11:43.631173762 +0800 ++++ gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c 2016-07-04 13:54:18.223726343 +0800 +@@ -1913,6 +1913,8 @@ setup_pango_layouts (GtkSourcePrintCompo + * GLIB - Library of useful routines for C programming + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald */ + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + static gchar * + strdup_strftime (const gchar *format, const struct tm *tm) + { +@@ -1982,6 +1984,7 @@ strdup_strftime (const gchar *format, co + + return convbuf; + } ++#pragma GCC diagnostic pop + + static gchar * + evaluate_format_string (GtkSourcePrintCompositor *compositor, diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb index c745e345a..df37b04a5 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb @@ -4,17 +4,20 @@ HOMEPAGE = "http://projects.gnome.org/gtksourceview/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "gtk+ libxml2" +DEPENDS = "gtk+ libxml2 intltool-native" PNAME = "gtksourceview" S = "${WORKDIR}/${PNAME}-${PV}" -inherit gnomebase lib_package gettext +inherit gnomebase lib_package gettext distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" # overrule SRC_URI from gnome.conf SRC_URI = "${GNOME_MIRROR}/${PNAME}/${@gnome_verdir("${PV}")}/${PNAME}-${PV}.tar.bz2;name=archive \ file://gtk-doc.make \ + file://suppress-string-format-literal-warning.patch \ " SRC_URI[archive.md5sum] = "1219ad1694df136f126507466aeb41aa" SRC_URI[archive.sha256sum] = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e" @@ -26,3 +29,4 @@ do_configure_prepend() { } FILES_${PN} += " ${datadir}/gtksourceview-2.0" + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gvfs/files/0001-Add-support-for-libsystemd.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gvfs/files/0001-Add-support-for-libsystemd.patch deleted file mode 100644 index 7ec950558..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gvfs/files/0001-Add-support-for-libsystemd.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 39be8b277c666db21965d54d5b72418ce57a450b Mon Sep 17 00:00:00 2001 -From: Michael Biebl <biebl@debian.org> -Date: Tue, 19 May 2015 23:38:11 +0200 -Subject: [PATCH] Add support for libsystemd - -In systemd v209 the various libsystemd-* libraries were merged into a -single libsystemd library. So first check for this library and fall back -to libsystemd-login if not found. - -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=749603 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779766 - -Upstream-Status: Applied ---- - configure.ac | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ee3475d..bd5c043 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -264,18 +264,20 @@ dnl ********************************** - dnl *** Check for libsystemd-login *** - dnl ********************************** - --AC_ARG_ENABLE(libsystemd_login, AS_HELP_STRING([--disable-libsystemd-login],[build without liblibsystemd-login])) -+AC_ARG_ENABLE(libsystemd_login, AS_HELP_STRING([--disable-libsystemd-login],[build without libsystemd-login])) - msg_libsystemd_login=no - LIBSYSTEMD_LOGIN_LIBS= - LIBSYSTEMD_LOGIN_CFLAGS= - LIBSYSTEMD_LOGIN_REQUIRED=44 - - if test "x$enable_libsystemd_login" != "xno"; then -- PKG_CHECK_EXISTS([libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED], msg_libsystemd_login=yes) -+ PKG_CHECK_EXISTS([libsystemd], [msg_libsystemd_login=yes], -+ [PKG_CHECK_EXISTS([libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED], msg_libsystemd_login=yes)]) - - if test "x$msg_libsystemd_login" = "xyes"; then -- PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED]) -- AC_DEFINE(HAVE_LIBSYSTEMD_LOGIN, 1, [Define to 1 if liblibsystemd_login is available]) -+ PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd],, -+ [PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED])]) -+ AC_DEFINE(HAVE_LIBSYSTEMD_LOGIN, 1, [Define to 1 if libsystemd_login is available]) - fi - fi - --- -2.5.0 - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.24.2.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.28.3.bb index aa6207019..746d73c71 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.24.2.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.28.3.bb @@ -2,15 +2,14 @@ DESCRIPTION = "gvfs is a userspace virtual filesystem" LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" -inherit gnome +inherit gnome bash-completion DEPENDS += "libsecret glib-2.0 gconf intltool-native libgudev udisks2" -SRC_URI[archive.md5sum] = "83ed317eb2a5264715d4273e90a5cfd8" -SRC_URI[archive.sha256sum] = "0949eaedd1df7175f8d7ee2700df8210d1f854b8ee37d963bc32ee7091eeb228" -SRC_URI += " \ - file://0001-Add-support-for-libsystemd.patch \ -" +SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" + +SRC_URI[archive.md5sum] = "d2399a1a217dd5030e8830c7e7c813c2" +SRC_URI[archive.sha256sum] = "458c4cb68570f6ef4a9e152995c62d0057c3e0a07ed64d84c7200cdd22f0bd17" EXTRA_OECONF = " \ --disable-gdu \ @@ -28,6 +27,7 @@ FILES_${PN} += " \ ${datadir}/dbus-1/services \ ${libdir}/gio/modules/*.so \ ${libdir}/tmpfiles.d \ + ${systemd_user_unitdir} \ " RDEPENDS_${PN} = "udisks2" @@ -40,20 +40,18 @@ FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.moun RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh" -PACKAGES += "${PN}-bash-completion" -FILES_${PN}-bash-completion = "${datadir}/bash-completion" -RDEPENDS_${PN}-bash-completion = "bash-completion" - -PACKAGECONFIG ?= "libgphoto2" +PACKAGECONFIG ?= "libgphoto2 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" PACKAGECONFIG[afc] = "--enable-afc, --disable-afc, libimobiledevice libplist" PACKAGECONFIG[archive] = "--enable-archive, --disable-archive, libarchive" PACKAGECONFIG[avahi] = "--enable-avahi, --disable-avahi, avahi" +PACKAGECONFIG[gcr] = "--enable-gcr, --disable-gcr, gcr" PACKAGECONFIG[gtk] = "--enable-gtk, --disable-gtk, gtk+3" PACKAGECONFIG[http] = "--enable-http, --disable-http, libsoup-2.4" PACKAGECONFIG[libmtp] = "--enable-libmtp, --disable-libmtp, libmtp" PACKAGECONFIG[libgphoto2] = "--enable-gphoto2, --disable-gphoto2, libgphoto2" PACKAGECONFIG[samba] = "--enable-samba, --disable-samba, samba" +PACKAGECONFIG[systemd] = "--with-systemduserunitdir=${systemd_user_unitdir},--without-systemduserunitdir,systemd" # needs meta-filesystems PACKAGECONFIG[fuse] = "--enable-fuse, --disable-fuse, fuse" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb index aeec2d31b..71fe545fc 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb @@ -20,4 +20,5 @@ FILES_${PN} += "${datadir}/gnome* \ PACKAGES =+ "${PN}-locationdata" FILES_${PN}-locationdata = "${datadir}/libgweather/Locations*" - +# http://errors.yoctoproject.org/Errors/Details/68608/ +PNBLACKLIST[libgweather] ?= "BROKEN: fails to build with gcc-6" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl_2.3.21.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl_2.3.21.bb index 4966ea4c7..7b295063b 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl_2.3.21.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl_2.3.21.bb @@ -24,5 +24,5 @@ FILES_${PN}-dev += "${bindir}/libart2-config" S = "${WORKDIR}/libart_lgpl-${PV}" do_configure_prepend() { - cp ${WORKDIR}/${ART_CONFIG} ${S}/art_config.h + cp ${WORKDIR}/${ART_CONFIG} ${S}/art_config.h } diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb index 2a6f04b4d..6ec6d4618 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb @@ -21,7 +21,7 @@ do_compile_prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gdata/.libs" } -EXTRA_OECONF += "--disable-goa --disable-tests" +EXTRA_OECONF += "--disable-goa --disable-tests --disable-gtk-doc" SRC_URI[archive.md5sum] = "eb552a8a8482e4231a3d1baf7262e64d" SRC_URI[archive.sha256sum] = "8740e071ecb2ae0d2a4b9f180d2ae5fdf9dc4c41e7ff9dc7e057f62442800827" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb index 27b8b9ae5..40caa7b11 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb @@ -12,7 +12,7 @@ SRC_URI[archive.sha256sum] = "b2c63916866485793b87398266dd7778548c1734923c272a94 SRC_URI += "file://0001-libgnome-Makefile.am-allow-deprecated-symbols.patch" GNOME_COMPRESS_TYPE="bz2" -DEPENDS += "libcanberra gconf-native gnome-vfs libbonobo esound" +DEPENDS += "libcanberra gconf-native gnome-vfs libbonobo esound intltool-native" EXTRA_OECONF += "--disable-gtk-doc" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb index 969df3b95..f35765790 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" SECTION = "x11/gnome/libs" -DEPENDS = "gconf gtk+ glib-2.0 libxklavier" +DEPENDS = "gconf gtk+ glib-2.0 libxklavier intltool-native" inherit gnome diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui/0001-suppress-string-format-literal-warning-to-fix-build-.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui/0001-suppress-string-format-literal-warning-to-fix-build-.patch new file mode 100644 index 000000000..abc9bdfba --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui/0001-suppress-string-format-literal-warning-to-fix-build-.patch @@ -0,0 +1,78 @@ +From 6697fcf9d7f53126b442bf19890640b5f88c8aa4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Fri, 29 Jul 2016 21:24:20 +0200 +Subject: [PATCH] suppress string format literal warning to fix build with gcc6 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +works around: +| ../../libgnomeui-2.24.5/libgnomeui/gnome-dateedit.c: In function 'day_selected': +| ../../libgnomeui-2.24.5/libgnomeui/gnome-dateedit.c:156:9: error: format not a string literal, format string not checked [-Werror=format-nonliteral] +| strftime_date_format, &mtm) == 0) +| ^~~~~~~~~~~~~~~~~~~~ +| ../../libgnomeui-2.24.5/libgnomeui/gnome-dateedit.c: In function 'gnome_date_edit_set_time': +| ../../libgnomeui-2.24.5/libgnomeui/gnome-dateedit.c:704:2: error: format not a string literal, format string not checked [-Werror=format-nonliteral] +| if (strftime (buffer, sizeof (buffer), strftime_date_format, mytm) == 0) +| ^~ + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + libgnomeui/gnome-dateedit.c | 6 ++++++ + libgnomeui/gnome-gconf-ui.c | 3 +++ + 2 files changed, 9 insertions(+) + +diff --git a/libgnomeui/gnome-dateedit.c b/libgnomeui/gnome-dateedit.c +index 69ab699..41541c3 100644 +--- a/libgnomeui/gnome-dateedit.c ++++ b/libgnomeui/gnome-dateedit.c +@@ -152,9 +152,12 @@ day_selected (GtkCalendar *calendar, GnomeDateEdit *gde) + else + mtm.tm_year = year; + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + if (strftime (buffer, sizeof (buffer), + strftime_date_format, &mtm) == 0) + strcpy (buffer, "???"); ++#pragma GCC diagnostic pop + buffer[sizeof(buffer)-1] = '\0'; + + /* FIXME: what about set time */ +@@ -701,8 +704,11 @@ gnome_date_edit_set_time (GnomeDateEdit *gde, time_t the_time) + mytm = localtime (&the_time); + + /* Set the date */ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + if (strftime (buffer, sizeof (buffer), strftime_date_format, mytm) == 0) + strcpy (buffer, "???"); ++#pragma GCC diagnostic pop + buffer[sizeof(buffer)-1] = '\0'; + + str_utf8 = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL); +diff --git a/libgnomeui/gnome-gconf-ui.c b/libgnomeui/gnome-gconf-ui.c +index 43c0f44..a84b2c0 100644 +--- a/libgnomeui/gnome-gconf-ui.c ++++ b/libgnomeui/gnome-gconf-ui.c +@@ -180,12 +180,15 @@ error_idle_func (gpointer data) + "configuration settings may not work properly."); + } + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + dialog = gtk_message_dialog_new (NULL /* parent */, + 0 /* flags */, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + fmt, + gnome_program_get_human_readable_name(gnome_program_get())); ++#pragma GCC diagnostic pop + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy), +-- +2.5.5 + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.3.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.3.bb deleted file mode 100644 index 6fb2786b1..000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -require libgnomeui.inc - -PR = "r1" - -SRC_URI[archive.md5sum] = "ceab6f4370581d1a03c09f15cc103099" -SRC_URI[archive.sha256sum] = "04c81f3bb5a337cdf3ed1230916f82d29857ee95eb884f58dd2f5c6860efe803" -GNOME_COMPRESS_TYPE="bz2" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui.inc b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb index 26997b851..94b00c133 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui.inc +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb @@ -5,20 +5,25 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" SECTION = "x11/gnome/libs" DEPENDS = "libgnome libgnomecanvas libbonoboui libgnome-keyring intltool-native" -inherit gnome +inherit gnome FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \ ${libdir}/libglade/*/lib*.so \ ${datadir}/pixmaps/gnome-about-logo.png" FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la" FILES_${PN}-staticdev += "${libdir}/libglade/*/*.a" -FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/" -SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch" +SRC_URI += " \ + file://0001-suppress-string-format-literal-warning-to-fix-build-.patch \ + file://gnome-stock-pixbufs.h \ + file://no-pixbuf-csource.patch \ +" +SRC_URI[archive.md5sum] = "d4bb506b1916015323928faab5aa708b" +SRC_URI[archive.sha256sum] = "ae352f2495889e65524c979932c909f4629a58e64290fb0c95333373225d3c0f" +GNOME_COMPRESS_TYPE="bz2" EXTRA_OECONF = "--disable-gtk-doc" do_configure_prepend() { install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h } - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb index be79ec14a..602d5134c 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dc7371b50816c96e145fa0f8ade8e24d \ SECTION = "libs" -DEPENDS= "libxml2 bzip2 glib-2.0 zlib" +DEPENDS= "libxml2 bzip2 glib-2.0 zlib intltool-native" inherit autotools pkgconfig gnome gconf gobject-introspection @@ -24,6 +24,6 @@ EXTRA_OECONF = "\ --with-bz2 \ " -RDEPENDS_${PN} = "gconf" +RDEPENDS_${PN} = "gconf" FILES_${PN} += "${datadir}/thumbnailers" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb index d273e6c1e..83e84687a 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb @@ -8,7 +8,9 @@ DEPENDS = "intltool-native gtk+ gdk-pixbuf-native libxres" PACKAGECONFIG ??= "startup-notification" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" -inherit gnomebase gobject-introspection +inherit gnomebase gobject-introspection distro_features_check +REQUIRED_DISTRO_FEATURES = "x11" + GNOME_COMPRESS_TYPE = "xz" SRC_URI[archive.md5sum] = "f03e1139296e2a3a92e3b65a3080cd32" SRC_URI[archive.sha256sum] = "83f732d20781fc88b22cdc6aaf2d4f388db6d3d4ff28d1a8fd45be9fb7743a9e" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb index 384841a8d..23e6603f7 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb @@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" DEPENDS = "xkbcomp gtk+ iso-codes libxi libxml2" GNOME_COMPRESS_TYPE = "xz" +inherit gnomebase gettext gobject-introspection distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" inherit gnomebase gettext gobject-introspection SRC_URI[archive.md5sum] = "290ea2a8abc40f78a3a16bdae6f02808" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb index 992596eaf..47b098045 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb @@ -11,3 +11,6 @@ SRC_URI[md5sum] = "0afd969758561599fd782e1effb39c08" SRC_URI[sha256sum] = "1a7fdc5f95a2193a1a25fdb13f071867fb7e42245ce19ccee4bcccb69e557f2e" PR = "r3" + +# tasks-0.19/libkoto/koto-utils.c:81:3: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] +PNBLACKLIST[tasks] ?= "Fails to build with gcc-6" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/tasks_git.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/tasks_git.bb index 6a06da336..32d2ac62e 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/tasks_git.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/tasks_git.bb @@ -7,3 +7,6 @@ PV = "0.13+git${SRCPV}" PR = "r3" S = "${WORKDIR}/git" + +# ../../git/libkoto/koto-utils.c:81:3: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] +PNBLACKLIST[tasks] ?= "Fails to build with gcc-6" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/system-tools/system-tools-backends_2.10.2.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/system-tools/system-tools-backends_2.10.2.bb index 1693f37cb..745b55805 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/system-tools/system-tools-backends_2.10.2.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/system-tools/system-tools-backends_2.10.2.bb @@ -34,7 +34,7 @@ do_configure() { do_install_append () { install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/system-tools-backends ${D}/${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/system-tools-backends ${D}/${sysconfdir}/init.d/ } INITSCRIPT_NAME = "system-tools-backends" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb index 3aa743e0c..8c39ad775 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb @@ -27,7 +27,7 @@ FILES_${PN} += "${datadir}/themes ${datadir}/icons" SRC_URI += "file://iconpath-option.patch \ file://drop-localedir-override.patch \ -" +" SRC_URI[archive.md5sum] = "41db9e3cb25d35af2675c599e67944d1" SRC_URI[archive.sha256sum] = "8601ee24c2e096593221cbd6ebdb6686042225a03c02a01c0d67c163f9febd1a" GNOME_COMPRESS_TYPE="bz2" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch b/import-layers/meta-openembedded/meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch new file mode 100644 index 000000000..0bb5dee80 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch @@ -0,0 +1,30 @@ +diff --git a/src/florence.c b/src/florence.c +index b27c31b..feadefe 100644 +--- a/src/florence.c ++++ b/src/florence.c +@@ -44,12 +44,6 @@ + /* exit signal */ + static int flo_exit=FALSE; + +-#ifdef ENABLE_AT_SPI2 +-void flo_check_show (struct florence *florence, AtspiAccessible *obj); +-#else +-void flo_check_show (struct florence *florence, Accessible *obj); +-#endif +- + /* Called on destroy event (systray quit or close window) */ + void flo_destroy (void) + { +@@ -61,6 +55,12 @@ void flo_destroy (void) + } + + #ifdef AT_SPI ++#ifdef ENABLE_AT_SPI2 ++void flo_check_show (struct florence *florence, AtspiAccessible *obj); ++#else ++void flo_check_show (struct florence *florence, Accessible *obj); ++#endif ++ + /* Called to destroy the icon */ + void flo_icon_destroy (GtkWidget *widget, gpointer user_data) + { diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-support/florence/florence_0.5.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-support/florence/florence_0.5.4.bb index 71014f087..dfdb6bdb8 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-support/florence/florence_0.5.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-support/florence/florence_0.5.4.bb @@ -8,13 +8,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" PR = "r1" -DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf cairo intltool-native gnome-doc-utils libnotify" +DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf cairo intltool-native gnome-doc-utils libnotify gstreamer" -SRC_URI = "${SOURCEFORGE_MIRROR}/florence/florence/${PV}/florence-${PV}.tar.bz2 \ - file://0001-Fix-glib-includes.patch" -SRC_URI[md5sum] = "56d12e5b47c100d9df172aa5ddc0f609" -SRC_URI[sha256sum] = "7b06ed84ef2b7b22d8d2cf0c7d013a05409bd82028240ac8719a68b192d5bc62" +SRC_URI = "${SOURCEFORGE_MIRROR}/florence/florence/${PV}-gtk2/florence-${PV}.tar.bz2 \ + file://fix-no-atspi-compile.patch" +SRC_URI[md5sum] = "8d5c2367a28485bfcf577650b0badab7" +SRC_URI[sha256sum] = "26d33aa20d5fbf34ceeded4c41cb922d2988b6082e33d9acc46dd7bfe56d31a1" inherit gettext autotools gconf pkgconfig -EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet" +EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet --without-xrecord" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb index 919aa7bca..ab20460f1 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb @@ -47,3 +47,5 @@ python populate_packages_prepend () { do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) } +# | ../../goffice-0.10.1/goffice/math/go-complex.c:75:3: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] +PNBLACKLIST[goffice] ?= "BROKEN: fails to build with gcc-6" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-support/tracker/tracker-0.14.2/giflib5-support.patch b/import-layers/meta-openembedded/meta-gnome/recipes-support/tracker/tracker-0.14.2/giflib5-support.patch new file mode 100644 index 000000000..fab3371f0 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-support/tracker/tracker-0.14.2/giflib5-support.patch @@ -0,0 +1,126 @@ + src/tracker-extract/tracker-extract-gif.c | 36 +++++++++++++++++++++++++++++ + 1 file changed, 36 insertions(+) +--- a/src/tracker-extract/tracker-extract-gif.c ++++ a/src/tracker-extract/tracker-extract-gif.c +@@ -75,6 +75,39 @@ + return (GIF_OK); + } + ++#if GIFLIB_MAJOR >= 5 ++static inline void ++gif_error (const gchar *action, int err) ++{ ++ const char *str = GifErrorString (err); ++ if (str != NULL) { ++ g_message ("%s, error: '%s'", action, str); ++ } else { ++ g_message ("%s, undefined error %d", action, err); ++ } ++} ++#else /* GIFLIB_MAJOR >= 5 */ ++static inline void print_gif_error() ++{ ++#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4) ++ const char *str = GifErrorString (); ++ if (str != NULL) { ++ g_message ("GIF, error: '%s'", str); ++ } else { ++ g_message ("GIF, undefined error"); ++ } ++#else ++ PrintGifError(); ++#endif ++} ++#endif /* GIFLIB_MAJOR >= 5 */ ++ ++/* giflib 5.1 changed the API of DGifCloseFile to take two arguments */ ++#if !defined(GIFLIB_MAJOR) || \ ++ !(GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1)) ++#define DGifCloseFile(a, b) DGifCloseFile(a) ++#endif ++ + static void + read_metadata (TrackerSparqlBuilder *preupdate, + TrackerSparqlBuilder *metadata, +@@ -100,14 +133,22 @@ + ExtBlock extBlock; + + if (DGifGetRecordType(gifFile, &RecordType) == GIF_ERROR) { +- PrintGifError(); ++#if GIFLIB_MAJOR < 5 ++ print_gif_error (); ++#else /* GIFLIB_MAJOR < 5 */ ++ gif_error ("Could not read next GIF record type", gifFile->Error); ++#endif /* GIFLIB_MAJOR < 5 */ + return; + } + + switch (RecordType) { + case IMAGE_DESC_RECORD_TYPE: + if (DGifGetImageDesc(gifFile) == GIF_ERROR) { +- PrintGifError(); ++#if GIFLIB_MAJOR < 5 ++ print_gif_error(); ++#else /* GIFLIB_MAJOR < 5 */ ++ gif_error ("Could not get GIF record information", gifFile->Error); ++#endif /* GIFLIB_MAJOR < 5 */ + return; + } + +@@ -117,7 +158,11 @@ + framedata = g_malloc (framewidth*frameheight); + + if (DGifGetLine(gifFile, framedata, framewidth*frameheight)==GIF_ERROR) { +- PrintGifError(); ++#if GIFLIB_MAJOR < 5 ++ print_gif_error(); ++#else /* GIFLIB_MAJOR < 5 */ ++ gif_error ("Could not load a block of GIF pixes", gifFile->Error); ++#endif /* GIFLIB_MAJOR < 5 */ + return; + } + +@@ -593,6 +638,9 @@ + gchar *filename, *uri; + GFile *file; + int fd; ++#if GIFLIB_MAJOR >= 5 ++ int err; ++#endif + + preupdate = tracker_extract_info_get_preupdate_builder (info); + metadata = tracker_extract_info_get_metadata_builder (info); +@@ -617,8 +665,14 @@ + return FALSE; + } + ++#if GIFLIB_MAJOR < 5 + if ((gifFile = DGifOpenFileHandle (fd)) == NULL) { +- PrintGifError (); ++ print_gif_error (); ++#else /* GIFLIB_MAJOR < 5 */ ++ if ((gifFile = DGifOpenFileHandle (fd, &err)) == NULL) { ++ gif_error ("Could not open GIF file with handle", err); ++#endif /* GIFLIB_MAJOR < 5 */ ++ g_free (filename); + close (fd); + return FALSE; + } +@@ -637,10 +691,15 @@ + g_string_free (where, TRUE); + + g_free (uri); +- ++#if GIFLIB_MAJOR < 5 + if (DGifCloseFile (gifFile) != GIF_OK) { +- PrintGifError (); ++ print_gif_error (); ++ } ++#else /* GIFLIB_MAJOR < 5 */ ++ if (DGifCloseFile (gifFile, NULL) != GIF_OK) { ++ gif_error ("Could not close GIF file", gifFile->Error); + } ++#endif /* GIFLIB_MAJOR < 5 */ + + return TRUE; + } diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb b/import-layers/meta-openembedded/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb index c52d95e97..7025280b8 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb @@ -1,9 +1,11 @@ DESCRIPTION = "Tracker is a tool designed to extract information and metadata about your personal data so that it can be searched easily and quickly." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=ee31012bf90e7b8c108c69f197f3e3a4" -DEPENDS = "file gstreamer dbus libexif gettext sqlite3 icu gst-plugins-base libgnome-keyring poppler tiff enca libgsf libunistring giflib taglib bzip2 upower gtk+3 libgee networkmanager" +DEPENDS = "file gstreamer dbus libexif gettext sqlite3 icu gst-plugins-base libgnome-keyring poppler tiff enca libgsf libunistring giflib taglib bzip2 upower gtk+3 libgee networkmanager intltool-native" RDEPENDS_${PN} += " gvfs gsettings-desktop-schemas" + +RDEPENDS_${PN}-nautilus-extension += "nautilus" HOMEPAGE = "http://projects.gnome.org/tracker/" PR = "r7" @@ -13,7 +15,8 @@ inherit autotools pkgconfig gnomebase gettext gsettings systemd gobject-introspe VER_DIR = "${@gnome_verdir("${PV}")}" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/${VER_DIR}/tracker-${PV}.tar.xz \ file://enable-sqlite-crosscompile.patch \ - file://fix-removable-media-detection.patch \ + file://fix-removable-media-detection.patch \ + file://giflib5-support.patch \ file://90tracker \ file://tracker-store.service \ file://tracker-miner-fs.service \ @@ -80,3 +83,6 @@ FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so" SRC_URI[md5sum] = "f3a871beeebf86fd752863ebd22af9ac" SRC_URI[sha256sum] = "9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1" + +# http://errors.yoctoproject.org/Errors/Details/81007/ +PNBLACKLIST[tracker] ?= "BROKEN: fails to build with new binutils-2.27" |