[arch-commits] Commit in lxde-common/repos (5 files)
Juergen Hoetzel
juergen at archlinux.org
Tue Jan 19 20:16:59 UTC 2010
Date: Tuesday, January 19, 2010 @ 15:16:59
Author: juergen
Revision: 64336
Merged revisions 63622,63802-63803,63840 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/lxde-common/trunk
........
r63622 | juergen | 2010-01-18 07:34:49 +0000 (Mon, 18 Jan 2010) | 1 line
removed orphaned patch
........
r63802 | juergen | 2010-01-18 19:37:30 +0000 (Mon, 18 Jan 2010) | 1 line
update to 0.5.0
........
r63803 | juergen | 2010-01-18 19:42:14 +0000 (Mon, 18 Jan 2010) | 1 line
backup autostart and desktop.conf
........
r63840 | juergen | 2010-01-18 21:37:51 +0000 (Mon, 18 Jan 2010) | 1 line
migrate old config file and fix invalid distfile
........
Added:
lxde-common/repos/extra-x86_64/lxde-common-arch.patch
(from rev 63840, lxde-common/trunk/lxde-common-arch.patch)
lxde-common/repos/extra-x86_64/lxde-common-invalid-distfile.patch
(from rev 63840, lxde-common/trunk/lxde-common-invalid-distfile.patch)
Modified:
lxde-common/repos/extra-x86_64/ (properties)
lxde-common/repos/extra-x86_64/PKGBUILD
Deleted:
lxde-common/repos/extra-x86_64/lxde-common-arch.patch
------------------------------------+
PKGBUILD | 19 +++++++++--------
lxde-common-arch.patch | 39 ++++++++++++++++-------------------
lxde-common-invalid-distfile.patch | 10 ++++++++
3 files changed, 39 insertions(+), 29 deletions(-)
Property changes on: lxde-common/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /lxde-common/trunk:1-45585
+ /lxde-common/trunk:1-64335
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2010-01-19 20:07:39 UTC (rev 64335)
+++ extra-x86_64/PKGBUILD 2010-01-19 20:16:59 UTC (rev 64336)
@@ -1,6 +1,6 @@
# Maintainer: Juergen Hoetzel <juergen at archlinux.org>
pkgname=lxde-common
-pkgver=0.4.2
+pkgver=0.5.0
pkgrel=1
pkgdesc="Common files of the LXDE Desktop"
arch=('i686' 'x86_64')
@@ -10,15 +10,18 @@
url="http://lxde.org/"
# startlxde is useless without lxsession
optdepends=(lxsession-lite)
-optdepends=(lxde-settings-daemon)
-install=${pkgname}.install
-source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('81978c149ef7f349d904c4796d623ee6')
+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" "${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
}
Deleted: extra-x86_64/lxde-common-arch.patch
===================================================================
--- extra-x86_64/lxde-common-arch.patch 2010-01-19 20:07:39 UTC (rev 64335)
+++ extra-x86_64/lxde-common-arch.patch 2010-01-19 20:16:59 UTC (rev 64336)
@@ -1,21 +0,0 @@
---- lxpanel/panel.in 2008-04-20 12:09:34.000000000 +0200
-+++ lxpanel/panel.in 2009-04-27 17:48:26.000000000 +0200
-@@ -29,7 +29,7 @@
- Plugin {
- type = menu
- Config {
-- image=@prefix@/share/lxpanel/images/my-computer.png
-+ image=@prefix@/share/lxde/images/lxde-icon.png
- system {
- }
- separator {
-@@ -53,9 +53,6 @@
- id=pcmanfm.desktop
- }
- Button {
-- id=gnome-terminal.desktop
-- }
-- Button {
- id=firefox.desktop
- }
- }
Copied: lxde-common/repos/extra-x86_64/lxde-common-arch.patch (from rev 63840, lxde-common/trunk/lxde-common-arch.patch)
===================================================================
--- extra-x86_64/lxde-common-arch.patch (rev 0)
+++ extra-x86_64/lxde-common-arch.patch 2010-01-19 20:16:59 UTC (rev 64336)
@@ -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
Copied: lxde-common/repos/extra-x86_64/lxde-common-invalid-distfile.patch (from rev 63840, lxde-common/trunk/lxde-common-invalid-distfile.patch)
===================================================================
--- extra-x86_64/lxde-common-invalid-distfile.patch (rev 0)
+++ extra-x86_64/lxde-common-invalid-distfile.patch 2010-01-19 20:16:59 UTC (rev 64336)
@@ -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