1. VectorLinux Core
  2. vabs

Commits

Lee Pak Hong  committed 63e379f

Update lxpanel to 0.5.12

Signed-off-by: Lee Pak Hong <benreilly@vector.Linux.net>

  • Participants
  • Parent commits f51ceb2
  • Branches veclinux-7.0

Comments (0)

Files changed (3)

File var/vabs/lxpanel/src/doinst.sh

View file
+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
+config usr/share/lxpanel/profile/default/two_panels/panels/{top,bottom}.new
+config usr/share/lxpanel/profile/default/two_panels/config.new

File var/vabs/lxpanel/src/lxpanel.SlackBuild

View file
 # AUTHORS = 
 
 NAME="lxpanel"            #Enter package Name!
-VERSION=${VERSION:-"0.5.8"}      #Enter package Version!
+VERSION=${VERSION:-"0.5.12"}      #Enter package Version!
 VER=$(echo $VERSION|sed 's/-/_/') #this fixes - in version
 VL_PACKAGER=${VL_PACKAGER:-"hata_ph"}   #Enter your Name!
-LINK=${LINK:-""}  #Enter URL for package here!
+LINK=${LINK:-"http://downloads.sourceforge.net/sourceforge/lxde/$NAME-$VERSION.tar.gz"}  #Enter URL for package here!
 
 
 #SYSTEM VARIABLES
 #----------------------------------------------------------------------------
-BUILDNUM=${BUILDNUM:-"12"}
+BUILDNUM=${BUILDNUM:-"1"}
 VL_VERSION=${VL_VERSION:-"$(ls /var/log/packages/|grep vlconfig2|cut -d "-" -f4|cut -c 2-5)"}
 BUILD=${BUILD:-"$BUILDNUM""$VL_VERSION"}
 ARCH=${ARCH:-"$(uname -m)"}
 CONFIG_OPTIONS=${CONFIG_OPTIONS:-""}
 LDFLAG_OPTIONS=${LDFLAG_OPTIONS:-""}
-ADDRB=${ADDRB:-""} #Add deps that need to be added to the slack-required file here
+ADDRB=${ADDRB:-"lxmenu-data >= 0.1.2"} #Add deps that need to be added to the slack-required file here
 EXRB=${EXRB:-""} #Add deps that need to be excluded from the slack-required file here
+MAKEDEPENDS=${MAKEDEPENDS:-"menu-cache lxmenu-data"} #Add deps needed TO BUILD this package here.
 #----------------------------------------------------------------------------
 
+# DO NOT EXECUTE if NORUN is set to 1
+if [ "$NORUN" != "1" ]; then
+
 
 #SETUP PACKAGING ENVIRONMENT
 #--------------------------------------------
 
 # this fix slipped somehow: reverting a commit to fix battery level detection
 # thanks to ricky cardo on LQ
-patch -p1 -R < $CWD/patches/battery-applet.patch
+#patch -p1 -R < $CWD/patches/battery-applet.patch
 
 #SET PERMISSIONS
 #-----------------------------------------
 #######################################################################
 
 # Use VL own theme panel config
-mkdir -p $PKG/usr/share/lxpanel/profile/default/panels/
-cp $CWD/panel $PKG/usr/share/lxpanel/profile/default/panels/
+mkdir -p $PKG/usr/share/$NAME/profile/default/panels/
+mv $PKG/usr/share/$NAME/profile/default/panels/panel \
+	$PKG/usr/share/$NAME/profile/default/panels/panel.defaults
+cp -a $CWD/vl_panel $PKG/usr/share/$NAME/profile/default/panels/panel
 
-# Don't overwrite the default configuration files.
+# Don't overwrite the current configuration files when updating lxpanel
 for i in config panels/panel; do
-mv $PKG/usr/share/$NAME/profile/default/$i $PKG/usr/share/$NAME/profile/default/$i.new
+mv $PKG/usr/share/$NAME/profile/default/$i \
+	$PKG/usr/share/$NAME/profile/default/$i.new
+done
+
+for i in config panels/{top,bottom}; do
+mv $PKG/usr/share/$NAME/profile/two_panels/$i \
+	$PKG/usr/share/$NAME/profile/two_panels/$i.new
 done
 
 mkdir -p $PKG/usr/doc/$NAME-$VERSION
-cp -a ANNOUNCE* AUTHORS* BUGS* COPYING* ChangeLog* CHANGELOG* Credits* DEVELOPERS \
-LICENSE* MANIFEST PROVENANCE README* TODO* Exception_to_GPL_for_Qt.txt \
+cp -a ABOUT* AUTHORS* COPYING* ChangeLog* INSTALL README* TODO* NEWS \
 $PKG/usr/doc/$NAME-$VERSION
 cat $CWD/$NAME.SlackBuild > $PKG/usr/doc/$NAME-$VERSION/$NAME.SlackBuild
 
 cd $CWD
 echo "Cleaning up temp files..." && rm -rf $TMP
 echo "Package Complete"
+fi
 #--------------------------------------------------------------
 
 # vim: set tabstop=4 shiftwidth=4 foldmethod=marker : ##

File var/vabs/lxpanel/src/vl_panel

View file
+# lxpanel <profile> 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=100
+    height=26
+    transparent=0
+    tintcolor=#000000
+    alpha=0
+    autohide=0
+    heightwhenhidden=2
+    setdocktype=1
+    setpartialstrut=1
+    usefontcolor=1
+    fontcolor=#ffffff
+    background=1
+    backgroundfile=/usr/share/lxpanel/images/background.png
+    iconsize=24
+}
+
+Plugin {
+    type = space
+    Config {
+        Size=2
+    }
+}
+
+Plugin {
+    type = menu
+    Config {
+        image=/usr/share/pixmaps/menu.png
+        system {
+        }
+        separator {
+        }
+        item {
+            command=run
+        }
+        separator {
+        }
+        item {
+            image=gnome-logout
+            command=logout
+        }
+    }
+}
+
+Plugin {
+    type = launchbar
+    Config {
+        Button {
+            id=/usr/share/applications/lxterminal.desktop
+        }
+        Button {
+            id=/usr/share/applications/leafpad.desktop
+        }
+        Button {
+            id=/usr/share/applications/firefox.desktop
+        }
+        Button {
+            id=pcmanfm.desktop
+        }
+    }
+}
+
+Plugin {
+    type = space
+    Config {
+        Size=4
+    }
+}
+
+Plugin {
+    type = space
+    Config {
+        Size=4
+    }
+}
+
+Plugin {
+    type = space
+    Config {
+        Size=4
+    }
+}
+
+Plugin {
+    type = taskbar
+    expand=1
+    Config {
+        tooltips=1
+        IconsOnly=0
+        ShowAllDesks=0
+        UseMouseWheel=1
+        UseUrgencyHint=1
+        FlatButton=0
+        MaxTaskWidth=150
+        spacing=1
+        GroupedTasks=0
+    }
+}
+
+Plugin {
+    type = space
+    Config {
+        Size=4
+    }
+}
+
+Plugin {
+    type = cpu
+}
+
+Plugin {
+    type = space
+    Config {
+        Size=4
+    }
+}
+
+Plugin {
+    type = tray
+}
+
+Plugin {
+    type = volumealsa
+}
+
+Plugin {
+    type = pager
+}
+
+Plugin {
+    type = wincmd
+    Config {
+        image=window-manager
+        Button1=iconify
+        Button2=shade
+        Toggle=0
+    }
+}
+
+Plugin {
+    type = dclock
+    Config {
+        ClockFmt=%R %p
+        TooltipFmt=%A %x
+        BoldFont=0
+        IconOnly=0
+    }
+}
+
+Plugin {
+    type = space
+    Config {
+        Size=4
+    }
+}
+
+Plugin {
+    type = launchbar
+    Config {
+        Button {
+            id=lxde-logout.desktop
+        }
+    }
+}
+