From 719a51d80360edaeee7bfed243dba583d2dd466d Mon Sep 17 00:00:00 2001 From: Andrew Clemons Date: Sun, 29 Aug 2021 15:23:37 +1200 Subject: [PATCH] audio/rubyripper: Updated for version 0.8.3.rc3. This fixes building against newer ruby gtk versions. Signed-off-by: Andrew Clemons Signed-off-by: Willy Sudiarto Raharjo --- audio/rubyripper/README | 2 +- audio/rubyripper/configure.patch | 16 ------------- audio/rubyripper/rubyripper.SlackBuild | 33 +++++++++++--------------- audio/rubyripper/rubyripper.info | 6 ++--- 4 files changed, 18 insertions(+), 39 deletions(-) delete mode 100644 audio/rubyripper/configure.patch diff --git a/audio/rubyripper/README b/audio/rubyripper/README index ed99969f01..cc69801b3c 100644 --- a/audio/rubyripper/README +++ b/audio/rubyripper/README @@ -7,7 +7,7 @@ interface. Rubyripper has the optional dependencies: * In SBo: -** rubygem-gtk2 (for gtk2 gui, use env GTK2=true) +** rubygem-gtk3 (for gtk3 gui, use env GTK3=true) ** cd-discid (for proper freedb support) ** vorbisgain, mp3gain (for replaygain support) * NOT in SBo: diff --git a/audio/rubyripper/configure.patch b/audio/rubyripper/configure.patch deleted file mode 100644 index a2cf2547ad..0000000000 --- a/audio/rubyripper/configure.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- configure.orig 2015-07-12 10:56:29.415500175 -0700 -+++ configure 2015-07-12 10:56:57.546148494 -0700 -@@ -110,10 +110,10 @@ - - puts "Testing support for the graphical frontend..." - begin -- require 'gtk2' -- puts "ruby-gtk2 bindings found" -+ require 'gtk2/base' -+ puts "rubygem-gtk2 bindings found" - rescue LoadError -- puts "ruby-gtk2 is not found. The graphical frontend won't work!" -+ puts "rubygem-gtk2 is not found. The graphical frontend won't work!" - end - - puts "\nTesting support for freedb metadata fetching..." diff --git a/audio/rubyripper/rubyripper.SlackBuild b/audio/rubyripper/rubyripper.SlackBuild index 5adda8fc7d..68256a9ff4 100644 --- a/audio/rubyripper/rubyripper.SlackBuild +++ b/audio/rubyripper/rubyripper.SlackBuild @@ -8,14 +8,14 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=rubyripper -VERSION=${VERSION:-0.6.2} +VERSION=${VERSION:-0.8.0rc3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -33,10 +33,10 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -GTK2=${GTK2:-false} +GTK3=${GTK3:-false} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -49,11 +49,11 @@ else LIBDIRSUFFIX="" fi -if [ "${GTK2}" = "true" ] ; then - GTK_ARGS="--enable-gtk2" +if [ "${GTK3}" = "true" ] ; then + GTK_ARGS="--enable-gtk3" fi -DOCS="GPL-3.txt README" +DOCS="CHANGELOG GPL-3.txt README.md" set -e @@ -61,18 +61,14 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# we should patch this regardless, because if 'gtk2' is present -# it will fail the build -patch --verbose < ${CWD}/configure.patch + \( -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 {} \; ./configure \ --prefix=/usr \ @@ -83,7 +79,7 @@ patch --verbose < ${CWD}/configure.patch make make install DESTDIR=$PKG -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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION @@ -95,4 +91,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE - diff --git a/audio/rubyripper/rubyripper.info b/audio/rubyripper/rubyripper.info index a22b3acb40..6b6947c0b0 100644 --- a/audio/rubyripper/rubyripper.info +++ b/audio/rubyripper/rubyripper.info @@ -1,8 +1,8 @@ PRGNAM="rubyripper" -VERSION="0.6.2" +VERSION="0.8.0rc3" HOMEPAGE="https://github.com/bleskodev/rubyripper" -DOWNLOAD="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/rubyripper/rubyripper-0.6.2.tar.bz2" -MD5SUM="04ee16c117ef8d839c3681b62839e8af" +DOWNLOAD="https://github.com/bleskodev/rubyripper/archive/v0.8.0rc3/rubyripper-0.8.0rc3.tar.gz" +MD5SUM="b3269bc08144286e99199f2cbd88eec3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES=""