diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2018-03-24 18:30:44 +0100 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-04-08 17:00:06 -0700 |
commit | 81ccb9735a4ea263caf950c68648ce1d50db34ad (patch) | |
tree | 23e273c450352f07411c2291c436b3612821ea06 | |
parent | b42de13f2742a95e5afb524e9a401c27d1408dbc (diff) | |
download | meta-openembedded-81ccb9735a4ea263caf950c68648ce1d50db34ad.tar.gz |
xdg-user-dirs: 0.15 -> 0.17
* This version ships autostart by default -> our file can go
* man pages are not build if disable-documentation is configured so
0001-...patch can go
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
4 files changed, 16 insertions, 65 deletions
diff --git a/meta-oe/recipes-support/xdg-user-dirs/files/0001-explicitly-disable-man-generation-disable-documentat.patch b/meta-oe/recipes-support/xdg-user-dirs/files/0001-explicitly-disable-man-generation-disable-documentat.patch deleted file mode 100644 index b2b0e49988..0000000000 --- a/meta-oe/recipes-support/xdg-user-dirs/files/0001-explicitly-disable-man-generation-disable-documentat.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 41093d9634bfeddcaec866745d8d4022f4c6f8c1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Sun, 19 Feb 2017 21:01:39 +0100 -Subject: [PATCH] explicitly disable man generation --disable-documentation is - not enough -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> ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index c01c54f..dcdf7a2 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,6 +1,6 @@ - NULL = - --SUBDIRS=po man -+SUBDIRS=po - - INCLUDES = \ - -I$(top_srcdir) \ --- -2.9.3 - diff --git a/meta-oe/recipes-support/xdg-user-dirs/files/xdg-user-dirs.desktop b/meta-oe/recipes-support/xdg-user-dirs/files/xdg-user-dirs.desktop deleted file mode 100644 index a9a22d3be7..0000000000 --- a/meta-oe/recipes-support/xdg-user-dirs/files/xdg-user-dirs.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Name=User folders update -Exec=xdg-user-dirs-update -StartupNotify=false -NoDisplay=true -X-GNOME-Autostart-Phase=Initialization -X-KDE-autostart-phase=1 - diff --git a/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.15.bb b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.15.bb deleted file mode 100644 index c05675976d..0000000000 --- a/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.15.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "xdg-user-dirs is a tool to help manage user directories like the desktop folder and the music folder" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SRC_URI = " \ - http://user-dirs.freedesktop.org/releases/${BPN}-${PV}.tar.gz \ - file://0001-explicitly-disable-man-generation-disable-documentat.patch \ - file://xdg-user-dirs.desktop \ -" -SRC_URI[md5sum] = "f5aaf5686ad7d8809a664bfb4566a54d" -SRC_URI[sha256sum] = "20b4a751f41d0554bce3e0ce5e8d934be98cc62d48f0b90a894c3e1916552786" - -inherit autotools gettext - -EXTRA_OECONF = "--disable-documentation" - -do_install_append () { - install -d ${D}${sysconfdir}/xdg/autostart - install -m 644 ${WORKDIR}/xdg-user-dirs.desktop ${D}${sysconfdir}/xdg/autostart -} - -CONFFILES_${PN} += " \ - ${sysconfdir}/xdg/user-dirs.conf \ - ${sysconfdir}/xdg/user-dirs.defaults \ -" diff --git a/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.17.bb b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.17.bb new file mode 100644 index 0000000000..e3ce9268cd --- /dev/null +++ b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.17.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "xdg-user-dirs is a tool to help manage user directories like the desktop folder and the music folder" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "http://user-dirs.freedesktop.org/releases/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "e0564ec6d838e6e41864d872a29b3575" +SRC_URI[sha256sum] = "2a07052823788e8614925c5a19ef5b968d8db734fdee656699ea4f97d132418c" + +inherit autotools gettext + +EXTRA_OECONF = "--disable-documentation" + +CONFFILES_${PN} += " \ + ${sysconfdir}/xdg/user-dirs.conf \ + ${sysconfdir}/xdg/user-dirs.defaults \ +" |