From a4b56a1f7676a024e0512180c1d7746702bbb849 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Thu, 6 Sep 2018 14:55:39 -0400 Subject: multimedia/nted: Updated for version 1.10.18_12. Signed-off-by: B. Watson --- multimedia/nted/README | 2 ++ multimedia/nted/nted.SlackBuild | 43 ++++++++++++++++++++++++++++++----------- multimedia/nted/nted.info | 7 ++++--- multimedia/nted/slack-desc | 4 ++-- 4 files changed, 40 insertions(+), 16 deletions(-) diff --git a/multimedia/nted/README b/multimedia/nted/README index c6682508d10d..27b3c3b0ef1f 100644 --- a/multimedia/nted/README +++ b/multimedia/nted/README @@ -1,3 +1,5 @@ +nted (musical score editor) + NtEd is a GTK+ score editor. It intends to be really WYSIWYG: what you see on the screen is exactly what you get on printer output. It supports up to 4 voices per staff, drum notes, 5 lyrics lines, diff --git a/multimedia/nted/nted.SlackBuild b/multimedia/nted/nted.SlackBuild index cfe07adf9c42..c8edc7bc360d 100644 --- a/multimedia/nted/nted.SlackBuild +++ b/multimedia/nted/nted.SlackBuild @@ -2,8 +2,9 @@ # Slackware build script for nted #(http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml) +# 20180905 bkw: original homepage is long gone. -# Copyright 2008 Corrado Franco (http://www.conraid.net) +# Copyright 2008 Corrado Franco (email removed) # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,11 +26,17 @@ # Modified by the SlackBuilds.org project +# 20180905 bkw: upstream has been dead a while, switch homepage to +# debian's package page, and use their patches. VERSION now 1.10.18_12, +# original version + debian patchlevel 12. The debian patches fix a few +# segfaults, and compile issues with later gcc versions (like the one +# in -current, and whatever will end up in 15.0). + # 20170621 bkw: fix build on -current (gcc7's pickier, use -Wno-narrowing) PRGNAM=nted -VERSION=${VERSION:-1.10.18} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.10.18_12} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -60,18 +67,32 @@ fi set -e +MAINVER="$( echo $VERSION | cut -d_ -f1 )" +DEBVER="$( echo $VERSION | cut -d_ -f2 )" + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$MAINVER +tar xvf $CWD/${PRGNAM}_$MAINVER.orig.tar.gz +cd $PRGNAM-$MAINVER +tar xvf $CWD/${PRGNAM}_$MAINVER-$DEBVER.debian.tar.xz chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +for i in $( cat debian/patches/series ); do + patch -p1 < debian/patches/$i +done + +# The -Wno-error causes automake to be run with --warnings=no-error, +# but automake still says "warnings are being treated as errors". The +# thing it's warning about is configure.in should be named configure.ac, +# I have no idea how to turn off warnings as errors if the goddam +# --warnings=no-error command line flag doesn't work, so just rename +# the thing. I *really hate* this kinda pointless pedantry. +mv configure.in configure.ac +autoreconf -ivf -Wno-error LDFLAGS="$SLKLDFLAGS" \ CFLAGS="$SLKCFLAGS" \ diff --git a/multimedia/nted/nted.info b/multimedia/nted/nted.info index 28d466ab5a17..60d2ce759866 100644 --- a/multimedia/nted/nted.info +++ b/multimedia/nted/nted.info @@ -1,7 +1,8 @@ PRGNAM="nted" -VERSION="1.10.18" -HOMEPAGE="http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/nted-1.10.18.tar.gz" +VERSION="1.10.18_12" +HOMEPAGE="https://packages.debian.org/sid/nted" +DOWNLOAD="http://http.debian.net/debian/pool/main/n/nted/nted_1.10.18.orig.tar.gz \ + http://http.debian.net/debian/pool/main/n/nted/nted_1.10.18-12.debian.tar.xz" MD5SUM="0ca7aa23109171ab643a9b552487bd4b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/multimedia/nted/slack-desc b/multimedia/nted/slack-desc index b6068c9dd61c..6f2f84e8e9f8 100644 --- a/multimedia/nted/slack-desc +++ b/multimedia/nted/slack-desc @@ -6,7 +6,7 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -nted: nted (musical score editor for Linux) +nted: nted (musical score editor) nted: nted: NtEd is a GTK+ score editor. It intends to be really WYSIWYG: what nted: you see on the screen is exactly what you get on printer output. It @@ -15,5 +15,5 @@ nted: N-Tuplets, context changes, repeats with alternatives, configurable nted: music instruments per staff, MIDI import/export, MusicXML import, nted: Postscript export. Scores can be played through the ALSA sequencer. nted: -nted: Home: http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml +nted: nted: -- cgit v1.2.3