[arch-commits] Commit in lxde-common/trunk (PKGBUILD startlxde.patch)

[Balló György]

    Date: Tuesday, October 7, 2014 @ 23:17:46
  Author: bgyorgy
Revision: 120375

upgpkg: lxde-common 0.5.6-1

Update to version 0.5.6

Modified:
  lxde-common/trunk/PKGBUILD
Deleted:
  lxde-common/trunk/startlxde.patch

-----------------+
 PKGBUILD        |   25 +++++++++++++------------
 startlxde.patch |   11 -----------
 2 files changed, 13 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-07 20:56:28 UTC (rev 120374)
+++ PKGBUILD	2014-10-07 21:17:46 UTC (rev 120375)
@@ -4,8 +4,8 @@
 # Contributor: Juergen Hoetzel <juergen at archlinux.org>
 
 pkgname=lxde-common
-pkgver=0.5.5
-pkgrel=3
+pkgver=0.5.6
+pkgrel=1
 pkgdesc='Common files of the LXDE Desktop'
 arch=('any')
 url='http://lxde.org/'
@@ -14,16 +14,9 @@
 backup=(etc/xdg/lxsession/LXDE/desktop.conf
         etc/xdg/lxsession/LXDE/autostart)
 depends=('gtk-engines' 'lxde-icon-theme' 'lxsession')
-source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz
-        startlxde.patch)
-md5sums=('e51a6b2a815a89fda1f497b509465a97'
-         '11aca3bcc2ea8fa2c03e72056a52d1fc')
+source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.xz)
+md5sums=('259b4a2db50117e632e34912251cfcb9')
 
-prepare() {
-    cd $srcdir/$pkgname-$pkgver
-    patch -Np0 -i $srcdir/startlxde.patch
-}
-
 build() {
     cd $srcdir/$pkgname-$pkgver
     ./configure --sysconfdir=/etc --prefix=/usr
@@ -33,6 +26,14 @@
 package() {
     cd $srcdir/$pkgname-$pkgver
     make DESTDIR=$pkgdir install
+
+    # Install lxde-logout.desktop file.
+    # https://sourceforge.net/p/lxde/bugs/399/
     install -Dm644 lxde-logout.desktop \
-      $pkgdir/usr/share/applications/lxde-logout.desktop
+      "$pkgdir/usr/share/applications/lxde-logout.desktop"
+
+    # Fix lxpanel profile location.
+    # https://sourceforge.net/p/lxde/patches/482/
+    mv "$pkgdir"/etc/xdg/lxpanel/{profile/,}LXDE
+    rm -r "$pkgdir/etc/xdg/lxpanel/profile"
 }

Deleted: startlxde.patch
===================================================================
--- startlxde.patch	2014-10-07 20:56:28 UTC (rev 120374)
+++ startlxde.patch	2014-10-07 21:17:46 UTC (rev 120375)
@@ -1,11 +0,0 @@
---- startlxde.in.orig	2011-08-03 21:59:05.000000000 +0200
-+++ startlxde.in	2012-07-02 19:40:19.982368074 +0200
-@@ -8,7 +8,7 @@ fi
- PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm/LXDE"
- if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then
- 	mkdir -p "$PCMANFM_CONF_DIR"
--	cp @prefix@/share/lxde/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf"
-+	cp @sysconfdir@/xdg/pcmanfm/LXDE/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf"
- fi
- 
- # Ensure the existance of openbox config file