Commits

Anonymous committed 6518b89

Update dillo to 3.0.3

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

Comments (0)

Files changed (3)

var/vabs/dillo/src/dillo.SlackBuild

 # AUTHORS = 
 
 NAME="dillo"            #Enter package Name!
-VERSION=${VERSION:-"3.0.2"}      #Enter package Version!
+VERSION=${VERSION:-"3.0.3"}      #Enter package Version!
 VER=$(echo $VERSION|sed 's/-/_/') #this fixes - in version
 VL_PACKAGER=${VL_PACKAGER:-"stretchedthin"}   #Enter your Name!
-LINK=${LINK:-"http://www.dillo.org/download/dillo-3.0.2.tar.bz2"}  #Enter URL for package here!
+LINK=${LINK:-"http://www.dillo.org/download/$NAME-$VERSION.tar.bz2"}  #Enter URL for package here!
 
 
 #SYSTEM VARIABLES
 #----------------------------------------------------------------------------
-BUILDNUM=${BUILDNUM:-"2"}
+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)"}
 MAKEDEPENDS=${MAKEDEPENDS:-"fltk"}
 #----------------------------------------------------------------------------
 
+# DO NOT EXECUTE if NORUN is set to 1
+if [ "$NORUN" != "1" ]; then
 
 #SETUP PACKAGING ENVIRONMENT
 #--------------------------------------------
 
 # Put any Patches into a patches folder in the src dir
 #-----------------------------------------------------
-for i in $CWD/patches/*;do
-	patch -p1 <$i
-done
+#for i in $CWD/patches/*;do
+#	patch -p1 <$i
+#done
 #-----------------------------------------------------
 
 
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --with-included-gettext \
-  --disable-debug \
   --program-prefix="" \
   --program-suffix="" \
   --build=$CONFIGURE_TRIPLET \
 #Miscellenious tweaks and things outside a normal ./configure go here #
 #######################################################################
 
+# Let's not clobber config files if they already exist
+mv $PKG/etc/dillo/dillorc $PKG/etc/dillo/dillorc.new
+mv $PKG/etc/dillo/dpidrc $PKG/etc/dillo/dpidrc.new
+mv $PKG/etc/dillo/keysrc $PKG/etc/dillo/keysrc.new
+mv $PKG/etc/dillo/domainrc $PKG/etc/dillo/domainrc.new
 
 # Menu entry - http://standards.freedesktop.org/desktop-entry-spec/latest/
 
 [Desktop Entry]
 # Please edit as needed
 Name=$NAME
-GenericName=
-Comment=
+GenericName=Dillo Web Browser
+Comment=Dillo Web Browser
 Exec=$NAME
 Icon=$NAME.png
 
 
 
 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 AUTHORS* COPYING* ChangeLog* INSTALL README* NEWS* \
 $PKG/usr/doc/$NAME-$VERSION
 cat $CWD/$NAME.SlackBuild > $PKG/usr/doc/$NAME-$VERSION/$NAME.SlackBuild
 
 fi 
 
 find $PKG/usr/info -type f -exec gzip -9 {} \;
+
 mkdir -p $PKG/install
+cp $CWD/doinst.sh $PKG/install
+
 if [ -d $PKG/usr/info ] ; then
 cat >> $PKG/install/doinst.sh << EOF
 CWD=\$(pwd)
 EOF
 fi
 
-mkdir -p $PKG/install
+# Add schemas install to the doinst.sh if schemas are found.
+if [ -d $PKG/etc/gconf/schemas ];then
+# Make sure we have gconftool installed
+echo "if [ -x usr/bin/gconftool-2 ]; then" >> $PKG/install/doinst.sh
+( cd $PKG/etc/gconf/schemas
+for schema in *.schemas; do
+ # Install schemas
+ echo "GCONF_CONFIG_SOURCE=\"xml::etc/gconf/gconf.xml.defaults\" \
+   usr/bin/gconftool-2 --makefile-install-rule \
+   etc/gconf/schemas/${schema} >/dev/null 2>&1" \
+   >> $PKG/install/doinst.sh
+done;
+)
+# Finish off gconf block
+echo "fi" >> $PKG/install/doinst.sh
+fi
+
+cat >> $PKG/install/doinst.sh << EOF
+# update rarian database
+if [ -x usr/bin/rarian-sk-update ]; then
+  usr/bin/rarian-sk-update 1> /dev/null 2> /dev/null
+fi
+
+# update mime database
+if [ -x usr/bin/update-mime-database ]; then
+  usr/bin/update-mime-database usr/share/mime 1> /dev/null 2> /dev/null
+fi
+
+# update desktop entries
+if [ -x usr/bin/update-desktop-database ]; then
+  usr/bin/update-desktop-database 1> /dev/null 2> /dev/null
+fi
+
+# update hicolor icons
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+	rm -f usr/share/icons/hicolor/icon-theme.cache
+fi
+usr/bin/gtk-update-icon-cache -f -q usr/share/icons/hicolor 1>/dev/null 2>/dev/null
 
+if [ -x /usr/bin/glib-compile-schemas ]; then
+  /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas/ >/dev/null 2>&1
+fi
+
+# Restart gconfd-2 if running to reload new gconf settings
+if ps acx | grep -q gconfd-2 ; then
+        killall -HUP gconfd-2 ;
+fi
+
+# A good idea whenever kernel modules are added or changed:
+if [ -x sbin/depmod ]; then
+  /sbin/depmod -a 1> /dev/null 2> /dev/null
+fi
+EOF
 
 #if there is a slack-desc in src dir use it
 if test -f $CWD/slack-desc; then
 # customary to leave one space after the ':'.
 
 $SHIM|-----handy-ruler------------------------------------------------------|
-$NAME: $NAME (Fast , lightweight web browser)
-$NAME: Dillo is a web browser project completely written in C. 
-$NAME: Dillo is a multi-platform graphical web browser known for its speed and   
-$NAME: small footprint.
-$NAME: Dillo is written in C and C++. 
-$NAME: Dillo is based on FLTK, the Fast Light Toolkit (statically-linked by default!).
-$NAME: Dillo is free software made available under the terms of the GPL
+$NAME: $NAME (dillo web browser)
+$NAME:
+$NAME: Dillo is a multi-platform graphical web browser known
+$NAME: for its speed and small footprint.  It is written in C and
+$NAME: C++ and is based on FLTK.  Dillo is free software made
+$NAME: available under the terms of the GNU GPLv3.
+$NAME: 
 $NAME: 
 $NAME: License: GPLv3
-$NAME: Authors:  Jorge Arellano Cid (see web page for complete list)
-$NAME: Website: http://www.dillo.org/D_authors.html 
+$NAME: Authors: Refer to AUTHORS
+$NAME: Website: http://www.dillo.org/
 
 EOF
 fi
 cd $CWD
 echo "Cleaning up temp files..." && rm -rf $TMP
 echo "Package Complete"
+fi
 #--------------------------------------------------------------
 
 # vim: set tabstop=4 shiftwidth=4 foldmethod=marker : ##

var/vabs/dillo/src/dillo.png

Added
New image

var/vabs/dillo/src/doinst.sh

+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 etc/dillo/dillorc.new
+config etc/dillo/dpidrc.new
+config etc/dillo/keysrc.new
+config etc/dillo/domainrc.new
+