Date: Friday, February 26, 2016 @ 15:54:44 Author: bgyorgy Revision: 163505
archrelease: copy trunk to community-any Added: lxde-common/repos/community-any/PKGBUILD (from rev 163504, lxde-common/trunk/PKGBUILD) lxde-common/repos/community-any/dbus-update-environment.patch (from rev 163504, lxde-common/trunk/dbus-update-environment.patch) lxde-common/repos/community-any/default-config.patch (from rev 163504, lxde-common/trunk/default-config.patch) Deleted: lxde-common/repos/community-any/PKGBUILD lxde-common/repos/community-any/dbus-update-environment.patch lxde-common/repos/community-any/default-config.patch -------------------------------+ PKGBUILD | 84 ++++++++++++++++++++-------------------- dbus-update-environment.patch | 40 +++++++++---------- default-config.patch | 32 +++++++++------ 3 files changed, 82 insertions(+), 74 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2016-02-26 14:54:38 UTC (rev 163504) +++ PKGBUILD 2016-02-26 14:54:44 UTC (rev 163505) @@ -1,42 +0,0 @@ -# $Id$ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Contributor: Angel Velasquez <an...@archlinux.org> -# Contributor: Juergen Hoetzel <juer...@archlinux.org> - -pkgname=lxde-common -pkgver=0.99.1 -pkgrel=1 -pkgdesc='Common files of the LXDE Desktop' -arch=('any') -url='http://lxde.org/' -license=('GPL2') -groups=('lxde' 'lxde-gtk3') -backup=(etc/xdg/lxsession/LXDE/desktop.conf - etc/xdg/lxsession/LXDE/autostart) -makedepends=('intltool') -optdepends=('gnome-themes-standard: default GTK+ theme' - 'lxde-icon-theme: default icon theme') -source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.xz - dbus-update-environment.patch - default-config.patch) -md5sums=('3ab92bd7bcff8bc8e6395651d164cf76' - '9f5cdfb8aef6286b6de79a50d1fddd7f' - '61b3a79b6d1397fd295c8f88561ece82') - -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../dbus-update-environment.patch - patch -Np1 -i ../default-config.patch -} - -build() { - cd $pkgname-$pkgver - ./configure --sysconfdir=/etc --prefix=/usr - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} Copied: lxde-common/repos/community-any/PKGBUILD (from rev 163504, lxde-common/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2016-02-26 14:54:44 UTC (rev 163505) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Angel Velasquez <an...@archlinux.org> +# Contributor: Juergen Hoetzel <juer...@archlinux.org> + +pkgname=lxde-common +pkgver=0.99.1 +pkgrel=2 +pkgdesc='Common files of the LXDE Desktop' +arch=('any') +url='http://lxde.org/' +license=('GPL2') +groups=('lxde' 'lxde-gtk3') +backup=(etc/xdg/lxsession/LXDE/desktop.conf + etc/xdg/lxsession/LXDE/autostart) +makedepends=('intltool') +optdepends=('gnome-themes-standard: default GTK+ theme' + 'lxde-icon-theme: default icon theme') +source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.xz + dbus-update-environment.patch + default-config.patch) +md5sums=('3ab92bd7bcff8bc8e6395651d164cf76' + '9f5cdfb8aef6286b6de79a50d1fddd7f' + 'fc8a3499ee9caeff1fbdeb1761fe8a4e') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../dbus-update-environment.patch + patch -Np1 -i ../default-config.patch +} + +build() { + cd $pkgname-$pkgver + ./configure --sysconfdir=/etc --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} Deleted: dbus-update-environment.patch =================================================================== --- dbus-update-environment.patch 2016-02-26 14:54:38 UTC (rev 163504) +++ dbus-update-environment.patch 2016-02-26 14:54:44 UTC (rev 163505) @@ -1,20 +0,0 @@ -diff -u -r lxde-common-0.99.0/startlxde.in lxde-common-0.99.0-dbus/startlxde.in ---- lxde-common-0.99.0/startlxde.in 2014-10-23 16:08:00.000000000 +0200 -+++ lxde-common-0.99.0-dbus/startlxde.in 2015-09-25 19:00:01.152474183 +0200 -@@ -26,8 +26,14 @@ - export SAL_USE_VCLPLUGIN=gtk - - # Launch DBus if needed --if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then -- eval "$(dbus-launch --sh-syntax --exit-with-session)" -+if test -z "$DBUS_SESSION_BUS_ADDRESS"; then -+ if which dbus-launch >/dev/null; then -+ eval "$(dbus-launch --sh-syntax --exit-with-session)" -+ fi -+else -+ if which dbus-update-activation-environment >/dev/null; then -+ dbus-update-activation-environment --systemd --all -+ fi - fi - - export XDG_MENU_PREFIX="lxde-" Copied: lxde-common/repos/community-any/dbus-update-environment.patch (from rev 163504, lxde-common/trunk/dbus-update-environment.patch) =================================================================== --- dbus-update-environment.patch (rev 0) +++ dbus-update-environment.patch 2016-02-26 14:54:44 UTC (rev 163505) @@ -0,0 +1,20 @@ +diff -u -r lxde-common-0.99.0/startlxde.in lxde-common-0.99.0-dbus/startlxde.in +--- lxde-common-0.99.0/startlxde.in 2014-10-23 16:08:00.000000000 +0200 ++++ lxde-common-0.99.0-dbus/startlxde.in 2015-09-25 19:00:01.152474183 +0200 +@@ -26,8 +26,14 @@ + export SAL_USE_VCLPLUGIN=gtk + + # Launch DBus if needed +-if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then +- eval "$(dbus-launch --sh-syntax --exit-with-session)" ++if test -z "$DBUS_SESSION_BUS_ADDRESS"; then ++ if which dbus-launch >/dev/null; then ++ eval "$(dbus-launch --sh-syntax --exit-with-session)" ++ fi ++else ++ if which dbus-update-activation-environment >/dev/null; then ++ dbus-update-activation-environment --systemd --all ++ fi + fi + + export XDG_MENU_PREFIX="lxde-" Deleted: default-config.patch =================================================================== --- default-config.patch 2016-02-26 14:54:38 UTC (rev 163504) +++ default-config.patch 2016-02-26 14:54:44 UTC (rev 163505) @@ -1,12 +0,0 @@ -diff -Naur lxde-common-0.99.0.orig/desktop.conf lxde-common-0.99.0/desktop.conf ---- lxde-common-0.99.0.orig/desktop.conf 2016-02-20 15:25:47.971017849 +0000 -+++ lxde-common-0.99.0/desktop.conf 2016-02-20 15:26:29.844166792 +0000 -@@ -2,7 +2,7 @@ - window_manager=openbox-lxde - - [GTK] --sNet/ThemeName=Clearlooks -+sNet/ThemeName=Adwaita - sNet/IconThemeName=nuoveXT2 - sGtk/FontName=Sans 10 - iGtk/ToolbarStyle=3 Copied: lxde-common/repos/community-any/default-config.patch (from rev 163504, lxde-common/trunk/default-config.patch) =================================================================== --- default-config.patch (rev 0) +++ default-config.patch 2016-02-26 14:54:44 UTC (rev 163505) @@ -0,0 +1,20 @@ +diff -Naur lxde-common-0.99.1.orig/desktop.conf lxde-common-0.99.1/desktop.conf +--- lxde-common-0.99.1.orig/desktop.conf 2016-02-26 14:51:28.558478250 +0000 ++++ lxde-common-0.99.1/desktop.conf 2016-02-26 14:52:20.038264394 +0000 +@@ -2,7 +2,7 @@ + window_manager=openbox-lxde + + [GTK] +-sNet/ThemeName=Clearlooks ++sNet/ThemeName=Adwaita + sNet/IconThemeName=nuoveXT2 + sGtk/FontName=Sans 10 + iGtk/ToolbarStyle=3 +diff -Naur lxde-common-0.99.1.orig/lxpanel/config lxde-common-0.99.1/lxpanel/config +--- lxde-common-0.99.1.orig/lxpanel/config 2016-02-26 14:51:28.558478250 +0000 ++++ lxde-common-0.99.1/lxpanel/config 2016-02-26 14:51:55.178367667 +0000 +@@ -1,4 +1,3 @@ + [Command] +-FileManager=pcmanfm %s + Terminal=lxterminal + Logout=lxde-logout