diff options
Diffstat (limited to 'external/poky/meta/recipes-gnome/gnome')
| -rw-r--r-- | external/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch | 6 | ||||
| -rw-r--r-- | external/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch | 12 | ||||
| -rw-r--r-- | external/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb (renamed from external/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb) | 13 | ||||
| -rw-r--r-- | external/poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb | 10 | ||||
| -rw-r--r-- | external/poky/meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch | 40 | ||||
| -rw-r--r-- | external/poky/meta/recipes-gnome/gnome/gnome-themes-standard_3.22.3.bb | 46 | ||||
| -rw-r--r-- | external/poky/meta/recipes-gnome/gnome/libart-lgpl/libart_lgpl-2.3.21-crosscompile.patch | 84 | ||||
| -rw-r--r-- | external/poky/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb | 22 |
8 files changed, 25 insertions, 208 deletions
diff --git a/external/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch b/external/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch index b5992eba..372f144b 100644 --- a/external/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch +++ b/external/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch @@ -1,4 +1,4 @@ -From 9661951838773251d0a914e897e8a0d95ce027f6 Mon Sep 17 00:00:00 2001 +From 4409423752885f76326d05c1266698155f47c5f9 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Tue, 30 May 2017 14:55:49 +0300 Subject: [PATCH] Don't use AC_CANONICAL_HOST @@ -14,12 +14,12 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac -index fb787dc..5caef0c 100644 +index 4a84501..52dbb8e 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,6 @@ AC_PREREQ(2.53) - AC_INIT([adwaita-icon-theme], [3.28.0], + AC_INIT([adwaita-icon-theme], [3.34.3], [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme]) -AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) diff --git a/external/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch b/external/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch index 6c38e237..c4d7e258 100644 --- a/external/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch +++ b/external/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch @@ -24,7 +24,8 @@ index 1c940a5..3998ee6 100644 - $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ + $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ done; \ - done; +- done; ++ done; \ + wait ## FIXME we should add a way to remove links generated by icon mapping @@ -45,7 +46,8 @@ index 86f4d7c..3fae8c1 100644 $(mkdir_p) $(DESTDIR)$(themedir)/scalable-up-to-32/$$context; \ - $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file; \ + $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file & \ - done +- done ++ done; \ + wait uninstall-local: @@ -61,7 +63,8 @@ index 24aac9b..61ba071 100644 - $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ + $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ done; \ - done +- done ++ done; \ for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \ context="`dirname $$file`"; \ $(mkdir_p) $(DESTDIR)$(themedir)/scalable/$$context; \ @@ -72,7 +75,8 @@ index 24aac9b..61ba071 100644 - $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context; \ + $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context & \ done \ - done +- done ++ done; \ + wait uninstall-local: diff --git a/external/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb b/external/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb index 6e453a01..3a2727b7 100644 --- a/external/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb +++ b/external/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb @@ -1,6 +1,6 @@ SUMMARY = "GTK+ icon theme" -HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/sources/adwaita-icon-theme/" -BUGTRACKER = "https://bugzilla.gnome.org/" +HOMEPAGE = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme/issues" SECTION = "x11/gnome" LICENSE = "LGPL-3.0 | CC-BY-SA-3.0" @@ -8,15 +8,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c" inherit allarch autotools pkgconfig gettext gtk-icon-cache upstream-version-is-even - MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0001-Don-t-use-AC_CANONICAL_HOST.patch \ file://0001-Run-installation-commands-as-shell-jobs.patch \ " -SRC_URI[md5sum] = "b25b2d82cbebf2cc9cd469457b604f2c" -SRC_URI[sha256sum] = "7aae8c1dffd6772fd1a21a3d365a0ea28b7c3988bdbbeafbf8742cda68242150" +SRC_URI[md5sum] = "9aea4ad9bc002aacad155ee0748b357f" +SRC_URI[sha256sum] = "e7c2d8c259125d5f35ec09522b88c8fe7ecf625224ab0811213ef0a95d90b908" + +DEPENDS += "librsvg-native" PACKAGES = "${PN}-cursors ${PN}-symbolic-hires ${PN}-symbolic ${PN}-hires ${PN}" @@ -36,3 +37,5 @@ FILES_${PN}-hires = "${prefix}/share/icons/Adwaita/256x256/ \ ${prefix}/share/icons/Adwaita/512x512/" FILES_${PN} = "${prefix}/share/icons/Adwaita/ \ ${prefix}/share/pkgconfig/adwaita-icon-theme.pc" + +BBCLASSEXTEND = "native nativesdk" diff --git a/external/poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb b/external/poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb index 120ae3e0..b8466d48 100644 --- a/external/poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb +++ b/external/poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb @@ -1,4 +1,7 @@ SUMMARY = "GNOME configuration system" +DESCRIPTION = "GConf is a system for storing application preferences. \ +It is intended for user preferences; not configuration of something like \ +Apache, or arbitrary data storage." SECTION = "x11/gnome" HOMEPAGE = "https://projects.gnome.org/gconf/" LICENSE = "LGPLv2+" @@ -22,12 +25,11 @@ S = "${WORKDIR}/GConf-${PV}" EXTRA_OECONF = "--enable-shared --disable-static \ --disable-orbit --with-openldap=no --disable-gtk" -# Disable PolicyKit by default -PACKAGECONFIG ??= "" -# We really don't want PolicyKit for native +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}" +# We really don't want Polkit for native PACKAGECONFIG_class-native = "" -PACKAGECONFIG[policykit] = "--enable-defaults-service,--disable-defaults-service,polkit" +PACKAGECONFIG[polkit] = "--enable-defaults-service,--disable-defaults-service,polkit" PACKAGECONFIG[debug] = "--enable-debug=yes, --enable-debug=minimum" do_install_append() { diff --git a/external/poky/meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch b/external/poky/meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch deleted file mode 100644 index 4cfcabd3..00000000 --- a/external/poky/meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 426e38468463a4abb495cf6a269b9635b2107519 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Tue, 17 May 2016 13:51:24 +0300 -Subject: [PATCH] glib-gettext.m4: Update AM_GLIB_GNU_GETTEXT to match glib - -This avoids - error: m4_copy: won't overwrite defined macro: glib_DEFUN - -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> -Upstream-Status: Inappropriate [No upstream] ---- - m4/glib-gettext.m4 | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/m4/glib-gettext.m4 b/m4/glib-gettext.m4 -index 81f8fd2..e2b142b 100644 ---- a/m4/glib-gettext.m4 -+++ b/m4/glib-gettext.m4 -@@ -310,7 +310,7 @@ msgstr "" - # on various variables needed by the Makefile.in.in installed by - # glib-gettextize. - dnl --glib_DEFUN([GLIB_GNU_GETTEXT], -+AU_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - -@@ -381,7 +381,8 @@ glib_DEFUN([GLIB_GNU_GETTEXT], - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES -- ]) -+ ] -+ [[$0: This macro is deprecated. You should use upstream gettext instead.]]) - - # AX_GLIB_DEFINE_LOCALEDIR(VARIABLE) - # ------------------------------- --- -2.1.4 - diff --git a/external/poky/meta/recipes-gnome/gnome/gnome-themes-standard_3.22.3.bb b/external/poky/meta/recipes-gnome/gnome/gnome-themes-standard_3.22.3.bb deleted file mode 100644 index 55ee2776..00000000 --- a/external/poky/meta/recipes-gnome/gnome/gnome-themes-standard_3.22.3.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "GTK+2 standard themes" -HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/sources/gnome-themes-standard/" -BUGTRACKER = "https://bugzilla.gnome.org/" -SECTION = "x11/gnome" - -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -inherit autotools pkgconfig gettext gtk-icon-cache upstream-version-is-even distro_features_check - -ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" - -DEPENDS += "intltool-native gtk+" - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" -SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ - " - -SRC_URI[md5sum] = "b51c362b157b6407303d44f93c31ee11" -SRC_URI[sha256sum] = "61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a" - -EXTRA_OECONF = "--disable-gtk3-engine" - -do_install_append() { - # Only building Adwaita, remove highcontrast files - rm -rf ${D}${prefix}/share/themes/HighContrast \ - ${D}${prefix}/share/icons - - # The libtool archive file is unneeded with shared libs on modern Linux - rm -rf ${D}${libdir}/gtk-2.0/2.10.0/engines/libadwaita.la -} - -# There could be gnome-theme-highcontrast as well but that requires -# gtk+3 and includes lots of icons (is also broken with B != S). -PACKAGES += "gnome-theme-adwaita \ - gnome-theme-adwaita-dark \ - " - -FILES_gnome-theme-adwaita = "${prefix}/share/themes/Adwaita \ - ${libdir}/gtk-2.0/2.10.0/engines/libadwaita.so" - -FILES_gnome-theme-adwaita-dark = "${prefix}/share/themes/Adwaita-dark" -RDEPENDS_gnome-theme-adwaita-dark = "gnome-theme-adwaita" - -# gnome-themes-standard is empty and doesn't exist -RDEPENDS_${PN}-dev = "" diff --git a/external/poky/meta/recipes-gnome/gnome/libart-lgpl/libart_lgpl-2.3.21-crosscompile.patch b/external/poky/meta/recipes-gnome/gnome/libart-lgpl/libart_lgpl-2.3.21-crosscompile.patch deleted file mode 100644 index 0261f58c..00000000 --- a/external/poky/meta/recipes-gnome/gnome/libart-lgpl/libart_lgpl-2.3.21-crosscompile.patch +++ /dev/null @@ -1,84 +0,0 @@ -Taken from portage - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -From e1443c945a4cf67096d8c27721aadd7368382b3f Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Tue, 6 Apr 2010 15:22:25 +0200 -Subject: [PATCH 2/2] gentoo: use ISO types for fixed type size - ---- - Makefile.am | 11 ++--------- - art_config.h | 5 +++++ - configure.in | 10 ---------- - 3 files changed, 7 insertions(+), 19 deletions(-) - create mode 100644 art_config.h - -diff --git a/Makefile.am b/Makefile.am -index 95952da..6aa2fe3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,13 +2,6 @@ check_PROGRAMS = testart testuta - - bin_SCRIPTS = \ - libart2-config -- --noinst_SCRIPTS = gen_art_config.sh -- --BUILT_SOURCES = art_config.h -- --art_config.h: -- ./gen_art_config.sh > art_config.h - - EXTRA_DIST = \ - libart.def \ -@@ -173,5 +166,5 @@ install-data-local: install-ms-lib install-libtool-import-lib - - uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib - --CLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS) --DISTCLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS) -+CLEANFILES = $(bin_SCRIPTS) -+DISTCLEANFILES = $(bin_SCRIPTS) -diff --git a/art_config.h b/art_config.h -new file mode 100644 -index 0000000..5985f1f ---- a/art_config.h -+++ b/art_config.h -@@ -0,0 +1,5 @@ -+#include <stdint.h> -+ -+typedef uint8_t art_u8; -+typedef uint16_t art_u16; -+typedef uint32_t art_u32; -diff --git a/configure.in b/configure.in -index e4804f7..ddcac4f 100644 ---- a/configure.in -+++ b/configure.in -@@ -92,15 +92,6 @@ AC_FUNC_ALLOCA - - AC_C_BIGENDIAN - --AC_CHECK_SIZEOF(char) --AC_SUBST(ART_SIZEOF_CHAR, $ac_cv_sizeof_char) --AC_CHECK_SIZEOF(short) --AC_SUBST(ART_SIZEOF_SHORT, $ac_cv_sizeof_short) --AC_CHECK_SIZEOF(int) --AC_SUBST(ART_SIZEOF_INT, $ac_cv_sizeof_int) --AC_CHECK_SIZEOF(long) --AC_SUBST(ART_SIZEOF_LONG, $ac_cv_sizeof_long) -- - AC_CONFIG_FILES([ - libart-features.h - Makefile -@@ -109,6 +100,5 @@ libart-2.0-uninstalled.pc - libart-zip]) - - AC_CONFIG_FILES([libart-config],[chmod +x libart-config]) --AC_CONFIG_FILES([gen_art_config.sh],[chmod +x gen_art_config.sh]) - - AC_OUTPUT --- -1.7.0.4 - diff --git a/external/poky/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb b/external/poky/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb deleted file mode 100644 index 95581b29..00000000 --- a/external/poky/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Library of functions for 2D graphics" -SECTION = "x11/gnome" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" -PR = "r2" - -# can't use gnome.oeclass due to _ in filename -SRC_URI = "${GNOME_MIRROR}/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \ - file://libart_lgpl-2.3.21-crosscompile.patch \ - " - -SRC_URI[md5sum] = "08559ff3c67fd95d57b0c5e91a6b4302" -SRC_URI[sha256sum] = "fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa" - -inherit autotools pkgconfig - -DEPENDS = "" - -FILES_${PN} = "${libdir}/*.so.*" -FILES_${PN}-dev += "${bindir}/libart2-config" - -S = "${WORKDIR}/libart_lgpl-${PV}" |