Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=9afcd2761239187b78805e806adaa926f024ea55
commit 9afcd2761239187b78805e806adaa926f024ea55
Author: bouleetbil <bouleet...@frogdev.info>
Date: Fri Jul 29 23:16:25 2011 +0200
lxde-common-0.5.5-1-x86_64
*version bump
*disable frugalware artwork the time to fix it
diff --git a/source/xlib-extra/lxde-common/Fix_Session.diff
b/source/xlib-extra/lxde-common/Fix_Session.diff
deleted file mode 100644
index 23a5438..0000000
--- a/source/xlib-extra/lxde-common/Fix_Session.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -NrU5 lxde-common-0.5.0.original/startlxde.in
lxde-common-0.5.0/startlxde.in
---- lxde-common-0.5.0.original/startlxde.in 2010-01-21 09:18:33.000000000
-0600
-+++ lxde-common-0.5.0/startlxde.in 2010-01-21 09:19:12.000000000 -0600
-@@ -23,6 +23,6 @@
-
- # Enable GTK+2 integration for OpenOffice.org, if available.
- export SAL_USE_VCLPLUGIN=gtk
-
- # Start the LXDE session
--exec @prefix@/bin/lxsession -s LXDE
-+exec @prefix@/bin/lxsession -s LXDE -e LXDE
diff --git a/source/xlib-extra/lxde-common/FrugalBuild
b/source/xlib-extra/lxde-common/FrugalBuild
index c350f61..e8e2ec8 100644
--- a/source/xlib-extra/lxde-common/FrugalBuild
+++ b/source/xlib-extra/lxde-common/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: bouleetbil <bouleet...@frogdev.info>
pkgname=lxde-common
-pkgver=0.5.0
+pkgver=0.5.5
pkgdesc="Common files of the LXDE Desktop"
depends=('glib2' 'libx11' 'dbus')
rodepends=('lxde-icon-theme')
@@ -13,24 +13,11 @@ _F_sourceforge_ext=".tar.gz"
_F_lxde_dir="lxde-common%20%28default%20config%29"
_F_lxde_sep="%20"
Finclude lxde
-pkgrel=6
+pkgrel=1
source=($source \
-
http://ftp.frugalware.org/pub/other/artwork/lxde-frugalware/lxde-frugalware-1.5.tar.bz2
\
- Fix_Session.diff
lxde-common-0.5.1-Launch-dbus-in-startlxde-when-needed.patch \
- lxde-common-0.5.1-Ensure-the-existance-of-the-Desktop-folder.patch \
- lxde-common-0.5.1-switch-from-pcmanfm-to-pcmanfm2.patch \
- lxde-common-0.5.1-Properly-set-XDG_MENU_PREFIX.patch \
- lxde-common-0.5.1-Fix-config-file-of-pcmanfm2.patch \
- lxde-frugalware-theme.diff)
-sha1sums=('01a95b9f125616a0f195de4bef7255452b86d1e9' \
- '7a4fb3830f64f25b2f02a835c907faf57d904891' \
- 'db00750b7a899e77ef0ea75ae4484e2fa98a6d90' \
- '68658521b3efdb024073f3ae6c9c23a6dad6bf1c' \
- 'bc9f62f79dbe6222c4e9f5d28b98146fe1272a3b' \
- 'df09d4f6ac2ec74ed49b4f827806ab68e8eccdc2' \
- 'e3ec89581b2f6be6024701089c4b3777bbd9ff0d' \
- 'ca8bdf81e52132afe85eb5725da774d9a9ec5f05' \
- 'a6a91c77ff3bbebc523bbe1ad6b758070ce3c5b3')
+
http://ftp.frugalware.org/pub/other/artwork/lxde-frugalware/lxde-frugalware-1.5.tar.bz2)
+sha1sums=('27ce9bcaf109ded61aa0c691a8dc6059a04a6d08' \
+ '7a4fb3830f64f25b2f02a835c907faf57d904891')
build() {
Fcd
diff --git
a/source/xlib-extra/lxde-common/lxde-common-0.5.1-Ensure-the-existance-of-the-Desktop-folder.patch
b/source/xlib-extra/lxde-common/lxde-common-0.5.1-Ensure-the-existance-of-the-Desktop-folder.patch
deleted file mode 100644
index e6e2762..0000000
---
a/source/xlib-extra/lxde-common/lxde-common-0.5.1-Ensure-the-existance-of-the-Desktop-folder.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 28309e598478254fa9c918782cf089aea6358abb Mon Sep 17 00:00:00 2001
-From: Christoph Wickert <christoph.wick...@googlemail.com>
-Date: Mon, 18 Jan 2010 00:42:06 +0000
-Subject: [PATCH 3/9] Ensure the existance of the 'Desktop' folder
-
----
- startlxde.in | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/startlxde.in b/startlxde.in
-index 31593a0..db2f2ee 100755
---- a/startlxde.in
-+++ b/startlxde.in
-@@ -18,6 +18,14 @@ if [ ! -f "$OPENBOX_CONF_DIR/lxde-rc.xml" ]; then
- cp @prefix@/share/lxde/openbox/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml"
- fi
-
-+# Ensure the existance of the 'Desktop' folder
-+if [ -e "$XDG_CONFIG_HOME/user-dirs.dirs" ]; then
-+ . "$XDG_CONFIG_HOME/user-dirs.dirs"
-+else
-+ XDG_DESKTOP_DIR="$HOME/Desktop"
-+fi
-+mkdir -p "$XDG_DESKTOP_DIR"
-+
- # Clean up after GDM (GDM sets the number of desktops to one)
- xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES
-remove _NET_CURRENT_DESKTOP 2> /dev/null
-
---
-1.6.6.1
-
diff --git
a/source/xlib-extra/lxde-common/lxde-common-0.5.1-Fix-config-file-of-pcmanfm2.patch
b/source/xlib-extra/lxde-common/lxde-common-0.5.1-Fix-config-file-of-pcmanfm2.patch
deleted file mode 100644
index a0de683..0000000
---
a/source/xlib-extra/lxde-common/lxde-common-0.5.1-Fix-config-file-of-pcmanfm2.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From bf7093b8c45c7a38a2f42ddb61135fca7566ff5e Mon Sep 17 00:00:00 2001
-From: Hong Jen Yee (PCMan) <pcman...@gmail.com>
-Date: Sun, 7 Mar 2010 11:03:53 +0800
-Subject: [PATCH 8/9] * Fix config file of pcmanfm2.
- * Fix autostart for pcmanfm2.
-
----
- Makefile.am | 6 +++---
- autostart | 2 +-
- configure.ac | 11 ++++++++++-
- pcmanfm/lxde.conf.in | 20 ++++++++++++++++++++
- pcmanfm/pcmanfm.conf.in | 20 --------------------
- 5 files changed, 34 insertions(+), 25 deletions(-)
- create mode 100644 pcmanfm/lxde.conf.in
- delete mode 100644 pcmanfm/pcmanfm.conf.in
-
-diff --git a/Makefile.am b/Makefile.am
-index dc0b332..61cf4c5 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -31,9 +31,9 @@ openbox_DATA= \
- openbox/rc.xml \
- openbox/menu.xml
-
--pcmanfmdir=$(datadir)/lxde/pcmanfm
-+pcmanfmdir=$(sysconfdir)/xdg/pcmanfm
- pcmanfm_DATA= \
-- pcmanfm/pcmanfm.conf
-+ pcmanfm/lxde.conf
-
- EXTRA_DIST = \
- autostart \
-@@ -45,7 +45,7 @@ EXTRA_DIST = \
- openbox/rc.xml.in \
- openbox/menu.xml \
- openbox-lxde.in \
-- pcmanfm/pcmanfm.conf.in \
-+ pcmanfm/lxde.conf.in \
- $(lxpanel_DATA) \
- lxpanel/panel.in
-
-diff --git a/autostart b/autostart
-index 946eac7..5c5aee3 100644
---- a/autostart
-+++ b/autostart
-@@ -1,3 +1,3 @@
- @lxpanel --profile LXDE
--@pcmanfm --desktop
-+@pcmanfm2 --desktop --profile lxde
- @xscreensaver -no-splash
-diff --git a/configure.ac b/configure.ac
-index b5dc864..d717f2f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -48,7 +48,16 @@ AC_OUTPUT([
- lxpanel/panel
- openbox/rc.xml
- openbox-lxde
-- pcmanfm/pcmanfm.conf
-+ pcmanfm/lxde.conf
- man/Makefile
- ])
-
-+if test x"$sysconfdir" != x'/etc'; then
-+ echo
-+ echo
-+ echo 'Error: sysconfdir is not /etc.'
-+ echo 'Please consider passing --sysconfdir=/etc to configure.';
-+ echo 'Otherwise default config files will be installed to wrong place.'
-+ echo
-+ echo
-+fi
-diff --git a/pcmanfm/lxde.conf.in b/pcmanfm/lxde.conf.in
-new file mode 100644
-index 0000000..6799e1f
---- /dev/null
-+++ b/pcmanfm/lxde.conf.in
-@@ -0,0 +1,20 @@
-+[config]
-+bm_open_method=0
-+su_cmd=xdg-su -c '%s'
-+
-+[desktop]
-+wallpaper_mode=1
-+wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
-+desktop_bg=#000000
-+desktop_fg=#ffffff
-+desktop_shadow=#000000
-+
-+[ui]
-+always_show_tabs=0
-+hide_close_btn=0
-+win_width=640
-+win_height=480
-+view_mode=0
-+show_hidden=0
-+sort_type=0
-+sort_by=0
-diff --git a/pcmanfm/pcmanfm.conf.in b/pcmanfm/pcmanfm.conf.in
-deleted file mode 100644
-index 6799e1f..0000000
---- a/pcmanfm/pcmanfm.conf.in
-+++ /dev/null
-@@ -1,20 +0,0 @@
--[config]
--bm_open_method=0
--su_cmd=xdg-su -c '%s'
--
--[desktop]
--wallpaper_mode=1
--wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
--desktop_bg=#000000
--desktop_fg=#ffffff
--desktop_shadow=#000000
--
--[ui]
--always_show_tabs=0
--hide_close_btn=0
--win_width=640
--win_height=480
--view_mode=0
--show_hidden=0
--sort_type=0
--sort_by=0
---
-1.6.6.1
-
diff --git
a/source/xlib-extra/lxde-common/lxde-common-0.5.1-Launch-dbus-in-startlxde-when-needed.patch
b/source/xlib-extra/lxde-common/lxde-common-0.5.1-Launch-dbus-in-startlxde-when-needed.patch
deleted file mode 100644
index b93e34a..0000000
---
a/source/xlib-extra/lxde-common/lxde-common-0.5.1-Launch-dbus-in-startlxde-when-needed.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 847a8e73e658bb9ced5eb7b12242b0064224f49e Mon Sep 17 00:00:00 2001
-From: Hong Jen Yee (PCMan) <pcman...@gmail.com>
-Date: Sat, 19 Dec 2009 03:10:45 +0000
-Subject: [PATCH 1/9] Launch dbus in startlxde when needed.
-
----
- startlxde.in | 15 ++++++++++-----
- 1 files changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/startlxde.in b/startlxde.in
-index 8372d3a..31593a0 100755
---- a/startlxde.in
-+++ b/startlxde.in
-@@ -1,21 +1,21 @@
- #!/bin/sh
-
- if [ -z "$XDG_CONFIG_HOME" ]; then
-- export XDG_CONFIG_HOME="$HOME/.config"
-+ export XDG_CONFIG_HOME="$HOME/.config"
- fi
-
- # Ensure the existance of pcmanfm config file
- PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm"
- if [ ! -f "$PCMANFM_CONF_DIR/main.lxde" ]; then
-- mkdir -p "$PCMANFM_CONF_DIR"
-- cp @prefix@/share/lxde/pcmanfm/main.lxde "$PCMANFM_CONF_DIR/main.lxde"
-+ mkdir -p "$PCMANFM_CONF_DIR"
-+ cp @prefix@/share/lxde/pcmanfm/main.lxde "$PCMANFM_CONF_DIR/main.lxde"
- fi
-
- # Ensure the existance of openbox config file
- OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox"
- if [ ! -f "$OPENBOX_CONF_DIR/lxde-rc.xml" ]; then
-- mkdir -p "$OPENBOX_CONF_DIR"
-- cp @prefix@/share/lxde/openbox/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml"
-+ mkdir -p "$OPENBOX_CONF_DIR"
-+ cp @prefix@/share/lxde/openbox/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml"
- fi
-
- # Clean up after GDM (GDM sets the number of desktops to one)
-@@ -24,5 +24,10 @@ 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
-
-+# 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)"
-+fi
-+
- # Start the LXDE session
- exec @prefix@/bin/lxsession -s LXDE -e LXDE
---
-1.6.6.1
-
diff --git
a/source/xlib-extra/lxde-common/lxde-common-0.5.1-Properly-set-XDG_MENU_PREFIX.patch
b/source/xlib-extra/lxde-common/lxde-common-0.5.1-Properly-set-XDG_MENU_PREFIX.patch
deleted file mode 100644
index 47d6a94..0000000
---
a/source/xlib-extra/lxde-common/lxde-common-0.5.1-Properly-set-XDG_MENU_PREFIX.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From fcefd17a7187232d15aca13fdedf47a4b854fc21 Mon Sep 17 00:00:00 2001
-From: Hong Jen Yee (PCMan) <pcman...@gmail.com>
-Date: Sun, 7 Mar 2010 10:51:08 +0800
-Subject: [PATCH 7/9] Properly set XDG_MENU_PREFIX.
-
----
- startlxde.in | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
- mode change 100755 => 100644 openbox-lxde
-
-diff --git a/openbox-lxde b/openbox-lxde
-old mode 100755
-new mode 100644
-diff --git a/startlxde.in b/startlxde.in
-index 3937e70..f493e28 100755
---- a/startlxde.in
-+++ b/startlxde.in
-@@ -37,5 +37,7 @@ if which dbus-launch >/dev/null && test -z
"$DBUS_SESSION_BUS_ADDRESS"; then
- eval "$(dbus-launch --sh-syntax --exit-with-session)"
- fi
-
-+export XDG_MENU_PREFIX="lxde-"
-+
- # Start the LXDE session
- exec @prefix@/bin/lxsession -s LXDE -e LXDE
---
-1.6.6.1
-
diff --git
a/source/xlib-extra/lxde-common/lxde-common-0.5.1-start-xscreensaver-after-lxpanel-and-pcmanfm.patch
b/source/xlib-extra/lxde-common/lxde-common-0.5.1-start-xscreensaver-after-lxpanel-and-pcmanfm.patch
deleted file mode 100644
index 9f9a749..0000000
---
a/source/xlib-extra/lxde-common/lxde-common-0.5.1-start-xscreensaver-after-lxpanel-and-pcmanfm.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 34cd793a18138463133a72b713173d2d01d32d66 Mon Sep 17 00:00:00 2001
-From: Christoph Wickert <christoph.wick...@googlemail.com>
-Date: Sun, 3 Jan 2010 11:09:30 +0000
-Subject: [PATCH 2/9] start xscreensaver after lxpanel and pcmanfm
-
----
- autostart | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/autostart b/autostart
-index 17d7b58..bcee88e 100644
---- a/autostart
-+++ b/autostart
-@@ -1,3 +1,3 @@
--@xscreensaver -no-splash
- @lxpanel --profile LXDE
- @pcmanfm -d
-+@xscreensaver -no-splash
---
-1.6.6.1
-
diff --git
a/source/xlib-extra/lxde-common/lxde-common-0.5.1-switch-from-pcmanfm-to-pcmanfm2.patch
b/source/xlib-extra/lxde-common/lxde-common-0.5.1-switch-from-pcmanfm-to-pcmanfm2.patch
deleted file mode 100644
index ecb3654..0000000
---
a/source/xlib-extra/lxde-common/lxde-common-0.5.1-switch-from-pcmanfm-to-pcmanfm2.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 0f3b683ccd0c208c1f32fae28f628db9e103ccd8 Mon Sep 17 00:00:00 2001
-From: Andrea Florio <anu...@linux-y9ev.site>
-Date: Mon, 1 Mar 2010 13:00:26 +0100
-Subject: [PATCH 5/9] swtich from pcmanfm to pcmanfm2
-
----
- Makefile.am | 4 ++--
- autostart | 2 +-
- configure.ac | 2 +-
- pcmanfm/pcmanfm.conf.in | 20 ++++++++++++++++++++
- startlxde.in | 4 ++--
- 5 files changed, 26 insertions(+), 6 deletions(-)
- create mode 100644 pcmanfm/pcmanfm.conf.in
-
-diff --git a/Makefile.am b/Makefile.am
-index ba4149c..dc0b332 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -33,7 +33,7 @@ openbox_DATA= \
-
- pcmanfmdir=$(datadir)/lxde/pcmanfm
- pcmanfm_DATA= \
-- pcmanfm/main.lxde
-+ pcmanfm/pcmanfm.conf
-
- EXTRA_DIST = \
- autostart \
-@@ -45,7 +45,7 @@ EXTRA_DIST = \
- openbox/rc.xml.in \
- openbox/menu.xml \
- openbox-lxde.in \
-- pcmanfm/main.lxde.in \
-+ pcmanfm/pcmanfm.conf.in \
- $(lxpanel_DATA) \
- lxpanel/panel.in
-
-diff --git a/autostart b/autostart
-index bcee88e..946eac7 100644
---- a/autostart
-+++ b/autostart
-@@ -1,3 +1,3 @@
- @lxpanel --profile LXDE
--@pcmanfm -d
-+@pcmanfm --desktop
- @xscreensaver -no-splash
-diff --git a/configure.ac b/configure.ac
-index 3b62903..b5dc864 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -48,7 +48,7 @@ AC_OUTPUT([
- lxpanel/panel
- openbox/rc.xml
- openbox-lxde
-- pcmanfm/main.lxde
-+ pcmanfm/pcmanfm.conf
- man/Makefile
- ])
-
-diff --git a/pcmanfm/pcmanfm.conf.in b/pcmanfm/pcmanfm.conf.in
-new file mode 100644
-index 0000000..6799e1f
---- /dev/null
-+++ b/pcmanfm/pcmanfm.conf.in
-@@ -0,0 +1,20 @@
-+[config]
-+bm_open_method=0
-+su_cmd=xdg-su -c '%s'
-+
-+[desktop]
-+wallpaper_mode=1
-+wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
-+desktop_bg=#000000
-+desktop_fg=#ffffff
-+desktop_shadow=#000000
-+
-+[ui]
-+always_show_tabs=0
-+hide_close_btn=0
-+win_width=640
-+win_height=480
-+view_mode=0
-+show_hidden=0
-+sort_type=0
-+sort_by=0
-diff --git a/startlxde.in b/startlxde.in
-index db2f2ee..3937e70 100755
---- a/startlxde.in
-+++ b/startlxde.in
-@@ -6,9 +6,9 @@ fi
-
- # Ensure the existance of pcmanfm config file
- PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm"
--if [ ! -f "$PCMANFM_CONF_DIR/main.lxde" ]; then
-+if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then
- mkdir -p "$PCMANFM_CONF_DIR"
-- cp @prefix@/share/lxde/pcmanfm/main.lxde "$PCMANFM_CONF_DIR/main.lxde"
-+ cp @prefix@/share/lxde/pcmanfm/pcmanfm.conf
"$PCMANFM_CONF_DIR/pcmanfm.conf"
- fi
-
- # Ensure the existance of openbox config file
---
-1.6.6.1
-
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
