diff options
| -rw-r--r-- | system/xcdroast/io_compile.patch | 21 | ||||
| -rw-r--r-- | system/xcdroast/xcdroast.SlackBuild | 56 | ||||
| -rw-r--r-- | system/xcdroast/xcdroast.desktop | 6 | ||||
| -rw-r--r-- | system/xcdroast/xcdroast.info | 6 |
4 files changed, 58 insertions, 31 deletions
diff --git a/system/xcdroast/io_compile.patch b/system/xcdroast/io_compile.patch new file mode 100644 index 0000000000..7285bd335d --- /dev/null +++ b/system/xcdroast/io_compile.patch @@ -0,0 +1,21 @@ +--- src/io.c.org 2009-02-24 09:38:27.000000000 +0100 ++++ src/io.c 2009-02-24 09:45:18.000000000 +0100 +@@ -1903,7 +1903,8 @@ + } + + strcpy(str,""); +- fgets(str,MAXLINE,fpin); ++ if (fgets(str,MAXLINE,fpin) == NULL) ++ g_error("fgets error\n"); + + if (pclose(fpin) == -1) { + g_error("pclose error\n"); +@@ -4720,7 +4721,7 @@ + dolog(3, "Saving extended output to %s\n", fname); + + /* write to file */ +- fd = open(fname,O_WRONLY | O_CREAT); ++ fd = open(fname, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); + if (fd < 0) { + g_warning("Can't open file %s for writing\n",fname); + return 1; diff --git a/system/xcdroast/xcdroast.SlackBuild b/system/xcdroast/xcdroast.SlackBuild index a3a1d05550..9eaee04bc9 100644 --- a/system/xcdroast/xcdroast.SlackBuild +++ b/system/xcdroast/xcdroast.SlackBuild @@ -3,26 +3,28 @@ # Slackware build script for xcdroast # Written by Georgios Efstathiou gefst@yahoo.com - -#Heavily based on original slackware script. +# Heavily based on original slackware script. PRGNAM=xcdroast VERSION=0.98alpha16 ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} # For consistency's sake, use this +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} # Drop the package in /tmp +OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e @@ -40,51 +42,47 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Configure flags; +patch -p0 < $CWD/io_compile.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ - --enable-gtk2 + --enable-gtk2 \ + --build=$ARCH-slackware-linux + +make XCDRLIB_PREFIX=/usr/lib${LIBDIRSUFFIX}/$PRGNAM +make XCDRLIB_PREFIX=/usr/lib${LIBDIRSUFFIX}/$PRGNAM install DESTDIR=$PKG -# Compile the application and install it into the $PKG directory -make -make install DESTDIR=$PKG +mkdir -p $PKG/usr/share/{applications,pixmaps} +cat $CWD/xcdroast.desktop > $PKG/usr/share/applications/xcdroast.desktop +( cd $PKG/usr/share/pixmaps + ln -s ../../lib${LIBDIRSUFFIX}/xcdroast/icons/xcdricon.png xcdroast.png +) -# Strip binaries and libraries - this can be done with 'make install-strip' -# in many source trees, and that's usually acceptable if so, but if not, -# use this: ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null || true + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null ) -# Compress man pages -# If the man pages are installed to /usr/share/man instead, you'll need to either -# add the --mandir=/usr/man flag to configure or move them manually after the -# make install process is run. ( cd $PKG/usr/man find . -type f -exec gzip -9 {} \; for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done ) -# Copy program documentation into the package mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING ChangeLog INSTALL README AUTHORS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + COPYING ChangeLog INSTALL README AUTHORS \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -#Copy the .desktop file -mkdir -p $PKG/usr/share/applications -cp -a ./extra/xcdroast.desktop $PKG/usr/share/applications - - -# Copy the slack-desc mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh -# Make the package cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/xcdroast/xcdroast.desktop b/system/xcdroast/xcdroast.desktop new file mode 100644 index 0000000000..40f9bcf8c5 --- /dev/null +++ b/system/xcdroast/xcdroast.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=X-CD-Roast +Type=Application +Exec=xcdroast +Icon=xcdroast +Comment=CD creation tool diff --git a/system/xcdroast/xcdroast.info b/system/xcdroast/xcdroast.info index b729a73c06..008b6f80db 100644 --- a/system/xcdroast/xcdroast.info +++ b/system/xcdroast/xcdroast.info @@ -1,8 +1,10 @@ PRGNAM="xcdroast" VERSION="0.98alpha16" HOMEPAGE="http://www.xcdroast.org/" -DOWNLOAD="http://prdownloads.sourceforge.net/xcdroast/xcdroast-0.98alpha16.tar.gz" +DOWNLOAD="http://downloads.sourceforge.net/xcdroast/xcdroast-0.98alpha16.tar.gz" MD5SUM="bc3d335a30f292067eaaf1ea03ebaf17" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="Georgios Efstathiou" EMAIL="gefst@yahoo.com" -APPROVED="David Somero"
\ No newline at end of file +APPROVED="rworkman" |