From de24c459de25d0d58acabcf0a533715cb029a7db Mon Sep 17 00:00:00 2001 From: ponce Date: Tue, 27 Dec 2011 01:47:27 -0600 Subject: desktop/lxpanel: Updated for version 20111223_ef3cf14 Signed-off-by: Erik Hanson --- desktop/lxpanel/battery-applet.patch | 31 ---- desktop/lxpanel/config/config | 4 + desktop/lxpanel/config/panel | 184 +++++++++++++++++++++++ desktop/lxpanel/doinst.sh | 15 -- desktop/lxpanel/lxpanel-0.5.6-symbol-alarm.patch | 32 ---- desktop/lxpanel/lxpanel.SlackBuild | 25 ++- desktop/lxpanel/lxpanel.info | 8 +- desktop/lxpanel/panel.patch | 101 ------------- 8 files changed, 201 insertions(+), 199 deletions(-) delete mode 100644 desktop/lxpanel/battery-applet.patch create mode 100644 desktop/lxpanel/config/config create mode 100644 desktop/lxpanel/config/panel delete mode 100644 desktop/lxpanel/doinst.sh delete mode 100644 desktop/lxpanel/lxpanel-0.5.6-symbol-alarm.patch delete mode 100644 desktop/lxpanel/panel.patch (limited to 'desktop/lxpanel') diff --git a/desktop/lxpanel/battery-applet.patch b/desktop/lxpanel/battery-applet.patch deleted file mode 100644 index c2f5b93007..0000000000 --- a/desktop/lxpanel/battery-applet.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 93d9373574fcb0ed63cc4be7807343b018daad1a Mon Sep 17 00:00:00 2001 -From: Marty Jack -Date: Thu, 19 Aug 2010 22:52:44 -0400 -Subject: [PATCH] Battery percentage incorrectly always evaluates as 100 percent (Bug3006059) - ---- - src/plugins/batt/batt_sys.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/batt/batt_sys.c b/src/plugins/batt/batt_sys.c -index 3c325b8..2ece803 100644 ---- a/src/plugins/batt/batt_sys.c -+++ b/src/plugins/batt/batt_sys.c -@@ -150,7 +150,7 @@ void battery_update( battery *b ) { - b->state = "available"; - } - else if ( strcmp("energy_now", sys_file ) == 0 ) { -- b->remaining_capacity = get_unit_value((gchar*) file_content) / 1000; -+ b->remaining_energy = get_unit_value((gchar*) file_content) / 1000; - if (!b->state) - b->state = "available"; - } -@@ -215,7 +215,7 @@ void battery_update( battery *b ) { - if (b->last_capacity < MIN_CAPACITY) - b->percentage = 0; - else -- b->percentage = b->remaining_capacity * 100 / b->last_capacity; -+ b->percentage = ((float) b->remaining_energy * 100.0) / (float) b->last_capacity_unit; - - if (b->percentage > 100) - b->percentage = 100; diff --git a/desktop/lxpanel/config/config b/desktop/lxpanel/config/config new file mode 100644 index 0000000000..f3ba910d89 --- /dev/null +++ b/desktop/lxpanel/config/config @@ -0,0 +1,4 @@ +[Command] +FileManager=pcmanfm %s +Terminal=lxterminal -e %s +Logout=lxde-logout diff --git a/desktop/lxpanel/config/panel b/desktop/lxpanel/config/panel new file mode 100644 index 0000000000..e81e5e5779 --- /dev/null +++ b/desktop/lxpanel/config/panel @@ -0,0 +1,184 @@ +# lxpanel config file. Manually editing is not recommended. +# Use preference dialog in lxpanel to adjust config when you can. + +Global { + edge=bottom + allign=center + margin=0 + widthtype=percent + width=95 + height=26 + transparent=0 + tintcolor=#000000 + alpha=0 + setdocktype=1 + setpartialstrut=1 + usefontcolor=1 + fontcolor=#ffffff + background=1 + backgroundfile=/usr/share/lxpanel/images/background.png +} + +Plugin { + type = space + Config { + Size=2 + } +} + +Plugin { + type = menu + Config { + image=/usr/share/lxpanel/images/my-computer.png + system { + } + separator { + } + item { + command=run + } + separator { + } + item { + image=gnome-logout + command=logout + } + } +} + +Plugin { + type = launchbar + Config { + Button { + id=pcmanfm.desktop + } + Button { + id=mozilla-firefox.desktop + } + Button { + id=mozilla-thunderbird.desktop + } + Button { + id=lxterminal.desktop + } + } +} + +Plugin { + type = space + Config { + Size=4 + } +} + +Plugin { + type = wincmd + Config { + Button1=iconify + Button2=shade + } +} + +Plugin { + type = space + Config { + Size=4 + } +} + +Plugin { + type = wnckpager +} + +Plugin { + type = space + Config { + Size=4 + } +} + +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 + } +} + +Plugin { + type = volumealsa +} + +Plugin { + type = space + Config { + Size=4 + } +} + +Plugin { + type = netstatus + Config { + iface=eth0 + configtool=network-admin --configure %i + } +} + +Plugin { + type = space + Config { + Size=4 + } +} + +Plugin { + type = cpu +} + +Plugin { + type = space + Config { + Size=4 + } +} + +Plugin { + type = cpufreq +} + +Plugin { + type = dclock + Config { + ClockFmt=%R + TooltipFmt=%A %x + BoldFont=0 + IconOnly=0 + } +} + +Plugin { + type = space + Config { + Size=4 + } +} + +Plugin { + type = launchbar + Config { + Button { + id=lxde-logout.desktop + } + } +} + diff --git a/desktop/lxpanel/doinst.sh b/desktop/lxpanel/doinst.sh deleted file mode 100644 index ac258d3ee7..0000000000 --- a/desktop/lxpanel/doinst.sh +++ /dev/null @@ -1,15 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config usr/share/lxpanel/profile/default/panels/panel.new -config usr/share/lxpanel/profile/default/config.new diff --git a/desktop/lxpanel/lxpanel-0.5.6-symbol-alarm.patch b/desktop/lxpanel/lxpanel-0.5.6-symbol-alarm.patch deleted file mode 100644 index a38243b318..0000000000 --- a/desktop/lxpanel/lxpanel-0.5.6-symbol-alarm.patch +++ /dev/null @@ -1,32 +0,0 @@ -@@ -, +, @@ - src/plugins/batt/batt.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) ---- a/src/plugins/batt/batt.c -+++ a/src/plugins/batt/batt.c -@@ -95,7 +95,7 @@ typedef struct { - typedef struct { - char *command; - sem_t *lock; --} alarm; -+} Alarm; - - static void destructor(Plugin *p); - static void update_display(lx_battery *lx_b, gboolean repaint); -@@ -103,7 +103,7 @@ static void update_display(lx_battery *lx_b, gboolean repaint); - /* alarmProcess takes the address of a dynamically allocated alarm struct (which - it must free). It ensures that alarm commands do not run concurrently. */ - static void * alarmProcess(void *arg) { -- alarm *a = (alarm *) arg; -+ Alarm *a = (Alarm *) arg; - - sem_wait(a->lock); - system(a->command); -@@ -157,7 +157,7 @@ void update_display(lx_battery *lx_b, gboolean repaint) { - /* Run the alarm command if it isn't already running */ - if (alarmCanRun) { - -- alarm *a = (alarm *) malloc(sizeof(alarm)); -+ Alarm *a = (Alarm *) malloc(sizeof(Alarm)); - a->command = lx_b->alarmCommand; - a->lock = &(lx_b->alarmProcessLock); - diff --git a/desktop/lxpanel/lxpanel.SlackBuild b/desktop/lxpanel/lxpanel.SlackBuild index c014a4bcd0..e4d87eaa1c 100644 --- a/desktop/lxpanel/lxpanel.SlackBuild +++ b/desktop/lxpanel/lxpanel.SlackBuild @@ -24,16 +24,14 @@ # Modified by ponce PRGNAM=lxpanel -VERSION=0.5.6 -BUILD=${BUILD:-2} +VERSION=${VERSION:-20111223_ef3cf14} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -74,10 +72,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# fix a battery applet issue: -patch -p1 < $CWD/battery-applet.patch -# fix redefinition of alarm -patch -p1 < $CWD/lxpanel-0.5.6-symbol-alarm.patch +sh autogen.sh || true CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -98,6 +93,12 @@ make install-strip DESTDIR=$PKG find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +# use some sane defaults +install -m 0644 $CWD/config/config \ + $PKG/usr/share/$PRGNAM/profile/default/config +install -m 0644 $CWD/config/panel \ + $PKG/usr/share/$PRGNAM/profile/default/panels/panel + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -105,14 +106,6 @@ chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/* mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -# Patch panel to use programs included in Slackware and slight default config -patch -p0 < $CWD/panel.patch -# Don't overwrite the default configuration files. -for i in config panels/panel; do - mv $PKG/usr/share/$PRGNAM/profile/default/$i $PKG/usr/share/$PRGNAM/profile/default/$i.new -done - /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/desktop/lxpanel/lxpanel.info b/desktop/lxpanel/lxpanel.info index fdbe8a2134..d2071d6d36 100644 --- a/desktop/lxpanel/lxpanel.info +++ b/desktop/lxpanel/lxpanel.info @@ -1,10 +1,10 @@ PRGNAM="lxpanel" -VERSION="0.5.6" +VERSION="20111223_ef3cf14" HOMEPAGE="http://wiki.lxde.org/en/LXPanel" -DOWNLOAD="http://download.sourceforge.net/lxde/lxpanel-0.5.6.tar.gz" -MD5SUM="3c6b5498b5f4109c3913b10a66809fe6" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxpanel-20111223_ef3cf14.tar.xz" +MD5SUM="9d9041428c859888416007a9a5cfe97d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="ponce" EMAIL="matteo.bernardini@gmail.com" -APPROVED="rworkman" +APPROVED="Erik Hanson" diff --git a/desktop/lxpanel/panel.patch b/desktop/lxpanel/panel.patch deleted file mode 100644 index 60bc0f113f..0000000000 --- a/desktop/lxpanel/panel.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- usr/share/lxpanel/profile/default/panels/panel.orig 2010-08-19 00:16:51.000000000 +0200 -+++ usr/share/lxpanel/profile/default/panels/panel 2010-08-18 23:58:42.239083001 +0200 -@@ -3,10 +3,10 @@ - - Global { - edge=bottom -- allign=left -+ allign=center - margin=0 - widthtype=percent -- width=100 -+ width=95 - height=26 - transparent=0 - tintcolor=#000000 -@@ -53,10 +53,13 @@ - id=pcmanfm.desktop - } - Button { -- id=gnome-terminal.desktop -+ id=mozilla-firefox.desktop - } - Button { -- id=firefox.desktop -+ id=mozilla-thunderbird.desktop -+ } -+ Button { -+ id=lxterminal.desktop - } - } - } -@@ -113,11 +116,44 @@ - } - - Plugin { -+ type = volumealsa -+} -+ -+Plugin { -+ type = space -+ Config { -+ Size=4 -+ } -+} -+ -+Plugin { -+ type = netstatus -+ Config { -+ iface=eth0 -+ configtool=network-admin --configure %i -+ } -+} -+ -+Plugin { -+ type = space -+ Config { -+ Size=4 -+ } -+} -+ -+Plugin { - type = cpu - } - - Plugin { -- type = tray -+ type = space -+ Config { -+ Size=4 -+ } -+} -+ -+Plugin { -+ type = cpufreq - } - - Plugin { -@@ -126,6 +162,23 @@ - ClockFmt=%R - TooltipFmt=%A %x - BoldFont=0 -+ IconOnly=0 -+ } -+} -+ -+Plugin { -+ type = space -+ Config { -+ Size=4 -+ } -+} -+ -+Plugin { -+ type = launchbar -+ Config { -+ Button { -+ id=lxde-logout.desktop -+ } - } - } - -- cgit v1.2.3