Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d148a42a3c7dd1570e4b4b7f2f378ad5c74ab064
commit d148a42a3c7dd1570e4b4b7f2f378ad5c74ab064 Author: PacMiam <[email protected]> Date: Thu Dec 11 20:23:48 2014 +0100 lxde-common-0.99.0-1-i686 * Version bump: 0.5.5 -> 0.99.0 diff --git a/source/xlib-extra/lxde-common/FrugalBuild b/source/xlib-extra/lxde-common/FrugalBuild index 5a032b8..3a3dc95 100644 --- a/source/xlib-extra/lxde-common/FrugalBuild +++ b/source/xlib-extra/lxde-common/FrugalBuild @@ -1,32 +1,19 @@ -# Compiling Time: 0.04 SBU -# Maintainer: bouleetbil <[email protected]> +# Compiling Time: 0.03 SBU +# Maintainer: PacMiam <[email protected]> +# Contributor: bouleetbil <[email protected]> pkgname=lxde-common -pkgver=0.5.5 +pkgver=0.99.0 pkgdesc="Common files of the LXDE Desktop" + +groups=('xlib-extra') + depends=('glib2' 'libx11' 'dbus') rodepends=('lxde-icon-theme' 'lxde-frugalware') -replaces=('lxde-settings-daemon') -groups=('xlib-extra') -archs=('i686' 'x86_64') -Finclude lxde -pkgrel=2 -source=($source \ - lxde-frugalware-theme.diff) -sha1sums=('27ce9bcaf109ded61aa0c691a8dc6059a04a6d08' \ - 'e3a1b99d93f6a96fdc6a1b8e69c1281f72e1a542') +makedepends=('intltool') -build() { - Fcd - Fpatchall - Fmake - Fmakeinstall - Fmkdir /etc/X11/sessions/ - Fmkdir /usr/share/apps/kdm/sessions - Fln /usr/share/xsessions/LXDE.desktop /usr/share/apps/kdm/sessions/LXDE.desktop - Fln /usr/share/xsessions/LXDE.desktop /etc/X11/sessions/LXDE.desktop - #frugalware theme - cd .. || Fdie -} +Finclude lxde -# optimization OK +source=($source lxde-frugalware-theme.diff) +sha1sums=('8ae027a26043620990a5c5d96a31e46b0ff669da' \ + '2415c9c5e7bcffb30341ab8508e03c428ca0fcc5') diff --git a/source/xlib-extra/lxde-common/lxde-frugalware-theme.diff b/source/xlib-extra/lxde-common/lxde-frugalware-theme.diff index 6684653..a00b255 100644 --- a/source/xlib-extra/lxde-common/lxde-frugalware-theme.diff +++ b/source/xlib-extra/lxde-common/lxde-frugalware-theme.diff @@ -1,7 +1,7 @@ -diff -Naur lxde-common-0.5.5/desktop.conf lxde-common-0.5.5new/desktop.conf ---- lxde-common-0.5.5/desktop.conf 2011-07-29 16:04:03.000000000 +0200 -+++ lxde-common-0.5.5new/desktop.conf 2011-11-20 09:59:08.000000000 +0100 -@@ -2,14 +2,17 @@ +diff -Naur lxde-common-0.99.0b/desktop.conf lxde-common-0.99.0/desktop.conf +--- lxde-common-0.99.0b/desktop.conf 2014-09-01 16:17:11.000000000 +0200 ++++ lxde-common-0.99.0/desktop.conf 2014-12-09 09:25:40.491418489 +0100 +@@ -2,14 +2,16 @@ window_manager=openbox-lxde [GTK] @@ -16,84 +16,309 @@ diff -Naur lxde-common-0.5.5/desktop.conf lxde-common-0.5.5new/desktop.conf iGtk/MenuImages=1 iGtk/CursorThemeSize=18 iXft/Antialias=1 -+iXft/Hinting=1 +sXft/HintStyle=hintslight +sXft/RGBA=rgb [Mouse] AccFactor=20 -diff -Naur lxde-common-0.5.5/lxpanel/panel.in lxde-common-0.5.5new/lxpanel/panel.in ---- lxde-common-0.5.5/lxpanel/panel.in 2011-07-29 16:04:03.000000000 +0200 -+++ lxde-common-0.5.5new/lxpanel/panel.in 2011-11-20 10:03:53.000000000 +0100 -@@ -7,7 +7,7 @@ - margin=0 - widthtype=percent - width=100 +diff -Naur lxde-common-0.99.0b/lxde-logout.desktop.in lxde-common-0.99.0/lxde-logout.desktop.in +--- lxde-common-0.99.0b/lxde-logout.desktop.in 2014-10-23 17:12:13.000000000 +0200 ++++ lxde-common-0.99.0/lxde-logout.desktop.in 2014-12-08 20:16:15.810787051 +0100 +@@ -2,6 +2,6 @@ + Type=Application + _Name=Logout + _Comment=Logout, shutdown or reboot +-Icon=gnome-logout ++Icon=system-log-out + Exec=lxde-logout + NoDisplay=true +diff -Naur lxde-common-0.99.0b/lxde-logout.in lxde-common-0.99.0/lxde-logout.in +--- lxde-common-0.99.0b/lxde-logout.in 2014-09-01 16:17:11.000000000 +0200 ++++ lxde-common-0.99.0/lxde-logout.in 2014-12-08 20:16:54.317362162 +0100 +@@ -1,2 +1,2 @@ + #!/bin/sh +-lxsession-logout --banner "@prefix@/share/lxde/images/logout-banner.png" --side=top ++lxsession-logout --prompt="" --banner="@prefix@/share/lxde/images/logout.png" --side=top +diff -Naur lxde-common-0.99.0b/lxpanel/panel.in lxde-common-0.99.0/lxpanel/panel.in +--- lxde-common-0.99.0b/lxpanel/panel.in 2014-10-23 16:08:00.000000000 +0200 ++++ lxde-common-0.99.0/lxpanel/panel.in 2014-12-09 09:23:46.979009524 +0100 +@@ -2,143 +2,137 @@ + # Use preference dialog in lxpanel to adjust config when you can. + + Global { +- edge=bottom +- allign=left +- margin=0 +- widthtype=percent +- width=100 - height=26 -+ height=24 - transparent=0 - tintcolor=#000000 - alpha=0 -@@ -16,7 +16,8 @@ - usefontcolor=1 - fontcolor=#ffffff - background=1 +- transparent=0 +- tintcolor=#000000 +- alpha=0 +- setdocktype=1 +- setpartialstrut=1 +- usefontcolor=1 +- fontcolor=#ffffff +- background=1 - backgroundfile=@prefix@/share/lxpanel/images/background.png -+ backgroundfile=/usr/share/lxpanel/images/lxpanel-background.png -+ iconsize=22 ++ edge=bottom ++ allign=left ++ margin=0 ++ widthtype=percent ++ width=100 ++ height=26 ++ transparent=0 ++ tintcolor=#000000 ++ alpha=0 ++ setdocktype=1 ++ setpartialstrut=1 ++ usefontcolor=0 ++ fontcolor=#ffffff ++ background=0 ++ backgroundfile=@prefix@/share/lxpanel/images/background.png } - +- Plugin { -@@ -29,7 +30,7 @@ +- type = space +- Config { +- Size=2 ++ type=menu ++ Config { ++ image=@prefix@/share/lxde/images/menu.svg ++ system { ++ } ++ separator { ++ } ++ item { ++ command=run ++ } ++ separator { + } ++ item { ++ image=system-log-out ++ command=logout ++ } ++ } + } +- Plugin { - type = menu - Config { +- type = menu +- Config { - image=@prefix@/share/lxde/images/lxde-icon.png -+ image=/usr/share/lxpanel/images/frugalware-logo.png - system { - } - separator { -@@ -118,6 +119,10 @@ +- system { +- } +- separator { +- } +- item { +- command=run +- } +- separator { +- } +- item { +- image=gnome-logout +- command=logout +- } +- } ++ type=space ++ Config { ++ Size=2 ++ } } - +- + Plugin { +- type = launchbar +- Config { +- Button { +- id=pcmanfm.desktop +- } +- Button { +- id=firefox.desktop +- } ++ type=launchtaskbar ++ Config { ++ Button { ++ id=menu://applications/System/lxterminal.desktop + } ++ Button { ++ id=menu://applications/System/pcmanfm.desktop ++ } ++ Button { ++ id=menu://applications/Accessories/leafpad.desktop ++ } ++ } + } +- + Plugin { +- type = space +- Config { +- Size=4 +- } ++ type=space ++ Config { ++ Size=2 ++ } + } +- + Plugin { +- type = wincmd +- Config { +- Button1=iconify +- Button2=shade +- } ++ type=netstatus ++ Config { ++ iface=enp4s4 ++ configtool=network-admin --configure %i ++ } + } +- + Plugin { +- type = space +- Config { +- Size=4 +- } ++ type=space ++ Config { ++ Size=2 ++ } + } +- + Plugin { +- type = pager ++ type=pager ++ Config { ++ } + } +- + Plugin { +- type = space +- Config { +- Size=4 +- } ++ type=space ++ Config { ++ Size=2 ++ } + } +- + Plugin { +- type = taskbar +- expand=1 +- Config { +- tooltips=1 +- IconsOnly=0 +- AcceptSkipPager=1 +- ShowIconified=1 +- ShowMapped=1 +- ShowAllDesks=0 +- UseMouseWheel=1 +- UseUrgencyHint=1 +- FlatButton=0 +- MaxTaskWidth=150 +- spacing=1 +- } ++ type=monitors ++ Config { ++ DisplayCPU=1 ++ DisplayRAM=1 ++ CPUColor=#0000FF ++ RAMColor=#FF0000 ++ } + } +- + Plugin { +- type = netstat ++ type=space ++ Config { ++ Size=2 ++ } + } +- + Plugin { +- type = cpu ++ type=tray ++ Config { ++ } + } +- + Plugin { +- type = tray ++ type=space ++ Config { ++ Size=2 ++ } + } +- + Plugin { +- type = dclock +- Config { +- ClockFmt=%R +- TooltipFmt=%A %x +- BoldFont=0 +- } ++ type=dclock ++ Config { ++ ClockFmt=%H:%M ++ TooltipFmt=%A %x ++ BoldFont=1 ++ IconOnly=0 ++ CenterText=1 ++ } + } +- Plugin { -+ type = volumealsa +- type = launchbar +- Config { +- Button { +- id=lxde-screenlock.desktop +- } +- Button { +- id=lxde-logout.desktop +- } +- } ++ type=space ++ Config { ++ Size=2 ++ } +} -+ +Plugin { - type = tray ++ type=wincmd ++ Config { ++ Button1=iconify ++ Button2=shade ++ } } +- +diff -Naur lxde-common-0.99.0b/openbox/rc.xml.in lxde-common-0.99.0/openbox/rc.xml.in +--- lxde-common-0.99.0b/openbox/rc.xml.in 2014-10-23 16:08:00.000000000 +0200 ++++ lxde-common-0.99.0/openbox/rc.xml.in 2014-12-08 20:47:08.943589545 +0100 +@@ -42,7 +42,7 @@ + </placement> -diff -Naur lxde-common-0.5.5/pcmanfm/pcmanfm.conf.in lxde-common-0.5.5new/pcmanfm/pcmanfm.conf.in ---- lxde-common-0.5.5/pcmanfm/pcmanfm.conf.in 2011-07-29 16:04:03.000000000 +0200 -+++ lxde-common-0.5.5new/pcmanfm/pcmanfm.conf.in 2011-11-20 09:20:56.000000000 +0100 -@@ -4,10 +4,11 @@ + <theme> +- <name>Onyx</name> ++ <name>Frugalware</name> + <titleLayout>NLIMC</titleLayout> + <!-- + available characters are NDSLIMC, each can occur at most once. +diff -Naur lxde-common-0.99.0b/pcmanfm/pcmanfm.conf.in lxde-common-0.99.0/pcmanfm/pcmanfm.conf.in +--- lxde-common-0.99.0b/pcmanfm/pcmanfm.conf.in 2014-10-23 16:08:00.000000000 +0200 ++++ lxde-common-0.99.0/pcmanfm/pcmanfm.conf.in 2014-12-09 15:23:26.381680297 +0100 +@@ -1,13 +1,14 @@ + [config] + bm_open_method=0 +-su_cmd=xdg-su -c '%s' ++su_cmd=gksu '%s' [desktop] - wallpaper_mode=1 +-wallpaper_mode=1 -wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg -+wallpaper=/usr/share/lxde/wallpapers/frugalware.png ++wallpaper_mode=crop ++wallpaper=@prefix@/share/lxde/wallpapers/wallpaper_frugalware.png desktop_bg=#000000 desktop_fg=#ffffff desktop_shadow=#000000 -+desktop_font=Droid Sans 11 ++desktop_font=Droid Sans 12 [ui] always_show_tabs=0 - -diff -Naur lxde-common-0.5.5/autostart lxde-common-0.5.5new/autostart ---- lxde-common-0.5.5/autostart 2011-07-29 16:04:03.000000000 +0200 -+++ lxde-common-0.5.5new/autostart 2013-04-10 19:00:52.428093770 +0200 -@@ -1,3 +1,3 @@ --@lxpanel --profile LXDE -+@lxpanel --profile default - @pcmanfm --desktop --profile LXDE - @xscreensaver -no-splash - -diff -Naur lxde-common-0.5.5/lxde-logout.in lxde-common-0.5.5b/lxde-logout.in ---- lxde-common-0.5.5/lxde-logout.in 2011-07-29 16:04:03.000000000 +0200 -+++ lxde-common-0.5.5b/lxde-logout.in 2014-02-23 14:53:28.032118155 +0100 -@@ -1,2 +1,2 @@ - #!/bin/sh --lxsession-logout --banner "@prefix@/share/lxde/images/logout-banner.png" --side=top -+lxsession-logout --prompt="" --banner="@prefix@/share/lxde/images/logout-banner.png" --side=top _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
