From 9b1d3ef8bceb950fe4779f7012c71eee50f90d4b Mon Sep 17 00:00:00 2001 From: David Golus Date: Thu, 12 Apr 2018 00:52:39 +0100 Subject: multimedia/ripperX: Updated for version 2.8.0. Signed-off-by: David Spencer --- multimedia/ripperX/README | 2 +- multimedia/ripperX/doinst.sh | 3 ++ multimedia/ripperX/gtk_cpp_workaround.patch | 43 +++++++++++++++++++++++++++++ multimedia/ripperX/ripperX.SlackBuild | 26 ++++++++--------- multimedia/ripperX/ripperX.info | 8 +++--- 5 files changed, 64 insertions(+), 18 deletions(-) create mode 100644 multimedia/ripperX/doinst.sh create mode 100644 multimedia/ripperX/gtk_cpp_workaround.patch (limited to 'multimedia/ripperX') diff --git a/multimedia/ripperX/README b/multimedia/ripperX/README index d34d1e67cd29..35f4d3bce877 100644 --- a/multimedia/ripperX/README +++ b/multimedia/ripperX/README @@ -1,4 +1,4 @@ RipperX is a GTK program to rip CD audio tracks and encode them to the Ogg, -MPE, or FLAC formats. It's goal is to be easy to use, requiring only a few +MPE, or FLAC formats. Its goal is to be easy to use, requiring only a few mouse clicks to convert an entire album. It supports CDDB lookups for album and track information. diff --git a/multimedia/ripperX/doinst.sh b/multimedia/ripperX/doinst.sh new file mode 100644 index 000000000000..5fb28930db0b --- /dev/null +++ b/multimedia/ripperX/doinst.sh @@ -0,0 +1,3 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi diff --git a/multimedia/ripperX/gtk_cpp_workaround.patch b/multimedia/ripperX/gtk_cpp_workaround.patch new file mode 100644 index 000000000000..fc6eef044386 --- /dev/null +++ b/multimedia/ripperX/gtk_cpp_workaround.patch @@ -0,0 +1,43 @@ +diff -urN ripperx-2.8.0/src/gtk_cpp_workaround.h ripperx-2.8.0/src/gtk_cpp_workaround.h +--- ripperx-2.8.0/src/gtk_cpp_workaround.h 1969-12-31 16:00:00.000000000 -0800 ++++ ripperx-2.8.0/src/gtk_cpp_workaround.h 2016-10-06 12:47:06.512778792 -0700 +@@ -0,0 +1,39 @@ ++#ifndef gtk_cpp_workaround_h ++#define gtk_cpp_workaround_h ++#ifdef __cplusplus ++//proto is wrong, override here for C++ ++namespace ++{ ++ ++inline void gtk_table_attach (GtkTable *table, ++ GtkWidget *child, ++ guint left_attach, ++ guint right_attach, ++ guint top_attach, ++ guint bottom_attach, ++ //GtkAttachOptions xoptions, ++ //GtkAttachOptions yoptions, ++ guint xoptions, guint yoptions, ++ guint xpadding, ++ guint ypadding ++ ) ++{ ++ gtk_table_attach(table, ++ child, ++ left_attach, ++ right_attach, ++ top_attach, ++ bottom_attach, ++ (GtkAttachOptions)xoptions, ++ (GtkAttachOptions)yoptions, ++ xpadding, ++ ypadding ++ ); ++ ++ }; ++ ++ ++} ++ ++#endif ++#endif diff --git a/multimedia/ripperX/ripperX.SlackBuild b/multimedia/ripperX/ripperX.SlackBuild index 18735e8aab22..ff8c28f0bd6f 100644 --- a/multimedia/ripperX/ripperX.SlackBuild +++ b/multimedia/ripperX/ripperX.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for ripperX -# Copyright 2012,2013 David Golus +# Copyright 2012,2013,2018 David Golus # # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: @@ -21,11 +21,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Heavily based on original slackbuild by AlienBOB. -# Modified by Robby Workman PRGNAM=ripperX -VERSION=${VERSION:-2.7.3} +SRCNAM=ripperx +VERSION=${VERSION:-2.8.0} BUILD=${BUILD:-3} TAG=${TAG:-_SBo} @@ -50,7 +49,6 @@ elif [ "$ARCH" = "i686" ]; then LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="-L/usr/lib64" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -62,15 +60,17 @@ set -e 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 $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2 +cd $SRCNAM-$VERSION 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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +patch -i $CWD/gtk_cpp_workaround.patch -o src/gtk_cpp_workaround.h LDFLAGS="-lm" \ CFLAGS="$SLKCFLAGS" \ @@ -78,10 +78,10 @@ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --sysconfdir=/etc \ --enable-static=no \ --build=$ARCH-slackware-linux @@ -94,7 +94,7 @@ mkdir -p $PKG/usr/share/applications cp -a ripperX.desktop $PKG/usr/share/applications echo "Categories=AudioVideo;" >> $PKG/usr/share/applications/ripperX.desktop -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 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 {} \; @@ -104,11 +104,11 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ BUGS CHANGES COPYING FAQ INSTALL README TODO README.plugin \ $PKG/usr/doc/$PRGNAM-$VERSION -find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \; +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -chmod -R o-w $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/multimedia/ripperX/ripperX.info b/multimedia/ripperX/ripperX.info index bb029e8bc624..ace21b511889 100644 --- a/multimedia/ripperX/ripperX.info +++ b/multimedia/ripperX/ripperX.info @@ -1,8 +1,8 @@ PRGNAM="ripperX" -VERSION="2.7.3" -HOMEPAGE="https://sourceforge.net/projects/ripperx/" -DOWNLOAD="https://downloads.sourceforge.net/ripperx/ripperX-2.7.3.tar.gz" -MD5SUM="f07c55edf08a1cd57537f1b9379b4e4d" +VERSION="2.8.0" +HOMEPAGE="https://sourceforge.net/projects/ripperx" +DOWNLOAD="https://downloads.sourceforge.net/ripperx/ripperx-2.8.0.tar.bz2" +MD5SUM="51ac9ec0fddef9d2e951232a60d23bcd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="id3lib" -- cgit v1.2.3