diff --git a/srcpkgs/lxde-common/patches/dbus-update-environment.patch b/srcpkgs/lxde-common/patches/dbus-update-environment.patch new file mode 100644 index 00000000000..0d3153b5be7 --- /dev/null +++ b/srcpkgs/lxde-common/patches/dbus-update-environment.patch @@ -0,0 +1,23 @@ +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 +@@ -34,10 +34,14 @@ + export SAL_USE_VCLPLUGIN=gtk + + # Launch DBus if needed +-if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then +- if test -z "$XDG_RUNTIME_DIR" -o ! -S "$XDG_RUNTIME_DIR/bus" -o ! -O "$XDG_RUNTIME_DIR/bus"; then +- eval "$(dbus-launch --sh-syntax --exit-with-session)" +- fi ++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-" + diff --git a/srcpkgs/lxde-common/patches/default-config.patch b/srcpkgs/lxde-common/patches/default-config.patch new file mode 100644 index 00000000000..b3e1ed02b6b --- /dev/null +++ b/srcpkgs/lxde-common/patches/default-config.patch @@ -0,0 +1,12 @@ +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 --git a/srcpkgs/lxde-common/template b/srcpkgs/lxde-common/template index e1d76e20640..e32c7c24111 100644 --- a/srcpkgs/lxde-common/template +++ b/srcpkgs/lxde-common/template @@ -1,15 +1,16 @@ # Template file for 'lxde-common' pkgname=lxde-common version=0.99.2 -revision=1 +revision=2 archs=noarch build_style=gnu-configure hostmakedepends="intltool" -depends="lxsession gtk2-engines lxde-icon-theme" +depends="lxsession gnome-themes-extra lxde-icon-theme" conf_files="/etc/xdg/pcmanfm/LXDE/* /etc/xdg/lxsession/LXDE/*" short_desc="LXDE configuration data" -license="GPL-2" maintainer="Juan RP " +license="GPL-2.0-or-later" homepage="http://lxde.org" distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz" checksum=1cd9bc900960c995d48ffbbdc86ecffda7c806168c67aaa50c53113794234856 +patch_args="-Np1"