diff options
| author | jmbills <42755197+jmbills@users.noreply.github.com> | 2019-10-25 19:18:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-25 19:18:16 +0300 |
| commit | 0dbb60593ebb5a62190c0e6cff7f1770493303a2 (patch) | |
| tree | 0df2ce67404dbca3ddc4ee063dbfd9ae455be682 /meta-openembedded/meta-gnome | |
| parent | 34a3942845ac3264ce27c648ae5486d302c3e6d8 (diff) | |
| parent | cc9cea46d74d280de03c713c8b555153fd811f09 (diff) | |
| download | openbmc-0dbb60593ebb5a62190c0e6cff7f1770493303a2.tar.xz | |
Merge branch 'intel' into intel2
Diffstat (limited to 'meta-openembedded/meta-gnome')
39 files changed, 448 insertions, 735 deletions
diff --git a/meta-openembedded/meta-gnome/README b/meta-openembedded/meta-gnome/README index 2a682e72d..3c5b4c5f9 100644 --- a/meta-openembedded/meta-gnome/README +++ b/meta-openembedded/meta-gnome/README @@ -1,23 +1,3 @@ -meta-gnome -=========== - -The recipe in this layer needs to have 'x11' in DISTRO_FEATURES -to have effect. To enable them, add in configuration file the following line. - - DISTRO_FEATURES_append = " x11" - -If meta-gnome is included, but x11 is not enabled as a -distro feature a warning is printed at parse time: - - You have included the meta-gnome layer, but - 'x11' has not been enabled in your DISTRO_FEATURES. - -If you know what you are doing, this warning can be disabled by setting the following -variable in your configuration: - - SKIP_META_GNOME_SANITY_CHECK = 1 - - Dependencies ------------ This layer depends on: diff --git a/meta-openembedded/meta-gnome/classes/sanity-meta-gnome.bbclass b/meta-openembedded/meta-gnome/classes/sanity-meta-gnome.bbclass deleted file mode 100644 index 331ea193d..000000000 --- a/meta-openembedded/meta-gnome/classes/sanity-meta-gnome.bbclass +++ /dev/null @@ -1,10 +0,0 @@ -addhandler gnome_bbappend_distrocheck -gnome_bbappend_distrocheck[eventmask] = "bb.event.SanityCheck" -python gnome_bbappend_distrocheck() { - skip_check = e.data.getVar('SKIP_META_GNOME_SANITY_CHECK') == "1" - if 'x11' not in e.data.getVar('DISTRO_FEATURES').split() and not skip_check: - bb.warn("You have included the meta-gnome layer, but \ -'x11' has not been enabled in your DISTRO_FEATURES. Some bbappend files \ -may not take effect. See the meta-gnome README for details on enabling \ -meta-gnome support.") -} diff --git a/meta-openembedded/meta-gnome/conf/layer.conf b/meta-openembedded/meta-gnome/conf/layer.conf index 0b68232de..862d622ee 100644 --- a/meta-openembedded/meta-gnome/conf/layer.conf +++ b/meta-openembedded/meta-gnome/conf/layer.conf @@ -14,8 +14,4 @@ LAYERVERSION_gnome-layer = "1" LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer" -LAYERSERIES_COMPAT_gnome-layer = "thud warrior" - -# Sanity check for meta-gnome layer. -# Setting SKIP_META_GNOME_SANITY_CHECK to "1" would skip the bbappend files check. -INHERIT += "sanity-meta-gnome" +LAYERSERIES_COMPAT_gnome-layer = "thud warrior zeus" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.22.bb index 80aafc870..37f512a73 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.22.bb @@ -3,17 +3,17 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" DEPENDS = "gtk+3 libnotify libsecret networkmanager \ - gconf libgnome-keyring iso-codes nss \ + libgnome-keyring iso-codes nss \ intltool-native \ " GNOMEBASEBUILDCLASS = "autotools-brokensep" -inherit distro_features_check gnomebase gsettings gtk-icon-cache gobject-introspection +inherit distro_features_check gnomebase gsettings gtk-icon-cache gobject-introspection gettext REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "06aafa851762146034351aa72ebb23d4" -SRC_URI[archive.sha256sum] = "050dbb155566c715239dc0378844d8beed10954e64e71014ecef8ca912df34ec" +SRC_URI[archive.md5sum] = "e0373f4c0d0637716e6e385799a9080f" +SRC_URI[archive.sha256sum] = "ebef1c1050ff6d94cad060e8d259f2a88ae159cf83ca75cb71d9f76867877eed" PACKAGECONFIG[modemmanager] = "--with-wwan,--without-wwan,modemmanager" PACKAGECONFIG[mobile-provider-info] = "--enable-mobile-broadband-provider-info,--disable-mobile-broadband-provider-info,mobile-broadband-provider-info,mobile-broadband-provider-info" @@ -23,13 +23,6 @@ EXTRA_OECONF = " \ --without-selinux \ " -do_configure_append() { - # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror - for i in $(find ${B} -name "Makefile") ; do - sed -i -e s%-Werror[^[:space:]]*%%g $i - done -} - # gobject-introspection related GI_DATA_ENABLED_libc-musl = "False" diff --git a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.33.0.bb b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.33.0.bb index a9f6993fb..de143b9c8 100644 --- a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.33.0.bb +++ b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.33.0.bb @@ -15,7 +15,7 @@ SRC_URI = " \ SRC_URI[md5sum] = "2f481ad34decb7021ca04ca305e79e7d" SRC_URI[sha256sum] = "5023b8c983f88a22e65bf6f09a12ea09369defc008981b52ee8b96a3879f81d6" -DEPENDS = "glib-2.0 glib-2.0-native gtkmm parted gnome-doc-utils intltool-native" +DEPENDS += "glib-2.0 glib-2.0-native gtkmm parted gnome-doc-utils intltool-native" do_install_append() { # Add a script which checks if polkit is installed. diff --git a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-Bug-13770-Require-C-11-from-now-on.patch b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-Bug-13770-Require-C-11-from-now-on.patch deleted file mode 100644 index 3731a23f1..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-Bug-13770-Require-C-11-from-now-on.patch +++ /dev/null @@ -1,180 +0,0 @@ -From f6d0dc338fe867c1b064682ae7f15bffe019b306 Mon Sep 17 00:00:00 2001 -From: Hubert Figuiere <hub@figuiere.net> -Date: Tue, 12 Apr 2016 02:55:47 +0000 -Subject: [PATCH] Bug 13770 - Require C++11 from now on. - -git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/trunk@35197 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6 - -Upstream-Status: Backport -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - ax_cxx_compile_stdcxx_11.m4 | 133 +++++++++++++++++++++++++++++++++++ - configure.ac | 1 + - src/wp/ap/gtk/ap_UnixApp.cpp | 2 +- - 3 files changed, 135 insertions(+), 1 deletion(-) - create mode 100644 ax_cxx_compile_stdcxx_11.m4 - -diff --git a/ax_cxx_compile_stdcxx_11.m4 b/ax_cxx_compile_stdcxx_11.m4 -new file mode 100644 -index 0000000..af37acd ---- /dev/null -+++ b/ax_cxx_compile_stdcxx_11.m4 -@@ -0,0 +1,133 @@ -+# ============================================================================ -+# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html -+# ============================================================================ -+# -+# SYNOPSIS -+# -+# AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional]) -+# -+# DESCRIPTION -+# -+# Check for baseline language coverage in the compiler for the C++11 -+# standard; if necessary, add switches to CXXFLAGS to enable support. -+# -+# The first argument, if specified, indicates whether you insist on an -+# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. -+# -std=c++11). If neither is specified, you get whatever works, with -+# preference for an extended mode. -+# -+# The second argument, if specified 'mandatory' or if left unspecified, -+# indicates that baseline C++11 support is required and that the macro -+# should error out if no mode with that support is found. If specified -+# 'optional', then configuration proceeds regardless, after defining -+# HAVE_CXX11 if and only if a supporting mode is found. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com> -+# Copyright (c) 2012 Zack Weinberg <zackw@panix.com> -+# Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu> -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice -+# and this notice are preserved. This file is offered as-is, without any -+# warranty. -+ -+#serial 3 -+ -+m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [ -+ template <typename T> -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ typedef check<check<bool>> right_angle_brackets; -+ -+ int a; -+ decltype(a) b; -+ -+ typedef check<int> check_type; -+ check_type c; -+ check_type&& cr = static_cast<check_type&&>(c); -+ -+ auto d = a; -+]) -+ -+AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl -+ m4_if([$1], [], [], -+ [$1], [ext], [], -+ [$1], [noext], [], -+ [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl -+ m4_if([$2], [], [ax_cxx_compile_cxx11_required=true], -+ [$2], [mandatory], [ax_cxx_compile_cxx11_required=true], -+ [$2], [optional], [ax_cxx_compile_cxx11_required=false], -+ [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl -+ AC_LANG_PUSH([C++])dnl -+ ac_success=no -+ AC_CACHE_CHECK(whether $CXX supports C++11 features by default, -+ ax_cv_cxx_compile_cxx11, -+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], -+ [ax_cv_cxx_compile_cxx11=yes], -+ [ax_cv_cxx_compile_cxx11=no])]) -+ if test x$ax_cv_cxx_compile_cxx11 = xyes; then -+ ac_success=yes -+ fi -+ -+ m4_if([$1], [noext], [], [dnl -+ if test x$ac_success = xno; then -+ for switch in -std=gnu++11 -std=gnu++0x; do -+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) -+ AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, -+ $cachevar, -+ [ac_save_CXXFLAGS="$CXXFLAGS" -+ CXXFLAGS="$CXXFLAGS $switch" -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], -+ [eval $cachevar=yes], -+ [eval $cachevar=no]) -+ CXXFLAGS="$ac_save_CXXFLAGS"]) -+ if eval test x\$$cachevar = xyes; then -+ CXXFLAGS="$CXXFLAGS $switch" -+ ac_success=yes -+ break -+ fi -+ done -+ fi]) -+ -+ m4_if([$1], [ext], [], [dnl -+ if test x$ac_success = xno; then -+ for switch in -std=c++11 -std=c++0x; do -+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) -+ AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, -+ $cachevar, -+ [ac_save_CXXFLAGS="$CXXFLAGS" -+ CXXFLAGS="$CXXFLAGS $switch" -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], -+ [eval $cachevar=yes], -+ [eval $cachevar=no]) -+ CXXFLAGS="$ac_save_CXXFLAGS"]) -+ if eval test x\$$cachevar = xyes; then -+ CXXFLAGS="$CXXFLAGS $switch" -+ ac_success=yes -+ break -+ fi -+ done -+ fi]) -+ AC_LANG_POP([C++]) -+ if test x$ax_cxx_compile_cxx11_required = xtrue; then -+ if test x$ac_success = xno; then -+ AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.]) -+ fi -+ else -+ if test x$ac_success = xno; then -+ HAVE_CXX11=0 -+ AC_MSG_NOTICE([No compiler with C++11 support was found]) -+ else -+ HAVE_CXX11=1 -+ AC_DEFINE(HAVE_CXX11,1, -+ [define if the compiler supports basic C++11 syntax]) -+ fi -+ -+ AC_SUBST(HAVE_CXX11) -+ fi -+]) -diff --git a/configure.ac b/configure.ac -index 48228be..f7be7de 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -131,6 +131,7 @@ win_pkgs="$enchant_req" - - AC_PROG_CC - AC_PROG_CXX -+AX_CXX_COMPILE_STDCXX_11(noext,mandatory) - #AC_PROG_OBJC - AC_PROG_INSTALL - # For libtool 1.5.x compatability (AC_PROG_LIBTOOL is deprecated version of LT_INIT) -diff --git a/src/wp/ap/gtk/ap_UnixApp.cpp b/src/wp/ap/gtk/ap_UnixApp.cpp -index 061a304..260f8e5 100644 ---- a/src/wp/ap/gtk/ap_UnixApp.cpp -+++ b/src/wp/ap/gtk/ap_UnixApp.cpp -@@ -863,7 +863,7 @@ static bool is_so (const char *file) { - if (len < (strlen(G_MODULE_SUFFIX) + 2)) // this is ".so" and at least one char for the filename - return false; - const char *suffix = file+(len-3); -- if(0 == strcmp (suffix, "."G_MODULE_SUFFIX)) -+ if(0 == strcmp (suffix, "." G_MODULE_SUFFIX)) - return true; - return false; - } diff --git a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch deleted file mode 100644 index 0dff1411d..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c646159ce817506131b58fdab1cdc1cd6364df7a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Sun, 7 Feb 2016 21:45:20 +0100 -Subject: [PATCH] plugins/aiksaurus/Makefile.am: remove uncomplete options - WITH_BUILTIN_AIKSAURUS_GTK -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* with gtk2 we won't use it -* it is missing in configure.ac causing - -| plugins/aiksaurus/Makefile.am:5: error: WITH_BUILTIN_AIKSAURUS_GTK does not appear in AM_CONDITIONAL - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - plugins/aiksaurus/Makefile.am | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/plugins/aiksaurus/Makefile.am b/plugins/aiksaurus/Makefile.am -index d402c58..1034e2a 100644 ---- a/plugins/aiksaurus/Makefile.am -+++ b/plugins/aiksaurus/Makefile.am -@@ -2,10 +2,6 @@ SUBDIRS = - - if TOOLKIT_GTK - --if WITH_BUILTIN_AIKSAURUS_GTK --SUBDIRS += aiksaurusgtk3 --platform_lib = aiksaurusgtk3/libAiksaurusGtk3.la --endif - - endif - --- -2.5.0 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb deleted file mode 100644 index 36b056fdd..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb +++ /dev/null @@ -1,142 +0,0 @@ -SUMMARY = "AbiWord is free word processing program similar to Microsoft(r) Word" -HOMEPAGE = "http://www.abiword.org" -SECTION = "x11/office" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20" -DEPENDS = " \ - perl-native \ - gtk+ \ - gtkmathview \ - wv \ - fribidi \ - jpeg \ - libpng \ - librsvg \ - libwmf-native \ - asio \ - evolution-data-server \ - libxslt \ - ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'redland rasqal', '', d)} \ -" -RDEPENDS_${PN}_append_libc-glibc = " \ - glibc-gconv-ibm850 glibc-gconv-cp1252 \ - glibc-gconv-iso8859-15 glibc-gconv-iso8859-1 \ -" -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://0001-Bug-13770-Require-C-11-from-now-on.patch \ - " - -LIC_FILES_CHKSUM = "file://COPYING;md5=c5edcc3ccd864b19004d14e9c1c9a26a" - -SRC_URI[md5sum] = "cda6dd58c747c133b421cc7eb18f5796" -SRC_URI[sha256sum] = "afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522" - -#want 3.x from 3.x.y for the installation directory -SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" - -inherit distro_features_check autotools-brokensep pkgconfig - -REQUIRED_DISTRO_FEATURES = "x11" - -PACKAGECONFIG ??= " \ - collab-backend-xmpp collab-backend-tcp \ - ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libical', '', d)} \ -" -PACKAGECONFIG[libical] = "--with-libical,--without-libical,libical raptor2" -PACKAGECONFIG[spell] = "--enable-spell,--disable-spell,enchant" -PACKAGECONFIG[collab-backend-xmpp] = "--enable-collab-backend-xmpp,--disable-collab-backend-xmpp,libgsf libxml2 loudmouth" -PACKAGECONFIG[collab-backend-tcp] = "--enable-collab-backend-tcp,--disable-collab-backend-tcp,libgsf libxml2" -PACKAGECONFIG[collab-backend-service] = "--enable-collab-backend-service,--disable-collab-backend-service,libgsf libxml2 libsoup-2.4 gnutls" -PACKAGECONFIG[collab-backend-telepathy] = "--enable-collab-backend-telepathy,--disable-collab-backend-telepathy,libgsf libxml2 telepathy-glib telepathy-mission-control" -PACKAGECONFIG[collab-backend-sugar] = "--enable-collab-backend-sugar,--disable-collab-backend-sugar,libgsf libxml2 dbus-glib" - -EXTRA_OECONF = " --disable-static \ - --enable-plugins \ - --enable-clipart \ - --enable-templates \ - --without-gnomevfs \ - --with-gtk2 \ - --with-libwmf-config=${STAGING_DIR} \ -" - -LDFLAGS += "-lgmodule-2.0" - -do_compile() { - cd goffice-bits2 - make goffice-paths.h - make libgoffice.la - cd ${B} - oe_runmake -} - -PACKAGES += " ${PN}-clipart ${PN}-strings ${PN}-systemprofiles ${PN}-templates " - -FILES_${PN} += " \ - ${libdir}/lib${PN}-*.so \ - ${datadir}/mime-info \ - ${datadir}/icons/* \ - ${datadir}/${PN}-${SHRT_VER}/glade \ - ${datadir}/${PN}-${SHRT_VER}/scripts \ - ${datadir}/${PN}-${SHRT_VER}/system.profile-en \ - ${datadir}/${PN}-${SHRT_VER}/system.profile-en_GB \ - ${datadir}/${PN}-${SHRT_VER}/templates/normal.awt \ - ${datadir}/${PN}-${SHRT_VER}/templates/normal.awt-en_GB \ - ${datadir}/${PN}-${SHRT_VER}/templates/Employee-Directory.awt \ - ${datadir}/${PN}-${SHRT_VER}/templates/Business-Report.awt \ - ${datadir}/${PN}-${SHRT_VER}/templates/Fax-Coversheet.awt \ - ${datadir}/${PN}-${SHRT_VER}/templates/Resume.awt \ - ${datadir}/${PN}-${SHRT_VER}/templates/Two-Columns.awt \ - ${datadir}/${PN}-${SHRT_VER}/templates/Memo.awt \ - ${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}/mime-info \ - ${datadir}/${PN}-${SHRT_VER}/Pr*.xml \ -" - -# don't steal /usr/lib/libabiword-3.0.so from ${PN} -# in this case it's needed in ${PN} -FILES_${PN}-dev = " \ - ${includedir} \ - ${libdir}/pkgconfig \ - ${libdir}/${PN}*.la \ - ${libdir}/lib${PN}*.la \ - ${libdir}/${PN}-${SHRT_VER}/plugins/*.la \ -" -FILES_${PN}-dbg += "${libdir}/${PN}-${SHRT_VER}/plugins/.debug" -FILES_${PN}-doc += "${datadir}/${PN}-*/readme*" - -FILES_${PN}-strings += "${datadir}/${PN}-${SHRT_VER}/strings" -FILES_${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/system.profile*" -FILES_${PN}-clipart += "${datadir}/${PN}-${SHRT_VER}/clipart" -FILES_${PN}-strings += "${datadir}/${PN}-${SHRT_VER}/AbiWord/strings" -FILES_${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/AbiWord/system.profile*" -FILES_${PN}-templates += "${datadir}/${PN}-${SHRT_VER}/templates" - -PACKAGES_DYNAMIC += "^${PN}-meta.* ^${PN}-plugin-.*" - -python populate_packages_prepend () { - abiword_libdir = d.expand('${libdir}/${PN}-${SHRT_VER}/plugins') - do_split_packages(d, abiword_libdir, '(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='') - - metapkg = "abiword-meta" - d.setVar('ALLOW_EMPTY_' + metapkg, "1") - d.setVar('FILES_' + metapkg, "") - blacklist = [ 'abiword-plugins-dbg', 'abiword-plugins', 'abiword-plugins-doc', 'abiword-plugins-dev', 'abiword-plugins-locale' ] - metapkg_rdepends = [] - packages = d.getVar('PACKAGES').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 %s" % pkg) - metapkg_rdepends.append(pkg) - d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) - d.setVar('DESCRIPTION_' + metapkg, 'abiword-plugin meta package') - packages.append(metapkg) - d.setVar('PACKAGES', ' '.join(packages)) -} - -FILES_${PN}-plugin-openxml += "${datadir}/${PN}-${SHRT_VER}/omml_xslt" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch index a821a14ab..cc9dca4ea 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch @@ -1,7 +1,7 @@ -From 131b88a81aba3d72d566bc8a9d968941a98e0007 Mon Sep 17 00:00:00 2001 +From e32075119803f9fffbba01a31083e416cb213011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Tue, 19 Dec 2017 16:37:20 +0100 -Subject: [PATCH] CMakeLists.txt: Remove TRY_RUN for iconv +Subject: [PATCH 1/7] CMakeLists.txt: Remove TRY_RUN for iconv MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,18 +13,20 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- - CMakeLists.txt | 5 ----- - 1 file changed, 5 deletions(-) + CMakeLists.txt | 6 ------ + 1 file changed, 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8d07772..a2396f2 100644 +index f9d72db..ed99904 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -521,13 +521,8 @@ if(NOT HAVE_ICONV) - endif(NOT HAVE_ICONV) +@@ -526,15 +526,9 @@ endif(NOT HAVE_ICONV) set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBS}) --CHECK_C_SOURCE_RUNS("#include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv) + file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/" _binary_dir_with_separator) +-CHECK_C_SOURCE_RUNS("#define ICONV_DETECT_BUILD_DIR \"${_binary_dir_with_separator}\" +- #include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv) + unset(_binary_dir_with_separator) unset(CMAKE_REQUIRED_LIBRARIES) -if(NOT _correct_iconv) @@ -35,5 +37,5 @@ index 8d07772..a2396f2 100644 # Backtraces for debugging # ****************************** -- -2.14.3 +2.21.0 diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch index c8dc7e12c..23c3a96d4 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch @@ -1,7 +1,7 @@ -From 210b204d9edd71202454ff04013cc52b23c598e4 Mon Sep 17 00:00:00 2001 +From 20bd8946a5c73290d961df151e82033171639c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Tue, 19 Dec 2017 16:55:13 +0100 -Subject: [PATCH] CMakeLists.txt: remove CHECK_C_SOURCE_RUNS check +Subject: [PATCH 2/7] CMakeLists.txt: remove CHECK_C_SOURCE_RUNS check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -15,10 +15,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 1 file changed, 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index a2396f2..f3b271b 100644 +index ed99904..9a2e99f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -573,29 +573,6 @@ CHECK_C_SOURCE_COMPILES("#include <langinfo.h> +@@ -579,29 +579,6 @@ CHECK_C_SOURCE_COMPILES("#include <langinfo.h> CHECK_C_SOURCE_COMPILES("#include <langinfo.h> int main(void) { char *detail = nl_langinfo (_NL_ADDRESS_COUNTRY_AB2); return 0; }" HAVE__NL_ADDRESS_COUNTRY_AB2) @@ -49,5 +49,5 @@ index a2396f2..f3b271b 100644 # system mail stuff # ****************************** -- -2.14.3 +2.21.0 diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch index 3cdfa8b6f..c9e6f96f5 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch @@ -1,14 +1,14 @@ -From 4df8bd8ae4258289663b27af1207027c7ee06340 Mon Sep 17 00:00:00 2001 +From d616eddf3a214a49900344f4455155879d3b82db Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sun, 4 Aug 2013 09:13:25 +0200 -Subject: [PATCH 1/5] contact: Replace the Novell sample contact with something +Subject: [PATCH 3/7] contact: Replace the Novell sample contact with something more appropriate Upstream-Status: Inappropriate [configuration] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- - src/addressbook/libedata-book/ximian-vcard.h | 179 ++++++++++++++++++------------- - 2 files changed, 103 insertions(+), 77 deletions(-) + src/addressbook/libedata-book/ximian-vcard.h | 179 +++++++++++-------- + 1 file changed, 102 insertions(+), 77 deletions(-) diff --git a/src/addressbook/libedata-book/ximian-vcard.h b/src/addressbook/libedata-book/ximian-vcard.h index 782d37b..5b0b250 100644 @@ -198,5 +198,5 @@ index 782d37b..5b0b250 100644 +" gQIUKE+H+C/wMGX8Ias1s6CQAAAABJRU5ErkJggg==\n" \ "END:VCARD" -- -1.8.3.2 +2.21.0 diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch new file mode 100644 index 000000000..67023df2c --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch @@ -0,0 +1,50 @@ +From 30bd4ae3badb152c9f81c6d34014c586fa0cc825 Mon Sep 17 00:00:00 2001 +From: Piotr Tworek <tworaz@tworaz.net> +Date: Mon, 12 Aug 2019 14:13:52 +0200 +Subject: [PATCH 4/7] Add native suffix to exacutables produced and run during + build process. + +CMake can't build tools for the host system when cross compiling. As +result eds currently fails to build in OE due to some programs being +cross compiled for the target and run on the host. To work around this +limitation modify existing targets using build time generated binaries +to invoke binaries suffixed with -native. We can inject such binaries +into expected locations prior to invoking ninja in do_compile. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Piotr Tworek <tworaz@tworaz.net> +--- + src/addressbook/libebook-contacts/CMakeLists.txt | 2 +- + src/camel/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/addressbook/libebook-contacts/CMakeLists.txt b/src/addressbook/libebook-contacts/CMakeLists.txt +index e9e3259..2ae72a8 100644 +--- a/src/addressbook/libebook-contacts/CMakeLists.txt ++++ b/src/addressbook/libebook-contacts/CMakeLists.txt +@@ -25,7 +25,7 @@ target_link_libraries(gen-western-table + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h +- COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h ++ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table-native "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h + DEPENDS gen-western-table e-name-western-tables.h.in + ) + +diff --git a/src/camel/CMakeLists.txt b/src/camel/CMakeLists.txt +index be626a8..9226b2b 100644 +--- a/src/camel/CMakeLists.txt ++++ b/src/camel/CMakeLists.txt +@@ -10,7 +10,7 @@ target_include_directories(camel-gen-tables PUBLIC + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c +- COMMAND ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c ++ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables-native >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c + DEPENDS camel-gen-tables + ) + +-- +2.21.0 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch deleted file mode 100644 index d3b0ac673..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 698a0e104dcbe4b630df848fd4af7c59f76cdc37 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 5 May 2018 17:46:52 -0700 -Subject: [PATCH] Use recommended way to handle the icu namespace - -Fixes build with icu >= 61 - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/libedataserver/e-alphabet-index-private.cpp | 2 ++ - src/libedataserver/e-transliterator-private.cpp | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/src/libedataserver/e-alphabet-index-private.cpp b/src/libedataserver/e-alphabet-index-private.cpp -index d3e44f4..ddffd99 100644 ---- a/src/libedataserver/e-alphabet-index-private.cpp -+++ b/src/libedataserver/e-alphabet-index-private.cpp -@@ -33,9 +33,11 @@ - - /* ICU headers */ - #include <unicode/alphaindex.h> -+#include <unicode/ustring.h> - - using icu::AlphabeticIndex; - using icu::Locale; -+using U_ICU_NAMESPACE::UnicodeString; - - struct _EAlphabetIndex { - AlphabeticIndex *priv; -diff --git a/src/libedataserver/e-transliterator-private.cpp b/src/libedataserver/e-transliterator-private.cpp -index bb15593..573446f 100644 ---- a/src/libedataserver/e-transliterator-private.cpp -+++ b/src/libedataserver/e-transliterator-private.cpp -@@ -33,8 +33,10 @@ - - /* ICU headers */ - #include <unicode/translit.h> -+#include <unicode/ustring.h> - - using icu::Transliterator; -+using U_ICU_NAMESPACE::UnicodeString; - - struct _ETransliterator { - Transliterator *priv; diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch new file mode 100644 index 000000000..55ab5a7fc --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch @@ -0,0 +1,33 @@ +From 95425206e7317e59b7ca06d7f838ad357cdd200c Mon Sep 17 00:00:00 2001 +From: Piotr Tworek <tworaz@tworaz.net> +Date: Wed, 14 Aug 2019 00:31:54 +0200 +Subject: [PATCH 5/7] Use LC_MESSAGES for address localization when LC_ADDRESS + is not available. + +Musl does not define LC_ADDRESS unfortunately. + +Upstream-Status: Inappropriate [musl specific] + +Signed-off-by: Piotr Tworek <tworaz@tworaz.net> +--- + src/addressbook/libebook-contacts/e-phone-number-private.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/addressbook/libebook-contacts/e-phone-number-private.cpp b/src/addressbook/libebook-contacts/e-phone-number-private.cpp +index 4c5aebb..9abcebd 100644 +--- a/src/addressbook/libebook-contacts/e-phone-number-private.cpp ++++ b/src/addressbook/libebook-contacts/e-phone-number-private.cpp +@@ -36,6 +36,10 @@ + #include <phonenumbers/logger.h> + #include <phonenumbers/phonenumberutil.h> + ++#ifndef LC_ADDRESS ++#define LC_ADDRESS LC_MESSAGES ++#endif ++ + using i18n::phonenumbers::PhoneNumber; + using i18n::phonenumbers::PhoneNumberUtil; + +-- +2.21.0 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch new file mode 100644 index 000000000..c0c1427fd --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch @@ -0,0 +1,36 @@ +From fb9164bbca5b425f1cf1bb3cac51d06afe81938a Mon Sep 17 00:00:00 2001 +From: Piotr Tworek <tworaz@tworaz.net> +Date: Wed, 14 Aug 2019 00:47:59 +0200 +Subject: [PATCH 6/7] Dont add /usr/lib to LDFLAGS when linking libphonenumber. + +This will refer to host lib dir which is not what we want. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Piotr Tworek <tworaz@tworaz.net> +--- + cmake/modules/FindPhonenumber.cmake | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/cmake/modules/FindPhonenumber.cmake b/cmake/modules/FindPhonenumber.cmake +index 04d1056..70c0c41 100644 +--- a/cmake/modules/FindPhonenumber.cmake ++++ b/cmake/modules/FindPhonenumber.cmake +@@ -37,12 +37,10 @@ string(TOUPPER "${WITH_PHONENUMBER}" optupper) + if(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}")) + set(WITH_PHONENUMBER "ON") + set(PHONENUMBER_INCLUDE_DIRS "${INCLUDE_INSTALL_DIR}") +- set(PHONENUMBER_LIB_DIRS ${LIB_INSTALL_DIR}) +- set(PHONENUMBER_LDFLAGS -L${PHONENUMBER_LIB_DIRS} ${PHONENUMBER_LDFLAGS}) ++ set(PHONENUMBER_LDFLAGS ${PHONENUMBER_LDFLAGS}) + else(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}")) + set(PHONENUMBER_INCLUDE_DIRS "${WITH_PHONENUMBER}/include") +- set(PHONENUMBER_LIB_DIRS ${WITH_PHONENUMBER}/lib${LIB_SUFFIX}) +- set(PHONENUMBER_LDFLAGS -L${PHONENUMBER_LIB_DIRS} ${PHONENUMBER_LDFLAGS}) ++ set(PHONENUMBER_LDFLAGS ${PHONENUMBER_LDFLAGS}) + endif(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}")) + + unset(bindirlen) +-- +2.21.0 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0007-Modify-gobject-intrispection-support-to-work-with-OE.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0007-Modify-gobject-intrispection-support-to-work-with-OE.patch new file mode 100644 index 000000000..c00082a2c --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0007-Modify-gobject-intrispection-support-to-work-with-OE.patch @@ -0,0 +1,75 @@ +From d84f4fd68441e934b37be2a6917abad52c5d1bda Mon Sep 17 00:00:00 2001 +From: Piotr Tworek <tworaz@tworaz.net> +Date: Fri, 16 Aug 2019 21:22:16 +0200 +Subject: [PATCH 7/7] Modify gobject-intrispection support to work with OE. + +1. Use tools provided by the recipe sysroot instread of host ones. +2. Make sure all the required dirs make it into g-ir-scanner via + LDFLAGS. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Piotr Tworek <tworaz@tworaz.net> +--- + cmake/modules/GObjectIntrospection.cmake | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/cmake/modules/GObjectIntrospection.cmake b/cmake/modules/GObjectIntrospection.cmake +index 5be5042..67c035a 100644 +--- a/cmake/modules/GObjectIntrospection.cmake ++++ b/cmake/modules/GObjectIntrospection.cmake +@@ -20,6 +20,9 @@ if(ENABLE_INTROSPECTION) + pkg_check_variable(G_IR_SCANNER gobject-introspection-1.0 g_ir_scanner) + pkg_check_variable(G_IR_COMPILER gobject-introspection-1.0 g_ir_compiler) + ++ string(CONCAT G_IR_SCANNER $ENV{PKG_CONFIG_SYSROOT_DIR} "${G_IR_SCANNER}") ++ string(CONCAT G_IR_COMPILER $ENV{PKG_CONFIG_SYSROOT_DIR} "${G_IR_COMPILER}") ++ + if(NOT G_IR_SCANNER) + message(FATAL_ERROR "g-ir-scanner not provided by gobject-introspection-1.0, you can disable GObject introspection by -DENABLE_INTROSPECTION=OFF") + endif(NOT G_IR_SCANNER) +@@ -116,7 +119,7 @@ macro(gir_add_introspection gir) + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_gir_name}_files "${_gir_files}") + + add_custom_command( +- COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS= ++ COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS=${INTROSPECTION_SCANNER_LDFLAGS} + ${INTROSPECTION_SCANNER_ENV} + ${G_IR_SCANNER} + ${INTROSPECTION_SCANNER_ARGS} +@@ -186,6 +189,7 @@ macro(gir_add_introspection_simple gir_library pkg_export_prefix gir_library_ver + unset(INTROSPECTION_SCANNER_ARGS) + unset(INTROSPECTION_SCANNER_ENV) + unset(INTROSPECTION_COMPILER_ARGS) ++ unset(INTROSPECTION_SCANNER_LDFLAGS) + + set(${gir_vars_prefix} ${gir_library}) + set(${gir_vars_prefix}_SCANNERFLAGS "--warn-all") +@@ -223,12 +227,12 @@ macro(gir_add_introspection_simple gir_library pkg_export_prefix gir_library_ver + --add-include-path=${CMAKE_CURRENT_SOURCE_DIR} + --library-path=${CMAKE_BINARY_DIR} + --library-path=${CMAKE_BINARY_DIR}/src ++ --library-path=${CMAKE_BINARY_DIR}/src/private + --library-path=${CMAKE_CURRENT_BINARY_DIR} + ${_gir_extra_libdirs} + ${_gir_identifies_prefixes} + ${_gir_deps} + --add-include-path=${SHARE_INSTALL_PREFIX}/gir-1.0 +- --library-path=${LIB_INSTALL_DIR} + ${_extra_library_path} + --pkg-export ${pkg_export_prefix}-${gir_library_version} + --c-include=${c_include} +@@ -279,6 +283,10 @@ macro(gir_add_introspection_simple gir_library pkg_export_prefix gir_library_ver + ) + endif(UNIX) + ++ _gir_list_prefix(_gir_scanner_ldflags ${gir_extra_libdirs_var} "-Wl,-rpath-link=") ++ string(REPLACE ";" " " _gir_scanner_ldflags "${_gir_scanner_ldflags}") ++ set(INTROSPECTION_SCANNER_LDFLAGS "${_gir_scanner_ldflags}") ++ + set(INTROSPECTION_SCANNER_ENV + ${_loader_library_path_var}="${_extra_loader_library_path_native}" + ) +-- +2.21.0 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.6.bb b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb index 1949fc7fd..429dd53d8 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.6.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.32.4.bb @@ -9,43 +9,43 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ file://src/calendar/libecal/e-cal.h;endline=24;md5=e699ec3866f73f129f7a4ffffdcfc196" DEPENDS = " \ - intltool-native gperf-native \ - glib-2.0 gtk+3 gconf libgnome-keyring libgdata \ + intltool-native gperf-native glib-2.0-native \ + glib-2.0 gtk+3 libgnome-keyring libgdata libcanberra icu \ dbus db virtual/libiconv zlib libsoup-2.4 libical nss libsecret \ " -inherit distro_features_check gnomebase cmake gtk-doc gettext gobject-introspection perlnative pythonnative +inherit gnomebase cmake gtk-doc gettext gobject-introspection perlnative upstream-version-is-even vala -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ - file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \ - file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \ - file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \ - file://iconv-detect.h \ - file://0004-Use-recommended-way-to-handle-the-icu-namespace.patch \ +SRC_URI += "file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \ + file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \ + file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \ + file://0004-Add-native-suffix-to-exacutables-produced-and-run-du.patch \ + file://0005-Use-LC_MESSAGES-for-address-localization-when-LC_ADD.patch \ + file://0006-Dont-add-usr-lib-to-LDFLAGS-when-linking-libphonenum.patch \ + file://0007-Modify-gobject-intrispection-support-to-work-with-OE.patch \ + file://iconv-detect.h \ " -SRC_URI[archive.md5sum] = "ae7bbf543b2c3ff79af27e0edea5d472" -SRC_URI[archive.sha256sum] = "e43aa1847ddc02965f560261ef88d18fb8704eddaa55555bf96b884a33e510ec" +SRC_URI[archive.md5sum] = "57820f3f88fc554e1a58665a52e12c05" +SRC_URI[archive.sha256sum] = "83f67cb4b680e892b22b51bcde64c788b7ac63e92a99de401fb347e3794f4c7f" LKSTRFTIME = "HAVE_LKSTRFTIME=ON" LKSTRFTIME_libc-musl = "HAVE_LKSTRFTIME=OFF" EXTRA_OECMAKE = " \ - -DWITH_KRB5=OFF \ - -DENABLE_GOA=OFF \ - -DENABLE_UOA=OFF \ - -DENABLE_GOOGLE_AUTH=OFF \ - -DENABLE_WEATHER=OFF \ -D${LKSTRFTIME} \ + -DSYSCONF_INSTALL_DIR=${sysconfdir} \ -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ " -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'introspection', '', d)}" PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap" - -EXTRA_OECONF = "--with-libdb=${STAGING_DIR_HOST}${prefix} \ - --disable-nntp --disable-gtk-doc" +PACKAGECONFIG[oauth2] = "-DENABLE_OAUTH2=ON,-DENABLE_OAUTH2=OFF,json-glib webkitgtk" +PACKAGECONFIG[mitkrb5] = "-DWITH_KRB5=ON,-DWITH_KRB5=OFF,krb5" +PACKAGECONFIG[goa] = "-DENABLE_GOA=ON,-DENABLE_GOA=OFF,gnome-online-accounts" +PACKAGECONFIG[weather] = "-DENABLE_WEATHER=ON,-DENABLE_WEATHER=OFF,libgweather" +PACKAGECONFIG[phonenumber] = "-DWITH_PHONENUMBER=ON,-DWITH_PHONENUMBER=OFF,libphonenumber" +PACKAGECONFIG[introspection] = "-DENABLE_INTROSPECTION=ON,-DENABLE_INTROSPECTION=OFF" +PACKAGECONFIG[vala] = "-DENABLE_VALA_BINDINGS=ON -DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen,-DENABLE_VALA_BINDINGS=OFF" # -ldb needs this on some platforms LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0" @@ -58,11 +58,21 @@ do_configure_append () { } do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/camel/.libs:${B}/libedataserver/.libs" + # CMake does not support building native binaries when cross compiling. As result + # it always cross compiles them for the target and then aborts when they fail to run. + # To work around this manually build required tools and patch cmake targets to use + # those native binaries we built here. + ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} -I${B} ${S}/src/camel/camel-gen-tables.c \ + -o ${B}/src/camel/camel-gen-tables-native + ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} -I${B} $(pkg-config-native --cflags glib-2.0) \ + ${S}/src/addressbook/libebook-contacts/gen-western-table.c \ + -o ${B}/src/addressbook/libebook-contacts/gen-western-table-native \ + $(pkg-config-native --libs glib-2.0) } -PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \ +PACKAGES =+ "libebook-contacts libebook-contacts-dev \ + libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \ libedata-book libedata-book-dev libedata-cal libedata-cal-dev \ libedataserver libedataserver-dev \ libedataserverui libedataserverui-dev" @@ -82,21 +92,33 @@ RRECOMMENDS_${PN}-dev += "libecal-dev libebook-dev" FILES_libcamel = "${libdir}/libcamel-*.so.* \ ${libdir}/libcamel-provider-*.so.* \ + ${libdir}/girepository-*/Camel-*.typelib \ ${libdir}/evolution-data-server*/camel-providers/*.so \ ${libdir}/evolution-data-server*/camel-providers/*.urls" FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so \ ${libdir}/pkgconfig/camel*pc \ - ${libdir}/evolution-data-server*/camel-providers/*.la \ - ${includedir}/evolution-data-server*/camel" + ${includedir}/evolution-data-server*/camel \ + ${datadir}/vala/vapi/camel-* \ + ${datadir}/gir-*/Camel-*.gir" -FILES_libebook = "${libdir}/libebook-*.so.*" -FILES_libebook-dev = "${libdir}/libebook-1.2.so \ +FILES_libebook = "${libdir}/libebook-*.so.* \ + ${libdir}/girepository-*/EBook-*.typelib" +FILES_libebook-dev = "${libdir}/libebook-*.so \ ${libdir}/pkgconfig/libebook-*.pc \ + ${datadir}/gir-*/EBook-*.gir \ + ${datadir}/vala/vapi/libebook-*.* \ ${includedir}/evolution-data-server*/libebook/*.h" RRECOMMENDS_libebook = "libedata-book" -FILES_libecal = "${libdir}/libecal-*.so.* \ - ${datadir}/evolution-data-server-1.4/zoneinfo" +FILES_libebook-contacts = "${libdir}/libebook-contacts-*.so.* \ + ${libdir}/girepository-*/EBookContacts-*.typelib" +FILES_libebook-contacts-dev = "${libdir}/libebook-contacts-*.so \ + ${libdir}/pkgconfig/libebook-contacts-*.pc \ + ${datadir}/gir-*/EBookContacts-*.gir \ + ${datadir}/vala/vapi/libebook-contacts-* \ + ${includedir}/evolution-data-server*/libebook-contacts/*.h" + +FILES_libecal = "${libdir}/libecal-*.so.*" FILES_libecal-dev = "${libdir}/libecal-*.so ${libdir}/pkgconfig/libecal-*.pc \ ${includedir}/evolution-data-server*/libecal/*.h \ ${includedir}/evolution-data-server*/libical/*.h" @@ -105,11 +127,9 @@ RRECOMMENDS_libecal = "libedata-cal tzdata" FILES_libedata-book = "${libexecdir}/e-addressbook-factory \ ${datadir}/dbus-1/services/*.AddressBook.service \ ${libdir}/libedata-book-*.so.* \ - ${libdir}/evolution-data-server-*/extensions/libebook*.so \ - ${datadir}/evolution-data-server-1.4/weather/Locations.xml" + ${libdir}/evolution-data-server-*/extensions/libebook*.so" FILES_libedata-book-dev = "${libdir}/libedata-book-*.so \ ${libdir}/pkgconfig/libedata-book-*.pc \ - ${libdir}/evolution-data-server-*/extensions/libebook*.la \ ${includedir}/evolution-data-server-*/libedata-book" FILES_libedata-cal = "${libexecdir}/e-calendar-factory \ @@ -118,15 +138,18 @@ FILES_libedata-cal = "${libexecdir}/e-calendar-factory \ ${libdir}/evolution-data-server-*/extensions/libecal*.so" FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so \ ${libdir}/pkgconfig/libedata-cal-*.pc \ - ${includedir}/evolution-data-server-*/libedata-cal \ - ${libdir}/evolution-data-server-*/extensions/libecal*.la" + ${includedir}/evolution-data-server-*/libedata-cal" -FILES_libedataserver = "${libdir}/libedataserver-*.so.*" +FILES_libedataserver = "${libdir}/libedataserver-*.so.* \ + ${libdir}/girepository-*/EDataServer-*.typelib" FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \ ${libdir}/pkgconfig/libedataserver-*.pc \ + ${datadir}/vala/vapi/libedataserver-* \ ${includedir}/evolution-data-server-*/libedataserver/*.h" -FILES_libedataserverui = "${libdir}/libedataserverui-*.so.* ${datadir}/evolution-data-server-1.4/glade/*.glade" +FILES_libedataserverui = "${libdir}/libedataserverui-*.so.*" FILES_libedataserverui-dev = "${libdir}/libedataserverui-*.so \ ${libdir}/pkgconfig/libedataserverui-*.pc \ + ${datadir}/gir-*/EDataServerUI-*.gir \ + ${datadir}/vala/vapi/libedataserverui-* \ ${includedir}/evolution-data-server-*/libedataserverui/*.h" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb index d2885906f..f45180e79 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b" SECTION = "x11/office" DEPENDS = "gtk+3 libsecret ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} poppler gstreamer1.0-plugins-base orc adwaita-icon-theme intltool-native gnome-common-native" -inherit gnome pkgconfig gtk-icon-cache gsettings gobject-introspection distro_features_check systemd +inherit gnomebase pkgconfig gtk-icon-cache gsettings gobject-introspection distro_features_check systemd SRC_URI = " \ ${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb index ea6439d91..6e0720888 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb @@ -3,13 +3,13 @@ SECTION = "x11/gnome" LICENSE = "GPLv2+" PR = "r2" -DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 gtk+ \ +DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 glib-2.0-native gtk+ \ gtksourceview2 iso-codes intltool-native gnome-common-native \ libice python3-six-native" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -inherit distro_features_check gnome gettext python3native +inherit distro_features_check gnomebase gconf gettext python3native REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb deleted file mode 100644 index 8cfd65af3..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "GNOME bluetooth manager" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ - file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ -" - -SECTION = "x11/gnome" - -DEPENDS = "udev gtk+3 libnotify libcanberra intltool-native gnome-common-native \ - ${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)} \ -" - -inherit gnomebase gtk-icon-cache gobject-introspection distro_features_check -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.md5sum] = "75d09c924468ec0c687f9ab3acf7f113" -SRC_URI[archive.sha256sum] = "d8df073c331df0f97261869fb77ffcdbf4e3e4eaf460d3c3ed2b16e03d9c5398" - -FILES_${PN}-dbg += "${libdir}/gnome-bluetooth/plugins/.debug/" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb new file mode 100644 index 000000000..3c4438e7e --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "GNOME bluetooth manager" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ + file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ +" + +SECTION = "x11/gnome" + +DEPENDS = "udev gtk+3 libnotify libcanberra bluez5" + +GNOMEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk_doc" + +inherit gnomebase gtk-icon-cache gtk-doc gobject-introspection upstream-version-is-even + +# gtk-icon-cache bbclass will take care of this for us. +EXTRA_OEMESON = "-Dicon_update=false" + +SRC_URI[archive.md5sum] = "5b3d66f564a5067ea154750cdb6d850d" +SRC_URI[archive.sha256sum] = "6441cafd313af94fba28b701698074f97d693b9023788a74e8e6f16f817ba1aa" + +RDEPENDS_${PN} += "bluez5" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.0.bb index 0acbb2117..77aa3fb61 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.0.bb @@ -8,14 +8,14 @@ BPN = "gnome-desktop" GNOMEBASEBUILDCLASS = "meson" -inherit gnome pkgconfig upstream-version-is-even gobject-introspection distro_features_check +inherit gnomebase pkgconfig upstream-version-is-even gobject-introspection distro_features_check # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" -SRC_URI[archive.md5sum] = "e423ed6d648c6c4f9798fa9cd9ea8d99" -SRC_URI[archive.sha256sum] = "a6393dc5fc29fc0652ac84c73b3da205d0b0168128c4cf6d27797a08f3d07b54" +SRC_URI[archive.md5sum] = "3149bbd12eaf6f4420b1a999131ec470" +SRC_URI[archive.sha256sum] = "8d331ee655c1d56b2b97562a07c7a7598ff6706a11ff1cdce97423ebc6b62426" SRC_URI += " \ file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ @@ -25,7 +25,7 @@ SRC_URI += " \ DEPENDS += "itstool-native gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" inherit distro_features_check gtk-doc -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES += "x11" GTKDOC_MESON_OPTION = "gtk_doc" EXTRA_OEMESON = "-Ddesktop_docs=false" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.28.2.bb index 55640625d..8dc11c85d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.28.2.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ " -inherit distro_features_check gnomebase remove-libtool +inherit distro_features_check gnomebase remove-libtool gettext upstream-version-is-even DEPENDS = " \ intltool-native \ @@ -20,19 +20,21 @@ DEPENDS = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ " -SRC_URI[archive.md5sum] = "e09efe8021944dae404736b5a2adb98e" -SRC_URI[archive.sha256sum] = "bc17cecd748a0e46e302171d11c3ae3d76bba5258c441fabec3786f418e7ec99" +SRC_URI[archive.md5sum] = "284580f954f762caf62aed2ae7358177" +SRC_URI[archive.sha256sum] = "81171b7d07211b216b4c9bb79bf2deb3deca18fe8d56d46dda1c4549b4a2646a" SRC_URI += "file://musl.patch" REQUIRED_DISTRO_FEATURES = "x11" RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils" -EXTRA_OECONF = " \ - --disable-doc \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)} \ -" +EXTRA_OECONF = "--disable-doc \ + ac_cv_path_SSH_AGENT=${bindir}/ssh-agent \ + ac_cv_path_SSH_ADD=${bindir}/ssh-add" +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" +PACKAGECONFIG[pam] = "--enable-pam --with-pam-dir=${base_libdir}/security, --disable-pam" +PACKAGECONFIG[ssh-agent] = "--enable-ssh-agent,--disable-ssh-agent,,openssh-misc" FILES_${PN} += " \ ${datadir}/dbus-1/services \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb index c2432a322..8930e1222 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb @@ -10,13 +10,14 @@ DEPENDS = " \ gtkmm3 \ libgtop \ librsvg \ + polkit \ " GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gtk-icon-cache distro_features_check gettext +inherit gnomebase gconf gtk-icon-cache distro_features_check gettext -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 polkit" SRC_URI[archive.md5sum] = "6c2c5c5bf8f15d3e6985faacbd3055dd" SRC_URI[archive.sha256sum] = "af00c4a42dd1db17d9abe88edb11c7751b20982db1a8a2a467bab206fd8a77e3" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.10.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb index d91e479d8..f7884930c 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.10.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb @@ -10,12 +10,12 @@ PNAME = "gtksourceview" S = "${WORKDIR}/${PNAME}-${PV}" -inherit gnomebase lib_package gettext distro_features_check gtk-doc gobject-introspection +inherit gnomebase lib_package gettext distro_features_check gtk-doc gobject-introspection upstream-version-is-even REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.24/${PNAME}-${PV}.tar.xz" -SRC_URI[md5sum] = "e43337d17c40eae440a76630db76c54e" -SRC_URI[sha256sum] = "ab5406cdd0bdcf66afcd52b1e048a2f43c0f3ab391644ee30d9ac419b93cd59b" +SRC_URI[md5sum] = "b748da426a7d64e1304f0c532b0f2a67" +SRC_URI[sha256sum] = "691b074a37b2a307f7f48edc5b8c7afa7301709be56378ccf9cc9735909077fd" FILES_${PN} += " ${datadir}/gtksourceview-3.0" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.41.2.bb index 7caee2771..27e3f92cc 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.41.2.bb @@ -3,14 +3,14 @@ LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" GNOMEBASEBUILDCLASS = "meson" -inherit gnome bash-completion gettext upstream-version-is-even +inherit gnomebase bash-completion gettext upstream-version-is-even -DEPENDS += "libsecret glib-2.0 gconf libgudev udisks2 polkit shadow-native" +DEPENDS += "libsecret glib-2.0 glib-2.0-native gconf libgudev shadow-native" SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" -SRC_URI[archive.md5sum] = "96ef53ed613e4d223e0db3a7acea44f0" -SRC_URI[archive.sha256sum] = "3739d64b79c95a9f0f9faf2c5f9e5298b4b2ebdd6431435ce656ecd19b31e2f2" +SRC_URI[archive.md5sum] = "9a9a97a63bb9e87258d48086a6bdacaa" +SRC_URI[archive.sha256sum] = "f311b7c5f855ebe259960c00c7d03c812e040928ecb0ec093b50a4f16b3bcf26" EXTRA_OEMESON = " \ @@ -18,7 +18,6 @@ EXTRA_OEMESON = " \ -Dgoa=false \ -Dgoogle=false \ -Dnfs=false \ - -Dudisks2=true \ " PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" @@ -31,7 +30,6 @@ FILES_${PN} += " \ ${libdir}/tmpfiles.d \ ${systemd_user_unitdir} \ " -RDEPENDS_${PN} = "udisks2" FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*" FILES_${PN}-dev += "${libdir}/gio/modules/*.la" @@ -42,8 +40,14 @@ FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.moun RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh" -PACKAGECONFIG ?= "libgphoto2 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG ?= "libgphoto2 \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','polkit','udisks2','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','polkit','admin','',d)} \ + " +PACKAGECONFIG[udisks2] = "-Dudisks2=true, -Dudisks2=false, udisks2, udisks2" +PACKAGECONFIG[admin] = "-Dadmin=true, -Dadmin=false, libcap polkit" PACKAGECONFIG[afc] = "-Dafc=true, -Dafc=false, libimobiledevice libplist" PACKAGECONFIG[archive] = "-Darchive=true, -Darchive=false, libarchive" PACKAGECONFIG[dnssd] = "-Ddnssd=true, -Ddnssd=false, avahi" @@ -62,9 +66,11 @@ PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse" PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia" do_install_append() { - # Fix up permissions on polkit rules.d to work with rpm4 constraints - chmod 700 ${D}/${datadir}/polkit-1/rules.d - chown polkitd:root ${D}/${datadir}/polkit-1/rules.d + if ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'true', 'false', d)}; then + # Fix up permissions on polkit rules.d to work with rpm4 constraints + chmod 700 ${D}/${datadir}/polkit-1/rules.d + chown polkitd:root ${D}/${datadir}/polkit-1/rules.d + fi # After rebuilds (not from scracth) it can happen that the executables in # libexec ar missing executable permission flag. Not sure but it came up diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb deleted file mode 100644 index 80cbae39f..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "GLib-based library for accessing online service APIs using the GData protocol" -HOMEPAGE = "http://live.gnome.org/libgdata" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ - file://gdata/gdata.h;endline=20;md5=079a554efcf65d46f96a515806e7e99a \ - file://gdata/gdata-types.h;endline=20;md5=7399b111aac8718da13888fc634be6ef" - -DEPENDS = "gnome-common-native libxml2 glib-2.0 libsoup-2.4 intltool-native liboauth gcr json-glib" - -inherit distro_features_check gnomebase pkgconfig autotools-brokensep gettext gtk-doc vala gobject-introspection - -REQUIRED_DISTRO_FEATURES = "x11" - -do_configure_prepend_class-target () { - # introspection.m4 pre-packaged with upstream tarballs does not yet - # have our fixes - rm -f ${S}/introspection.m4 - - # remove the pre-built gtk-doc files, as they're installed (or attempted to be installed) - # even if gtk-doc is explicitly disabled - rm -rf ${S}/docs/reference/html -} - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/gdata/.libs" -} - -EXTRA_OECONF += "--disable-goa --disable-tests --disable-gtk-doc" - -SRC_URI[archive.md5sum] = "eb552a8a8482e4231a3d1baf7262e64d" -SRC_URI[archive.sha256sum] = "8740e071ecb2ae0d2a4b9f180d2ae5fdf9dc4c41e7ff9dc7e057f62442800827" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.10.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.10.bb new file mode 100644 index 000000000..7bedd87ad --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.10.bb @@ -0,0 +1,30 @@ +SUMMARY = "GLib-based library for accessing online service APIs using the GData protocol" +HOMEPAGE = "http://live.gnome.org/libgdata" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ + file://gdata/gdata.h;endline=20;md5=079a554efcf65d46f96a515806e7e99a \ + file://gdata/gdata-types.h;endline=20;md5=7399b111aac8718da13888fc634be6ef" + +DEPENDS = "libxml2 glib-2.0 libsoup-2.4 intltool-native liboauth gcr json-glib" + +GTKDOC_MESON_OPTION = "gtk_doc" +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase pkgconfig gettext gtk-doc vala gobject-introspection manpages + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/gdata/.libs" +} + +PACKAGECONFIG ??= "" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false" +PACKAGECONFIG[goa] = "-Dgoa=enabled,-Dgoa=disabled,gnome-online-accounts" +PACKAGECONFIG[gtk] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3" +PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" + +EXTRA_OEMESON = "-Dalways_build_tests=false" + +SRC_URI[archive.md5sum] = "d858d411ad394c275643b14993dfeed4" +SRC_URI[archive.sha256sum] = "c1d3d1f303f6a0416a0dac355a195276c31157a74bb1d040772d46d1cb15b012" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb index 3a7379f9e..d9f643106 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb @@ -6,12 +6,10 @@ SECTION = "x11/gnome/libs" DEPENDS = "gconf glib-2.0 libxklavier gtk+3 intltool-native" -inherit distro_features_check gnome gobject-introspection gettext +inherit distro_features_check gnomebase gobject-introspection gettext REQUIRED_DISTRO_FEATURES = "x11" -GNOME_COMPRESS_TYPE = "xz" - SRC_URI[archive.md5sum] = "98040022484406e7ebe25f82cef93344" SRC_URI[archive.sha256sum] = "f7ca02631576e9b88aee1b1bae37ac1488b80ee7975f20a97f29e761a7172679" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.45.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.45.bb index e63e26e73..ac36ceb04 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.45.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.45.bb @@ -7,15 +7,13 @@ SECTION = "libs" DEPENDS= "libxml2 bzip2 glib-2.0 zlib intltool-native gnome-common-native" -inherit autotools pkgconfig gnome gconf gobject-introspection +inherit autotools pkgconfig gnomebase gobject-introspection SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch" SRC_URI[archive.md5sum] = "e45cc8aa9c49516d540b7d7307f755f1" SRC_URI[archive.sha256sum] = "5cbc2c0f1dc44d202fa0c6e3a51e9f17b0c2deb8711ba650432bfde3180b69fa" -GNOME_COMPRESS_TYPE = "xz" - PACKAGECONFIG ??= "" PACKAGECONFIG[gdk-pixbuf] = "--with-gdk-pixbuf,--without-gdk-pixbuf,gdk-pixbuf" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb index ea4c8df53..f50b9ceb9 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb @@ -11,7 +11,6 @@ PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-s 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/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.30.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.32.0.bb index 253f7ef36..ef6ea7946 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.30.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.32.0.bb @@ -19,7 +19,7 @@ SRC_URI = "git://github.com/GNOME/metacity.git;branch=master \ " S = "${WORKDIR}/git" -SRCREV = "d69fba052cdd0aa8348dc1bbbbb1ecbadfbebbd8" +SRCREV = "bf1bfbadf47eff97703df17e95b15168e2034222" EXTRA_OECONF += "--disable-xinerama" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/wv/wv/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch b/meta-openembedded/meta-gnome/recipes-gnome/wv/wv/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch deleted file mode 100644 index a8c5bc796..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/wv/wv/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch +++ /dev/null @@ -1,29 +0,0 @@ -From eebe1f27f4b27b05eb4b9b55f9df1124acf4d092 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Fri, 1 Aug 2014 12:25:24 +0200 -Subject: [PATCH] configure: use 'foreign' mode to avoid errors with missing - NEWS/AUTHORS/etc - -Upstream-status: Pending - -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3d7eef6..1784bdd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -41,7 +41,7 @@ VERSION=$WV_VERSION - PACKAGE=wv - - dnl Initialize automake stuff --AM_INIT_AUTOMAKE($PACKAGE, $VERSION) -+AM_INIT_AUTOMAKE([foreign]) - - # Specify a configuration file - AM_CONFIG_HEADER(config.h) --- -1.9.0 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/wv/wv/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch b/meta-openembedded/meta-gnome/recipes-gnome/wv/wv/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch deleted file mode 100644 index 2fc3f367f..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/wv/wv/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 079529b8d5e339e2211fa2f8c15543a738a627bc Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 27 Jun 2017 14:50:51 -0700 -Subject: [PATCH] wvRTF.c: Specify print format in rtf_output() - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - wvRTF.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wvRTF.c b/wvRTF.c -index 361d258..4f24b30 100644 ---- a/wvRTF.c -+++ b/wvRTF.c -@@ -192,7 +192,7 @@ output_rtfUserData (rtfUserData * ud) - rtf_output_char ('{'); - - /* font color */ -- rtf_output (rtfColors[ud->cCol]); -+ rtf_output ("%s", rtfColors[ud->cCol]); - - /* font face */ - rtf_output ("\\f%d", ud->cFont); --- -2.13.2 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/wv/wv_1.2.9.bb b/meta-openembedded/meta-gnome/recipes-gnome/wv/wv_1.2.9.bb deleted file mode 100644 index 72b8508a2..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/wv/wv_1.2.9.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Programs for accessing Microsoft Word documents" -HOMEPAGE = "http://wvware.sourceforge.net/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=6cbca01f1c9178aca280e8ff64d85b2f" - -DEPENDS = "libgsf glib-2.0 libpng" - -SRC_URI = "https://www.abisource.com/downloads/wv/${PV}/${BP}.tar.gz \ - file://0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch \ - file://0001-wvRTF.c-Specify-print-format-in-rtf_output.patch \ - " - -SRC_URI[md5sum] = "dbccf2e9f747e50c913b7e3d126b73f7" -SRC_URI[sha256sum] = "4c730d3b325c0785450dd3a043eeb53e1518598c4f41f155558385dd2635c19d" - -inherit autotools pkgconfig - -EXTRA_OECONF = "" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity/0001-build-don-t-generate-manual.patch b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity/0001-build-don-t-generate-manual.patch new file mode 100644 index 000000000..488548667 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity/0001-build-don-t-generate-manual.patch @@ -0,0 +1,50 @@ +From 38eeb345fdfca0298b11427aa942b68e627ba10e Mon Sep 17 00:00:00 2001 +From: Bartosz Golaszewski <bgolaszewski@baylibre.com> +Date: Thu, 12 Sep 2019 13:14:55 +0200 +Subject: [PATCH] build: don't generate manual + +We don't have yelp in yocto and even if we did it would pull in +webkitgtk just to generate help. Just remove the manual generation +altogether. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> +--- + Makefile.am | 3 +-- + configure.ac | 5 ----- + 2 files changed, 1 insertion(+), 7 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 81ae6a7..bd073dd 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -4,8 +4,7 @@ AM_CPPFLAGS = src + SUBDIRS = \ + src \ + po \ +- data \ +- help ++ data + + EXTRA_DIST = \ + autogen.sh \ +diff --git a/configure.ac b/configure.ac +index 5dccdb0..f88b2c0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -115,11 +115,6 @@ GETTEXT_PACKAGE=zenity + AC_SUBST([GETTEXT_PACKAGE]) + AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext domain]) + +-# ******************************* +-# User manual +-# ******************************* +-YELP_HELP_INIT +- + # ******************************* + + AC_SUBST([AM_CPPFLAGS]) +-- +2.21.0 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb new file mode 100644 index 000000000..295288bfb --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "Display dialog boxes from the command line and shell scripts" +SECTION = "x11/gnome" +LICENSE = "GPLv2+" + +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" + +inherit distro_features_check gnomebase gettext + +DEPENDS = "gtk+3" + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ + file://0001-build-don-t-generate-manual.patch \ +" + +SRC_URI[archive.md5sum] = "ba2b2a13248773b4ec0fd323d95e6d5a" +SRC_URI[archive.sha256sum] = "e786e733569c97372c3ef1776e71be7e7599ebe87e11e8ad67dcc2e63a82cd95" +GNOME_COMPRESS_TYPE="xz" + +do_install_append() { + # Remove gdialog compatibility helper - we don't want to pull in perl + rm ${D}${bindir}/gdialog +} diff --git a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch deleted file mode 100644 index 79756b9a0..000000000 --- a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch +++ /dev/null @@ -1,62 +0,0 @@ -From d0537cb7f2dc5877700ad78dfd191515379d4edc Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 7 Jan 2016 02:22:51 +0000 -Subject: [PATCH 1/2] Check for issetugid() - -If secure version of getenv is not there then we can use -issetugid() as aid to call getenv() - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - configure.ac | 1 + - lib/config.c | 12 +++++++++++- - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 1ded1a2..ee19e1f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -125,6 +125,7 @@ AC_TYPE_OFF_T - AC_TYPE_SIZE_T - - AC_CHECK_FUNCS([__secure_getenv secure_getenv]) -+AC_CHECK_FUNCS([issetugid]) - - # Modify CFLAGS after all tests are run (some of them could fail because - # of the -Werror). -diff --git a/lib/config.c b/lib/config.c -index 29e7120..30f9daf 100644 ---- a/lib/config.c -+++ b/lib/config.c -@@ -44,8 +44,10 @@ - # define safe_getenv(string) secure_getenv(string) - #elif defined(HAVE___SECURE_GETENV) - # define safe_getenv(string) __secure_getenv(string) -+#elif defined(HAVE_ISSETUGID) -+# define safe_getenv(string) safe_getenv_issetugid(string) - #else --# error Neither secure_getenv not __secure_getenv are available -+# error None of secure_getenv, __secure_getenv, or issetugid is available - #endif - - struct config_config { -@@ -59,6 +61,14 @@ struct config_key { - GList *values; - }; - -+static const char* -+safe_getenv_issetugid(const char* name) -+{ -+ if (issetugid ()) -+ return 0; -+ return getenv (name); -+} -+ - /* Compare two section names */ - static int - compare_section_names(gconstpointer a, gconstpointer b) --- -2.7.0 - diff --git a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb index 7ec54eb16..74053e451 100644 --- a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb +++ b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb @@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ SECTION = "base" SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.xz \ - file://0001-Check-for-issetugid.patch \ file://0002-remove-unused-execinfo.h.patch \ file://0001-modules-files.c-parse_field-fix-string-formating-in-.patch \ " |