lxsession: update to 0.5.2, obsoletes lxpolkit

lxsession now includes lxpolkit, remove receipe and package from
packagegroup

7 files changed, 3 insertions, 71 deletions

diff --git a/recipes-lxde/lxpolkit/lxpolkit-0.1.0/lxpolkit-configure-ac.patch b/recipes-lxde/lxpolkit/lxpolkit-0.1.0/lxpolkit-configure-ac.patch
deleted file mode 100644
index 37917ac..0000000
--- a/recipes-lxde/lxpolkit/lxpolkit-0.1.0/lxpolkit-configure-ac.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lxpolkit-0.1.0/configure.ac~	2014-04-30 17:18:26.000000000 +0200
-+++ lxpolkit-0.1.0/configure.ac	2014-04-30 18:03:32.625295807 +0200
-@@ -5,7 +5,7 @@
- 
- AC_PREREQ([2.63])
- AC_INIT([lxpolkit], [0.1.0], [http://lxde.org/])
--AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-+AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
- 
- AC_CONFIG_HEADERS([config.h])
- 
diff --git a/recipes-lxde/lxpolkit/lxpolkit-0.1.0/lxpolkit-disable-autostart.patch b/recipes-lxde/lxpolkit/lxpolkit-0.1.0/lxpolkit-disable-autostart.patch
deleted file mode 100644
index 3146741..0000000
--- a/recipes-lxde/lxpolkit/lxpolkit-0.1.0/lxpolkit-disable-autostart.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/data/lxpolkit.desktop.in.in b/data/lxpolkit.desktop.in.in
-index d8ddb75..a28531d 100644
---- a/data/lxpolkit.desktop.in.in
-+++ b/data/lxpolkit.desktop.in.in
-@@ -4,4 +4,4 @@ _Name=LXPolKit
- _Comment=Policykit Authentication Agent
- Exec=@FULL_LIBEXECDIR@/lxpolkit
- Icon=gtk-dialog-authentication
--NotShowIn=GNOME;KDE;
-+NotShowIn=GNOME;KDE;LXDE;
diff --git a/recipes-lxde/lxpolkit/lxpolkit-0.1.0/lxpolkit_missing_am_prog_cc_c_0.patch b/recipes-lxde/lxpolkit/lxpolkit-0.1.0/lxpolkit_missing_am_prog_cc_c_0.patch
deleted file mode 100644
index 5fa39e6..0000000
--- a/recipes-lxde/lxpolkit/lxpolkit-0.1.0/lxpolkit_missing_am_prog_cc_c_0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lxpolkit-0.1.0/configure.ac~	2011-07-24 13:59:15.000000000 +0200
-+++ lxpolkit-0.1.0/configure.ac	2012-08-12 17:06:47.000000000 +0200
-@@ -11,6 +11,7 @@
- 
- # Checks for programs.
- AC_PROG_CC
-+AM_PROG_CC_C_O
- # AM_PROG_LIBTOOL
- 
- # Checks for libraries.
diff --git a/recipes-lxde/lxpolkit/lxpolkit-0.1.0/lxpolkit_remove_gnu_make_extension.patch b/recipes-lxde/lxpolkit/lxpolkit-0.1.0/lxpolkit_remove_gnu_make_extension.patch
deleted file mode 100644
index c719828..0000000
--- a/recipes-lxde/lxpolkit/lxpolkit-0.1.0/lxpolkit_remove_gnu_make_extension.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lxpolkit-0.1.0/data/ui/Makefile.am~	2011-07-24 13:59:15.000000000 +0200
-+++ lxpolkit-0.1.0/data/ui/Makefile.am	2012-08-12 17:09:53.000000000 +0200
-@@ -12,7 +12,7 @@
- 	$(NULL)
- 
- # Purge GtkBuilder UI files
--%.ui: %.glade
-+.ui: .glade
- 	cp $< $@
- 	$(top_srcdir)/src/xml-purge $@
- 
diff --git a/recipes-lxde/lxpolkit/lxpolkit_0.1.0.bb b/recipes-lxde/lxpolkit/lxpolkit_0.1.0.bb
deleted file mode 100644
index d310511..0000000
--- a/recipes-lxde/lxpolkit/lxpolkit_0.1.0.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "Simple PolicyKit authentication agent"
-HOMEPAGE = "http://lxde.org/"
-SECTION = "x11"
-
-PR = "r3"
-
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-DEPENDS = "glib-2.0 gtk+ polkit"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${P}.tar.gz \
-           file://lxpolkit_missing_am_prog_cc_c_0.patch \
-           file://lxpolkit_remove_gnu_make_extension.patch \
-           file://lxpolkit-configure-ac.patch \
-           file://lxpolkit-disable-autostart.patch \
-"
-SRC_URI[md5sum] = "2597b00035fe1d695219e0f9bfa8c26f"
-SRC_URI[sha256sum] = "511affca8f55adc67031fb3627b9889064c685e4b983737d8deecdf4f94f008b"
-
-inherit autotools gettext pkgconfig
diff --git a/recipes-lxde/lxsession/lxsession_0.4.9.2.bb b/recipes-lxde/lxsession/lxsession_0.5.2.bb
index e39c40d..062a6e9 100644
--- a/recipes-lxde/lxsession/lxsession_0.4.9.2.bb
+++ b/recipes-lxde/lxsession/lxsession_0.5.2.bb
@@ -11,12 +11,9 @@ COMMON_DEPENDS = "gtk+ glib-2.0 lxde-common dbus libgee"
 DEPENDS = "${COMMON_DEPENDS} xproto virtual/libx11"
 RDEPENDS_{PN} = "${COMMON_DEPENDS} upower dbus-x11"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz"
-SRC_URI += "file://lxsession-logout-git-62bfec81f6c50083423b8501a94be80125396966.patch"
-SRC_URI += "file://lxsession-configure-ac.patch"
-SRC_URI += "file://0001-lxsession-logout-fix-dbus-string-value-check-for-sys.patch"
-SRC_URI[md5sum] = "bc3eb71936dbdf813e9ac2f00ab948f0"
-SRC_URI[sha256sum] = "eff03e573b561cabe81c5d015d825e3d998e98d6621040113d7df471c8b9cfb4"
+SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "2957acccbf9ce37ef8205ec5424f8047"
+SRC_URI[sha256sum] = "2d55e9ea80057fe5ffd68a91a15bb004ad7bf019e50807a8bb9b342115efaada"
 
 inherit autotools pkgconfig gettext
 
diff --git a/recipes-lxde/packagegroup/packagegroup-lxde-extended.bb b/recipes-lxde/packagegroup/packagegroup-lxde-extended.bb
index 74ca35a..c286981 100644
--- a/recipes-lxde/packagegroup/packagegroup-lxde-extended.bb
+++ b/recipes-lxde/packagegroup/packagegroup-lxde-extended.bb
@@ -15,6 +15,4 @@ RRECOMMENDS_${PN} = " \
     gpicview \
     lxtask \
     lxinput \
-    lxshortcut \
-    lxpolkit \
     "