diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-gnome/recipes-gnome/dconf | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-gnome/recipes-gnome/dconf')
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.32.0.bb (renamed from meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.28.0.bb) | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.28.0.bb | 18 | ||||
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb | 21 |
3 files changed, 23 insertions, 20 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.28.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.32.0.bb index 70f917ea5..999ed041a 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.28.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.32.0.bb @@ -8,8 +8,8 @@ DEPENDS = "dconf gtk+3" inherit gnomebase vala gettext gsettings bash-completion -SRC_URI[archive.md5sum] = "cc9eb8020cc848812972d8519c3d05cf" -SRC_URI[archive.sha256sum] = "455b53d827820efd28a176ee52e13eda5cda8cdf4e31e0145cfdd69931bf0c5a" +SRC_URI[archive.md5sum] = "331a3603c0f8a9913e3a3c0f178b5310" +SRC_URI[archive.sha256sum] = "f19d1332ac27e23ef3dc2ed07ba4e4646d9d7f05e2e78748aa525a1320adbaba" FILES_${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.28.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.28.0.bb deleted file mode 100644 index 99292a88c..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.28.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "configuation database system" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" -SECTION = "x11/gnome" - -SRC_URI[archive.md5sum] = "81faa8e68e5ea71ff0ee75050fc0759c" -SRC_URI[archive.sha256sum] = "61d3b3865ef58b729c3b39aa0979f886c014aa8362f93dcfc74bf5648ed9c742" - -DEPENDS = "dbus glib-2.0 intltool-native" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings bash-completion vala - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${libdir}/gio/modules/*.so \ -" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb new file mode 100644 index 000000000..8d1bbdfd1 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "configuation database system" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" +SECTION = "x11/gnome" + +SRC_URI[archive.md5sum] = "e1ac0b6285abefeed69ca9e380e44f5a" +SRC_URI[archive.sha256sum] = "68bce78b19bc94cb2c3bb8587e37f9e5e338568c3a674f86edde9c9f1624ffab" + +DEPENDS = "dbus glib-2.0 intltool-native" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase bash-completion vala + +# I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl +EXTRA_OEMESON = "-Dman=false" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${libdir}/gio/modules/*.so \ +" |