[Slackbuilds-users] Updating slackbuilds

Mon Mar 14 12:10:14 UTC 2016

2016-03-14 7:31 GMT+01:00 Eric Pratt <eric.b.pratt at gmail.com>:
> I see.  Thanks!
>
> On Sun, Mar 13, 2016 at 11:02 PM, Willy Sudiarto Raharjo
> <willysr at slackbuilds.org> wrote:
>>
>> > Well, it looks like the same guy did it again in January.  I thought
>> > only
>> > the maintainer could submit updates to the slackbuild.  Is that
>> > incorrect?
>> >
>> > Since this appears to be happening, lets just go ahead and commit this
>> > update.  It eliminates the cumbersome patch files and gets us all the
>> > latest bug fixes except for what's in the last release since that
>> > release
>> > wont build and I haven't investigated why yet.
>>
>> It was one of the admin, Matteo (ponce)
>> During development cycle like this, we often update the SlackBuild if
>> it's really needed for several reasons:
>> - Fix a build failure due to changes in Slackware
>> - Not yet updated by maintainer for a long time

Hi Eric,

as I am using vice myself I noticed when the build broke in the last
5+ years (compiler, ffmpeg versions, etc.) and took care of fixing it
or we had to remove it from the repository.
as for the last update it slipped from my personal repository when
merging the other fixes for current...

I just had a look at your submission and I see you have rebased your
modifications on your old script and not what we have in our
repository, so I had to fix some things again:
- the homepage isn't working anymore, so I switched to the sourceforge one;
- I moved the block that defines some variables in the slackbuild
lower in it because that's how we have in most of our SlackBuilds:
this helps in case we had to do some automated scripting cleanups in
our repository, like it often happens (this is effective if we have
scripts conforming to the templates);
- I added man and info file compression blocks;
- as the doc directory from the sources folder is messy and the "make
install" already installs a clean one in
/usr/lib$LIBDIRSUFFIX/$PRGNAM/doc where it shouldn't be, I opted to
move this later in /usr/doc/$PRGNAM-$VERSION and the html stuff in a
subdirectory, fixing permissions (executable text files).
I attach the diff over your last submission: if it's ok for you I'll
commit your submission with these corrections in our git.

Matteo

P.S. Note that not enabling the bundled ffmpeg implies that recording
videos of the emulator running from the menus doesn't work: feel free
to look at the script I previously submitted.
-------------- next part --------------
diff -Naur vice/slack-desc vice.new/slack-desc

--- vice/slack-desc	2013-11-22 20:47:41.000000000 +0100
+++ vice.new/slack-desc	2016-03-14 08:47:56.867459895 +0100
@@ -14,6 +14,6 @@
 vice: emulates the C64, the C128, the VIC20, almost all PET models, the
 vice: PLUS4 and the CBM-II (aka C610).
 vice:
-vice: Homepage: http://www.viceteam.org/
+vice: Homepage: http://vice-emu.sourceforge.net/
 vice:
 vice:
diff -Naur vice/vice.SlackBuild vice.new/vice.SlackBuild
--- vice/vice.SlackBuild	2016-03-13 20:36:54.000000000 +0100
+++ vice.new/vice.SlackBuild	2016-03-14 10:39:54.749268128 +0100
@@ -27,10 +27,6 @@
 VERSION=${VERSION:-2.4.24}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -40,6 +36,11 @@
   esac
 fi
 
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -115,16 +116,26 @@
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+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
+
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
+
 # Install icon and menu entries
 mkdir -p $PKG/usr/share/{applications,pixmaps}
 install -D -m 0644 $CWD/config/*.desktop $PKG/usr/share/applications
 install -D -m 0644 $CWD/config/vice.png $PKG/usr/share/pixmaps
 
-# Copy the original documentation folder to the usual place
+# Move the original documentation folder to the usual place
+# and create a link to where vice expect it to be
 mkdir -p $PKG/usr/doc
-cp -a doc $PKG/usr/doc/$PRGNAM-$VERSION
-find $PKG/usr/doc/$PRGNAM-$VERSION -name "Makefile*" -exec rm -f {} \;
-find $PKG/usr/doc/$PRGNAM-$VERSION -name "tex*" -exec rm -f {} \;
+mv $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/doc $PKG/usr/doc/$PRGNAM-$VERSION
+( cd $PKG/usr/doc/$PRGNAM-$VERSION
+  chmod 644 *
+  mkdir html
+  mv *.html *.png *.gif *.jpg *.css html/ )
+( cd $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM ; ln -s /usr/doc/$PRGNAM-$VERSION doc )
 
 # Copy additional program documentation
 cp -a AUTHORS ChangeLog COPYING FEEDBACK INSTALL NEWS README \
diff -Naur vice/vice.info vice.new/vice.info
--- vice/vice.info	2016-03-12 09:38:43.000000000 +0100
+++ vice.new/vice.info	2016-03-14 08:47:18.978644421 +0100
@@ -1,7 +1,7 @@
 PRGNAM="vice"
 VERSION="2.4.24"
-HOMEPAGE="http://www.viceteam.org/"
-DOWNLOAD="http://downloads.sourceforge.net/project/vice-emu/development-releases/vice-2.4.24.tar.gz?r=&ts=1457765603&use_mirror=iweb"
+HOMEPAGE="http://vice-emu.sourceforge.net"
+DOWNLOAD="http://downloads.sourceforge.net/vice-emu/vice-2.4.24.tar.gz"
 MD5SUM="bd064f09908737951ccc75e734b6720c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
