[arch-commits] Commit in lxde-common/trunk (3 files)
Juergen Hoetzel
juergen at archlinux.org
Mon Jan 18 21:37:51 UTC 2010
Date: Monday, January 18, 2010 @ 16:37:51
Author: juergen
Revision: 63840
migrate old config file and fix invalid distfile
Added:
lxde-common/trunk/lxde-common-arch.patch
lxde-common/trunk/lxde-common-invalid-distfile.patch
Modified:
lxde-common/trunk/PKGBUILD
------------------------------------+
PKGBUILD | 13 ++++++++-----
lxde-common-arch.patch | 18 ++++++++++++++++++
lxde-common-invalid-distfile.patch | 10 ++++++++++
3 files changed, 36 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-01-18 21:32:52 UTC (rev 63839)
+++ PKGBUILD 2010-01-18 21:37:51 UTC (rev 63840)
@@ -11,14 +11,17 @@
# startlxde is useless without lxsession
optdepends=(lxsession-lite)
backup=(etc/xdg/lxsession/LXDE/{desktop.conf,autostart})
-source=("http://downloads.sourceforge.net/project/lxde/${pkgname}%20%28default%20config%29/${pkgname}%200.5.0/${pkgname}-0.5.0.tar.gz")
-md5sums=('23606ab3d6e1039386d62a4b68b4ffc6')
+source=("http://downloads.sourceforge.net/project/lxde/${pkgname}%20%28default%20config%29/${pkgname}%200.5.0/${pkgname}-0.5.0.tar.gz" "${pkgname}-arch.patch" ${pkgname}-invalid-distfile.patch)
+md5sums=('23606ab3d6e1039386d62a4b68b4ffc6' '257faf607d2f5d109dfeb0a67f885a31'\
+ '24938631783683fd98dfd533023e6d4e')
build() {
cd "$srcdir/$pkgname-$pkgver"
- ./configure --sysconfdir=/etc --prefix=/usr || return 1
- make || return 1
- make DESTDIR="$pkgdir" install || return 1
+ patch -i ${srcdir}/${pkgname}-arch.patch
+ patch -i ${srcdir}/${pkgname}-invalid-distfile.patch
+ ./configure --sysconfdir=/etc --prefix=/usr
+ make
+ make DESTDIR="$pkgdir" install
}
Added: lxde-common-arch.patch
===================================================================
--- lxde-common-arch.patch (rev 0)
+++ lxde-common-arch.patch 2010-01-18 21:37:51 UTC (rev 63840)
@@ -0,0 +1,18 @@
+diff --git a/lxde-common/startlxde.in b/lxde-common/startlxde.in
+index 8372d3a..9391864 100755
+--- a/lxde-common/startlxde.in
++++ b/lxde-common/startlxde.in
+@@ -24,5 +24,13 @@ xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _
+ # Enable GTK+2 integration for OpenOffice.org, if available.
+ export SAL_USE_VCLPLUGIN=gtk
+
++# Migrate old config files
++OLD_CONFIG=${XDG_CONFIG_HOME}/lxsession/LXDE/config
++NEW_CONFIG=${XDG_CONFIG_HOME}/lxsession/LXDE/desktop.conf
++if [ ! -f ${NEW_CONFIG} -a -f ${OLD_CONFIG} ]; then
++ echo "Warning: Migrating config file: ${OLD_CONFIG} -> ${NEW_CONFIG}" >&2;
++ mv ${OLD_CONFIG} ${NEW_CONFIG}
++fi
++
+ # Start the LXDE session
+ exec @prefix@/bin/lxsession -s LXDE -e LXDE
Added: lxde-common-invalid-distfile.patch
===================================================================
--- lxde-common-invalid-distfile.patch (rev 0)
+++ lxde-common-invalid-distfile.patch 2010-01-18 21:37:51 UTC (rev 63840)
@@ -0,0 +1,10 @@
+diff -ub lxde-common-0.5.0.dist/startlxde.in lxde-common-0.5.0/startlxde.in
+--- lxde-common-0.5.0.dist/startlxde.in 2009-09-04 11:46:53.000000000 +0200
++++ lxde-common-0.5.0./startlxde.in 2010-01-18 21:47:18.000000000 +0100
+@@ -25,4 +25,4 @@
+ export SAL_USE_VCLPLUGIN=gtk
+
+ # Start the LXDE session
+-exec @prefix@/bin/lxsession -s LXDE
++exec @prefix@/bin/lxsession -s LXDE -e LXDE
+
More information about the arch-commits
mailing list